From 175fc8ff3b7854296906ce75dc25aacdfd2bc8c2 Mon Sep 17 00:00:00 2001 From: chaoskagami Date: Mon, 22 Sep 2014 22:51:48 -0400 Subject: [PATCH] Removed android functionality; it needs re-evaluation --- build | 11 ----------- buildscripts/build.android | 26 -------------------------- 2 files changed, 37 deletions(-) delete mode 100755 buildscripts/build.android diff --git a/build b/build index 41db46f..b82a60a 100755 --- a/build +++ b/build @@ -10,20 +10,9 @@ elif [ "$1" == "linux" ]; then buildscripts/build.generic elif [ "$1" == "generic" ]; then buildscripts/build.generic -elif [ "$1" == "android" ]; then - buildscripts/build.android elif [ "$1" == "clean" ]; then rm -rf bin echo "RM bin" - cd external/Android - echo "NDK-CLEAN external/Android" - ndk-build clean > /dev/null - echo "ANT-CLEAN external/Android" - ant clean > /dev/null - echo "RM external/Android/jni/src/*.{cpp,hpp}" - rm jni/src/*.hpp - rm jni/src/*.cpp - cd ../../ else echo "Targets: mingw32, mingw64, linux, generic" echo "linux32 target was removed. Build in a chroot." diff --git a/buildscripts/build.android b/buildscripts/build.android deleted file mode 100755 index b3ea0ac..0000000 --- a/buildscripts/build.android +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -## -## Use this build script to build for -## android. GLES2 support is required. -## - -source buildscripts/mk - -ROOT=`pwd` - -# Extra parameter sets 'we're android' value. -gith vndc/include/gitrev.hpp "#define WITH_ANDROID 1" -echo "COPY vndc/*/* -> external/Android/jni/src" -cp -r $ROOT/vndc/*/* $ROOT/external/Android/jni/src/ > /dev/null 2>&1 -echo "COPY external/zero/*/* -> external/Android/jni/src" -cp -r $ROOT/external/zero/*/* $ROOT/external/Android/jni/src/ > /dev/null 2>&1 - -cd $ROOT/external/Android - -echo "NDK-BUILD external/Android" -ndk-build > /dev/null -echo "ANT-BUILD external/Android" -ant debug > /dev/null - -cd $ROOT -- 2.39.5