diff --git a/deps/lib-versions b/deps/lib-versions index c7963f03..2b0c8fe6 100644 --- a/deps/lib-versions +++ b/deps/lib-versions @@ -10,11 +10,5 @@ export MBEDTLS_CSUM=9a6e0b0386496fae6863e41968eb308034a74008e775a533750af483a383 export JSONCPP_VERSION=1.8.4 export JSONCPP_CSUM=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6 -export LZO_VERSION=lzo-2.10 -export LZO_CSUM=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 - -export OPENSSL_VERSION=openssl-1.1.1n -export OPENSSL_CSUM=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a - export XXHASH_VERSION=0.8.0 export XXHASH_CSUM=7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f diff --git a/deps/lzo/build-lzo b/deps/lzo/build-lzo deleted file mode 100755 index df96fb7a..00000000 --- a/deps/lzo/build-lzo +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env bash - -set -e -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree - exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to dependency build folder - exit 1 -fi -if [ -z "$TARGET" ]; then - echo TARGET var must be defined - exit 1 -fi - -[ -z "$DL" ] && DL=~/Downloads - -# source vars -. $O3/core/vars/vars-${TARGET} -. $O3/core/deps/lib-versions - -# source helper functions -. $O3/core/deps/functions.sh - -FNAME=${LZO_VERSION}.tar.gz -PN=${LZO_VERSION#*-} -URL=http://www.oberhumer.com/opensource/lzo/download/${LZO_VERSION}.tar.gz -CSUM=${LZO_CSUM} - -download - -CC=cc -LD=ld -AR=ar -RANLIB=ranlib -[ "$GCC_CMD" ] && CC=$GCC_CMD -[ "$LD_CMD" ] && LD=$LD_CMD -[ "$AR_CMD" ] && AR=$AR_CMD -[ "$RANLIB_CMD" ] && RANLIB=$RANLIB_CMD - -case $PLATFORM in -android*) - echo PLATFORM android - host=arm - target=arm - ;; -ios*) - echo PLATFORM ios - host="x86_64-apple-darwin" - target=arm - ;; -*) - host="" - target="" - ;; -esac - -if [ "$target" ]; then - targ_opt="--target=$target" -fi - -if [ "$host" ]; then - host_opt="--host=$host" -fi - -if [ "$NO_WIPE" != "1" ]; then - rm -rf $LZO_VERSION - tar xfz $DL/$LZO_VERSION.tar.gz -fi - -DIST=$(pwd)/lzo/lzo-$PLATFORM -rm -rf $DIST -mkdir -p $DIST -cd $LZO_VERSION -echo 'OPTIONS' $CC $LD $AR $RANLIB $host_opt $targ_opt -CFLAGS="$PLATFORM_FLAGS $OTHER_COMPILER_FLAGS $LIB_OPT_LEVEL $LIB_FPIC" ./configure --prefix=$DIST $host_opt $targ_opt -make -make install -exit 0 diff --git a/deps/openssl/build-openssl b/deps/openssl/build-openssl deleted file mode 100755 index e90abe1b..00000000 --- a/deps/openssl/build-openssl +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash -set -e -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree - exit 1 -fi -if [ -z "$TARGET" ]; then - echo TARGET var must be defined - exit 1 -fi -if [ -z "$OPENSSL_TARGET" ]; then - echo "OPENSSL_TARGET var must be defined" - exit 1 -fi - -# GNU sed differs from BSD sed -if sed --version 2>&1 | grep -q GNU ; then - mysed='sed -i' -else - mysed='sed -i ""' -fi - -[ -z "$GCC_CMD" ] && GCC_CMD=gcc - -[ -z "$LINK_MODE" ] && LINK_MODE=static -[ "$LINK_MODE" = "static" ] && LINK_MODE=no-shared - -[ -z "$DL" ] && DL=~/Downloads - -. $O3/core/vars/vars-$TARGET -. $O3/core/deps/lib-versions - - -# source vars -. $O3/core/vars/vars-${TARGET} -. $O3/core/deps/lib-versions - -# source helper functions -. $O3/core/deps/functions.sh - -FNAME=openssl-${OPENSSL_VERSION}.tar.gz -URL=https://www.openssl.org/source/${OPENSSL_VERSION}.tar.gz -CSUM=${OPENSSL_CSUM} - -download - -AR="ar rc" -RANLIB=ranlib -[ "$AR_CMD" ] && AR="$AR_CMD" -[ "$RANLIB_CMD" ] && RANLIB="$RANLIB_CMD" - -# special hack because OpenSSL build system doesn't use rc options for ar -[ "$AR" = "gcc-ar" ] && AR="gcc-ar rc" -[ "$AR" = "gcc-ar-5" ] && AR="gcc-ar-5 rc" - -OPENSSL=$OPENSSL_VERSION -DIST=$(pwd)/openssl/openssl-$PLATFORM -[ "$ARCH" ] && DIST=$DIST/$ARCH -rm -rf $OPENSSL $DIST -mkdir -p $DIST -tar xfz $DL/$FNAME -pushd $OPENSSL -export SOURCE_DATE_EPOCH=$(date -r CHANGES +%s) -CMD="./Configure $OPENSSL_TARGET $LINK_MODE threads no-idea no-mdc2 no-rc5 --prefix=$DIST" -echo $CMD -$CMD -$mysed -e "s|-O3|$LIB_OPT_LEVEL $MIN_DEPLOY_TARGET $OTHER_COMPILER_FLAGS $LIB_FPIC|" Makefile -#$mysed -e "s|ERR_load_COMP_strings()|//ERR_load_COMP_strings()|" crypto/err/err_all.c -make depend -make CC="$GCC_CMD" AR="$AR" ARFLAGS="" RANLIB="$RANLIB" -j ${MAKE_JOBS:-1} build_libs -touch apps/openssl -touch openssl.pc -touch libcrypto.pc -touch libssl.pc -make RANLIB="$RANLIB" install_sw -popd - -exit 0 diff --git a/mac/.gitignore b/mac/.gitignore deleted file mode 100644 index 14ce7f3c..00000000 --- a/mac/.gitignore +++ /dev/null @@ -1 +0,0 @@ -**/xcuserdata/ diff --git a/mac/ovpn3-core/ovpn3-core.xcodeproj/project.pbxproj b/mac/ovpn3-core/ovpn3-core.xcodeproj/project.pbxproj deleted file mode 100644 index cdd8e999..00000000 --- a/mac/ovpn3-core/ovpn3-core.xcodeproj/project.pbxproj +++ /dev/null @@ -1,573 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 48; - objects = { - -/* Begin PBXBuildFile section */ - DF28F0D422E6071900E5B24C /* ovpnagent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF28F0D322E6071900E5B24C /* ovpnagent.cpp */; }; - DF28F0D522E60BBF00E5B24C /* libjsoncpp_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF28F0C522E5E40D00E5B24C /* libjsoncpp_static.a */; }; - DF28F0D622E60BEF00E5B24C /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AEA201F0DDC0003272D /* CoreServices.framework */; }; - DF28F0D722E60BF500E5B24C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AE8201F0DB80003272D /* IOKit.framework */; }; - DF28F0D822E60BFD00E5B24C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AE6201F0D910003272D /* SystemConfiguration.framework */; }; - DF28F0D922E60C0700E5B24C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AE4201F0D4F0003272D /* CoreFoundation.framework */; }; - DF380AE2201F0A2F0003272D /* cli.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF380AE1201F0A2F0003272D /* cli.cpp */; }; - DF380AE5201F0D4F0003272D /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AE4201F0D4F0003272D /* CoreFoundation.framework */; }; - DF380AE7201F0D910003272D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AE6201F0D910003272D /* SystemConfiguration.framework */; }; - DF380AE9201F0DB80003272D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AE8201F0DB80003272D /* IOKit.framework */; }; - DF380AEB201F0DDC0003272D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AEA201F0DDC0003272D /* CoreServices.framework */; }; - DF380AED201F0E0E0003272D /* libmbedtls.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF380AEC201F0E0E0003272D /* libmbedtls.a */; }; - DF838B412090AC2F00B68F90 /* liblz4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF838B402090AC2F00B68F90 /* liblz4.a */; }; - DFA442402361E2F3007ACEF6 /* libjsoncpp_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF28F0C522E5E40D00E5B24C /* libjsoncpp_static.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - DF28F0C922E5E6C600E5B24C /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; - DF380AD4201F07AE0003272D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - DF28F0C522E5E40D00E5B24C /* libjsoncpp_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp_static.a; path = ../../../../../../../usr/local/lib/libjsoncpp_static.a; sourceTree = ""; }; - DF28F0CB22E5E6C600E5B24C /* agent */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = agent; sourceTree = BUILT_PRODUCTS_DIR; }; - DF28F0D322E6071900E5B24C /* ovpnagent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ovpnagent.cpp; path = ../../../../common/ovpnagent/mac/ovpnagent.cpp; sourceTree = ""; }; - DF380AD6201F07AE0003272D /* ovpn3-core */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "ovpn3-core"; sourceTree = BUILT_PRODUCTS_DIR; }; - DF380AE0201F09B70003272D /* openvpn */ = {isa = PBXFileReference; lastKnownFileType = folder; name = openvpn; path = ../../../openvpn; sourceTree = ""; }; - DF380AE1201F0A2F0003272D /* cli.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cli.cpp; path = ../../../test/ovpncli/cli.cpp; sourceTree = ""; }; - DF380AE4201F0D4F0003272D /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - DF380AE6201F0D910003272D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; - DF380AE8201F0DB80003272D /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; - DF380AEA201F0DDC0003272D /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; - DF380AEC201F0E0E0003272D /* libmbedtls.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmbedtls.a; path = "../../../deps/mbedtls/mbedtls-osx/library/libmbedtls.a"; sourceTree = ""; }; - DF838B402090AC2F00B68F90 /* liblz4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblz4.a; path = "../../../deps/lz4/lz4-osx/lib/liblz4.a"; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - DF28F0C822E5E6C600E5B24C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DF28F0D922E60C0700E5B24C /* CoreFoundation.framework in Frameworks */, - DF28F0D822E60BFD00E5B24C /* SystemConfiguration.framework in Frameworks */, - DF28F0D722E60BF500E5B24C /* IOKit.framework in Frameworks */, - DF28F0D622E60BEF00E5B24C /* CoreServices.framework in Frameworks */, - DF28F0D522E60BBF00E5B24C /* libjsoncpp_static.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DF380AD3201F07AE0003272D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DF838B412090AC2F00B68F90 /* liblz4.a in Frameworks */, - DF380AED201F0E0E0003272D /* libmbedtls.a in Frameworks */, - DFA442402361E2F3007ACEF6 /* libjsoncpp_static.a in Frameworks */, - DF380AEB201F0DDC0003272D /* CoreServices.framework in Frameworks */, - DF380AE9201F0DB80003272D /* IOKit.framework in Frameworks */, - DF380AE7201F0D910003272D /* SystemConfiguration.framework in Frameworks */, - DF380AE5201F0D4F0003272D /* CoreFoundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - DF28F0CC22E5E6C700E5B24C /* agent */ = { - isa = PBXGroup; - children = ( - DF28F0D322E6071900E5B24C /* ovpnagent.cpp */, - ); - path = agent; - sourceTree = ""; - }; - DF380ACD201F07AE0003272D = { - isa = PBXGroup; - children = ( - DF380AD8201F07AE0003272D /* ovpn3-core */, - DF28F0CC22E5E6C700E5B24C /* agent */, - DF380AD7201F07AE0003272D /* Products */, - DF380AE3201F0D4F0003272D /* Frameworks */, - ); - sourceTree = ""; - }; - DF380AD7201F07AE0003272D /* Products */ = { - isa = PBXGroup; - children = ( - DF380AD6201F07AE0003272D /* ovpn3-core */, - DF28F0CB22E5E6C600E5B24C /* agent */, - ); - name = Products; - sourceTree = ""; - }; - DF380AD8201F07AE0003272D /* ovpn3-core */ = { - isa = PBXGroup; - children = ( - DF380AE1201F0A2F0003272D /* cli.cpp */, - DF380AE0201F09B70003272D /* openvpn */, - ); - path = "ovpn3-core"; - sourceTree = ""; - }; - DF380AE3201F0D4F0003272D /* Frameworks */ = { - isa = PBXGroup; - children = ( - DF28F0C522E5E40D00E5B24C /* libjsoncpp_static.a */, - DF838B402090AC2F00B68F90 /* liblz4.a */, - DF380AEC201F0E0E0003272D /* libmbedtls.a */, - DF380AEA201F0DDC0003272D /* CoreServices.framework */, - DF380AE8201F0DB80003272D /* IOKit.framework */, - DF380AE6201F0D910003272D /* SystemConfiguration.framework */, - DF380AE4201F0D4F0003272D /* CoreFoundation.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - DF28F0CA22E5E6C600E5B24C /* agent */ = { - isa = PBXNativeTarget; - buildConfigurationList = DF28F0CF22E5E6C700E5B24C /* Build configuration list for PBXNativeTarget "agent" */; - buildPhases = ( - DF28F0C722E5E6C600E5B24C /* Sources */, - DF28F0C822E5E6C600E5B24C /* Frameworks */, - DF28F0C922E5E6C600E5B24C /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = agent; - productName = agent; - productReference = DF28F0CB22E5E6C600E5B24C /* agent */; - productType = "com.apple.product-type.tool"; - }; - DF380AD5201F07AE0003272D /* ovpn3-core */ = { - isa = PBXNativeTarget; - buildConfigurationList = DF380ADD201F07AE0003272D /* Build configuration list for PBXNativeTarget "ovpn3-core" */; - buildPhases = ( - DF380AD2201F07AE0003272D /* Sources */, - DF380AD3201F07AE0003272D /* Frameworks */, - DF380AD4201F07AE0003272D /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "ovpn3-core"; - productName = "ovpn3-core"; - productReference = DF380AD6201F07AE0003272D /* ovpn3-core */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - DF380ACE201F07AE0003272D /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1030; - ORGANIZATIONNAME = "Lev Stipakov"; - TargetAttributes = { - DF28F0CA22E5E6C600E5B24C = { - CreatedOnToolsVersion = 10.1; - ProvisioningStyle = Automatic; - }; - DF380AD5201F07AE0003272D = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - }; - }; - }; - buildConfigurationList = DF380AD1201F07AE0003272D /* Build configuration list for PBXProject "ovpn3-core" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = DF380ACD201F07AE0003272D; - productRefGroup = DF380AD7201F07AE0003272D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - DF380AD5201F07AE0003272D /* ovpn3-core */, - DF28F0CA22E5E6C600E5B24C /* agent */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - DF28F0C722E5E6C600E5B24C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DF28F0D422E6071900E5B24C /* ovpnagent.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DF380AD2201F07AE0003272D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DF380AE2201F0A2F0003272D /* cli.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - DF28F0C322E5DAD200E5B24C /* DebugAgent */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = DebugAgent; - }; - DF28F0C422E5DAD200E5B24C /* DebugAgent */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - GCC_PREPROCESSOR_DEFINITIONS = ( - USE_ASIO, - ASIO_STANDALONE, - USE_MBEDTLS, - HAVE_LZ4, - LZ4_DISABLE_DEPRECATE_WARNINGS, - OPENVPN_COMMAND_AGENT, - HAVE_JSONCPP, - ); - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../..\"", - "\"$(SRCROOT)/../../../deps/asio/asio/include\"", - "\"$(SRCROOT)/../../../deps/mbedtls/mbedtls-osx/include\"", - "\"$(SRCROOT)/../../../deps/lz4/lz4-osx/include\"", - "\"$(SRCROOT)/../../../common\"", - /usr/local/include, - ); - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../../deps/mbedtls/mbedtls-osx/library\"", - "\"$(SRCROOT)/../../../deps/lz4/lz4-osx/lib\"", - /usr/local/lib, - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - STRINGS_FILE_OUTPUT_ENCODING = "UTF-8"; - }; - name = DebugAgent; - }; - DF28F0D022E5E6C700E5B24C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CODE_SIGN_STYLE = Automatic; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - DF28F0D122E5E6C700E5B24C /* DebugAgent */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CODE_SIGN_STYLE = Automatic; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ASIO_STANDALONE, - USE_ASIO, - USE_MBEDTLS, - HAVE_JSONCPP, - ); - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../..\"", - "\"$(SRCROOT)/../../../deps/asio/asio/include\"", - "\"$(SRCROOT)/../../../common\"", - "\"$(SRCROOT)/../../../deps/mbedtls/mbedtls-osx/include\"", - /usr/local/include, - ); - LIBRARY_SEARCH_PATHS = /usr/local/lib; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = DebugAgent; - }; - DF28F0D222E5E6C700E5B24C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CODE_SIGN_STYLE = Automatic; - MTL_FAST_MATH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - DF380ADB201F07AE0003272D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - DF380ADC201F07AE0003272D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - }; - name = Release; - }; - DF380ADE201F07AE0003272D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - GCC_PREPROCESSOR_DEFINITIONS = ( - USE_ASIO, - ASIO_STANDALONE, - USE_MBEDTLS, - HAVE_LZ4, - LZ4_DISABLE_DEPRECATE_WARNINGS, - ); - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../..\"", - "\"$(SRCROOT)/../../../deps/asio/asio/include\"", - "\"$(SRCROOT)/../../../deps/mbedtls/mbedtls-osx/include\"", - "\"$(SRCROOT)/../../../deps/lz4/lz4-osx/include\"", - ); - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../../deps/mbedtls/mbedtls-osx/library\"", - "\"$(SRCROOT)/../../../deps/lz4/lz4-osx/lib\"", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - STRINGS_FILE_OUTPUT_ENCODING = "UTF-8"; - }; - name = Debug; - }; - DF380ADF201F07AE0003272D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - GCC_PREPROCESSOR_DEFINITIONS = ( - USE_ASIO, - ASIO_STANDALONE, - USE_MBEDTLS, - HAVE_LZ4, - LZ4_DISABLE_DEPRECATE_WARNINGS, - ); - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../..\"", - "\"$(SRCROOT)/../../../deps/asio/asio/include\"", - "\"$(SRCROOT)/../../../deps/mbedtls/mbedtls-osx/include\"", - "\"$(SRCROOT)/../../../deps/lz4/lz4-osx/include\"", - ); - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../../deps/mbedtls/mbedtls-osx/library\"", - "\"$(SRCROOT)/../../../deps/lz4/lz4-osx/lib\"", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - STRINGS_FILE_OUTPUT_ENCODING = "UTF-8"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - DF28F0CF22E5E6C700E5B24C /* Build configuration list for PBXNativeTarget "agent" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DF28F0D022E5E6C700E5B24C /* Debug */, - DF28F0D122E5E6C700E5B24C /* DebugAgent */, - DF28F0D222E5E6C700E5B24C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = DebugAgent; - }; - DF380AD1201F07AE0003272D /* Build configuration list for PBXProject "ovpn3-core" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DF380ADB201F07AE0003272D /* Debug */, - DF28F0C322E5DAD200E5B24C /* DebugAgent */, - DF380ADC201F07AE0003272D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = DebugAgent; - }; - DF380ADD201F07AE0003272D /* Build configuration list for PBXNativeTarget "ovpn3-core" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DF380ADE201F07AE0003272D /* Debug */, - DF28F0C422E5DAD200E5B24C /* DebugAgent */, - DF380ADF201F07AE0003272D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = DebugAgent; - }; -/* End XCConfigurationList section */ - }; - rootObject = DF380ACE201F07AE0003272D /* Project object */; -} diff --git a/mac/ovpn3-core/ovpn3-core.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mac/ovpn3-core/ovpn3-core.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 15953989..00000000 --- a/mac/ovpn3-core/ovpn3-core.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/scripts/linux/build-all b/scripts/linux/build-all index 3930e1e7..2e73eea4 100755 --- a/scripts/linux/build-all +++ b/scripts/linux/build-all @@ -21,5 +21,3 @@ fi echo "******* LZ4" "$O3"/core/scripts/linux/build-lz4 -#$O3/core/scripts/linux/build-openssl x64 -#$O3/core/scripts/linux/build-lzo diff --git a/scripts/linux/build-lzo b/scripts/linux/build-lzo deleted file mode 100755 index 878dd33a..00000000 --- a/scripts/linux/build-lzo +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -e -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree ; exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to ovpn3 dependency tree - exit 1 -fi -cd $DEP_DIR -rm -rf lzo -mkdir lzo -TARGET=linux $O3/core/deps/lzo/build-lzo -exit 0 diff --git a/scripts/linux/build-openssl b/scripts/linux/build-openssl deleted file mode 100755 index 1273c417..00000000 --- a/scripts/linux/build-openssl +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -set -e -if [ -z "$1" ]; then - echo "usage: build-openssl x64|arm" - exit 1 -fi -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree ; exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to ovpn3 dependency tree - exit 1 -fi -cd $DEP_DIR - -rm -rf openssl -mkdir openssl - -export LINK_MODE=shared - -case $1 in -x64*) - export OPENSSL_TARGET=linux-x86_64 - ;; -arm*) - export OPENSSL_TARGET=linux-armv4 - ;; -*) - echo "unknown platform" - exit 1 - ;; -esac - -TARGET=linux $O3/core/deps/openssl/build-openssl -exit 0 diff --git a/scripts/mac/build-all b/scripts/mac/build-all deleted file mode 100755 index 918131f7..00000000 --- a/scripts/mac/build-all +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -set -e -set -u -export DEP_DIR="${DEP_DIR:-$HOME/src/mac}" -if [ -z "${O3:-}" ]; then - echo O3 var must point to ovpn3 tree ; exit 1 -fi -cd $DEP_DIR -rm -rf asio* boost* lz4* lzo* minicrypto openssl* polarssl* mbedtls* snappy* jsoncpp* - -echo "******* ASIO" -"$O3"/core/deps/asio/build-asio - -if [ "${MTLS:-1}" = 0 ] ; then - echo "******* MBEDTLS (skipped)" -else - echo "******* MBEDTLS" - - # consider OSX_SERVER=0 - "$O3"/core/scripts/mac/build-mbedtls -fi - -if [ "${OSSL:-0}" = 1 ] ; then - echo "******* OPENSSL" - "$O3"/core/scripts/mac/build-openssl -else - echo "******* OPENSSL (skipped)" -fi - -echo "******* LZ4" -"$O3"/core/scripts/mac/build-lz4 -echo "******* xxHash" -"$O3"/core/deps/xxHash/build-xxHash - -echo "******* JSONCPP" -"$O3"/core/scripts/mac/build-jsoncpp diff --git a/scripts/mac/build-jsoncpp b/scripts/mac/build-jsoncpp deleted file mode 100755 index 42fab466..00000000 --- a/scripts/mac/build-jsoncpp +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -e -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree - exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to ovpn3 dependency tree - exit 1 -fi -cd $DEP_DIR - -rm -rf jsoncpp -mkdir jsoncpp - -if [ "$OSX_ONLY" != "1" ]; then - for target in ios ios-dbg ; do - echo '***************' TARGET $target - TARGET=$target $O3/core/deps/jsoncpp/build-jsoncpp - done -fi - -for target in osx osx-dbg ; do - echo '***************' TARGET $target - TARGET=$target $O3/core/deps/jsoncpp/build-jsoncpp -done -exit 0 diff --git a/scripts/mac/build-lz4 b/scripts/mac/build-lz4 deleted file mode 100755 index cc2a4330..00000000 --- a/scripts/mac/build-lz4 +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -set -e -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree ; exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to ovpn3 dependency tree - exit 1 -fi -cd $DEP_DIR - -rm -rf lz4 -mkdir lz4 - -if [ "$OSX_ONLY" != "1" ]; then - for target in ios ios-dbg ; do - echo '***************' TARGET $target - TARGET=$target $O3/core/deps/lz4/build-lz4 - done -fi - -for target in osx osx-dbg ; do - echo '***************' TARGET $target - TARGET=$target $O3/core/deps/lz4/build-lz4 -done -exit 0 diff --git a/scripts/mac/build-lzo b/scripts/mac/build-lzo deleted file mode 100755 index cab9c808..00000000 --- a/scripts/mac/build-lzo +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -e -[ "$DEP_DIR" ] && cd $DEP_DIR -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree ; exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to ovpn3 dependency tree - exit 1 -fi -cd $DEP_DIR - -rm -rf lzo -mkdir lzo - -if [ "$OSX_ONLY" != "1" ]; then - for target in ios ios-dbg ; do - echo '***************' TARGET $target - TARGET=$target $O3/core/deps/lzo/build-lzo - done -fi - -for target in osx osx-dbg ; do - echo '***************' TARGET $target - TARGET=$target $O3/core/deps/lzo/build-lzo -done -exit 0 diff --git a/scripts/mac/build-mbedtls b/scripts/mac/build-mbedtls deleted file mode 100755 index 6fbf437e..00000000 --- a/scripts/mac/build-mbedtls +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -e -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree ; exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to ovpn3 dependency tree - exit 1 -fi -cd $DEP_DIR - -rm -rf mbedtls - -if [ "$OSX_ONLY" != "1" ]; then - # for ios, build with minicrypto - for target in ios-dbg ios ; do - echo '***************' TARGET $target - VERBOSE=1 TARGET=$target USE_MINICRYPTO=0 $O3/core/deps/mbedtls/build-mbedtls - [ "$IOS_DBG_ONLY" = "1" ] && exit - done -fi - -# osx -[ -z "$OSX_MINICRYPTO" ] && OSX_MINICRYPTO=0 -[ -z "$OSX_SERVER" ] && OSX_SERVER=1 -for target in osx osx-dbg ; do - echo '***************' TARGET $target - VERBOSE=1 TARGET=$target USE_MINICRYPTO=$OSX_MINICRYPTO MINICRYPTO_NO_AES=1 ENABLE_SERVER=$OSX_SERVER $O3/core/deps/mbedtls/build-mbedtls -done -exit 0 diff --git a/scripts/mac/build-openssl b/scripts/mac/build-openssl deleted file mode 100755 index 25376aa6..00000000 --- a/scripts/mac/build-openssl +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -e -[ "$DEP_DIR" ] && cd $DEP_DIR -if [ -z "$O3" ]; then - echo O3 var must point to ovpn3 tree ; exit 1 -fi -if [ -z "$DEP_DIR" ]; then - echo DEP_DIR var must point to ovpn3 dependency tree - exit 1 -fi -cd $DEP_DIR - -rm -rf openssl -mkdir openssl - -for target in ios osx; do - echo '***************' OpenSSL-64 $target - - if [ "$target" = "osx" ]; then - TARGET=$target OPENSSL_TARGET=darwin64-x86_64-cc $O3/core/deps/openssl/build-openssl - else - ARCH=arm64 CROSS_TOP=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer \ - CROSS_SDK=iPhoneOS.sdk TARGET=$target OPENSSL_TARGET="ios64-cross no-dso no-engine" \ - $O3/core/deps/openssl/build-openssl - - ARCH=armv7 CROSS_TOP=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer \ - CROSS_SDK=iPhoneOS.sdk TARGET=$target OPENSSL_TARGET="ios-cross no-dso no-engine" \ - $O3/core/deps/openssl/build-openssl - fi -done - -cd openssl/openssl-ios -mkdir -p fat/lib -for l in libcrypto.a libssl.a ; do - lipo -create arm64/lib/$l armv7/lib/$l -output fat/lib/$l -done - -exit 0 diff --git a/vars/vars-android-a7a b/vars/vars-android-a7a deleted file mode 100644 index ac72bf15..00000000 --- a/vars/vars-android-a7a +++ /dev/null @@ -1,15 +0,0 @@ -[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android -export PLATFORM=android-a7a -export ABI=armeabi-v7a -export DEBUG_BUILD=0 -export OTHER_COMPILER_FLAGS="" -export CXX_COMPILER_FLAGS="-std=c++1y" -export LIB_OPT_LEVEL="-O3" -export LIB_FPIC="-fPIC" -export TC=$DEP_DIR/tc-arm -export PLATFORM_FLAGS="-D__LP32__ -march=armv7-a -mthumb -fomit-frame-pointer --sysroot=$TC/sysroot" -export GPP_CMD="$TC/bin/arm-linux-androideabi-g++" -export GCC_CMD="$TC/bin/arm-linux-androideabi-gcc" - -[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH" -export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH" diff --git a/vars/vars-android-a7a-dbg b/vars/vars-android-a7a-dbg deleted file mode 100644 index 2efa1af9..00000000 --- a/vars/vars-android-a7a-dbg +++ /dev/null @@ -1,15 +0,0 @@ -[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android -export PLATFORM=android-a7a-dbg -export ABI=armeabi-v7a -export DEBUG_BUILD=1 -export OTHER_COMPILER_FLAGS="-g" -export CXX_COMPILER_FLAGS="-std=c++1y" -export LIB_OPT_LEVEL="-O0" -export LIB_FPIC="-fPIC" -export TC=$DEP_DIR/tc-arm -export PLATFORM_FLAGS="-march=armv7-a -mthumb -fomit-frame-pointer --sysroot=$TC/sysroot" -export GPP_CMD="$TC/bin/arm-linux-androideabi-g++" -export GCC_CMD="$TC/bin/arm-linux-androideabi-gcc" - -[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH" -export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH" diff --git a/vars/vars-android-a8a b/vars/vars-android-a8a deleted file mode 100644 index 0f29a514..00000000 --- a/vars/vars-android-a8a +++ /dev/null @@ -1,15 +0,0 @@ -[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android -export PLATFORM=android-a8a -export ABI=arm64-v8a -export DEBUG_BUILD=0 -export OTHER_COMPILER_FLAGS="" -export CXX_COMPILER_FLAGS="-std=c++1y" -export LIB_OPT_LEVEL="-O3" -export LIB_FPIC="-fPIC" -export TC=$DEP_DIR/tc-arm64 -export PLATFORM_FLAGS="-march=armv8-a -fomit-frame-pointer --sysroot=$TC/sysroot" -export GPP_CMD="$TC/bin/aarch64-linux-android-g++" -export GCC_CMD="$TC/bin/aarch64-linux-android-gcc" - -[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH" -export PATH="$TC/bin:$TC/aarch64-linux-android/bin:$VARS_SAVE_PATH" diff --git a/vars/vars-android-a8a-dbg b/vars/vars-android-a8a-dbg deleted file mode 100644 index 2634a216..00000000 --- a/vars/vars-android-a8a-dbg +++ /dev/null @@ -1,15 +0,0 @@ -[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android -export PLATFORM=android-a8a-dbg -export ABI=arm64-v8a -export DEBUG_BUILD=1 -export OTHER_COMPILER_FLAGS="-g" -export CXX_COMPILER_FLAGS="-std=c++1y" -export LIB_OPT_LEVEL="-O0" -export LIB_FPIC="-fPIC" -export TC=$DEP_DIR/tc-arm64 -export PLATFORM_FLAGS="-march=armv8-a -fomit-frame-pointer --sysroot=$TC/sysroot" -export GPP_CMD="$TC/bin/aarch64-linux-android-g++" -export GCC_CMD="$TC/bin/aarch64-linux-android-gcc" - -[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH" -export PATH="$TC/bin:$TC/aarch64-linux-android/bin:$VARS_SAVE_PATH" diff --git a/vars/vars-android-srconly b/vars/vars-android-srconly deleted file mode 100644 index 67bb0638..00000000 --- a/vars/vars-android-srconly +++ /dev/null @@ -1 +0,0 @@ -# Nothing in here diff --git a/vars/vars-android-x86 b/vars/vars-android-x86 deleted file mode 100644 index 6f6c74f2..00000000 --- a/vars/vars-android-x86 +++ /dev/null @@ -1,15 +0,0 @@ -[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/android -export PLATFORM=android-x86 -export ABI=x86 -export DEBUG_BUILD=0 -export OTHER_COMPILER_FLAGS="" -export CXX_COMPILER_FLAGS="-std=c++1y" -export LIB_OPT_LEVEL="-O3" -export LIB_FPIC="-fPIC" -export TC=$DEP_DIR/tc-x86 -export PLATFORM_FLAGS="-D__LP32__ -march=i686 -fomit-frame-pointer --sysroot=$TC/sysroot" -export GPP_CMD="$TC/bin/i686-linux-android-g++" -export GCC_CMD="$TC/bin/i686-linux-android-gcc" - -[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH" -export PATH="$TC/bin:$TC/i686-linux-android/bin:$VARS_SAVE_PATH" diff --git a/vars/vars-ios b/vars/vars-ios deleted file mode 100644 index bd614149..00000000 --- a/vars/vars-ios +++ /dev/null @@ -1,10 +0,0 @@ -export PLATFORM=ios -export APPLE_FAMILY=1 -export GPP_CMD=clang++ -export GCC_CMD=clang -export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk" -export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=10.0 -isysroot $IOS_SDK" -export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden" -export CXX_COMPILER_FLAGS="-std=c++14 -stdlib=libc++" -export LIB_OPT_LEVEL="-O3" -export LIB_FPIC="" diff --git a/vars/vars-ios-dbg b/vars/vars-ios-dbg deleted file mode 100644 index 448923c5..00000000 --- a/vars/vars-ios-dbg +++ /dev/null @@ -1,11 +0,0 @@ -export PLATFORM=ios-dbg -export APPLE_FAMILY=1 -export DEBUG_BUILD=1 -export GPP_CMD=clang++ -export GCC_CMD=clang -export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk" -export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=10.0 -isysroot $IOS_SDK" -export OTHER_COMPILER_FLAGS="-g" -export CXX_COMPILER_FLAGS="-std=c++14 -stdlib=libc++" -export LIB_OPT_LEVEL="-O0" -export LIB_FPIC="" diff --git a/vars/vars-osx b/vars/vars-osx deleted file mode 100644 index bd18266c..00000000 --- a/vars/vars-osx +++ /dev/null @@ -1,15 +0,0 @@ -export PLATFORM=osx -[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/mac -export APPLE_FAMILY=1 -export DEBUG_BUILD=0 -export GPP_CMD=clang++ -export GCC_CMD=clang -export AR_CMD="libtool -static -D -o" -# already taken care of by libtool -export RANLIB_CMD="true" -export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.12" -export PLATFORM_FLAGS="-arch x86_64 -arch arm64 $MIN_DEPLOY_TARGET" -export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden" -export CXX_COMPILER_FLAGS="-std=c++14 -stdlib=libc++" -export LIB_OPT_LEVEL="-O3" -export LIB_FPIC="" diff --git a/vars/vars-osx-dbg b/vars/vars-osx-dbg deleted file mode 100644 index b4a00e6e..00000000 --- a/vars/vars-osx-dbg +++ /dev/null @@ -1,15 +0,0 @@ -export PLATFORM=osx-dbg -[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/src/mac -export APPLE_FAMILY=1 -export DEBUG_BUILD=1 -export GPP_CMD=clang++ -export GCC_CMD=clang -export AR_CMD="libtool -static -D -o" -# already taken care of by libtool -export RANLIB_CMD="true" -export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.12" -export PLATFORM_FLAGS="-arch x86_64 -arch arm64 $MIN_DEPLOY_TARGET" -export CXX_COMPILER_FLAGS="-std=c++14 -stdlib=libc++" -export OTHER_COMPILER_FLAGS="-g" -export LIB_OPT_LEVEL="-O0" -export LIB_FPIC=""