OS X fixes

2015-09-02 09:10:11 -10:00 · 2015-09-02 09:10:11 -10:00 · 5fb8287d50
parent 43230d5a85
commit 5fb8287d50
7 changed files with 6 additions and 9 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -10,7 +10,6 @@ endif()
 add_subdirectory(libBoo)
 set(BOO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libBoo/include)

-set(HECL_SUBPROJECT TRUE)
 set(HECL_DATASPEC_DECLS
 "/* RetroCommon specs */
 namespace Retro
--- a/DataSpec/CMakeLists.txt
+++ b/DataSpec/CMakeLists.txt
@ -1,8 +1,5 @@
 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
 macro(make_dnalist outlist)
  foreach(type ${ARGN}) 
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 960ba8e4623c30434c50ffd533c12b3083452a96
+Subproject commit ceb4d3bb9b83839d333cf577bb153554639f2d32
--- a/Runtime/CMakeLists.txt
+++ b/Runtime/CMakeLists.txt
@ -10,7 +10,7 @@ add_subdirectory(Particle)
 if(WIN32)
  list(APPEND PLAT_SRCS CMemoryCardSysWin.cpp)
 elseif(APPLE)
-  list(APPEND PLAT_SRCS CMemoryCardSysMac.cpp)
+  list(APPEND PLAT_SRCS CMemoryCardSysOSX.cpp)
 else()
  list(APPEND PLAT_SRCS CMemoryCardSysNix.cpp CCallStackNix.cpp)
 endif()
--- a/Runtime/MP1/CMakeLists.txt
+++ b/Runtime/MP1/CMakeLists.txt
@ -16,5 +16,6 @@ target_link_libraries(mp1
                      DNAMP1
                      DNACommon
                      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})
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 92cc6576b5b01ebaa5f48cbfd337c790a39e6531
+Subproject commit c903c3cb44479c4189195057a5dc6dc5fe4037e5
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit de51c2dcc5dbed7fdc8fd9559afe3dd2a1359590
+Subproject commit 13edb3eb01c06e9d3bd93ba9fed24d33d2e59f85