From 05cf720c4d390dfb3184e433e5a384a28b778fc0 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 2 Oct 2011 07:16:57 +0000 Subject: [PATCH] move Electric Fence (EFENCE) handling from build/Makefile to Makefile.common git-svn-id: https://svn.eduke32.com/eduke32@2059 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile.common | 5 +++++ polymer/eduke32/build/Makefile | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index 6bca1ce8e..245c69068 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -123,6 +123,11 @@ ifneq (0,$(USE_LIBVPX)) BASECFLAGS+= -DUSE_LIBVPX endif +ifneq (0,$(EFENCE)) + LIBS+= -lefence + BASECFLAGS+= -DEFENCE +endif + BASECXXFLAGS= -fno-exceptions -fno-rtti BASEASFLAGS=-s #-g diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile index dcda5c0b3..9ab366ad7 100644 --- a/polymer/eduke32/build/Makefile +++ b/polymer/eduke32/build/Makefile @@ -151,11 +151,6 @@ ifeq ($(RENDERTYPE),WIN) EDITOROBJS+= $(OBJ)/startwin.editor.$o endif -ifneq (0,$(EFENCE)) - LIBS+= -lefence - OURCFLAGS+= -DEFENCE -endif - OURCFLAGS+= $(BUILDCFLAGS) .SILENT: