diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-17 21:42:10 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-17 21:42:10 +0200 |
| commit | 7a2ce4fc1450dfccf9fd2e98e34c0449a5c7112a (patch) | |
| tree | aa26e0a25415886d3557e3b546ebfd54e0841ff8 | |
| parent | 4ab718bdd67ee0b5327269e24675070c2a705cc5 (diff) | |
fix faceapi build with mingw-w64, fix build error
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ftnoir_tracker_sm/ftnoir_tracker_sm.h | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6385f04d..0d0f7cf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,9 +559,13 @@ if(SDK_SM_FACEAPI_PATH) add_library(opentrack-tracker-faceapi SHARED ${opentrack-tracker-faceapi-c} ${opentrack-tracker-faceapi-moc} ${opentrack-tracker-faceapi-uih} ${opentrack-tracker-faceapi-rcc}) target_link_libraries(opentrack-tracker-faceapi ${MY_QT_LIBS} opentrack-compat) endif() - if(MSVC80) + if(MSVC80 OR MINGW) add_executable(opentrack-faceapi-wrapper ${opentrack-faceapi-wrapper-c}) target_link_libraries(opentrack-faceapi-wrapper "${SDK_SM_FACEAPI_PATH}/bin/smft32.lib") + if(CMAKE_COMPILER_IS_GNUCXX) + #target_link_libraries(opentrack-faceapi-wrapper msvcr80) + SET_TARGET_PROPERTIES(opentrack-faceapi-wrapper PROPERTIES LINK_FLAGS "-mdll") + endif() endif() endif() @@ -608,7 +612,7 @@ if(NOT SDK_FACEAPI_ONLY) NAMELINK_SKIP ) - if(SDK_VJOY) + if(WIN32 AND SDK_VJOY) install(TARGETS opentrack-proto-vjoy RUNTIME DESTINATION . LIBRARY DESTINATION . diff --git a/ftnoir_tracker_sm/ftnoir_tracker_sm.h b/ftnoir_tracker_sm/ftnoir_tracker_sm.h index 5d692ea0..6c76b149 100644 --- a/ftnoir_tracker_sm/ftnoir_tracker_sm.h +++ b/ftnoir_tracker_sm/ftnoir_tracker_sm.h @@ -22,14 +22,14 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. * * * ********************************************************************************/ -#include "..\ftnoir_tracker_base\ftnoir_tracker_base.h" -#include "..\ftnoir_tracker_base\ftnoir_tracker_sm_types.h" -#include "ui_FTNoIR_SM_controls.h" +#include "ftnoir_tracker_base/ftnoir_tracker_base.h" +#include "ftnoir_tracker_base/ftnoir_tracker_sm_types.h" +#include "ui_ftnoir_sm_controls.h" #include <QMessageBox> #include <QSettings> #include <QProcess> -#include "Windows.h" +#include <windows.h> #include "math.h" #include "facetracknoir/global-settings.h" #include "compat/compat.h" |