From 4a519dfe8c1c27a16b434162f4abad324af24603 Mon Sep 17 00:00:00 2001 From: Macoy Madson Date: Thu, 18 Mar 2021 20:31:08 -0700 Subject: [PATCH] Only build necessary things, update comment This custom build script is a hack which should go away once GameLib is more customizable in regard to what gets built --- Android/app/jni/src/Android.mk | 2 +- Build.sh | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Android/app/jni/src/Android.mk b/Android/app/jni/src/Android.mk index 84d85b9..4bafc1d 100644 --- a/Android/app/jni/src/Android.mk +++ b/Android/app/jni/src/Android.mk @@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include $(LOCAL_PATH)/../../../../ # Work around "bug" in cakelisp where too many parens LOCAL_CFLAGS += -Wno-parentheses-equality -# Add your application source files here... +# Note that these generated files are copied into this folder in a Main.cake build step LOCAL_SRC_FILES := Main.cake.cpp Math.cake.cpp SDL.cake.cpp PuzzleIO.cake.cpp LOCAL_SHARED_LIBRARIES := SDL2 diff --git a/Build.sh b/Build.sh index 3aa005d..738d78d 100755 --- a/Build.sh +++ b/Build.sh @@ -1,9 +1,26 @@ #!/bin/sh # Note that we everything build relative to GameLib, because GameLib isn't relocatable yet +cd Dependencies/gamelib +# Rather than using the large slow script, write our own which is leaner +# This is risky if GameLib changes how it needs to be built, but we're locked in a version anyways # cd Dependencies/gamelib && ./Build_Debug.sh || exit $? -cd Dependencies/gamelib && ./Build_FromKitty.sh || exit $? +# cd Dependencies/gamelib && ./Build_FromKitty.sh || exit $? + +# Build Cakelisp itself +echo "\n\nCakelisp\n\n" +cd Dependencies/cakelisp +./Build.sh || exit $? +cd ../.. + +# echo "\n\nAuto Test (Math only)\n\n" +# ./Dependencies/cakelisp/bin/cakelisp --execute test/src/Config_Linux.cake src/AutoTest.cake src/Math.cake || exit $? +echo "\n\nAuto Test\n\n" +./Dependencies/cakelisp/bin/cakelisp test/src/Config_Linux.cake src/AutoTest.cake src/SDL.cake src/Math.cake src/Aubio.cake || exit $? +# ./Dependencies/cakelisp/bin/cakelisp test/src/Config_Linux.cake src/AutoTest.cake src/SDL.cake src/Tracy.cake src/Math.cake src/Aubio.cake || exit $? + +echo "\n\nKitty Gridlock\n\n" CAKELISP=./Dependencies/cakelisp/bin/cakelisp