MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mingw32 fixes

develop
Petr Mrázek 2011-02-18 01:14:16 +01:00
parent 02e6e46d5f
commit 1c8249c55a
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/Memory-ng.xml
Unescape Escape View File

@ -1941,6 +1941,9 @@
<Address name="organics_plants" value="0x171e7C0 0x16e52AC" valid="true" /> <Address name="organics_plants" value="0x171e7C0 0x16e52AC" valid="true" />
<Address name="organics_trees" value="0x171e7E0 0x16e52CC" valid="true" /> <Address name="organics_trees" value="0x171e7E0 0x16e52CC" valid="true" />
</Group> </Group>
<Group name="GUI" valid="false">
<Address name="pause_state" value="0x14c9be1" valid="true" />
</Group>
<!-- <!--
<Address name="WORLD" valid="false" /> <Address name="WORLD" valid="false" />
<Group name="Buildings"> <Group name="Buildings">
@ -1950,9 +1953,6 @@
<Offset name="custom_workshop_name" value="0x4" /> INVALID! <Offset name="custom_workshop_name" value="0x4" /> INVALID!
<Offset name="custom_workshop_type" value="0x20" /> INVALID! <Offset name="custom_workshop_type" value="0x20" /> INVALID!
</Group> </Group>
<Group name="GUI" valid="false">
<Address name="pause_state" value="0x14c9be1" valid="true" />
</Group>
<Group name="Maps"> <Group name="Maps">
<Group name="features"> <Group name="features">
<Group name="global"> <Group name="global">

7
library/CMakeLists.txt
Unescape Escape View File

@ -191,7 +191,12 @@ IF(UNIX)
SET(PROJECT_LIBS ${X11_LIBRARY} rt ) #dfhack-md5 dfhack-tixml SET(PROJECT_LIBS ${X11_LIBRARY} rt ) #dfhack-md5 dfhack-tixml
ELSE(UNIX) 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) ENDIF(UNIX)
ADD_LIBRARY(dfhack SHARED ${PROJECT_SRCS}) ADD_LIBRARY(dfhack SHARED ${PROJECT_SRCS})

2
library/DFProcess-windows-SHM.cpp
Unescape Escape View File

@ -317,7 +317,7 @@ bool SHMProcess::isIdentified()
bool SHMProcess::Private::validate(vector <VersionInfo *> & known_versions) bool SHMProcess::Private::validate(vector <VersionInfo *> & known_versions)
{ {
// try to identify the DF version // try to identify the DF version
IMAGE_NT_HEADERS32 pe_header; IMAGE_NT_HEADERS pe_header;
IMAGE_SECTION_HEADER sections[16]; IMAGE_SECTION_HEADER sections[16];
HMODULE hmod = NULL; HMODULE hmod = NULL;
DWORD junk; DWORD junk;

2
library/DFProcess-windows.cpp
Unescape Escape View File

@ -54,7 +54,7 @@ class NormalProcess::Private
uint32_t STLSTR_buf_off; uint32_t STLSTR_buf_off;
uint32_t STLSTR_size_off; uint32_t STLSTR_size_off;
uint32_t STLSTR_cap_off; uint32_t STLSTR_cap_off;
IMAGE_NT_HEADERS32 pe_header; IMAGE_NT_HEADERS pe_header;
IMAGE_SECTION_HEADER * sections; IMAGE_SECTION_HEADER * sections;
uint32_t base; uint32_t base;
}; };