Browse Source

Fix dependency on win32-pthreads

BtbN 11 years ago
parent
commit
ce542525fc

+ 1 - 4
deps/CMakeLists.txt

@@ -1,7 +1,4 @@
 
-if(WIN32)
-	add_subdirectory(w32-pthreads)
-endif()
-
+add_subdirectory(w32-pthreads)
 add_subdirectory(glad)
 add_subdirectory(jansson)

+ 4 - 0
deps/w32-pthreads/CMakeLists.txt

@@ -1,5 +1,9 @@
 project(w32-pthreads)
 
+if(NOT WIN32)
+	return()
+endif()
+
 set(w32-pthreads_SOURCES
 	pthread.c)
 

+ 0 - 2
libobs/CMakeLists.txt

@@ -26,8 +26,6 @@ if(WIN32)
 	set(libobs_PLATFORM_DEPS
 		w32-pthreads
 		winmm.lib)
-
-	add_definitions(-DPTW32_STATIC_LIB)
 elseif(APPLE)
 	set(libobs_PLATFORM_SOURCES
 		obs-cocoa.c

+ 6 - 0
plugins/obs-ffmpeg/CMakeLists.txt

@@ -1,5 +1,10 @@
 project(obs-ffmpeg)
 
+if(WIN32)
+	set(obs-ffmpeg_PLATFORM_DEPS
+		w32-pthreads)
+endif()
+
 find_package(Libavcodec REQUIRED)
 include_directories(${Libavcodec_INCLUDE_DIR})
 add_definitions(${Libavcodec_DEFINITIONS})
@@ -32,6 +37,7 @@ add_library(obs-ffmpeg MODULE
 	${obs-ffmpeg_SOURCES})
 target_link_libraries(obs-ffmpeg
 	libobs
+	${obs-ffmpeg_PLATFORM_DEPS}
 	${Libavcodec_LIBRARIES}
 	${Libavutil_LIBRARIES}
 	${Libswscale_LIBRARIES}

+ 1 - 0
plugins/obs-outputs/CMakeLists.txt

@@ -2,6 +2,7 @@ project(obs-outputs)
 
 if(WIN32)
 	set(obs-outputs_PLATFORM_DEPS
+		w32-pthreads
 		ws2_32.lib
 		winmm.lib)
 endif()

+ 3 - 0
test/test-input/CMakeLists.txt

@@ -21,6 +21,9 @@ if(APPLE)
 	set(test-input_PLATFORM_DEPS
 		${IOSURF}
 		${COCOA})
+elseif(WIN32)
+	set(test-input_PLATFORM_DEPS
+		w32-pthreads)
 endif()
 
 set(test-input_SOURCES