Browse Source

Require 2019.2 henceforth.

Par Winzell 6 năm trước cách đây
mục cha
commit
e990432ecf
2 tập tin đã thay đổi với 11 bổ sung5 xóa
  1. 7 1
      CMakeLists.txt
  2. 4 4
      FindFBX.cmake

+ 7 - 1
CMakeLists.txt

@@ -8,13 +8,17 @@ if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 endif ()
 
 set(CMAKE_CXX_STANDARD 11)
+
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package(Threads REQUIRED)
+find_package(LibXml2 REQUIRED)
+find_package(ZLIB REQUIRED)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 include(ExternalProject)
 
 # FBX
-foreach (FBXSDK_VERSION "2019.0" "2018.1.1")
+foreach (FBXSDK_VERSION "2019.2")
   find_package(FBX)
   if (FBXSDK_FOUND)
     break()
@@ -230,6 +234,8 @@ target_link_libraries(libFBX2glTF
   optimized ${FBXSDK_LIBRARY}
   debug ${FBXSDK_LIBRARY_DEBUG}
   ${CMAKE_DL_LIBS}
+  ${LIBXML2_LIBRARIES}
+  ${ZLIB_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
 )
 

+ 4 - 4
FindFBX.cmake

@@ -66,11 +66,11 @@ elseif (WIN32)
 elseif (UNIX)
   set(_fbxsdk_root "${FBXSDK_LINUX_ROOT}")
   if (ARCH_32)
-    set(_fbxsdk_libdir_debug "lib/gcc4/x86/debug")
-    set(_fbxsdk_libdir_release "lib/gcc4/x86/release")
+    set(_fbxsdk_libdir_debug "lib/gcc/x86/debug")
+    set(_fbxsdk_libdir_release "lib/gcc/x86/release")
   else()
-    set(_fbxsdk_libdir_debug "lib/gcc4/x64/debug")
-    set(_fbxsdk_libdir_release "lib/gcc4/x64/release")
+    set(_fbxsdk_libdir_debug "lib/gcc/x64/debug")
+    set(_fbxsdk_libdir_release "lib/gcc/x64/release")
   endif()
   set(_fbxsdk_libname_debug "libfbxsdk.a")
   set(_fbxsdk_libname_release "libfbxsdk.a")