summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-12-04 18:45:39 +0100
committerStanislaw Halik <sthalik@misaki.pl>2013-12-04 18:45:39 +0100
commitbb0b7ca45ca2091b52e969cf0948be2d908377c2 (patch)
treee239ebc948ab5a1ad54c6be4cf584a89e9737346
parent59f4f2326f3fd8941e0694a930270d07774ca651 (diff)
fix msvc build
-rw-r--r--CMakeLists.txt11
1 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0b0f017..bc9aaec3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -556,6 +556,12 @@ if(SDK_ARUCO_LIBPATH)
SET_TARGET_PROPERTIES(opentrack-tracker-aruco
PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/${version-script}-version-script.txt")
endif()
+ if(WIN32 AND MSVC)
+ target_link_libraries(opentrack-tracker-aruco
+ "${CMAKE_SOURCE_DIR}/dinput/dxguid.lib"
+ "${CMAKE_SOURCE_DIR}/dinput/strmiids.lib"
+ uuid)
+ endif()
endif()
add_library(opentrack-tracker-hatire SHARED ${opentrack-tracker-hatire-c} ${opentrack-tracker-hatire-h} ${opentrack-tracker-hatire-moc} ${opentrack-tracker-hatire-uih} ${opentrack-tracker-hatire-rcc})
@@ -611,7 +617,8 @@ if(SDK_RIFT)
add_library(opentrack-tracker-rift SHARED ${opentrack-tracker-rift-c} ${opentrack-tracker-rift-h} ${opentrack-tracker-rift-moc} ${opentrack-tracker-rift-uih} ${opentrack-tracker-rift-rcc})
target_link_libraries(opentrack-tracker-rift ${MY_QT_LIBS})
if(MSVC)
- target_link_libraries(opentrack-tracker-rift "${SDK_RIFT}/Lib/Win32/libovr.lib" winmm.lib)
+ target_link_libraries(opentrack-tracker-rift "${SDK_RIFT}/Lib/Win32/libovr.lib" winmm.lib setupapi.lib)
+ set_target_properties(opentrack-tracker-rift PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
else()
if(WIN32)
target_link_libraries(opentrack-tracker-rift "${SDK_RIFT}/libLibOVR.a" winmm.lib setupapi.lib)
@@ -727,7 +734,7 @@ if(WIN32)
)
endif()
if(MSVC)
- SET_TARGET_PROPERTIES(opentrack PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup /NODEFAULTLIB:LIBCMT.LIB")
+ SET_TARGET_PROPERTIES(opentrack PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup")
endif()
target_link_libraries(opentrack opentrack-pose-widget opentrack-spline-widget ${MY_QT_LIBS} ${QXT_QXTCORE_LIB_RELEASE} ${QXT_QXTWIDGETS_LIB_RELEASE})
if(NOT WIN32)