AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Update submodules; LLVM 4.0 support

Browse Source
This commit is contained in:
Jack Andersen
2016-12-07 18:55:44 -10:00
parent 265eeeeac3
commit 75b69b590c
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -81,6 +81,11 @@ set(HECL_DATASPEC_PUSHES
hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3); hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3);
hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);") hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);")
add_subdirectory(hecl) add_subdirectory(hecl)
if(NOT TARGET atdna)
message(FATAL_ERROR "atdna required for building URDE; please verify LLVM installation")
endif()
add_definitions(${BOO_SYS_DEFINES}) add_definitions(${BOO_SYS_DEFINES})
include_directories(${BOO_SYS_INCLUDES}) include_directories(${BOO_SYS_INCLUDES})
add_subdirectory(amuse) add_subdirectory(amuse)

1
Editor/icons/CMakeLists.txt
View File

@@ -12,6 +12,7 @@ if(WIN32)
"$ENV{ProgramW6432}/Inkscape" "$ENV{ProgramW6432}/Inkscape"
"$ENV{PROGRAMFILES(X86)}/Inkscape") "$ENV{PROGRAMFILES(X86)}/Inkscape")
else() else()
set(CMAKE_FIND_APPBUNDLE FIRST)
find_program(INKSCAPE_BIN inkscape) find_program(INKSCAPE_BIN inkscape)
endif() endif()
if(INKSCAPE_BIN STREQUAL "INKSCAPE_BIN-NOTFOUND") if(INKSCAPE_BIN STREQUAL "INKSCAPE_BIN-NOTFOUND")

2
amuse

Submodule amuse updated: c886bfd7d2...eb948dfd63

2
hecl

Submodule hecl updated: 9a4781eb6c...ec7262879f