diff options
| -rw-r--r-- | gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | opentrack-compat/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | opentrack/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | proto-vjoy/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tracker-aruco/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tracker-ht/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tracker-joystick/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tracker-pt/CMakeLists.txt | 1 |
8 files changed, 5 insertions, 9 deletions
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index d34ea981..5e47e7f7 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -26,8 +26,6 @@ target_link_libraries(opentrack opentrack-version ) -link_with_dinput8(opentrack) - if(APPLE) # for process detector target_link_libraries(opentrack proc) diff --git a/opentrack-compat/CMakeLists.txt b/opentrack-compat/CMakeLists.txt index fbca0263..ab3278a3 100644 --- a/opentrack-compat/CMakeLists.txt +++ b/opentrack-compat/CMakeLists.txt @@ -2,4 +2,3 @@ opentrack_boilerplate(opentrack-compat NO-COMPAT) if(NOT WIN32 AND NOT APPLE) target_link_libraries(opentrack-compat rt) endif() -link_with_dinput8(opentrack-compat) diff --git a/opentrack/CMakeLists.txt b/opentrack/CMakeLists.txt index c20a04a3..7763178d 100644 --- a/opentrack/CMakeLists.txt +++ b/opentrack/CMakeLists.txt @@ -5,4 +5,3 @@ if(NOT WIN32) else() target_link_libraries(opentrack-api winmm) endif() -link_with_dinput8(opentrack-api) diff --git a/proto-vjoy/CMakeLists.txt b/proto-vjoy/CMakeLists.txt index 22678c32..5584c876 100644 --- a/proto-vjoy/CMakeLists.txt +++ b/proto-vjoy/CMakeLists.txt @@ -1,7 +1,11 @@ if(WIN32) set(SDK_VJOY "" CACHE PATH "VJoy SDK path") if(SDK_VJOY) - opentrack_boilerplate(opentrack-proto-vjoy GNU-LINK "-Wl,--enable-stdcall-fixup") + set(link "") + if(CMAKE_COMPILER_IS_GNUCXX) + set(link "-Wl,--enable-stdcall-fixup") + endif() + opentrack_boilerplate(opentrack-proto-vjoy LINK "${link}") if(MSVC) set(ext .lib) else() diff --git a/tracker-aruco/CMakeLists.txt b/tracker-aruco/CMakeLists.txt index 70d742ee..483eef92 100644 --- a/tracker-aruco/CMakeLists.txt +++ b/tracker-aruco/CMakeLists.txt @@ -4,5 +4,4 @@ if(SDK_ARUCO_LIBPATH) opentrack_boilerplate(opentrack-tracker-aruco) target_link_libraries(opentrack-tracker-aruco ${SDK_ARUCO_LIBPATH} ${OpenCV_LIBS}) target_include_directories(opentrack-tracker-aruco SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) - link_with_dinput8(opentrack-tracker-aruco) endif() diff --git a/tracker-ht/CMakeLists.txt b/tracker-ht/CMakeLists.txt index cbbda108..82784fe6 100644 --- a/tracker-ht/CMakeLists.txt +++ b/tracker-ht/CMakeLists.txt @@ -6,7 +6,6 @@ if(OpenCV_FOUND) if(SDK_HT AND SDK_HT_FLANDMARK) opentrack_boilerplate(opentrack-tracker-ht) target_link_libraries(opentrack-tracker-ht ${SDK_HT} ${SDK_HT_FLANDMARK} ${OpenCV_LIBS}) - link_with_dinput8(opentrack-tracker-ht) target_include_directories(opentrack-tracker-ht SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) endif() endif() diff --git a/tracker-joystick/CMakeLists.txt b/tracker-joystick/CMakeLists.txt index c8d2d218..b5fbcf75 100644 --- a/tracker-joystick/CMakeLists.txt +++ b/tracker-joystick/CMakeLists.txt @@ -1,4 +1,3 @@ if(WIN32) opentrack_boilerplate(opentrack-tracker-joystick) - link_with_dinput8(opentrack-tracker-joystick) endif() diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt index 36710ecf..f646dd8b 100644 --- a/tracker-pt/CMakeLists.txt +++ b/tracker-pt/CMakeLists.txt @@ -3,5 +3,4 @@ if(OpenCV_FOUND) opentrack_boilerplate(opentrack-tracker-pt) target_link_libraries(opentrack-tracker-pt ${OpenCV_LIBS}) target_include_directories(opentrack-tracker-pt SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) - link_with_dinput8(opentrack-tracker-pt) endif() |