Merge remote-tracking branch 'public/master' into tunnel

This commit is contained in:
Simon Morlat 2014-04-14 20:14:22 +02:00
commit 988bc012ca
3 changed files with 6 additions and 2 deletions

@ -1 +1 @@
Subproject commit e881f0512913a75d58ffe4ae6edf9139703383cc
Subproject commit 0177ef2de50f9609d8ed0525e8878f957da6ab61

View file

@ -44,6 +44,10 @@ echo "Selecting SDK path = ${SYSROOT_PATH}"
COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -${CLANG_TARGET_SPECIFIER}=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions"
#workaround for polarssl conflicting symbols
COMMON_FLAGS="$COMMON_FLAGS -Dsha256=polarssl_sha256"
# silence clang unused operators. This is temporary, we should find a way to compile 3rd party with correct flags :(
COMMON_FLAGS="-Qunused-arguments -Wno-unknown-warning-option -Wno-unused-command-line-argument-hard-error-in-future $COMMON_FLAGS"

@ -1 +1 @@
Subproject commit fd813601605e2f4e2cbd70e2cdb96806e3e78e41
Subproject commit e5d8ff817a5de726d75a6a69791d6a9603fe6460