[haiku-commits] r37178 - haiku/trunk/data/develop

  • From: zharik@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 19 Jun 2010 22:26:04 +0200 (CEST)

Author: siarzhuk
Date: 2010-06-19 22:26:04 +0200 (Sat, 19 Jun 2010)
New Revision: 37178
Changeset: http://dev.haiku-os.org/changeset/37178/haiku

Modified:
   haiku/trunk/data/develop/makefile-engine
Log:
- prefix for system include paths was changed from -I to -system;
- objects directories are separated for release and debug builds too.

Thanks to Axel for pointing those details!



Modified: haiku/trunk/data/develop/makefile-engine
===================================================================
--- haiku/trunk/data/develop/makefile-engine    2010-06-19 17:27:17 UTC (rev 
37177)
+++ haiku/trunk/data/develop/makefile-engine    2010-06-19 20:26:04 UTC (rev 
37178)
@@ -97,14 +97,10 @@
        endif
 
 #      guess compiler version
-       CC_VER_DMP = $(subst -, , $(subst ., , $(shell $(CC) -dumpversion)))
-       CC_VER_MAJ = $(word 1, $(CC_VER_DMP))
-       CC_VER_MIN = $(word 2, $(CC_VER_DMP))
-       CC_VER_MIC = $(word 3, $(CC_VER_DMP))
-       CC_VER = $(CC_VER_MAJ).$(CC_VER_MIN).$(CC_VER_MIC)
+       CC_VER = $(word 1, $(subst -, , $(subst ., , $(shell $(CC) 
-dumpversion))))
 
 #      set the directory where object files and binaries will be created
-       OBJ_DIR         := obj.$(CPU).$(CC)-$(CC_VER)
+       OBJ_DIR         := objects.$(CPU)-$(CC)$(CC_VER)-$(if 
$(DEBUGGER),debug,release)
 
 #      specify the directory the binary should be created in by default
 ifeq ($(TARGET_DIR), )
@@ -143,14 +139,15 @@
 #      SETTING: build the local and system include paths
 ifeq ($(CPU), x86)
        LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), 
$(addprefix -I, $(path)))
- ifeq ($(CC_VER_MAJ), 2)
+ ifeq ($(CC_VER), 2)
        INCLUDES = $(LOC_INCLUDES)
        INCLUDES += -I-
+       INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -I, 
$(path)))
  else
        INCLUDES = -iquote./
        INCLUDES += $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), 
$(addprefix -iquote, $(path)))
+       INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix 
-isystem, $(path)))
  endif
-       INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -I, 
$(path)))
 else
 ifeq ($(CPU), ppc)
        LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), 
$(addprefix -I, $(path)))


Other related posts:

  • » [haiku-commits] r37178 - haiku/trunk/data/develop - zharik