x64 only

Tossy0423 · Mar 13, 2019 · d629476 · d629476
1 parent 5be12ce
commit d629476
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 5 deletions.
diff --git a/3rdparty/pthreads/dll/x64/pthreadGC2.dll → 3rdparty/pthreads/bin/pthreadGC2.dll b/3rdparty/pthreads/dll/x64/pthreadGC2.dll → 3rdparty/pthreads/bin/pthreadGC2.dll
diff --git a/3rdparty/pthreads/dll/x64/pthreadVC2.dll → 3rdparty/pthreads/bin/pthreadVC2.dll b/3rdparty/pthreads/dll/x64/pthreadVC2.dll → 3rdparty/pthreads/bin/pthreadVC2.dll
diff --git a/3rdparty/pthreads/dll/x86/pthreadGC2.dll b/3rdparty/pthreads/dll/x86/pthreadGC2.dll
diff --git a/3rdparty/pthreads/dll/x86/pthreadGCE2.dll b/3rdparty/pthreads/dll/x86/pthreadGCE2.dll
diff --git a/3rdparty/pthreads/dll/x86/pthreadVC2.dll b/3rdparty/pthreads/dll/x86/pthreadVC2.dll
diff --git a/3rdparty/pthreads/dll/x86/pthreadVCE2.dll b/3rdparty/pthreads/dll/x86/pthreadVCE2.dll
diff --git a/3rdparty/pthreads/dll/x86/pthreadVSE2.dll b/3rdparty/pthreads/dll/x86/pthreadVSE2.dll
diff --git a/3rdparty/pthreads/lib/x64/libpthreadGC2.a → 3rdparty/pthreads/lib/libpthreadGC2.a b/3rdparty/pthreads/lib/x64/libpthreadGC2.a → 3rdparty/pthreads/lib/libpthreadGC2.a
diff --git a/3rdparty/pthreads/lib/x64/pthreadVC2.lib → 3rdparty/pthreads/lib/pthreadVC2.lib b/3rdparty/pthreads/lib/x64/pthreadVC2.lib → 3rdparty/pthreads/lib/pthreadVC2.lib
diff --git a/3rdparty/pthreads/lib/x86/libpthreadGC2.a b/3rdparty/pthreads/lib/x86/libpthreadGC2.a
diff --git a/3rdparty/pthreads/lib/x86/libpthreadGCE2.a b/3rdparty/pthreads/lib/x86/libpthreadGCE2.a
diff --git a/3rdparty/pthreads/lib/x86/pthreadVC2.lib b/3rdparty/pthreads/lib/x86/pthreadVC2.lib
diff --git a/3rdparty/pthreads/lib/x86/pthreadVCE2.lib b/3rdparty/pthreads/lib/x86/pthreadVCE2.lib
diff --git a/3rdparty/pthreads/lib/x86/pthreadVSE2.lib b/3rdparty/pthreads/lib/x86/pthreadVSE2.lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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")
   add_definitions(-D_TIMESPEC_DEFINED)
 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)
 add_definitions(-DUSE_CMAKE_LIBS)

diff --git a/cmake/Modules/FindPThreads_windows.cmake b/cmake/Modules/FindPThreads_windows.cmake
@@ -26,13 +26,13 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
 
 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()
 
 # Allow libraries to be set manually
 if(NOT PThreads_windows_LIBRARY)
-  find_library(PThreads_windows_LIBRARY_RELEASE NAMES pthreadsVC2 pthreadVC2)
-  find_library(PThreads_windows_LIBRARY_DEBUG NAMES pthreadsVC2d pthreadVC2d)
+  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 PATHS ${PThreads_windows_DIR} PATH_SUFFIXES lib)
   select_library_configurations(PThreads_windows)
 endif()
 

diff --git a/cmake/Modules/FindStb.cmake b/cmake/Modules/FindStb.cmake
@@ -23,7 +23,7 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
 
 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()
 
 find_package_handle_standard_args(Stb DEFAULT_MSG Stb_INCLUDE_DIR)