Ignore:
Timestamp:
Jul 29, 2015 2:31:12 AM (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/build/Makefile

    r4753 r5137  
    66 
    77RULES_MAK := $(PJDIR)/build/rules.mak 
    8  
    9 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 
    10 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 
    11 PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 
    12 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 
    13 PJMEDIA_AUDIODEV_LIB:=../../pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) 
    14 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 
    15 PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT) 
    16 PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) 
    17 PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 
    18 PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT) 
    198 
    209 
     
    7968$(PJSUA_EXE): 
    8069        $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 
     70        @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \ 
     71          for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \ 
     72            if test -f $$F; then \ 
     73              tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \ 
     74              ln -sf $$F ../src/pjsua/ios/$$tmp; \ 
     75            fi; \ 
     76          done; \ 
     77        fi; 
    8178 
    8279pjsystest: $(PJSYSTEST_EXE) 
     
    9996          echo '$(BINDIR)/$(PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \ 
    10097        fi 
    101  
    102  
    103  
     98        @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \ 
     99          for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \ 
     100            tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \ 
     101            rm -f ../src/pjsua/ios/$$tmp; \ 
     102          done; \ 
     103        fi; 
Note: See TracChangeset for help on using the changeset viewer.