diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-07-29 02:31:12 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-07-29 02:31:12 +0000 |
commit | 4bf98126d927c55fbfbfec3d76798cd5e14543cc (patch) | |
tree | 477ed4eb9e62a8083e6ca3de1971f5606414e6f8 /pjsip-apps/build | |
parent | 0916db620571f0e2e4fcc8d89cd3417f5f52f629 (diff) |
Re #1870: Fixed 64 bit arch issues on iOS: pool alignment, updated config.sub, updated lib/app file naming, lib dependencies on XCode.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5137 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/build')
-rw-r--r-- | pjsip-apps/build/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index 917b1deb..a3c7386b 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -6,17 +6,6 @@ export BINDIR := ../bin 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) - ############################################################################### # Gather all flags. @@ -78,6 +67,14 @@ distclean: realclean pjsua: $(PJSUA_EXE) $(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) $(PJSYSTEST_EXE): @@ -98,6 +95,9 @@ clean depend realclean: echo '$(BINDIR)/$(PJSUA_EXE): $(APP_LIB_FILES)' >> .pjsua-$(TARGET_NAME).depend; \ 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; |