pull/2599/head
Stefano Sinigardi 6 years ago
parent 5be12ce058
commit d6294761be
  1. 0
      3rdparty/pthreads/bin/pthreadGC2.dll
  2. 0
      3rdparty/pthreads/bin/pthreadVC2.dll
  3. BIN
      3rdparty/pthreads/dll/x86/pthreadGC2.dll
  4. BIN
      3rdparty/pthreads/dll/x86/pthreadGCE2.dll
  5. BIN
      3rdparty/pthreads/dll/x86/pthreadVC2.dll
  6. BIN
      3rdparty/pthreads/dll/x86/pthreadVCE2.dll
  7. BIN
      3rdparty/pthreads/dll/x86/pthreadVSE2.dll
  8. 0
      3rdparty/pthreads/lib/libpthreadGC2.a
  9. 0
      3rdparty/pthreads/lib/pthreadVC2.lib
  10. BIN
      3rdparty/pthreads/lib/x86/libpthreadGC2.a
  11. BIN
      3rdparty/pthreads/lib/x86/libpthreadGCE2.a
  12. BIN
      3rdparty/pthreads/lib/x86/pthreadVC2.lib
  13. BIN
      3rdparty/pthreads/lib/x86/pthreadVCE2.lib
  14. BIN
      3rdparty/pthreads/lib/x86/pthreadVSE2.lib
  15. 2
      CMakeLists.txt
  16. 6
      cmake/Modules/FindPThreads_windows.cmake
  17. 2
      cmake/Modules/FindStb.cmake

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -76,7 +76,7 @@ if(USE_INTEGRATED_LIBS)
set(PThreads_windows_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pthreads CACHE PATH "Path where pthreads for windows can be located") set(PThreads_windows_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pthreads CACHE PATH "Path where pthreads for windows can be located")
add_definitions(-D_TIMESPEC_DEFINED) add_definitions(-D_TIMESPEC_DEFINED)
endif() endif()
set(Stb_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/stb/include CACHE PATH "Path where Stb image library can be located") set(Stb_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/stb CACHE PATH "Path where Stb image library can be located")
set(CMAKE_DEBUG_POSTFIX d) set(CMAKE_DEBUG_POSTFIX d)
add_definitions(-DUSE_CMAKE_LIBS) add_definitions(-DUSE_CMAKE_LIBS)

@ -26,13 +26,13 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
if(NOT PThreads_windows_INCLUDE_DIR) if(NOT PThreads_windows_INCLUDE_DIR)
find_path(PThreads_windows_INCLUDE_DIR NAMES pthread.h) find_path(PThreads_windows_INCLUDE_DIR NAMES pthread.h PATHS ${PThreads_windows_DIR} PATH_SUFFIXES include)
endif() endif()
# Allow libraries to be set manually # Allow libraries to be set manually
if(NOT PThreads_windows_LIBRARY) if(NOT PThreads_windows_LIBRARY)
find_library(PThreads_windows_LIBRARY_RELEASE NAMES pthreadsVC2 pthreadVC2) find_library(PThreads_windows_LIBRARY_RELEASE NAMES pthreadsVC2 pthreadVC2 PATHS ${PThreads_windows_DIR} PATH_SUFFIXES lib)
find_library(PThreads_windows_LIBRARY_DEBUG NAMES pthreadsVC2d pthreadVC2d) find_library(PThreads_windows_LIBRARY_DEBUG NAMES pthreadsVC2d pthreadVC2d PATHS ${PThreads_windows_DIR} PATH_SUFFIXES lib)
select_library_configurations(PThreads_windows) select_library_configurations(PThreads_windows)
endif() endif()

@ -23,7 +23,7 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
if(NOT Stb_INCLUDE_DIR) if(NOT Stb_INCLUDE_DIR)
find_path(Stb_INCLUDE_DIR NAMES stb_image.h PATHS ${Stb_DIR}) find_path(Stb_INCLUDE_DIR NAMES stb_image.h PATHS ${Stb_DIR} PATH_SUFFIXES include)
endif() endif()
find_package_handle_standard_args(Stb DEFAULT_MSG Stb_INCLUDE_DIR) find_package_handle_standard_args(Stb DEFAULT_MSG Stb_INCLUDE_DIR)

Loading…
Cancel
Save