Browse Source

Meta: Add assimp dependency

master
Riyyi 6 months ago
parent
commit
08969e32d1
  1. 3
      .gitmodules
  2. 1
      README.org
  3. 13
      vendor/CMakeLists.txt
  4. 1
      vendor/assimp

3
.gitmodules vendored

@ -19,3 +19,6 @@
[submodule "inferno/vendor/ruc"] [submodule "inferno/vendor/ruc"]
path = vendor/ruc path = vendor/ruc
url = https://github.com/Riyyi/ruc url = https://github.com/Riyyi/ruc
[submodule "inferno/vendor/assimp"]
path = vendor/assimp
url = https://github.com/assimp/assimp

1
README.org

@ -33,6 +33,7 @@ $ cmake .. && make
* Libraries * Libraries
- [[https://github.com/assimp/assimp][assimp]]
# - [[https://github.com/bulletphysics/bullet3][Bullet]] # - [[https://github.com/bulletphysics/bullet3][Bullet]]
- [[https://github.com/skypjack/entt][EnTT]] - [[https://github.com/skypjack/entt][EnTT]]
- [[https://github.com/Dav1dde/glad][glad]] - [[https://github.com/Dav1dde/glad][glad]]

13
vendor/CMakeLists.txt vendored

@ -9,6 +9,16 @@ add_subdirectory(glfw)
# Add RUC target to project # Add RUC target to project
add_subdirectory(ruc) add_subdirectory(ruc)
# assimp options
option(ASSIMP_BUILD_ASSIMP_VIEW OFF)
option(ASSIMP_BUILD_TESTS OFF)
option(ASSIMP_INSTALL OFF)
option(ASSIMP_INSTALL_PDB OFF)
option(ASSIMP_WARNINGS_AS_ERRORS OFF)
# Add assimp target to project
add_subdirectory(assimp)
# Define engine source files # Define engine source files
file(GLOB_RECURSE GLAD "glad/*.c") file(GLOB_RECURSE GLAD "glad/*.c")
file(GLOB LUA "lua/lua/*.c") file(GLOB LUA "lua/lua/*.c")
@ -19,6 +29,7 @@ set(ENGINE_SOURCES ${GLAD} ${LUA})
add_library(${ENGINE}-dependencies ${ENGINE_SOURCES}) add_library(${ENGINE}-dependencies ${ENGINE_SOURCES})
target_include_directories(${ENGINE}-dependencies PUBLIC target_include_directories(${ENGINE}-dependencies PUBLIC
"assimp/include"
"glad/include" "glad/include"
"lua") "lua")
target_link_libraries(${ENGINE}-dependencies glfw ruc ruc-test) target_link_libraries(${ENGINE}-dependencies glfw ruc ruc-test assimp)

1
vendor/assimp vendored

@ -0,0 +1 @@
Subproject commit 762ad8e9b7d8749c17dedd3e0b9a32b933949e8f
Loading…
Cancel
Save