From 1c8249c55afd1d686e266523717b7e342de6b824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 18 Feb 2011 01:14:16 +0100
Subject: [PATCH] Mingw32 fixes

---
 data/Memory-ng.xml                | 6 +++---
 library/CMakeLists.txt            | 7 ++++++-
 library/DFProcess-windows-SHM.cpp | 2 +-
 library/DFProcess-windows.cpp     | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml
index 98d8be319..285e57350 100644
--- a/data/Memory-ng.xml
+++ b/data/Memory-ng.xml
@@ -1941,6 +1941,9 @@
                 <Address name="organics_plants" value="0x171e7C0 0x16e52AC" valid="true" />
                 <Address name="organics_trees" value="0x171e7E0 0x16e52CC" valid="true" />
             </Group>
+            <Group name="GUI" valid="false">
+                <Address name="pause_state" value="0x14c9be1" valid="true" />
+            </Group>
             <!--
             <Address name="WORLD" valid="false" />
             <Group name="Buildings">
@@ -1950,9 +1953,6 @@
                 <Offset name="custom_workshop_name" value="0x4" /> INVALID!
                 <Offset name="custom_workshop_type" value="0x20" /> INVALID!
             </Group>
-            <Group name="GUI" valid="false">
-                <Address name="pause_state" value="0x14c9be1" valid="true" />
-            </Group>
             <Group name="Maps">
                 <Group name="features">
                     <Group name="global">
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index f921fd140..bb7a9c199 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -191,7 +191,12 @@ IF(UNIX)
 
   SET(PROJECT_LIBS ${X11_LIBRARY} rt ) #dfhack-md5 dfhack-tixml
 ELSE(UNIX)
-  SET(PROJECT_LIBS psapi ${CMAKE_SOURCE_DIR}/library/depends/ntdll/ntdll.lib)
+  IF(MSVC)
+    SET(PROJECT_LIBS psapi ${CMAKE_SOURCE_DIR}/library/depends/ntdll/ntdll.lib)
+  ELSE(MSVC)
+    SET(PROJECT_LIBS psapi ntdll)
+  ENDIF(MSVC)
+
 ENDIF(UNIX)
 
 ADD_LIBRARY(dfhack SHARED ${PROJECT_SRCS})
diff --git a/library/DFProcess-windows-SHM.cpp b/library/DFProcess-windows-SHM.cpp
index 62a98128c..c068bb84f 100644
--- a/library/DFProcess-windows-SHM.cpp
+++ b/library/DFProcess-windows-SHM.cpp
@@ -317,7 +317,7 @@ bool SHMProcess::isIdentified()
 bool SHMProcess::Private::validate(vector <VersionInfo *> & known_versions)
 {
     // try to identify the DF version
-    IMAGE_NT_HEADERS32 pe_header;
+    IMAGE_NT_HEADERS pe_header;
     IMAGE_SECTION_HEADER sections[16];
     HMODULE hmod = NULL;
     DWORD junk;
diff --git a/library/DFProcess-windows.cpp b/library/DFProcess-windows.cpp
index 6743d0923..2d318ddf4 100644
--- a/library/DFProcess-windows.cpp
+++ b/library/DFProcess-windows.cpp
@@ -54,7 +54,7 @@ class NormalProcess::Private
         uint32_t STLSTR_buf_off;
         uint32_t STLSTR_size_off;
         uint32_t STLSTR_cap_off;
-        IMAGE_NT_HEADERS32 pe_header;
+        IMAGE_NT_HEADERS pe_header;
         IMAGE_SECTION_HEADER * sections;
         uint32_t base;
 };