teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile: Revert r5864 and move some code introduced in r5762 to a later Mac-only block so that architecture detection is not broken on Linux.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5919 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-10-29 16:59:28 +00:00
parent 42bb07cace
commit ccb7a93a7c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
polymer/eduke32/Makefile.common
View file

@ -324,18 +324,9 @@ ifeq ($(PLATFORM),WINDOWS)
WINLIB?=/$(BITS)
else ifeq ($(PLATFORM),WII)
IMPLICIT_ARCH=ppc
else ifeq ($(PLATFORM),DARWIN)
ifeq (1,$(BUILD32_ON_64))
ifeq ($(ARCH),)
override ARCH:=-arch i386
endif
endif
else
ifneq ($(ARCH),)
override ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(strip $(ARCH)))))
ifneq ($(findstring -arch,$(ARCH)),-arch)
override ARCH := -arch $(ARCH)
endif
IMPLICIT_ARCH=$(ARCH)
else
IMPLICIT_ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(strip $(shell uname -m)))))
@ -367,8 +358,17 @@ ifeq ($(PLATFORM),DARWIN)
W_STRICT_OVERFLOW :=
endif
ifneq ($(ARCH),)
ifneq ($(findstring -arch,$(ARCH)),-arch)
override ARCH := -arch $(ARCH)
endif
endif
ifeq (1,$(BUILD32_ON_64))
COMMONFLAGS += $(F_NO_STACK_PROTECTOR)
ifeq ($(ARCH),)
override ARCH:=-arch i386
endif
else
ifeq ($(findstring ppc,$(IMPLICIT_ARCH)),ppc)
COMMONFLAGS += $(F_NO_STACK_PROTECTOR)