Changeset 4711 for pjproject/trunk/build.mak.in

Timestamp:

Jan 23, 2014 2:28:41 AM (10 years ago)

Author:

ming

Message:

Re #1723: Modified build system to link with C++ library only for pjsua2 lib or app

File:

• pjproject/trunk/build.mak.in (modified) (7 diffs)

pjproject/trunk/build.mak.in

@@ -173 +173 @@
         -I$(PJDIR)/pjsip/include
 export APP_CXXFLAGS := $(APP_CFLAGS)
-#  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x
-#
-# FIX THIS
-#
-# pjsua2 is c++ library hence maybe needs to be put in separate
-# variables. it will also require -lstdc++ or -static-libstdc++
-#  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x
 export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
         -L$(PJDIR)/pjlib-util/lib\
@@ -187 +180 @@
         -L$(PJDIR)/third_party/lib\
         $(PJ_VIDEO_LDFLAGS) \
-        -static-libstdc++ \
         @LDFLAGS@
-
-#  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x
-#
-# FIX THIS
-#
-# pjsua2 is c++ library hence maybe needs to be put in separate
-# variables. it will also require -lstdc++
-#  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x
+export APP_LDXXFLAGS := $(APP_LDFLAGS) \
+        -static-libstdc++
+
 export APP_LIB_FILES = \
-        $(PJ_DIR)/pjsip/lib/libpjsua2-$(LIB_SUFFIX) \
         $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \
         $(PJ_DIR)/pjsip/lib/libpjsip-ua-$(LIB_SUFFIX) \
@@ -211 +197 @@
         $(APP_THIRD_PARTY_LIB_FILES) \
         $(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX)
+export APP_LIBXX_FILES = \
+        $(PJ_DIR)/pjsip/lib/libpjsua2-$(LIB_SUFFIX) \
+        $(APP_LIB_FILES)
 
 ifeq ($(PJ_SHARED_LIBRARIES),)
@@ -239 +228 @@
 export PJSUA2_LIB_LDLIB := -lpjsua2
 
-APP_LIB_FILES += $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX) \
+export ADD_LIB_FILES := $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX) \
         $(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX) \
         $(PJ_DIR)/pjsip/lib/libpjsip-simple.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip-simple.$(SHLIB_SUFFIX) \
@@ -250 +239 @@
         $(PJ_DIR)/pjlib-util/lib/libpjlib-util.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjlib-util/lib/libpjlib-util.$(SHLIB_SUFFIX) \
         $(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX)
-endif
-
-export APP_LDLIBS := $(PJSUA2_LIB_LDLIB) \
-        $(PJSUA_LIB_LDLIB) \
+
+APP_LIB_FILES += $(ADD_LIB_FILES)
+
+APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
+        $(ADD_LIB_FILES)
+endif
+
+export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
         $(PJSIP_UA_LDLIB) \
         $(PJSIP_SIMPLE_LDLIB) \
@@ -267 +260 @@
         $(PJLIB_LDLIB) \
         @LIBS@
+export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
+        -lstdc++ \
+        $(APP_LDLIBS)
 
 # Here are the variabels to use if application is using the library
@@ -275 +271 @@
 export PJ_CXXFLAGS := $(APP_CXXFLAGS)
 export PJ_LDFLAGS := $(APP_LDFLAGS)
+export PJ_LDXXFLAGS := $(APP_LDXXFLAGS)
 export PJ_LDLIBS := $(APP_LDLIBS)
+export PJ_LDXXLIBS := $(APP_LDXXLIBS)
 export PJ_LIB_FILES := $(APP_LIB_FILES)
+export PJ_LIBXX_FILES := $(APP_LIBXX_FILES)
 
 # And here are the variables to use if application is using the