move debug to extradbeug, add a "debug" build config that's less debuggy (just -g, still -O (not -O3), no extra debug code)

git-svn-id: svn://svn.icculus.org/netradiant/trunk@79 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-17 11:10:47 +00:00
parent 911a5e0fdd
commit 8a5dd5605f

View File

@ -82,7 +82,21 @@ LIBS_COMMON =
CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
ifeq ($(findstring $(CFLAGS),-g),)
CFLAGS_COMMON += -g
# only add -g if no -g flag is in $(CFLAGS)
endif
ifeq ($(findstring $(CFLAGS),-O),)
CFLAGS_COMMON += -O
# only add -O if no -O flag is in $(CFLAGS)
endif
CPPFLAGS_COMMON +=
LDFLAGS_COMMON +=
else ifeq ($(BUILD),extradebug)
ifeq ($(findstring $(CFLAGS),-g),)
CFLAGS_COMMON += -g3 CFLAGS_COMMON += -g3
# only add -g3 if no -g flag is in $(CFLAGS)
endif
CPPFLAGS_COMMON += -D_DEBUG CPPFLAGS_COMMON += -D_DEBUG
LDFLAGS_COMMON += LDFLAGS_COMMON +=
else ifeq ($(BUILD),release) else ifeq ($(BUILD),release)
@ -794,6 +808,13 @@ install/plugins/ufoaiplug.$(DLL): \
contrib/ufoaiplug/ufoai_level.o \ contrib/ufoaiplug/ufoai_level.o \
contrib/ufoaiplug/ufoai.o \ contrib/ufoaiplug/ufoai.o \
#install/plugins/bkgrnd2d.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK)
#install/plugins/bkgrnd2d.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude
#install/plugins/bkgrnd2d.$(DLL): \
# contrib/bkgrnd2d/bkgrnd2d.o \
# contrib/bkgrnd2d/dialog.o \
# contrib/bkgrnd2d/plugin.o \
install/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML) install/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML)
install/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/qdata_heretic2/common -Itools/quake2/qdata_heretic2/qcommon -Itools/quake2/qdata_heretic2 -Itools/quake2/common -Ilibs -Iinclude install/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/qdata_heretic2/common -Itools/quake2/qdata_heretic2/qcommon -Itools/quake2/qdata_heretic2 -Itools/quake2/common -Ilibs -Iinclude
install/heretic2/h2data.$(EXE): \ install/heretic2/h2data.$(EXE): \