AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add amuse library

This commit is contained in:
Jack Andersen 2016-05-02 15:23:09 -10:00
parent d972ab9124
commit 7085549a42
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "nod"] [submodule "nod"]
path = nod path = nod
url = https://github.com/AxioDL/nod.git url = https://github.com/AxioDL/nod.git
[submodule "amuse"]
path = amuse
url = https://github.com/AxioDL/amuse.git

3
CMakeLists.txt
View File

@ -84,6 +84,7 @@ set(HECL_DATASPEC_PUSHES
hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);") hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);")
add_subdirectory(hecl) add_subdirectory(hecl)
add_definitions(${BOO_SYS_DEFINES}) add_definitions(${BOO_SYS_DEFINES})
add_subdirectory(amuse)
add_subdirectory(specter) add_subdirectory(specter)
set(SPECTER_INCLUDE_DIR specter/include specter/freetype2/include) set(SPECTER_INCLUDE_DIR specter/include specter/freetype2/include)
add_subdirectory(nod) add_subdirectory(nod)
@ -91,7 +92,7 @@ set(NOD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nod/include)
add_definitions(-DZE_ATHENA_TYPES=1) add_definitions(-DZE_ATHENA_TYPES=1)
set(ZEUS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/specter/zeus/include) set(ZEUS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/specter/zeus/include)
include_directories(${ATHENA_INCLUDE_DIR} ${LOGVISOR_INCLUDE_DIR} ${HECL_INCLUDE_DIR} include_directories(${ATHENA_INCLUDE_DIR} ${LOGVISOR_INCLUDE_DIR} ${HECL_INCLUDE_DIR}
${NOD_INCLUDE_DIR} ${ZEUS_INCLUDE_DIR} ${BOO_INCLUDE_DIR} ${NOD_INCLUDE_DIR} ${ZEUS_INCLUDE_DIR} ${BOO_INCLUDE_DIR} ${AMUSE_INCLUDE_DIR}
${SPECTER_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) ${SPECTER_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(DataSpec) add_subdirectory(DataSpec)
add_subdirectory(Editor) add_subdirectory(Editor)

2
Editor/CMakeLists.txt
View File

@ -40,7 +40,7 @@ target_link_libraries(urde
DNAMP3 DNAMP2 DNAMP1 DNAMP3 DNAMP2 DNAMP1
DNACommon specter specter-fonts freetype ${DATA_SPEC_LIBS} DNACommon specter specter-fonts freetype ${DATA_SPEC_LIBS}
hecl-database hecl-runtime hecl-backend hecl-frontend hecl-hmdl hecl-blender hecl-common hecl-database hecl-runtime hecl-backend hecl-frontend hecl-hmdl hecl-blender hecl-common
athena-core nod logvisor athena-libyaml boo ${PNG_LIB} libjpeg-turbo squish xxhash zeus athena-core nod logvisor athena-libyaml amuse boo ${PNG_LIB} libjpeg-turbo squish xxhash zeus
${ZLIB_LIBRARIES} ${LZO_LIB} ${ZLIB_LIBRARIES} ${LZO_LIB}
${BOO_SYS_LIBS}) ${BOO_SYS_LIBS})

1
amuse Submodule

@ -0,0 +1 @@
Subproject commit fa8d9038dffab436223b75ab185ea0a3340e3d45

2
specter

@ -1 +1 @@
Subproject commit 44d56fe9435329c1a70a60ec70b88be51e9c3c44 Subproject commit 90daa39c473e5821bf3a54c6c8f0a4a6cd011499