sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re #1516: fixing multiple inclusions of crtbegin.o and -lgcc in the makefiles. The former causes link errors due to multiple symbols 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4732 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2014-02-05 05:52:10 +00:00
parent e9c0d06173
commit fdff733444
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aconfigure
View File

@ -6116,7 +6116,7 @@ fi
case $target in
*android*)
LIBS="$LIBS -llog -lgcc"
LIBS="$LIBS -llog"
;;
arm-apple-darwin*)
LIBS="$LIBS -framework UIKit"

2
aconfigure.ac
View File

@ -691,7 +691,7 @@ AC_ARG_ENABLE(video,
case $target in
*android*)
LIBS="$LIBS -llog -lgcc"
LIBS="$LIBS -llog"
;;
arm-apple-darwin*)
LIBS="$LIBS -framework UIKit"

12
pjsip-apps/build/Makefile
View File

@ -39,9 +39,9 @@ export PJSUA_SRCDIR = ../src/pjsua
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 += $(_LDFLAGS)
export PJSUA_CFLAGS += $(PJ_CFLAGS)
export PJSUA_CXXFLAGS += $(PJ_CXXFLAGS)
export PJSUA_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS)
export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE)
@ -51,9 +51,9 @@ export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE)
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 += $(_LDFLAGS)
export PJSYSTEST_CFLAGS += $(PJ_CFLAGS)
export PJSYSTEST_CXXFLAGS += $(PJ_CXXFLAGS)
export PJSYSTEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS)
export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE)