]> Chaos Git - vn/vndc.git/commitdiff
Removed android functionality; it needs re-evaluation
authorchaoskagami <chaos.kagami@gmail.com>
Tue, 23 Sep 2014 02:51:48 +0000 (22:51 -0400)
committerchaoskagami <chaos.kagami@gmail.com>
Tue, 23 Sep 2014 02:51:48 +0000 (22:51 -0400)
build
buildscripts/build.android [deleted file]

diff --git a/build b/build
index 41db46f565e785b6f13449f0cbef8c7d244937bb..b82a60a21678e0d5552f2f67d3cdeb7db50217e5 100755 (executable)
--- 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 (executable)
index b3ea0ac..0000000
+++ /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