summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2020-03-29 16:39:13 +0200
committerStanislaw Halik <sthalik@misaki.pl>2020-03-29 16:39:32 +0200
commit5a95a9e670a815cc97934c16d0f1bec9b4b77a90 (patch)
tree3c71278cc5115ee661cbc5ae9ce063fa6428219c
parentc7748ef20650007b4ef4067bcb5277a38dea12e0 (diff)
fix build
-rw-r--r--video-ps3eye/CMakeLists.txt3
m---------video-ps3eye/ps3eye-driver0
-rw-r--r--video-ps3eye/shm.cxx3
-rw-r--r--video-ps3eye/shm.hpp2
4 files changed, 5 insertions, 3 deletions
diff --git a/video-ps3eye/CMakeLists.txt b/video-ps3eye/CMakeLists.txt
index 7e2e6aa3..3423901b 100644
--- a/video-ps3eye/CMakeLists.txt
+++ b/video-ps3eye/CMakeLists.txt
@@ -42,8 +42,9 @@ endif()
if(TARGET ps3eye-driver)
add_executable(ps3eye-subprocess "wrapper.cxx" "shm.cxx")
+ target_link_libraries(ps3eye-subprocess ps3eye-driver)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
- target_link_libraries(ps3eye-subprocess rt ps3eye-driver)
+ target_link_libraries(ps3eye-subprocess rt)
endif()
install(TARGETS "ps3eye-subprocess" DESTINATION "${opentrack-libexec}")
endif()
diff --git a/video-ps3eye/ps3eye-driver b/video-ps3eye/ps3eye-driver
-Subproject 83b6d1434c75e415ca1dc42bbecf1228be87def
+Subproject 19c46e09c262b4b9b8e67d36cf198dc4705b906
diff --git a/video-ps3eye/shm.cxx b/video-ps3eye/shm.cxx
index 6a8c0f53..57e35c3a 100644
--- a/video-ps3eye/shm.cxx
+++ b/video-ps3eye/shm.cxx
@@ -1,3 +1,2 @@
-#define OTR_GENERIC_EXPORT
-#define OTR_GENERIC_IMPORT
+#include "shm.hpp"
#include "../compat/shm.cpp"
diff --git a/video-ps3eye/shm.hpp b/video-ps3eye/shm.hpp
index ef73be8a..2bb8cb89 100644
--- a/video-ps3eye/shm.hpp
+++ b/video-ps3eye/shm.hpp
@@ -1,2 +1,4 @@
#pragma once
+#define OTR_GENERIC_EXPORT
+#define OTR_GENERIC_IMPORT
#include "../compat/shm.h"