diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-24 16:33:23 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-24 16:33:23 +0000 |
| commit | 230d2519c778778f0a6e9b39d2157963ae8ab798 (patch) | |
| tree | eb797c39fd8fb0366c4f6676c12d88fcc947d85b | |
| parent | 0c584734dc8d4feb5390938671f6f88d9d87b39c (diff) | |
| download | hercules-230d2519c778778f0a6e9b39d2157963ae8ab798.tar.gz hercules-230d2519c778778f0a6e9b39d2157963ae8ab798.tar.bz2 hercules-230d2519c778778f0a6e9b39d2157963ae8ab798.tar.xz hercules-230d2519c778778f0a6e9b39d2157963ae8ab798.zip | |
Added Krade's makefile fix for 64bit compilers
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9910 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 720ca1686..fb75eaa8f 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/02/25 + * Added Krade's makefile fix for 64bit compilers [ultramage] + - ref: http://www.eathena.ws/board/index.php?showtopic=136622 * Minor cleanup/documentation on the script engine. [FlavioJS] 2007/02/24 * Fixed the mob_override_name setting not working on summoned mobs. @@ -42,6 +42,7 @@ OPT += -Wall -Wno-sign-compare # LIBS += -L/usr/local/lib -lpcre PLATFORM = $(shell uname) +ARCH = $(shell uname -m) ifeq ($(findstring Linux,$(PLATFORM)), Linux) LIBS += -ldl @@ -73,6 +74,10 @@ ifeq ($(findstring CYGWIN,$(PLATFORM)), CYGWIN) endif endif +ifeq ($(findstring x86_64,$(ARCH)), x86_64) + OPT += -m32 +endif + CFLAGS = $(OPT) -I../common $(OS_TYPE) ifdef SQLFLAG |