Make w32-pthreads and jansson shared libraries

This commit is contained in:
jp9000
2014-04-19 20:33:45 -07:00
parent 7a60694159
commit 92812ba313
5 changed files with 261 additions and 4 deletions

3
deps/CMakeLists.txt vendored
View File

@@ -7,7 +7,6 @@ add_subdirectory(glad)
set(BUILD_DOCS FALSE CACHE INTERNAL "" FORCE)
set(STATIC_CRT TRUE CACHE INTERNAL "" FORCE)
set(BUILD_SHARED_LIBS FALSE CACHE INTERNAL "" FORCE)
set(BUILD_SHARED_LIBS TRUE CACHE INTERNAL "" FORCE)
set(WITHOUT_TESTS TRUE CACHE INTERNAL "" FORCE)
add_subdirectory(jansson)

View File

@@ -479,3 +479,7 @@ if (NOT WITHOUT_TESTS)
DEPENDS json_process ${api_tests})
endif ()
target_include_directories(jansson
PUBLIC src)
install_obs_core(jansson)

View File

@@ -2,7 +2,6 @@ project(w32-pthreads)
add_definitions(-D__CLEANUP_C)
add_definitions(-DPTW32_BUILD)
add_definitions(-DPTW32_STATIC_LIB)
set(w32-pthreads_SOURCES
pthread.c)
@@ -13,7 +12,9 @@ set(w32-pthreads_HEADERS
sched.h
semaphore.h)
add_library(w32-pthreads STATIC
add_library(w32-pthreads
${w32-pthreads_SOURCES}
${w32-pthreads_HEADERS})
target_link_libraries(w32-pthreads)
install_obs_core(w32-pthreads)