OS X fixes

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

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}) 

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()

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})