From 79dfb65b9ac99113610ab889e830e0eb90a70268 Mon Sep 17 00:00:00 2001 From: Timothy Collett Date: Fri, 15 Mar 2013 13:59:47 -0400 Subject: [PATCH] FORCE_FLAT_NAMESPACE no longer needed --- Compile.rst | 7 ++----- package/darwin/dfhack | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Compile.rst b/Compile.rst index 41f057e95..ce5d93ddf 100644 --- a/Compile.rst +++ b/Compile.rst @@ -114,14 +114,11 @@ Snow Leopard Changes 1. Add a step 6.2a (before Install XML::LibXSLT):: In a separate Terminal window or tab, run: - sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml + ``sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml`` 2. Add a step 7a (before building):: In /library/LuaTypes.cpp, change line 467 to - int len = strlen((char*)ptr); - -3. After the whole thing is built and installed, edit the "dfhack" script in the DF directory and remove the line - export DYLD_FORCE_FLAT_NAMESPACE=1 + ``int len = strlen((char*)ptr);`` ======= Windows diff --git a/package/darwin/dfhack b/package/darwin/dfhack index 62407342a..7c3be1cdf 100755 --- a/package/darwin/dfhack +++ b/package/darwin/dfhack @@ -11,5 +11,4 @@ else export DYLD_FALLBACK_LIBRARY_PATH=${PWD}/hack:${PWD}/libs export DYLD_FALLBACK_FRAMEWORK_PATH=${PWD}/hack:${PWD}/libs fi -export DYLD_FORCE_FLAT_NAMESPACE=1 cd "${PWD}"; ./dwarfort.exe