Skip to content

Commit

Permalink
Fixed warnings of duplicate libs (#4177)
Browse files Browse the repository at this point in the history
  • Loading branch information
sauwming authored Dec 4, 2024
1 parent 22991e4 commit 8117bc5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 2 additions & 3 deletions aconfigure
Original file line number Diff line number Diff line change
Expand Up @@ -7064,7 +7064,7 @@ if ac_fn_c_try_link "$LINENO"
then :

CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS"
LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS"
LDFLAGS="$LDFLAGS $UPNP_LDFLAGS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }

Expand Down Expand Up @@ -8566,7 +8566,6 @@ printf "%s\n" "not found" >&6; }
ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
ac_sdl_ldflags=`$SDL_CONFIG --libs`
ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'`
LIBS="$LIBS $ac_sdl_ldflags"
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5
printf "%s\n" "Unsupported SDL version" >&6; }
Expand Down Expand Up @@ -9231,7 +9230,7 @@ if ac_fn_c_try_link "$LINENO"
then :

ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS"
ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS"
ac_vpx_ldflags="$VPX_LDFLAGS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }

Expand Down
5 changes: 2 additions & 3 deletions aconfigure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ AC_ARG_ENABLE(upnp,
],
[
CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS"
LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS"
LDFLAGS="$LDFLAGS $UPNP_LDFLAGS"
AC_MSG_RESULT(yes)
],
[
Expand Down Expand Up @@ -1546,7 +1546,6 @@ AC_ARG_ENABLE(sdl,
ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
ac_sdl_ldflags=`$SDL_CONFIG --libs`
ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'`
LIBS="$LIBS $ac_sdl_ldflags"
else
AC_MSG_RESULT([Unsupported SDL version])
fi
Expand Down Expand Up @@ -1806,7 +1805,7 @@ AC_ARG_ENABLE(vpx,
],
[
ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS"
ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS"
ac_vpx_ldflags="$VPX_LDFLAGS"
AC_MSG_RESULT(yes)
],
[
Expand Down
1 change: 0 additions & 1 deletion build.mak.in
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
$(PJLIB_LDLIB) \
@LIBS@
export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
-lstdc++ \
$(APP_LDLIBS)

# Here are the variables to use if application is using the library
Expand Down

0 comments on commit 8117bc5

Please sign in to comment.