Changeset 5137 for pjproject/trunk/pjsip-apps/build/Makefile

Timestamp:

Jul 29, 2015 2:31:12 AM (9 years ago)

Author:

nanang

Message:

Re #1870: Fixed 64 bit arch issues on iOS: pool alignment, updated config.sub, updated lib/app file naming, lib dependencies on XCode.

File:

• pjproject/trunk/pjsip-apps/build/Makefile (modified) (3 diffs)

pjproject/trunk/pjsip-apps/build/Makefile

@@ -6 +6 @@
 
 RULES_MAK := $(PJDIR)/build/rules.mak
-
-PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
-PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
-PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT)
-PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT)
-PJMEDIA_AUDIODEV_LIB:=../../pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT)
-PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT)
-PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT)
-PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT)
-PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT)
-PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT)
 
 
@@ -79 +68 @@
 $(PJSUA_EXE):
         $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
+        @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \
+          for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \
+            if test -f $$F; then \
+              tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \
+              ln -sf $$F ../src/pjsua/ios/$$tmp; \
+            fi; \
+          done; \
+        fi;
 
 pjsystest: $(PJSYSTEST_EXE)
@@ -99 +96 @@
           echo '$(BINDIR)/$(PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \
         fi
-
-
-
+        @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \
+          for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \
+            tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \
+            rm -f ../src/pjsua/ios/$$tmp; \
+          done; \
+        fi;