From a3870bb5a17e62a30050c083318c7e4f3b8702c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Wed, 22 Sep 2010 18:20:55 +0200
Subject: [PATCH] Constructions, buildings, base 31.13 windows entry on DF2010
 instead of 31.12.

---
 data/Memory-ng.xml     | 24 ++++++++++++++----------
 library/CMakeLists.txt | 20 ++++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml
index 96ef2f53f..7f7e4c48c 100644
--- a/data/Memory-ng.xml
+++ b/data/Memory-ng.xml
@@ -1474,7 +1474,7 @@
             </Group>
         </Offsets>
     </Version>
-    <Version name="v0.31.13 SDL" os="windows" base="v0.31.12 SDL">
+    <Version name="v0.31.13 SDL" os="windows" base="DF2010">
         <MD5 value="59f194b0b2103ca5df7601a01ce21280" />
         <PETimeStamp value="0x4C90ADA8" />
         <Offsets>
@@ -1610,28 +1610,32 @@
                 </Group>
             </Group>
             <Group name="Constructions">
-                <Address name="vector"/>
-                <Offset name="sizeof"/>
+                <Address name="vector" value="0x1642650"/>
+                <Offset name="sizeof" value="0x14" />
             </Group>
             <Group name="Translations">
-                <Address name="language_vector"/>
-                <Address name="translation_vector"/>
-                <Offset name="word_table"/>
+                <Address name="language_vector" value="0x169a0fC"/>
+                <Address name="translation_vector" value="0x169a11C"/>
+                <Offset name="word_table" value="0x3c"/>
             </Group>
+            
             <Group name="Vegetation">
-                <Address name="vector"/>
-                <Offset name="tree_desc_offset"/>
+                <Address name="vector" value="0x1656efc"/>
+                <Offset name="tree_desc_offset" value="0x6C"/>
             </Group>
             <Group name="Buildings">
-                <Address name="buildings_vector"/>
+                <Address name="buildings_vector" value="0x1656890"/>
+                Second possible:  0x16568a0 (can't decide)
+                <!--
                 <Offset name="building_custom_workshop_type"/>
                 <Address name="custom_workshop_vector"/>
                 <Offset name="custom_workshop_name"/>
                 <Offset name="custom_workshop_type"/>
+                -->
             </Group>
         </Offsets>
     </Version>
-    31.13 WEATHER_START 0147E94E
+
                             .-"""-.
                            '       \
                           |,.  ,-.  |   _________________________
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 813d356dc..0b72d10fe 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -205,17 +205,21 @@ if(MSVC)
     # It exploits the fact that MSVC has some variables in .vcproj files, much like cmake does here.
     #
     # So, $(TargetDir) is ignored by cmake, and replaced with the actual output directory by MSVC
-    ADD_CUSTOM_COMMAND(TARGET dfhack POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/data/Memory-ng.xml $(TargetDir)/Memory.xml
+    ADD_CUSTOM_COMMAND(TARGET dfhack
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/data/Memory-ng.xml "$(TargetDir)/Memory.xml"
+    MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/data/Memory-ng.xml
     )
-    ADD_CUSTOM_COMMAND(TARGET dfhack POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Compile.html $(TargetDir)/Compile.html
+    ADD_CUSTOM_COMMAND(TARGET dfhack
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Compile.html "$(TargetDir)/Compile.html"
+    MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/Compile.html
     )
-    ADD_CUSTOM_COMMAND(TARGET dfhack POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Readme.html $(TargetDir)/Readme.html
+    ADD_CUSTOM_COMMAND(TARGET dfhack
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Readme.html "$(TargetDir)/Readme.html"
+    MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/Readme.html
     )
-    ADD_CUSTOM_COMMAND(TARGET dfhack POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/LICENSE $(TargetDir)/LICENSE.txt
+    ADD_CUSTOM_COMMAND(TARGET dfhack
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/LICENSE "$(TargetDir)/LICENSE.txt"
+    MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/LICENSE
     )
 else(MSVC)
     # Just put the file in the output directory on Linux and Mac