FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #204 from LaurensVoerman/submitFBX2017

Browse Source 
added FBX SDK 2017.1 and try to add apple (clang) support.
This commit is contained in:
OpenSceneGraph git repository
2017-03-11 11:34:56 +00:00
committed by GitHub
parent 1d8efb1a3a 0f899a2a1e
commit 36e0fd8f5a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeModules/FindFBX.cmake
View File

@@ -9,7 +9,12 @@
# correspond to the ./configure --prefix=$FBX_DIR
IF(APPLE)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# using regular Clang or AppleClang
SET(FBX_LIBDIR "clang")
else()
SET(FBX_LIBDIR "gcc4/ub")
endif()
ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
SET(FBX_LIBDIR "gcc4")
ELSEIF(MSVC80)
@@ -55,6 +60,9 @@ SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
SET( FBX_SEARCH_PATHS
$ENV{FBX_DIR}
"$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2017.1"
"$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2017.1"
"/Applications/Autodesk/FBX SDK/2017.1"
"$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2016.1.1"
"$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2016.1.1"
"$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2015.1"