Fix dependency on win32-pthreads

master
BtbN 2014-05-05 19:07:42 +02:00
parent 38594fff9e
commit ce542525fc
6 changed files with 15 additions and 6 deletions

5
deps/CMakeLists.txt vendored
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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