diff --git a/build.sh b/build.sh index 760d290..7261ef4 100755 --- a/build.sh +++ b/build.sh @@ -1,12 +1,13 @@ #!/bin/bash -rm ZMemory.pk3 -cd src + +# Construct the ACS source from the original file. +cd build_files +cat ../src/acs_source/ZMEMORY.acs | ../meta_src/metatool.out ZMEMORY.acs ZMEMORY_g.acs ZMEMORY_w.acs ../acs_interface/ZMEMORY.acs ../acs_interface/ZMEMORY_g.acs ../acs_interface/ZMEMORY_w.acs # compile the ACS source -cd acs_source -bash compile.sh -cd .. +acc -i $ACC_ZCOMMON_PATH ZMEMORY.acs ../src/acs/ZMEMORY.o +cd ../src # Bundle everything that isn't: # .sh : a shell script. thin_arg=$1 diff --git a/build2.sh b/build2.sh deleted file mode 100755 index 7261ef4..0000000 --- a/build2.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Construct the ACS source from the original file. -cd build_files -cat ../src/acs_source/ZMEMORY.acs | ../meta_src/metatool.out ZMEMORY.acs ZMEMORY_g.acs ZMEMORY_w.acs ../acs_interface/ZMEMORY.acs ../acs_interface/ZMEMORY_g.acs ../acs_interface/ZMEMORY_w.acs - -# compile the ACS source -acc -i $ACC_ZCOMMON_PATH ZMEMORY.acs ../src/acs/ZMEMORY.o - -cd ../src -# Bundle everything that isn't: -# .sh : a shell script. -thin_arg=$1 -version=$(cat ../version.txt) -if [[ $thin_arg == "thin" ]]; then - 7za a -tzip ../ZMemory_v$version\_thin.pk3 -r -x\!*.sh -x\!acs/.gitignore -xr\!acs_source -else - 7za a -tzip ../ZMemory_v$version.pk3 -r -x\!*.sh -x\!acs/.gitignore -fi - -