Browse Source

Added Krade's makefile fix for 64bit compilers

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9910 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 18 years ago
parent
commit
628e944513
2 changed files with 7 additions and 0 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 5 0
      Makefile

+ 2 - 0
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.

+ 5 - 0
Makefile

@@ -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