From 75b12d47f1c279d722f27e510eb7cac7f64d1873 Mon Sep 17 00:00:00 2001 From: jaburns Date: Sat, 10 Oct 2020 13:36:49 -0600 Subject: [PATCH] Building so and copying h to /dist dir --- .gitignore | 9 ++++---- configure | 23 +++++++++---------- ...ct-decomp-source.py => import-mario-geo.py | 0 3 files changed, 15 insertions(+), 17 deletions(-) rename extract-decomp-source.py => import-mario-geo.py (100%) diff --git a/.gitignore b/.gitignore index 2b0e05e..47a6a1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ -/build/ -/libsm64.so -Makefile /src/mario -*.z64 -/src/anim_datac.h \ No newline at end of file +/build/ +/dist/ +Makefile +*.z64 \ No newline at end of file diff --git a/configure b/configure index 85f8302..4ba6410 100755 --- a/configure +++ b/configure @@ -4,14 +4,9 @@ cd "$(dirname "${BASH_SOURCE[0]}")" CC='cc -g' CFLAGS='-Wall -fPIC' -BIN_FILE='libsm64.so' +BIN_FILE='dist/libsm64.so' LDFLAGS='' -prepare() { - git submodule update --init --recursive - ./extract-decomp-source.py -} - c_to_obj() { printf 'build/' echo "$1" | sed 's/cp*$/o/;s:/:_:g' @@ -32,20 +27,24 @@ print_makefile() { for f in $(file_list); do all_objs="$all_objs $(c_to_obj $f)" done - echo "$BIN_FILE: $all_objs" + echo "$BIN_FILE: $all_objs dist/include/libsm64.h" echo -e "\t$CC -shared -o $BIN_FILE $all_objs $LDFLAGS" for f in $(file_list); do make_cmd "$f" done - echo -e "src/mario/geo.inc.c: extract-decomp-source.py\n\t ./extract-decomp-source.py" - echo -e "src/mario/model.inc.c: extract-decomp-source.py\n\t ./extract-decomp-source.py" + echo -e "src/mario/geo.inc.c: import-mario-geo.py\n\t ./import-mario-geo.py" + echo -e "src/mario/model.inc.c: import-mario-geo.py\n\t ./import-mario-geo.py" - echo '.PHONY: clean run .FORCE' - echo -e "clean:\n\t find . -iname '*.o' | xargs rm && rm -f ./$BIN_FILE" + echo -e "dist/include/libsm64.h: src/libsm64.h\n\t cp src/libsm64.h dist/include/libsm64.h" + + echo -e "clean:\n\t rm -rf build && rm -rf dist && mkdir -p build && mkdir -p dist/include" + + echo '.PHONY: clean' } -prepare +./import-mario-geo.py mkdir -p build +mkdir -p dist/include print_makefile > Makefile \ No newline at end of file diff --git a/extract-decomp-source.py b/import-mario-geo.py similarity index 100% rename from extract-decomp-source.py rename to import-mario-geo.py