diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 00:54:33 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 00:54:33 +0200 |
| commit | b948329c7ae6ab2ff546cba43cdc4aca9b743cfd (patch) | |
| tree | 2293deaad3cc65098220525c8fe09834708d0dae | |
| parent | 8a953439f1fe8d331dd2fc51c244b0003f68dae0 (diff) | |
Try to unbreak mingw-w64 build
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b022e79b..25d3a809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,7 +432,8 @@ endif() target_link_libraries(opentrack-tracker-ht "${CMAKE_SOURCE_DIR}/dinput/dinput8.lib" "${CMAKE_SOURCE_DIR}/dinput/dxguid.lib" - "${CMAKE_SOURCE_DIR}/dinput/strmiids.lib") + "${CMAKE_SOURCE_DIR}/dinput/strmiids.lib" + uuid) endif() if(OpenCV_FOUND) diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h index 99478a54..d901b63e 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h @@ -28,13 +28,12 @@ #ifndef INCLUDED_FSUIPCSERVER_H #define INCLUDED_FSUIPCSERVER_H -#include "Windows.h" +#include <windows.h> #include <stdlib.h> #include "FSUIPC_User.h" #include "facetracknoir/global-settings.h" - -#include "..\ftnoir_protocol_base\ftnoir_protocol_base.h" -#include "ui_FTNoIR_FSUIPCcontrols.h" +#include "ftnoir_protocol_base/ftnoir_protocol_base.h" +#include "ui_ftnoir_fsuipccontrols.h" #include <QMessageBox> #include <QSettings> #include <QLibrary> |