Changeset 3175 for pjproject/trunk/build

Timestamp:

May 17, 2010 1:07:39 PM (14 years ago)

Author:

ming

Message:

Merge #1050, #1052, #1053, #1054 into the main trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• build (modified) (1 prop)
• build/cc-auto.mak.in (copied) (copied from pjproject/branches/projects/iphone/build/cc-auto.mak.in)
• build/common.mak (modified) (1 diff)
• build/rules.mak (modified) (1 diff)

pjproject/trunk/build

@@ -2 +2 @@
 *.opt
 os-auto.mak
+cc-auto.mak

@@ -2 +2 @@
 *.opt
 os-auto.mak
+cc-auto.mak

pjproject/trunk/build/common.mak

@@ -16 +16 @@
 #
 -include cc-$(CC_NAME).mak
+
+#
+# Include auto configured compiler specification.
+# This will override the compiler settings above.
+# Currently this is made OPTIONAL, to prevent people
+# from getting errors because they don't re-run ./configure
+# after downloading new PJSIP.
+#
+-include $(PJDIR)/build/cc-auto.mak
 
 #

pjproject/trunk/build/rules.mak

@@ -66 +66 @@
         @echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS)
         @echo DEPFLAGS=$(DEPFLAGS)
+        @echo CC=$(CC)
+        @echo AR=$(AR)
+        @echo RANLIB=$(RANLIB)
 
 print_bin: print_common

@@ -2 +2 @@
 *.opt
 os-auto.mak
+cc-auto.mak