Ignore:
Timestamp:
Mar 30, 2012 7:10:13 AM (10 years ago)
Author:
bennylp
Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/build.mak.in

    r3664 r3999  
     1export PJDIR := @ac_pjdir@ 
     2include $(PJDIR)/version.mak 
     3export PJ_DIR := $(PJDIR) 
     4 
    15# @configure_input@ 
    26export MACHINE_NAME := auto 
     
    711export CROSS_COMPILE := @ac_cross_compile@ 
    812export LINUX_POLL := @ac_linux_poll@  
     13export SHLIB_SUFFIX := @ac_shlib_suffix@ 
    914 
    1015export ac_prefix := @prefix@ 
     
    1318 
    1419# Determine which party libraries to use 
    15 export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) 
     20export APP_THIRD_PARTY_LIBS := -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) 
    1621export APP_THIRD_PARTY_EXT := 
    17 export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) 
     22export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) 
     23 
     24ifeq (@ac_resample_dll@,1) 
     25export PJ_RESAMPLE_DLL := 1 
     26export APP_THIRD_PARTY_LIBS := -lresample $(APP_THIRD_PARTY_LIBS) 
     27export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX) $(APP_THIRD_PARTY_LIB_FILES) 
     28else 
     29export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) $(APP_THIRD_PARTY_LIBS) 
     30export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(APP_THIRD_PARTY_LIB_FILES) 
     31endif 
    1832 
    1933ifneq (@ac_no_gsm_codec@,1) 
     
    90104 
    91105# CFLAGS, LDFLAGS, and LIBS to be used by applications 
    92 export PJDIR := @ac_pjdir@ 
    93106export APP_CC := @CC@ 
    94107export APP_CXX := @CXX@ 
     
    139152# Here are the variabels to use if application is using the library 
    140153# from within the source distribution 
    141 export PJ_DIR := $(PJDIR) 
    142154export PJ_CC := $(APP_CC) 
    143155export PJ_CXX := $(APP_CXX) 
Note: See TracChangeset for help on using the changeset viewer.