From ae59db2390ddb0fd0f0a63a5241565c20313a926 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 13 Dec 2012 02:32:59 +0000 Subject: [PATCH] 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 --- polymer/eduke32/Makefile | 6 +++--- polymer/eduke32/Makefile.common | 18 +++++++++++++++++- polymer/eduke32/build/Makefile | 2 +- polymer/eduke32/build/Makefile.shared | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 396f2b97c..23587d1c1 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -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 diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index 952d5797f..652b2aae6 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -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)) diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile index 9294237d8..d6f7937e5 100644 --- a/polymer/eduke32/build/Makefile +++ b/polymer/eduke32/build/Makefile @@ -103,7 +103,7 @@ EDITOROBJS=$(OBJ)/build.$o \ # PLATFORM SPECIFIC SETTINGS -ifeq ($(PLATFORM),LINUX) +ifeq ($(SUBPLATFORM),LINUX) OURASFLAGS+= -f elf endif ifeq ($(PLATFORM),DARWIN) diff --git a/polymer/eduke32/build/Makefile.shared b/polymer/eduke32/build/Makefile.shared index b31c58f75..a60595c90 100644 --- a/polymer/eduke32/build/Makefile.shared +++ b/polymer/eduke32/build/Makefile.shared @@ -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