From c127d0faa780f46fd96591545a27e5aad675da74 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 22 Jun 2022 09:16:44 +0000 Subject: [PATCH] - moved default compile and link flags to defaults.mk git-svn-id: http://moon:8086/svn/software/trunk/make@1056 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- compile.mk | 10 ++-------- defaults.mk | 16 ++++++++++++++++ link.mk | 2 -- 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 defaults.mk diff --git a/compile.mk b/compile.mk index f439fc0..d5424a4 100644 --- a/compile.mk +++ b/compile.mk @@ -1,13 +1,7 @@ DEPFLAGS := -MMD -CXXFLAGS_debug ?= -g -O0 -CXXFLAGS_release ?= -O2 -CXXFLAGS += ${CXXFLAGS_${CONFIG}} - -CFLAGS_debug ?= -g -O0 -CFLAGS_release ?=- O2 CFLAGS += ${CFLAGS_${CONFIG}} - +CXXFLAGS += ${CXXFLAGS_${CONFIG}} DEFINES += ${DEFINES_${CONFIG}} CXX_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(CXX_SRCS))) @@ -25,7 +19,7 @@ ${CXX_OBJS}: $(BUILD_DIR)/%.o : %.cpp $(CXX_SRCS) | $(BUILD_DIR) ${GCC_OBJS}: $(BUILD_DIR)/%.o : %.c $(GCC_SRCS) | $(BUILD_DIR) @mkdir -p $(dir $@) - @echo Compiling $@ + @echo Compiling $< $(CC) ${DEPFLAGS} ${CFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $< $(BUILD_DIR): diff --git a/defaults.mk b/defaults.mk new file mode 100644 index 0000000..de5ec09 --- /dev/null +++ b/defaults.mk @@ -0,0 +1,16 @@ +MAKEFLAGS += --no-print-directory + +TARGET_ARCH := -march=native + +# debug +LDFLAGS_debug := -g +CXXFLAGS_debug := -g -O0 +CFLAGS_debug := -g -O0 +LDFLAGS_debug := -g -O0 + +# release +LDFLAGS_release := -g +CXXFLAGS_release := -g -O3 +CFLAGS_release := -g -O3 +LDFLAGS_release := -g -O3 + diff --git a/link.mk b/link.mk index cb15964..4682e5f 100644 --- a/link.mk +++ b/link.mk @@ -1,5 +1,3 @@ -LDFLAGS_release += -LDFLAGS_debug += -g LDFLAGS += ${LDFLAGS_${CONFIG}} OBJS = $(shell find ${BUILD_DIR} -name *.o 2>/dev/null)