janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 13:03:58 +01:00
Code Activity

defs.mk: Handle optimisation and debug options globally in defs.mk

Browse source
This commit is contained in:
Jan Lindemann 2005-04-26 18:43:34 +00:00 • committed by Jan Lindemann
commit f463fdbdf0
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
make/defs.mk
View file

@ -133,19 +133,12 @@ MEMBERS = $(LIB_A)($(OBJ))
#YAMD = yamd- #YAMD = yamd-
#EFENCE = -lefence #EFENCE = -lefence
#CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production #CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH)
CPPFLAGS_DEBUG = $(CFLAGS_DEBUG)
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(YLIB_CFLAGS) $(INCLUDE) CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(YLIB_CFLAGS) $(INCLUDE)
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(YLIB_CPPFLAGS) $(INCLUDE) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(YLIB_CPPFLAGS) $(INCLUDE)
LDFFTW = -lrfftw -lfftw -lm LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile #LDAUDIO = -laudiofile
CORE = $(wildcard core core.*) CORE = $(wildcard core core.*)
ifeq ($(DEVELOPMENT),true)
CFLAGS += $(CFLAGS_DEBUG)
CPPFLAGS += $(CPPFLAGS_DEBUG)
endif
LIBDIR = $(TOPDIR)/lib LIBDIR = $(TOPDIR)/lib
INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
@ -293,21 +286,25 @@ ifeq ($(USE_TRACING),true)
endif endif
ifeq ($(USE_COMPILER_DEBUG_OPTS),true) ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
PROJECT_CFLAGS += -Wall -g3
PROJECT_CPPFLAGS += -Wall -g3 CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH)
PROJECT_LDFLAGS += -Wall -g3 CPPFLAGS_DEBUG = $(CFLAGS_DEBUG)
LDFLAGS_DEBUG = -Wall -g3
PROJECT_CFLAGS += $(CFLAGS_DEBUG)
PROJECT_CPPFLAGS += $(CFLAGS_DEBUG)
PROJECT_LDFLAGS += $(LDFLAGS_DEBUG)
else
PROJECT_CFLAGS += -DNDEBUG
PROJECT_CPPFLAGS += -DNDEBUG
endif endif
ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
PROJECT_CFLAGS += -funroll-loops -O2 PROJECT_CFLAGS += -funroll-loops -O2
PROJECT_CPPFLAGS += -funroll-loops -O2 PROJECT_CPPFLAGS += -funroll-loops -O2
else
ifneq ($(USE_COMPILER_DEBUG_OPTS),true)
PROJECT_CFLAGS += -DNDEBUG
PROJECT_CPPFLAGS += -DNDEBUG
endif
endif endif
ifneq ($(wildcard $(TOPDIR)/make/local.mk),) ifneq ($(wildcard $(TOPDIR)/make/local.mk),)
include $(TOPDIR)/make/local.mk include $(TOPDIR)/make/local.mk
endif endif