Aurailus
/
Zepha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Assimp compilation

master
Nicole Collings 2019-11-02 17:00:50 -07:00
parent 7cbbd6fed2
commit 88ecf13e2c
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -23,12 +23,6 @@ find_library(LUA_LIB NAMES lua lua5.1 PATHS
/usr/lib
/usr/local/lib)
if (WIN32)
find_library(ASSIMP_LIB assimp-vc142-mt)
else()
find_library(ASSIMP_LIB assimp)
endif()
find_library(ENET_LIB enet)
find_library(NOISE_LIB NAMES libnoise noise noise-static)
@ -38,12 +32,18 @@ else()
find_library(PTHREAD_LIB pthread)
endif()
if (WIN32)
set(SOL_HEADERS lib/header/sol2/include_win)
else()
set(SOL_HEADERS lib/header/sol2/include_linux)
endif()
include_directories(
# Include Header Only Libraries
lib/header/catch2/include # Catch2 unit testing library.
lib/header/gzip/include # GZip Compression header library.
${GLM_HEADERS} # OpenGL Mathematics Library.
lib/header/sol2/include # Sol2 Lua Parser library.
${SOL_HEADERS} # Sol2 Lua Parser library.
lib/header/cute_files/include # Cute file traversal header library.
lib/header/stb_image/include # STB Image processor header library.
lib/header/json/include # JSON header library.

24
LoadLibs.cmake
View File

@ -29,17 +29,23 @@ endif()
target_link_libraries(${MAIN_EXEC_NAME} ${GLEW_LIB})
# Build and Link Assimp
set(BUILD_SHARED_LIBS OFF)
set(ASSIMP_NO_EXPORT ON)
set(ASSIMP_BUILD_TESTS OFF)
set(ASSIMP_BUILD_ASSIMP_TOOLS OFF)
set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT OFF)
set(ASSIMP_BUILD_B3D_IMPORTER ON)
set(ASSIMP_BUILD_X3D_IMPORTER ON) # Doesn't compile if not defined
if (WIN32)
find_library(ASSIMP_LIB assimp-vc142-mt)
else()
set(BUILD_SHARED_LIBS OFF)
set(ASSIMP_NO_EXPORT ON)
set(ASSIMP_BUILD_TESTS OFF)
set(ASSIMP_BUILD_ASSIMP_TOOLS OFF)
# add_subdirectory(lib/static/assimp)
target_link_libraries(${MAIN_EXEC_NAME} assimp)
set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT OFF)
set(ASSIMP_BUILD_B3D_IMPORTER ON)
set(ASSIMP_BUILD_X3D_IMPORTER ON) # Doesn't compile if not defined
add_subdirectory(lib/static/assimp)
target_compile_options(assimp PRIVATE -w)
target_link_libraries(${MAIN_EXEC_NAME} assimp)
endif()
# Link Lua 5.3.5
target_link_libraries(${MAIN_EXEC_NAME} ${LUA_LIB})