diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-03-10 09:13:10 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-03-10 09:13:10 +0000 |
| commit | f3bfb967699d1697c81c5bc8f22824c648dff7e7 (patch) | |
| tree | ef33cab67027b0be056dafd97a3e26a2968d9101 /third_party | |
| parent | e309d458718a406f7d4c8e0fd00f6cd0d3390ef0 (diff) | |
Re #1745 (Shared lib on MinGW): Fixed missing LDFLAGS setting on some components and build options for win32 DLL.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4786 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/build/portaudio/Makefile | 1 | ||||
| -rw-r--r-- | third_party/build/speex/Makefile | 4 | ||||
| -rw-r--r-- | third_party/build/srtp/Makefile | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/third_party/build/portaudio/Makefile b/third_party/build/portaudio/Makefile index a5c2449e..c1ad23a2 100644 --- a/third_party/build/portaudio/Makefile +++ b/third_party/build/portaudio/Makefile @@ -42,6 +42,7 @@ export _LDFLAGS += $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ export PORTAUDIO_SRCDIR = src export PORTAUDIO_OBJS += export PORTAUDIO_CFLAGS += $(_CFLAGS) +export PORTAUDIO_LDFLAGS += $(_LDFLAGS) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT ############################################################################### diff --git a/third_party/build/speex/Makefile b/third_party/build/speex/Makefile index 7e5e6fd6..479a1976 100644 --- a/third_party/build/speex/Makefile +++ b/third_party/build/speex/Makefile @@ -23,7 +23,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ - $(LDFLAGS) + $(APP_LDFLAGS) $(LDFLAGS) export SPEEX_SRCDIR = ../../speex/libspeex export SPEEX_OBJS = bits.o cb_search.o exc_10_16_table.o \ @@ -42,7 +42,7 @@ export SPEEX_OBJS = bits.o cb_search.o exc_10_16_table.o \ stereo.o vbr.o vq.o window.o export SPEEX_CFLAGS = -DHAVE_CONFIG_H $(_CFLAGS) - +export SPEEX_LDFLAGS := $(PJLIB_LDLIB) $(_LDFLAGS) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT ############################################################################### diff --git a/third_party/build/srtp/Makefile b/third_party/build/srtp/Makefile index 9538f0bb..65f60613 100644 --- a/third_party/build/srtp/Makefile +++ b/third_party/build/srtp/Makefile @@ -24,7 +24,7 @@ export _CFLAGS := $(CC_INC). $(CC_INC)../../srtp/crypto/include \ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ - $(LDFLAGS) + $(APP_LDFLAGS) $(LDFLAGS) # libcrypt.a (the crypto engine) ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o \ @@ -55,6 +55,7 @@ cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay) export SRTP_SRCDIR = ../../srtp export SRTP_OBJS = $(cryptobj) $(srtpobj) export SRTP_CFLAGS = -DHAVE_CONFIG_H $(_CFLAGS) +export SRTP_LDFLAGS = $(PJLIB_LDLIB) $(_LDFLAGS) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT |