Remove pthreads references in Windows.

Unset variable STATIC - basisu wants this, but it breaks the draco build-generation.
simul · Jul 27, 2024 · fdf3703 · fdf3703
1 parent 6e0b416
commit fdf3703
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -181,7 +181,7 @@ if(TELEPORT_WINDOWS)
 	set(LIB_EAY_RELEASE ${OPENSSL_LIBRARIES}/libcrypto.lib CACHE STRING "" )
 	message("OPENSSL_CRYPTO_LIBRARY ${OPENSSL_CRYPTO_LIBRARY}")
 	include_directories(${CMAKE_SOURCE_DIR}/firstparty/Platform/Windows)
-	add_subdirectory(thirdparty/srt/submodules/pthread-win32)
+	#add_subdirectory(thirdparty/srt/submodules/pthread-win32)
 
 	option(TELEPORT_CLIENT_SUPPORT_IPSME "Should IPSME be included?" OFF)
 	set(TELEPORT_CLIENT_MOSQUITTO_LIB_DIR "E:/Code/Teleport/IPSME/mosquitto-2.0.18/build/lib" CACHE PATH "Mosquitto install path for IPSME support")

diff --git a/TeleportServer/CMakeLists.txt b/TeleportServer/CMakeLists.txt
@@ -128,7 +128,7 @@ if(UNIX)
 	message("{LIBAV_CUDA_DIR}/libx64 ${LIBAV_CUDA_DIR}/libx64")
 endif()
 target_link_directories(TeleportServer PUBLIC ../thirdparty/openssl/x64/lib)
-target_link_libraries(TeleportServer TeleportAudio TeleportCore libavstream basisu efp fmt LibDataChannel::LibDataChannelStatic pthreads4w::pthreadVC3)
+target_link_libraries(TeleportServer TeleportAudio TeleportCore libavstream basisu efp fmt LibDataChannel::LibDataChannelStatic )
 if(WIN32)
 	target_link_libraries(TeleportServer draco winmm d3d12 Secur32.lib)
 else()

diff --git a/libavstream/CMakeLists.txt b/libavstream/CMakeLists.txt
@@ -367,7 +367,7 @@ target_include_directories(libavstream PRIVATE src PRIVATE ${CMAKE_SOURCE_DIR}
 														${webrtc_include_paths}
 														${efp_include_paths}
 														include
-														${PTHREAD_INCLUDE_DIR}
+														#${PTHREAD_INCLUDE_DIR}
 														PUBLIC include include/libavstream
 														${curl_include_paths})
 target_compile_features(libavstream PRIVATE cxx_std_17)
@@ -435,5 +435,5 @@ if(TELEPORT_TEST)
 	find_package(Catch2 REQUIRED)
 	add_executable(libavstream_test src/test/test.cpp)
 	set_target_properties(libavstream_test PROPERTIES FOLDER AVStream)
-	target_link_libraries(libavstream_test Catch2WithMain libavstream efp fmt LibDataChannel::LibDataChannelStatic pthreads4w::pthreadVC3)
+	target_link_libraries(libavstream_test Catch2WithMain libavstream efp fmt LibDataChannel::LibDataChannelStatic )
 endif()