Changeset 837 in 3DVCSoftware for branches/HTM-10.0rc1-dev0/build

Timestamp:

8 Feb 2014, 00:23:11 (11 years ago)

Author:

tech

Message:

Merged HM 13.0. (No yet checked).

File:

• branches/HTM-10.0rc1-dev0/build/linux/common/makefile.base (modified) (5 diffs)

branches/HTM-10.0rc1-dev0/build/linux/common/makefile.base

@@ -14 +14 @@
 
 CPP     = g++
+CC      = gcc
 AR      = ar
 LD      = $(CPP)
@@ -47 +48 @@
 # default cpp flags for all configurations
 #CPPFLAGS          = -Wall -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
-CPPFLAGS          = -fPIC $(DEFS) $(ADDDEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
+CPPFLAGS          = -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
 
 ########## 
@@ -63 +64 @@
 #
 # release cpp
-RELEASE_CPPFLAGS  =  -O3 -ffloat-store -Wuninitialized
+RELEASE_CPPFLAGS  =  -O3 -Wuninitialized
 
 
@@ -208 +209 @@
                 rm -f $(OBJ_DIR)/$*.d.d
 endef
+define COMPILE_AND_DEPEND_RELEASE_C
+        $(CC) -c -MMD -MF $(OBJ_DIR)/$*.r.d -MT $(OBJ_DIR)/$*.r.o $(CPPFLAGS) $(RELEASE_CPPFLAGS) -o $@ $(CURDIR)/$<
+        @cp $(OBJ_DIR)/$*.r.d $(OBJ_DIR)/$*.r.P; \
+                sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+                -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.r.d >> $(OBJ_DIR)/$*.r.P; \
+                rm -f $(OBJ_DIR)/$*.r.d
+endef
+define COMPILE_AND_DEPEND_DEBUG_C
+        $(CC) -c -MMD -MF $(OBJ_DIR)/$*.d.d -MT $(OBJ_DIR)/$*.d.o $(CPPFLAGS) $(DEBUG_CPPFLAGS) -o $@ $(CURDIR)/$<
+        @cp $(OBJ_DIR)/$*.d.d $(OBJ_DIR)/$*.d.P; \
+                sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+                -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.d.d >> $(OBJ_DIR)/$*.d.P; \
+                rm -f $(OBJ_DIR)/$*.d.d
+endef
 
 # create release objects
@@ -251 +266 @@
 # create release objects
 $(OBJ_DIR)/%.r.o: $(SRC_DIR)/%.c
-        $(COMPILE_AND_DEPEND_RELEASE)
+        $(COMPILE_AND_DEPEND_RELEASE_C)
 
 # create debug objects
 $(OBJ_DIR)/%.d.o: $(SRC_DIR)/%.c
-        $(COMPILE_AND_DEPEND_DEBUG)
+        $(COMPILE_AND_DEPEND_DEBUG_C)
 
 # create release objects
 $(OBJ_DIR)/%.r.o: $(SRC_DIR1)/%.c
-        $(COMPILE_AND_DEPEND_RELEASE)
+        $(COMPILE_AND_DEPEND_RELEASE_C)
 
 # create debug objects
 $(OBJ_DIR)/%.d.o: $(SRC_DIR1)/%.c
-        $(COMPILE_AND_DEPEND_DEBUG)
+        $(COMPILE_AND_DEPEND_DEBUG_C)
 
 # create release objects
 $(OBJ_DIR)/%.r.o: $(SRC_DIR2)/%.c
-        $(COMPILE_AND_DEPEND_RELEASE)
+        $(COMPILE_AND_DEPEND_RELEASE_C)
 
 # create debug objects
 $(OBJ_DIR)/%.d.o: $(SRC_DIR2)/%.c
-        $(COMPILE_AND_DEPEND_DEBUG)
+        $(COMPILE_AND_DEPEND_DEBUG_C)
 
 # create release objects
 $(OBJ_DIR)/%.r.o: $(SRC_DIR3)/%.c
-        $(COMPILE_AND_DEPEND_RELEASE)
+        $(COMPILE_AND_DEPEND_RELEASE_C)
 
 # create debug objects
 $(OBJ_DIR)/%.d.o: $(SRC_DIR3)/%.c
-        $(COMPILE_AND_DEPEND_DEBUG)
+        $(COMPILE_AND_DEPEND_DEBUG_C)
 
 # create release objects
 $(OBJ_DIR)/%.r.o: $(SRC_DIR4)/%.c
-        $(COMPILE_AND_DEPEND_RELEASE)
+        $(COMPILE_AND_DEPEND_RELEASE_C)
 
 # create debug objects
 $(OBJ_DIR)/%.d.o: $(SRC_DIR4)/%.c
-        $(COMPILE_AND_DEPEND_DEBUG)
+        $(COMPILE_AND_DEPEND_DEBUG_C)