From fc6b61a63ee30ad3aa6a6cecb3848732b514e54b Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Wed, 8 Jul 2015 21:15:43 -1000
Subject: [PATCH] followed @Antidote's advice and added atdna_* prefix

---
 DataSpec/CMakeLists.txt        | 10 ++++++----
 DataSpec/DNAMP1/CMakeLists.txt |  8 +++-----
 DataSpec/DNAMP3/CMakeLists.txt |  6 ++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/DataSpec/CMakeLists.txt b/DataSpec/CMakeLists.txt
index 56041b5a8..c76e59d7a 100644
--- a/DataSpec/CMakeLists.txt
+++ b/DataSpec/CMakeLists.txt
@@ -6,17 +6,19 @@ find_package(atdna REQUIRED)
 
 # Assembles a source/header pair list for use in a DNA library
 macro(make_dnalist outlist)
-foreach(type ${ARGN})
-  atdna(${type}.cpp ${type}.hpp)
-  list(APPEND ${outlist} ${type}.cpp ${type}.hpp)
-endforeach()
+  foreach(type ${ARGN})
+    atdna(atdna_${type}.cpp ${type}.hpp)
+    list(APPEND ${outlist} atdna_${type}.cpp ${type}.hpp)
+  endforeach()
 endmacro()
 
+# Each game's DNA library
 add_subdirectory(DNACommon)
 add_subdirectory(DNAMP1)
 add_subdirectory(DNAMP2)
 add_subdirectory(DNAMP3)
 
+# Each game's DataSpec implementation
 add_library(RetroDataSpec
             SpecBase.cpp
             SpecMP1.cpp
diff --git a/DataSpec/DNAMP1/CMakeLists.txt b/DataSpec/DNAMP1/CMakeLists.txt
index cae2b6d79..3c3a1ab08 100644
--- a/DataSpec/DNAMP1/CMakeLists.txt
+++ b/DataSpec/DNAMP1/CMakeLists.txt
@@ -1,6 +1,4 @@
-list(APPEND types
-     PAK
-     MLVL)
-
-make_dnalist(liblist ${types})
+make_dnalist(liblist
+             PAK
+             MLVL)
 add_library(DNAMP1 ${liblist})
diff --git a/DataSpec/DNAMP3/CMakeLists.txt b/DataSpec/DNAMP3/CMakeLists.txt
index a7b4586f2..8f7502e60 100644
--- a/DataSpec/DNAMP3/CMakeLists.txt
+++ b/DataSpec/DNAMP3/CMakeLists.txt
@@ -1,5 +1,3 @@
-list(APPEND types
-     PAK)
-
-make_dnalist(liblist ${types})
+make_dnalist(liblist
+             PAK)
 add_library(DNAMP3 ${liblist})