mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 08:52:00 +00:00
Makefiles: Replace all "ifeq ($(PLATFORM),LINUX)" with "ifeq ($(SUBPLATFORM),LINUX)" and set SUBPLATFORM=LINUX when PLATFORM equals LINUX, DINGOO, GCW, or CAANOO.
git-svn-id: https://svn.eduke32.com/eduke32@3272 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
977764e57a
commit
ae59db2390
4 changed files with 23 additions and 7 deletions
|
@ -97,7 +97,7 @@ ifeq ($(PLATFORM),WINDOWS)
|
|||
EOBJ=eobj_win
|
||||
LIBS+= $(L_SSP) -Wl,--enable-auto-import
|
||||
else
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
ifeq ($(SUBPLATFORM),LINUX)
|
||||
LIBS+= -ldl -lrt
|
||||
endif
|
||||
LIBS+= -pthread
|
||||
|
@ -199,7 +199,7 @@ ifneq (0,$(LUNATIC))
|
|||
MISCEDITORDEPS+= $(SRC)/lunatic/mapster32.def
|
||||
EDITORLDFLAGS+= $(SRC)/lunatic/mapster32.def
|
||||
endif
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
ifeq ($(SUBPLATFORM),LINUX)
|
||||
GAMELDFLAGS+= -Wl,--dynamic-list=$(SRC)/lunatic/dynsymlist
|
||||
EDITORLDFLAGS+= -Wl,--dynamic-list=$(SRC)/lunatic/dynsymlist_m32
|
||||
endif
|
||||
|
@ -208,7 +208,7 @@ endif
|
|||
|
||||
# PLATFORM SPECIFIC SETTINGS
|
||||
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
ifeq ($(SUBPLATFORM),LINUX)
|
||||
ifeq (0,$(CLANG))
|
||||
OURCOMMONFLAGS += -fno-pic
|
||||
endif
|
||||
|
|
|
@ -71,6 +71,22 @@ ifndef PLATFORM
|
|||
endif
|
||||
endif
|
||||
|
||||
ifndef SUBPLATFORM
|
||||
SUBPLATFORM=
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
SUBPLATFORM=LINUX
|
||||
endif
|
||||
ifeq ($(PLATFORM),DINGOO)
|
||||
SUBPLATFORM=LINUX
|
||||
endif
|
||||
ifeq ($(PLATFORM),GCW)
|
||||
SUBPLATFORM=LINUX
|
||||
endif
|
||||
ifeq ($(PLATFORM),CAANOO)
|
||||
SUBPLATFORM=LINUX
|
||||
endif
|
||||
endif
|
||||
|
||||
# Binary suffix override:
|
||||
EXESUFFIX_OVERRIDE ?=
|
||||
|
||||
|
@ -269,7 +285,7 @@ else
|
|||
# debug+= -faddress-sanitizer
|
||||
# endif
|
||||
endif
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
ifeq ($(SUBPLATFORM),LINUX)
|
||||
BASELIBS+=-rdynamic
|
||||
endif
|
||||
ifneq (0,$(MUDFLAP))
|
||||
|
|
|
@ -103,7 +103,7 @@ EDITOROBJS=$(OBJ)/build.$o \
|
|||
|
||||
# PLATFORM SPECIFIC SETTINGS
|
||||
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
ifeq ($(SUBPLATFORM),LINUX)
|
||||
OURASFLAGS+= -f elf
|
||||
endif
|
||||
ifeq ($(PLATFORM),DARWIN)
|
||||
|
|
|
@ -34,14 +34,14 @@ endif
|
|||
BUILDCOMMONFLAGS=$(ARCH)
|
||||
BUILDLIBS=
|
||||
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
ifeq ($(SUBPLATFORM),LINUX)
|
||||
STDCPPLIB:=
|
||||
else
|
||||
# Overridden for OSes that don't have the cutdown stdc++ that is supc++
|
||||
STDCPPLIB:=-lsupc++
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM),LINUX)
|
||||
ifeq ($(SUBPLATFORM),LINUX)
|
||||
RENDERTYPE=SDL
|
||||
BUILDCOMMONFLAGS+= -DHAVE_INTTYPES
|
||||
GTKCOMPAT32=0
|
||||
|
|
Loading…
Reference in a new issue