- improved

git-svn-id: http://moon:8086/svn/software/trunk/make@915 b431acfa-c32f-4a4a-93f1-934dc6c82436

compile.mk

@@ -1,15 +1,18 @@
-CXXFLAGS_debug += -g -O0
-CXXFLAGS_release += -O2
+DEPFLAGS := -MMD
+
+CXXFLAGS += -std=c++11
+CXXFLAGS_debug ?= -g -O0 
+CXXFLAGS_release ?= -O2
 CXXFLAGS += ${CXXFLAGS_${CONFIG}}
 
-CFLAGS_debug += -g -O0
-CFLAGS_release +=- O2
+CFLAGS_debug ?= -g -O0
+CFLAGS_release ?=- O2
 CFLAGS += ${CFLAGS_${CONFIG}}
 
 CXX_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(CXX_SRCS)))
 GCC_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .c,.o,$(GCC_SRCS)))
 
-OBJS = $(shell find build/debug -name *.o 2>/dev/null)
+OBJS = $(shell find ${BUILD_DIR} -name *.o 2>/dev/null)
 DEPS := $(OBJS:%.o=%.d)
 
 compile: pkg_info ${CXX_OBJS} ${GCC_OBJS}
@@ -17,12 +20,12 @@ compile: pkg_info ${CXX_OBJS} ${GCC_OBJS}
 ${CXX_OBJS}: $(BUILD_DIR)/%.o : %.cpp $(CXX_SRCS) | $(BUILD_DIR)
 	@mkdir -p $(dir $@)
 	@echo Compiling $<
-	@$(CXX) -MMD ${CXXFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
+	$(CXX) ${DEPFLAGS} ${CXXFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
 
 ${GCC_OBJS}: $(BUILD_DIR)/%.o : %.c $(GCC_SRCS) | $(BUILD_DIR)
 	@mkdir -p $(dir $@)
 	@echo Compiling $@
-	@$(CC) -MMD ${CFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
+	$(CC) ${DEPFLAGS} ${CFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $<
 
 $(BUILD_DIR):
 	@mkdir -p $(dir $@)

link.mk

@@ -8,7 +8,7 @@ run: app
 	@${BUILD_DIR}/${TARGET}
 
 ${BUILD_DIR}/${TARGET}: ${OBJS} $(BUILD_DIR)
-	@$(CC) ${LDFLAGS} ${OBJS} ${LIBS} -o $@
+	$(CC) ${LDFLAGS} ${OBJS} ${LIBS} -o $@
 
 target_info:
 	@echo Linking ${TARGET}