Fix the Makefile on OSX. Their linker has a different syntax for requesting the

memory map.

git-svn-id: https://svn.eduke32.com/eduke32@2116 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-11-17 21:10:18 +00:00
parent 21274b317f
commit 5efac3a09a
2 changed files with 6 additions and 0 deletions

View file

@ -220,7 +220,11 @@ ifeq ($(PLATFORM),WINDOWS)
MISCLINKOPTS+= -Wl,--large-address-aware MISCLINKOPTS+= -Wl,--large-address-aware
endif endif
#ifneq (0,$(KRANDDEBUG)) #ifneq (0,$(KRANDDEBUG))
ifeq ($(PLATFORM),DARWIN)
MISCLINKOPTS+=-Wl,-map -Wl,$@.memmap
else
MISCLINKOPTS+=-Wl,-Map=$@.memmap MISCLINKOPTS+=-Wl,-Map=$@.memmap
endif
#endif #endif
ifneq (0,$(PROFILER)) ifneq (0,$(PROFILER))
MISCLINKOPTS+=-pg MISCLINKOPTS+=-pg

View file

@ -92,6 +92,8 @@ if [ -f mapster32.x64 ] && [ -f eduke32.x86 ] && [ -f eduke32.ppc ]; then
echo "This archive was produced from revision $rev by the osxbuild.sh script." > README.OSX echo "This archive was produced from revision $rev by the osxbuild.sh script." > README.OSX
echo "EDuke32 home: http://www.eduke32.com" >> README.OSX echo "EDuke32 home: http://www.eduke32.com" >> README.OSX
echo "OSX build discussion on Duke4.net: http://forums.duke4.net/topic/4242-building-eduke-on-mac-os-x/" >> README.OSX echo "OSX build discussion on Duke4.net: http://forums.duke4.net/topic/4242-building-eduke-on-mac-os-x/" >> README.OSX
echo "The 64-bit build in this archive has LibVPX (http://www.webmproject.org/code/)" >> README.OSX
echo "from MacPorts (http://www.macports.org/) statically linked into it." >> README.OSX
rm -f "$arfilename" rm -f "$arfilename"
zip "$arfilename" mapster32 eduke32 README.OSX zip "$arfilename" mapster32 eduke32 README.OSX
fi fi