From 5fb8287d5061538a2a79fc12fa91647a99ed3cb9 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Wed, 2 Sep 2015 09:10:11 -1000
Subject: [PATCH] OS X fixes

---
 CMakeLists.txt             | 1 -
 DataSpec/CMakeLists.txt    | 3 ---
 NODLib                     | 2 +-
 Runtime/CMakeLists.txt     | 2 +-
 Runtime/MP1/CMakeLists.txt | 3 ++-
 hecl                       | 2 +-
 libBoo                     | 2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85c521786..5fe3ab04d 100644
--- 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
diff --git a/DataSpec/CMakeLists.txt b/DataSpec/CMakeLists.txt
index b4d93852d..c1c96e1f9 100644
--- 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}) 
diff --git a/NODLib b/NODLib
index 960ba8e46..ceb4d3bb9 160000
--- a/NODLib
+++ b/NODLib
@@ -1 +1 @@
-Subproject commit 960ba8e4623c30434c50ffd533c12b3083452a96
+Subproject commit ceb4d3bb9b83839d333cf577bb153554639f2d32
diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt
index 7ada7b683..f31636384 100644
--- 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()
diff --git a/Runtime/MP1/CMakeLists.txt b/Runtime/MP1/CMakeLists.txt
index 4c3995f65..1c9828109 100644
--- 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})
diff --git a/hecl b/hecl
index 92cc6576b..c903c3cb4 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 92cc6576b5b01ebaa5f48cbfd337c790a39e6531
+Subproject commit c903c3cb44479c4189195057a5dc6dc5fe4037e5
diff --git a/libBoo b/libBoo
index de51c2dcc..13edb3eb0 160000
--- a/libBoo
+++ b/libBoo
@@ -1 +1 @@
-Subproject commit de51c2dcc5dbed7fdc8fd9559afe3dd2a1359590
+Subproject commit 13edb3eb01c06e9d3bd93ba9fed24d33d2e59f85