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

OS X fixes

This commit is contained in:
Jack Andersen 2015-09-02 09:10:11 -10:00
parent 43230d5a85
commit 5fb8287d50
7 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -10,7 +10,6 @@ endif()
add_subdirectory(libBoo) add_subdirectory(libBoo)
set(BOO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libBoo/include) set(BOO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libBoo/include)
set(HECL_SUBPROJECT TRUE)
set(HECL_DATASPEC_DECLS set(HECL_DATASPEC_DECLS
"/* RetroCommon specs */ "/* RetroCommon specs */
namespace Retro namespace Retro

3
DataSpec/CMakeLists.txt
View File

@ -1,8 +1,5 @@
include_directories(${LIBPNG_INCLUDE_DIR} ${SQUISH_INCLUDE_DIR}) include_directories(${LIBPNG_INCLUDE_DIR} ${SQUISH_INCLUDE_DIR})
# Magic ingredient
find_package(atdna REQUIRED)
# Assembles a source/header pair list for use in a DNA library # Assembles a source/header pair list for use in a DNA library
macro(make_dnalist outlist) macro(make_dnalist outlist)
foreach(type ${ARGN}) foreach(type ${ARGN})

2
NODLib

@ -1 +1 @@
Subproject commit 960ba8e4623c30434c50ffd533c12b3083452a96 Subproject commit ceb4d3bb9b83839d333cf577bb153554639f2d32

2
Runtime/CMakeLists.txt
View File

@ -10,7 +10,7 @@ add_subdirectory(Particle)
if(WIN32) if(WIN32)
list(APPEND PLAT_SRCS CMemoryCardSysWin.cpp) list(APPEND PLAT_SRCS CMemoryCardSysWin.cpp)
elseif(APPLE) elseif(APPLE)
list(APPEND PLAT_SRCS CMemoryCardSysMac.cpp) list(APPEND PLAT_SRCS CMemoryCardSysOSX.cpp)
else() else()
list(APPEND PLAT_SRCS CMemoryCardSysNix.cpp CCallStackNix.cpp) list(APPEND PLAT_SRCS CMemoryCardSysNix.cpp CCallStackNix.cpp)
endif() endif()

3
Runtime/MP1/CMakeLists.txt
View File

@ -16,5 +16,6 @@ target_link_libraries(mp1
DNAMP1 DNAMP1
DNACommon DNACommon
HECLDatabase HECLBlender HECLCommon AthenaCore NOD HECLDatabase HECLBlender HECLCommon AthenaCore NOD
LogVisor AthenaLibYaml Boo png squish blowfish z lzo2 LogVisor AthenaLibYaml Boo ${PNG_LIB} squish blowfish
${ZLIB_LIBRARIES} ${LZO_LIB}
${BOO_SYS_LIBS}) ${BOO_SYS_LIBS})

2
hecl

@ -1 +1 @@
Subproject commit 92cc6576b5b01ebaa5f48cbfd337c790a39e6531 Subproject commit c903c3cb44479c4189195057a5dc6dc5fe4037e5

2
libBoo

@ -1 +1 @@
Subproject commit de51c2dcc5dbed7fdc8fd9559afe3dd2a1359590 Subproject commit 13edb3eb01c06e9d3bd93ba9fed24d33d2e59f85