mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@586 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
717d839815
commit
d6739cc554
3 changed files with 12 additions and 8 deletions
|
@ -19,6 +19,7 @@ POLYMOST ?= 1
|
||||||
USE_OPENGL ?= 1
|
USE_OPENGL ?= 1
|
||||||
NOASM ?= 0
|
NOASM ?= 0
|
||||||
LINKED_GTK ?= 0
|
LINKED_GTK ?= 0
|
||||||
|
BUILD32_ON_64 ?= 1
|
||||||
|
|
||||||
# Debugging options
|
# Debugging options
|
||||||
# RELEASE - 1 = no debugging
|
# RELEASE - 1 = no debugging
|
||||||
|
|
|
@ -48,14 +48,16 @@ endif
|
||||||
|
|
||||||
ifeq ($(PLATFORM),LINUX)
|
ifeq ($(PLATFORM),LINUX)
|
||||||
RENDERTYPE=SDL
|
RENDERTYPE=SDL
|
||||||
|
|
||||||
|
GTKCOMPAT32=0
|
||||||
ifeq ($(findstring x86_64,$(shell uname -m)),x86_64)
|
ifeq ($(findstring x86_64,$(shell uname -m)),x86_64)
|
||||||
# on my 64bit Gentoo these are the 32bit emulation libs
|
ifeq (1,$(BUILD32_ON_64))
|
||||||
LIBS+= -m32 -L/emul/linux/x86/usr/lib
|
# on my 64bit Gentoo these are the 32bit emulation libs
|
||||||
BUILDCFLAGS+= -m32
|
LIBS+= -m32 -L/emul/linux/x86/usr/lib
|
||||||
#override WITHOUT_GTK=0
|
BUILDCFLAGS+= -m32
|
||||||
GTKCOMPAT32=1
|
#override WITHOUT_GTK=0
|
||||||
else
|
GTKCOMPAT32=1
|
||||||
GTKCOMPAT32=0
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),WINDOWS)
|
ifeq ($(PLATFORM),WINDOWS)
|
||||||
|
|
|
@ -9,6 +9,7 @@ POLYMOST = 1
|
||||||
USE_OPENGL = 1
|
USE_OPENGL = 1
|
||||||
NOASM = 0
|
NOASM = 0
|
||||||
LINKED_GTK = 0
|
LINKED_GTK = 0
|
||||||
|
BUILD32_ON_64 = 1
|
||||||
|
|
||||||
# Debugging options
|
# Debugging options
|
||||||
RELEASE?=1
|
RELEASE?=1
|
||||||
|
@ -206,7 +207,7 @@ enginelib editorlib:
|
||||||
-mkdir -p $(EOBJ)
|
-mkdir -p $(EOBJ)
|
||||||
$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
|
$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
|
||||||
SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
|
SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
|
||||||
USE_OPENGL=$(USE_OPENGL) \
|
USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \
|
||||||
NOASM=$(NOASM) RELEASE=$(RELEASE) $@
|
NOASM=$(NOASM) RELEASE=$(RELEASE) $@
|
||||||
|
|
||||||
$(EOBJ)/$(ENGINELIB): enginelib
|
$(EOBJ)/$(ENGINELIB): enginelib
|
||||||
|
|
Loading…
Reference in a new issue