summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2008-02-07 11:58:04 +0000
committerBenny Prijono <bennylp@teluu.com>2008-02-07 11:58:04 +0000
commita50cf4e4adc531db5edd98ec99bb358b397c8557 (patch)
tree721af1ddace1a2f5da9368bb63393cb7a375c3d5 /third_party
parentbef9c8e0fb289fcd1ee3a31b00ecc4589f6cf4a6 (diff)
Fixed compilation error on libsrtp in crypto/aes.c when it finds the wrong err.h to be included. The solution was to change the order of include paths in Makefile
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1782 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/build/srtp/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/third_party/build/srtp/Makefile b/third_party/build/srtp/Makefile
index 7b4d1b41..7be343de 100644
--- a/third_party/build/srtp/Makefile
+++ b/third_party/build/srtp/Makefile
@@ -10,10 +10,11 @@ export SRTP_LIB := ../../lib/libsrtp-$(TARGET_NAME)$(LIBEXT)
###############################################################################
# Gather all flags.
#
-export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
- $(CFLAGS) $(CC_INC). $(CC_INC)../../srtp/crypto/include \
+export _CFLAGS := $(CC_INC). $(CC_INC)../../srtp/crypto/include \
$(CC_INC)../../srtp/include \
- $(CC_INC)../../../pjlib/include
+ $(CC_INC)../../../pjlib/include \
+ $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CFLAGS)
export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
$(HOST_CXXFLAGS) $(CXXFLAGS)
export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \