From 25bc6b7d6ccfdeecf4595cd9aee2847895276e2a Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Thu, 24 Oct 2013 07:12:39 +0000 Subject: Re #1630 (misc): Use the right compiler and flags to compile C++ (.cpp) files git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4637 74dad513-b988-da41-8d7b-12977e46ad98 --- build/rules.mak | 2 +- pjlib-util/build/Makefile | 2 ++ pjlib/build/Makefile | 2 ++ pjmedia/build/Makefile | 7 +++++++ pjnath/build/Makefile | 4 ++++ pjsip-apps/build/Makefile | 2 ++ pjsip/build/Makefile | 5 +++++ 7 files changed, 23 insertions(+), 1 deletion(-) diff --git a/build/rules.mak b/build/rules.mak index 15ae6672..49798a37 100644 --- a/build/rules.mak +++ b/build/rules.mak @@ -142,7 +142,7 @@ $(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S $(subst /,$(HOST_PSEP),$<) $(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp - $(CC) $($(APP)_CXXFLAGS) \ + $(CXX) $($(APP)_CXXFLAGS) \ $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ $(subst /,$(HOST_PSEP),$<) diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile index 5bff51e3..b89cae15 100644 --- a/pjlib-util/build/Makefile +++ b/pjlib-util/build/Makefile @@ -34,6 +34,7 @@ export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ srv_resolver.o string.o stun_simple.o \ stun_simple_client.o xml.o export PJLIB_UTIL_CFLAGS += $(_CFLAGS) +export PJLIB_UTIL_CXXFLAGS += $(_CXXFLAGS) ############################################################################### # Defines for building test application @@ -42,6 +43,7 @@ export UTIL_TEST_SRCDIR = ../src/pjlib-util-test export UTIL_TEST_OBJS += xml.o encryption.o stun.o resolver_test.o test.o \ http_client.o export UTIL_TEST_CFLAGS += $(_CFLAGS) +export UTIL_TEST_CXXFLAGS += $(_CXXFLAGS) export UTIL_TEST_LDFLAGS += $(_LDFLAGS) export UTIL_TEST_EXE:=../bin/pjlib-util-test-$(TARGET_NAME)$(HOST_EXE) diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 272206d7..a1c9acf9 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -30,6 +30,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ ssl_sock_common.o ssl_sock_ossl.o ssl_sock_dump.o \ string.o timer.o types.o export PJLIB_CFLAGS += $(_CFLAGS) +export PJLIB_CXXFLAGS += $(_CXXFLAGS) ############################################################################### # Defines for building test application @@ -44,6 +45,7 @@ export TEST_OBJS += activesock.o atomic.o echo_clt.o errno.o exception.o \ udp_echo_srv_sync.o udp_echo_srv_ioqueue.o \ util.o export TEST_CFLAGS += $(_CFLAGS) +export TEST_CXXFLAGS += $(_CXXFLAGS) export TEST_LDFLAGS += $(_LDFLAGS) export TEST_EXE := ../bin/pjlib-test-$(TARGET_NAME)$(HOST_EXE) diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 1970e8c0..dec360ec 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -73,6 +73,7 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ wsola.o export PJMEDIA_CFLAGS += $(_CFLAGS) +export PJMEDIA_CXXFLAGS += $(_CXXFLAGS) ############################################################################### @@ -84,6 +85,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \ alsa_dev.o bb10_dev.o bdimad_dev.o \ android_jni_dev.o opensl_dev.o export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) +export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS) ############################################################################### @@ -93,6 +95,7 @@ export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \ colorbar_dev.o v4l2_dev.o export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) +export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS) ############################################################################### @@ -105,6 +108,7 @@ export PJSDP_SRCDIR = ../src/pjmedia export PJSDP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ errno.o sdp.o sdp_cmp.o sdp_neg.o export PJSDP_CFLAGS += $(_CFLAGS) +export PJSDP_CXXFLAGS += $(_CXXFLAGS) ############################################################################### @@ -118,6 +122,8 @@ export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_vid_codecs.o \ g7221_sdp_match.o amr_sdp_match.o export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS) +export PJMEDIA_CODEC_CXXFLAGS += $(_CXXFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ + $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS) ############################################################################### @@ -129,6 +135,7 @@ export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o \ rtp_test.o test.o export PJMEDIA_TEST_OBJS += sdp_neg_test.o export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) +export PJMEDIA_TEST_CXXFLAGS += $(_CXXFLAGS) export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS) export PJMEDIA_TEST_EXE:=../bin/pjmedia-test-$(TARGET_NAME)$(HOST_EXE) diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile index 8937dfeb..24ddfd5d 100644 --- a/pjnath/build/Makefile +++ b/pjnath/build/Makefile @@ -35,6 +35,7 @@ export PJNATH_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ stun_msg.o stun_msg_dump.o stun_session.o stun_sock.o \ stun_transaction.o turn_session.o turn_sock.o export PJNATH_CFLAGS += $(_CFLAGS) +export PJNATH_CXXFLAGS += $(_CXXFLAGS) ############################################################################### # Defines for building test application @@ -43,6 +44,7 @@ export PJNATH_TEST_SRCDIR = ../src/pjnath-test export PJNATH_TEST_OBJS += ice_test.o stun.o sess_auth.o server.o concur_test.o \ stun_sock_test.o turn_sock_test.o test.o export PJNATH_TEST_CFLAGS += $(_CFLAGS) +export PJNATH_TEST_CXXFLAGS += $(_CXXFLAGS) export PJNATH_TEST_LDFLAGS += $(_LDFLAGS) export PJNATH_TEST_EXE:=../bin/pjnath-test-$(TARGET_NAME)$(HOST_EXE) @@ -53,6 +55,7 @@ export PJNATH_TEST_EXE:=../bin/pjnath-test-$(TARGET_NAME)$(HOST_EXE) export PJTURN_CLIENT_SRCDIR = ../src/pjturn-client export PJTURN_CLIENT_OBJS += client_main.o export PJTURN_CLIENT_CFLAGS += $(_CFLAGS) +export PJTURN_CLIENT_CXXFLAGS += $(_CXXFLAGS) export PJTURN_CLIENT_LDFLAGS += $(_LDFLAGS) export PJTURN_CLIENT_EXE:=../bin/pjturn-client-$(TARGET_NAME)$(HOST_EXE) @@ -63,6 +66,7 @@ export PJTURN_SRV_SRCDIR = ../src/pjturn-srv export PJTURN_SRV_OBJS += allocation.o auth.o listener_udp.o \ listener_tcp.o server.o main.o export PJTURN_SRV_CFLAGS += $(_CFLAGS) +export PJTURN_SRV_CXXFLAGS += $(_CXXFLAGS) export PJTURN_SRV_LDFLAGS += $(_LDFLAGS) export PJTURN_SRV_EXE:=../bin/pjturn-srv-$(TARGET_NAME)$(HOST_EXE) diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index ad7fc726..1c043cb7 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -36,6 +36,7 @@ export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ main.o pjsua_app.o pjsua_app_cli.o pjsua_app_common.o \ pjsua_app_config.o pjsua_app_legacy.o export PJSUA_CFLAGS += $(_CFLAGS) +export PJSUA_CXXFLAGS += $(_CXXFLAGS) export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS) export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE) @@ -47,6 +48,7 @@ export PJSYSTEST_SRCDIR = ../src/pjsystest export PJSYSTEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ systest.o main_console.o export PJSYSTEST_CFLAGS += $(_CFLAGS) +export PJSYSTEST_CXXFLAGS += $(_CXXFLAGS) export PJSYSTEST_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS) export PJSYSTEST_EXE:=../bin/pjsystest-$(TARGET_NAME)$(HOST_EXE) diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 41e91a12..3914cf83 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -48,6 +48,7 @@ export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ sip_transaction.o sip_util_statefull.o \ sip_dialog.o sip_ua_layer.o export PJSIP_CFLAGS += $(_CFLAGS) +export PJSIP_CXXFLAGS += $(_CXXFLAGS) ############################################################################### # Defines for building PJSIP UA library @@ -57,6 +58,7 @@ export PJSIP_UA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ sip_inv.o sip_reg.o sip_replaces.o sip_xfer.o \ sip_100rel.o sip_timer.o export PJSIP_UA_CFLAGS += $(_CFLAGS) +export PJSIP_UA_CXXFLAGS += $(_CXXFLAGS) ############################################################################### @@ -68,6 +70,7 @@ export PJSIP_SIMPLE_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ mwi.o pidf.o presence.o presence_body.o publishc.o \ rpid.o xpidf.o export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS) +export PJSIP_SIMPLE_CXXFLAGS += $(_CXXFLAGS) ############################################################################### @@ -79,6 +82,7 @@ export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ pjsua_im.o pjsua_media.o pjsua_pres.o \ pjsua_dump.o pjsua_aud.o pjsua_vid.o export PJSUA_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) +export PJSUA_LIB_CXXFLAGS += $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT @@ -95,6 +99,7 @@ export TEST_OBJS += dlg_core_test.o dns_test.o msg_err_test.o \ tsx_uas_test.o txdata_test.o uri_test.o \ inv_offer_answer_test.o export TEST_CFLAGS += $(_CFLAGS) +export TEST_CXXFLAGS += $(_CXXFLAGS) export TEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE) -- cgit v1.2.3