summaryrefslogtreecommitdiff
path: root/build.mak.in
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2010-05-17 13:07:39 +0000
committerLiong Sauw Ming <ming@teluu.com>2010-05-17 13:07:39 +0000
commit3fb7b207726aa7500b761c7056f7dbf82ac5015d (patch)
treeca9641fb466f01651cbbd8d619fa6da5fac32976 /build.mak.in
parent49aea0237b6e2134fe31c551f21e8148c884e140 (diff)
Merge #1050, #1052, #1053, #1054 into the main trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3175 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build.mak.in')
-rw-r--r--build.mak.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/build.mak.in b/build.mak.in
index bcba2013..2f8197da 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -60,7 +60,8 @@ endif
# CFLAGS, LDFLAGS, and LIBS to be used by applications
export PJDIR := @ac_pjdir@
-export APP_CC := $(CROSS_COMPILE)$(CC_NAME)
+export APP_CC := @CC@
+export APP_CXX := @CXX@
export APP_CFLAGS := -DPJ_AUTOCONF=1\
@CFLAGS@\
-I$(PJDIR)/pjlib/include\
@@ -105,6 +106,7 @@ export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \
# from within the source distribution
export PJ_DIR := $(PJDIR)
export PJ_CC := $(APP_CC)
+export PJ_CXX := $(APP_CXX)
export PJ_CFLAGS := $(APP_CFLAGS)
export PJ_CXXFLAGS := $(APP_CXXFLAGS)
export PJ_LDFLAGS := $(APP_LDFLAGS)