Changeset 5512 for pjproject/branches/projects/uwp/third_party/build/srtp/Makefile

Timestamp:

Dec 28, 2016 3:28:05 AM (7 years ago)

Author:

nanang

Message:

Re #1900: Merged from trunk (without 3 text conflicts in sln & vcxproj).

Location:

pjproject/branches/projects/uwp/third_party

Files:

• . (modified) (1 prop)
• build/srtp/Makefile (modified) (5 diffs)

pjproject/branches/projects/uwp/third_party/build/srtp/Makefile

@@ -1 +1 @@
 include ../../../build.mak
 include ../../../build/common.mak
+include ../os-$(OS_NAME).mak
 
 export LIBDIR := ../../lib
@@ -29 +30 @@
 # libcrypt.a (the crypto engine) 
 ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o      \
-          crypto/cipher/aes.o crypto/cipher/aes_icm.o             \
-          crypto/cipher/aes_cbc.o
+          $(CIPHERS_SRC)
 
-hashes  = crypto/hash/null_auth.o crypto/hash/sha1.o \
-          crypto/hash/hmac.o crypto/hash/auth.o # crypto/hash/tmmhv2.o 
+hashes  = crypto/hash/null_auth.o crypto/hash/auth.o $(HASHES_SRC)
 
 replay  = crypto/replay/rdb.o crypto/replay/rdbx.o               \
@@ -42 +41 @@
 ust     = crypto/ust/ust.o 
 
-rng     = crypto/rng/rand_source.o crypto/rng/prng.o crypto/rng/ctr_prng.o
+rng     = $(RNG_SRC)
 
 err     = pjlib/srtp_err.o
@@ -49 +48 @@
           crypto/kernel/key.o $(rng) $(err) # $(ust) 
 
-srtpobj = srtp/srtp.o 
+srtpobj = srtp/srtp.o srtp/ekt.o
 
 cryptobj =  $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
@@ -55 +54 @@
 export SRTP_SRCDIR = ../../srtp
 export SRTP_OBJS = $(cryptobj) $(srtpobj)
-export SRTP_CFLAGS = -DHAVE_CONFIG_H $(_CFLAGS)
+export SRTP_CFLAGS = -DHAVE_CONFIG_H $(_CFLAGS) $(SRTP_OTHER_CFLAGS)
 export SRTP_LDFLAGS = $(PJLIB_LDLIB) $(_LDFLAGS)