diff --git a/compile.mk b/compile.mk index 42e1c88..5c2902e 100644 --- a/compile.mk +++ b/compile.mk @@ -1,18 +1,11 @@ -CXXFLAGS += -std=c++11 CXXFLAGS_debug := -g -O0 CXXFLAGS_release := -O2 CXXFLAGS += ${CXXFLAGS_${CONFIG}} -CFLAGS += CFLAGS_debug := -g -O0 CFLAGS_release :=- O2 CFLAGS += ${CFLAGS_${CONFIG}} -LFLAGS += -LFLAGS_release := -LFLAGS_debug := -g -LFLAGS += ${LFLAGS_${CONFIG}} - CXX_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(CXX_SRCS))) GCC_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .c,.o,$(GCC_SRCS))) @@ -24,12 +17,12 @@ DEPS := $(OBJS:%.o=%.d) ${CXX_OBJS}: $(BUILD_DIR)/%.o : %.cpp $(CXX_SRCS) | $(BUILD_DIR) @echo create $(dir $@) @mkdir -p $(dir $@) - g++ -MMD ${CXXFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $< + $(CXX) -MMD ${CXXFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $< ${GCC_OBJS}: $(BUILD_DIR)/%.o : %.c $(GCC_SRCS) | $(BUILD_DIR) @echo create $(dir $@) @mkdir -p $(dir $@) - gcc -MMD ${CFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $< + $(CC) -MMD ${CFLAGS} ${DEFINES} ${INCLUDES} -o $@ -c $< $(BUILD_DIR): @echo create $@ diff --git a/link.mk b/link.mk index 856f145..98d1660 100644 --- a/link.mk +++ b/link.mk @@ -1,7 +1,11 @@ -include $(DEPS) +LDFLAGS_release := +LDFLAGS_debug := -g +LDFLAGS += ${LFLAGS_${CONFIG}} + ${BUILD_DIR}/${TARGET}: ${OBJS} $(BUILD_DIR) - gcc ${LFLAGS} ${OBJS} ${LIBS} -o $@ + $(CC) ${LDFLAGS} ${OBJS} ${LIBS} -o $@ test: @echo $(DEPS)