diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
| commit | 6b4964727bffb379aca9601e1cf69051ccbf600c (patch) | |
| tree | 1d9739ea8b3b5e0421f1d99b39e798b1514fb644 /build.mak.in | |
| parent | 85ac546acb235df62169c4ad317da74a62e56a88 (diff) | |
Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3999 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build.mak.in')
| -rw-r--r-- | build.mak.in | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/build.mak.in b/build.mak.in index 99465bfc..5ea6e79d 100644 --- a/build.mak.in +++ b/build.mak.in @@ -1,3 +1,7 @@ +export PJDIR := @ac_pjdir@ +include $(PJDIR)/version.mak +export PJ_DIR := $(PJDIR) + # @configure_input@ export MACHINE_NAME := auto export OS_NAME := auto @@ -6,15 +10,25 @@ export CC_NAME := gcc export TARGET_NAME := @target@ export CROSS_COMPILE := @ac_cross_compile@ export LINUX_POLL := @ac_linux_poll@ +export SHLIB_SUFFIX := @ac_shlib_suffix@ export ac_prefix := @prefix@ LIB_SUFFIX = $(TARGET_NAME).a # Determine which party libraries to use -export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) +export APP_THIRD_PARTY_LIBS := -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) export APP_THIRD_PARTY_EXT := -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) +export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) + +ifeq (@ac_resample_dll@,1) +export PJ_RESAMPLE_DLL := 1 +export APP_THIRD_PARTY_LIBS := -lresample $(APP_THIRD_PARTY_LIBS) +export 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) +else +export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) $(APP_THIRD_PARTY_LIBS) +export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(APP_THIRD_PARTY_LIB_FILES) +endif ifneq (@ac_no_gsm_codec@,1) ifeq (@ac_external_gsm@,1) @@ -89,7 +103,6 @@ PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) # CFLAGS, LDFLAGS, and LIBS to be used by applications -export PJDIR := @ac_pjdir@ export APP_CC := @CC@ export APP_CXX := @CXX@ export APP_CFLAGS := -DPJ_AUTOCONF=1\ @@ -138,7 +151,6 @@ export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \ # Here are the variabels to use if application is using the library # from within the source distribution -export PJ_DIR := $(PJDIR) export PJ_CC := $(APP_CC) export PJ_CXX := $(APP_CXX) export PJ_CFLAGS := $(APP_CFLAGS) |