From 230d2519c778778f0a6e9b39d2157963ae8ab798 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 24 Feb 2007 16:33:23 +0000
Subject: 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
---
 Changelog-Trunk.txt | 2 ++
 Makefile            | 5 +++++
 2 files changed, 7 insertions(+)

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.
diff --git a/Makefile b/Makefile
index d8a3b2d89..0dff88c72 100644
--- a/Makefile
+++ b/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
-- 
cgit v1.2.3-70-g09d2