From d6739cc55414480ed8ec5d5af551945d38fecd4f Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 13 Dec 2007 17:38:46 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@586
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/build/Makefile        |  1 +
 polymer/build/Makefile.shared | 16 +++++++++-------
 polymer/eduke32/Makefile      |  3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/polymer/build/Makefile b/polymer/build/Makefile
index b6b00378d..e4e466352 100644
--- a/polymer/build/Makefile
+++ b/polymer/build/Makefile
@@ -19,6 +19,7 @@ POLYMOST ?= 1
 USE_OPENGL ?= 1
 NOASM ?= 0
 LINKED_GTK ?= 0
+BUILD32_ON_64 ?= 1
 
 # Debugging options
 #  RELEASE - 1 = no debugging
diff --git a/polymer/build/Makefile.shared b/polymer/build/Makefile.shared
index a2d0911e7..da8c2aafc 100644
--- a/polymer/build/Makefile.shared
+++ b/polymer/build/Makefile.shared
@@ -48,14 +48,16 @@ endif
 
 ifeq ($(PLATFORM),LINUX)
 	RENDERTYPE=SDL
+
+	GTKCOMPAT32=0
 	ifeq ($(findstring x86_64,$(shell uname -m)),x86_64)
-		# on my 64bit Gentoo these are the 32bit emulation libs
-		LIBS+= -m32 -L/emul/linux/x86/usr/lib
-		BUILDCFLAGS+= -m32
-		#override WITHOUT_GTK=0
-		GTKCOMPAT32=1
-	else
-		GTKCOMPAT32=0
+		ifeq (1,$(BUILD32_ON_64))
+			# on my 64bit Gentoo these are the 32bit emulation libs
+			LIBS+= -m32 -L/emul/linux/x86/usr/lib
+			BUILDCFLAGS+= -m32
+			#override WITHOUT_GTK=0
+			GTKCOMPAT32=1
+		endif
 	endif
 endif
 ifeq ($(PLATFORM),WINDOWS)
diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index b8accaefb..6f6f68c62 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -9,6 +9,7 @@ POLYMOST = 1
 USE_OPENGL = 1
 NOASM = 0
 LINKED_GTK = 0
+BUILD32_ON_64 = 1
 
 # Debugging options
 RELEASE?=1
@@ -206,7 +207,7 @@ enginelib editorlib:
 	-mkdir -p $(EOBJ)
 	$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
 		SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
-		USE_OPENGL=$(USE_OPENGL) \
+		USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \
 		NOASM=$(NOASM) RELEASE=$(RELEASE) $@
 	
 $(EOBJ)/$(ENGINELIB): enginelib