summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Collett2012-06-14 13:42:06 -0400
committerTimothy Collett2012-06-14 13:42:06 -0400
commit12543d6a5b4afc4cbba20670f3e463672ed9fac4 (patch)
treee43580d6b4d627ad119d7cdb2b0daa54ee04bd9f
parentc6700585bcbe5b03216cef2811486d94c795e556 (diff)
downloaddfhack-12543d6a5b4afc4cbba20670f3e463672ed9fac4.tar.gz
dfhack-12543d6a5b4afc4cbba20670f3e463672ed9fac4.tar.bz2
dfhack-12543d6a5b4afc4cbba20670f3e463672ed9fac4.tar.xz
Make offsets with "darwin" os-type recognized as Apple, rather than ignored
m---------depends/clsocket0
-rw-r--r--library/VersionInfoFactory.cpp6
2 files changed, 6 insertions, 0 deletions
diff --git a/depends/clsocket b/depends/clsocket
-Subproject c85e9fb35d3510c5dcc367056cda3237d77a7ad
+Subproject f2722ca9ac49f8f13da4ddcfcb0fa47a0eb3045
diff --git a/library/VersionInfoFactory.cpp b/library/VersionInfoFactory.cpp
index 972ab31b..4ac53dd1 100644
--- a/library/VersionInfoFactory.cpp
+++ b/library/VersionInfoFactory.cpp
@@ -105,6 +105,12 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem)
// this is wrong... I'm not going to do base image relocation on linux though.
mem->setBase(0x0);
}
+ else if(os == "darwin")
+ {
+ mem->setOS(OS_APPLE);
+ // this is wrong... I'm not going to do base image relocation on linux though.
+ mem->setBase(0x0);
+ }
else
{
return; // ignore it if it's invalid