12 files changed, 8 insertions(+), 19 deletions(-)
M .gitmodules
M build.sh
M prepare-android.sh
D src/android/app/src/main/assets/automata.rom
D src/android/app/src/main/assets/darena.rom
D src/android/app/src/main/assets/drum-rack.rom
D src/android/app/src/main/assets/dungeon.rom
D src/android/app/src/main/assets/logic.rom
D src/android/app/src/main/assets/nametable.rom
D src/android/app/src/main/assets/prng.rom
D src/android/app/src/main/assets/rule110.rom
D src/android/app/src/main/assets/theme.rom
M .gitmodules => .gitmodules +1 -1
@@ 1,3 1,3 @@
[submodule "src/android/app/jni/SDL/SDL"]
path = src/android/app/jni/SDL/SDL
- url = git://github.com/libsdl-org/SDL
+ url = https://github.com/libsdl-org/SDL
M build.sh => build.sh +1 -3
@@ 119,12 119,10 @@ do
bin/uxncli bin/asma.rom $f bin/`basename ${f%.tal}`.rom 2> /dev/null
done
-<<<<<<< HEAD
if [ $norun = 1 ]; then exit; fi
-=======
+
echo "Assembling(piano).."
./bin/uxnasm projects/software/piano.tal bin/piano.rom
->>>>>>> main
echo "Running.."
./bin/uxnemu bin/piano.rom
M prepare-android.sh => prepare-android.sh +6 -6
@@ 2,12 2,12 @@
set -e
-# need launcher.rom to be included
+# build the thing
./build.sh --no-run
-# duplicate? already have a piano
-rm -f bin/asma-piano.rom
+
+# more roms
+./bin/uxncli bin/asma.rom projects/software/piano.tal bin/piano.rom
# get more roms
-curl https://rabbits.srht.site/uxn-rompack.tar.gz | tar -C bin -xzf -
-mv bin/uxn/*.rom bin
-rm -r bin/uxn
+curl -L https://github.com/randrew/uxn32/releases/latest/download/uxn32-essentials.zip | bsdtar -xvf- -C bin
+rm -f bin/*.exe
D src/android/app/src/main/assets/automata.rom => src/android/app/src/main/assets/automata.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/automata.rom>
\ No newline at end of file
D src/android/app/src/main/assets/darena.rom => src/android/app/src/main/assets/darena.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/darena.rom>
\ No newline at end of file
D src/android/app/src/main/assets/drum-rack.rom => src/android/app/src/main/assets/drum-rack.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/drum-rack.rom>
\ No newline at end of file
D src/android/app/src/main/assets/dungeon.rom => src/android/app/src/main/assets/dungeon.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/dungeon.rom>
\ No newline at end of file
D src/android/app/src/main/assets/logic.rom => src/android/app/src/main/assets/logic.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/logic.rom>
\ No newline at end of file
D src/android/app/src/main/assets/nametable.rom => src/android/app/src/main/assets/nametable.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/nametable.rom>
\ No newline at end of file
D src/android/app/src/main/assets/prng.rom => src/android/app/src/main/assets/prng.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/prng.rom>
\ No newline at end of file
D src/android/app/src/main/assets/rule110.rom => src/android/app/src/main/assets/rule110.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/rule110.rom>
\ No newline at end of file
D src/android/app/src/main/assets/theme.rom => src/android/app/src/main/assets/theme.rom +0 -1
@@ 1,1 0,0 @@
-../../../../../../bin/theme.rom>
\ No newline at end of file