diff --git a/.gitignore b/.gitignore index f2f0487a..dc63d488 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ build/ __pycache__/ +.vscode/ +MangoHud.tar.gz # Prerequisites *.d diff --git a/build.sh b/build.sh index 70c4febd..bb21231a 100755 --- a/build.sh +++ b/build.sh @@ -1,18 +1,18 @@ #!/bin/bash DATA_DIR=$HOME/.local/share/MangoHud -LAYER=build/release/share/vulkan/implicit_layer.d/mangohud.json +LAYER=build/release/usr/share/vulkan/implicit_layer.d/mangohud.json IMPLICIT_LAYER_DIR=$HOME/.local/share/vulkan/implicit_layer.d configure() { if [[ ! -d build/meson64 ]]; then - meson build/meson64 --libdir lib64 --prefix $PWD/build/release + meson build/meson64 --libdir lib64 --prefix $PWD/build/release/usr export CC="gcc -m32" export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" export LLVM_CONFIG="/usr/bin/llvm-config32" - meson build/meson32 --libdir lib32 --prefix $PWD/build/release + meson build/meson32 --libdir lib32 --prefix $PWD/build/release/usr fi } @@ -25,8 +25,8 @@ install() { mkdir -p $IMPLICIT_LAYER_DIR mkdir -p $DATA_DIR - cp build/release/lib32/libMangoHud.so $DATA_DIR/libMangoHud32.so - cp build/release/lib64/libMangoHud.so $DATA_DIR/libMangoHud.so + cp build/release/usr/lib32/libMangoHud.so $DATA_DIR/libMangoHud32.so + cp build/release/usr/lib64/libMangoHud.so $DATA_DIR/libMangoHud.so cp $LAYER $IMPLICIT_LAYER_DIR/mangohud64.json cp $LAYER $IMPLICIT_LAYER_DIR/mangohud32.json @@ -35,6 +35,11 @@ install() { sed -i "s|64bit|32bit|g" $IMPLICIT_LAYER_DIR/mangohud32.json } +package() { + cd build/release + tar czf ../../MangoHud.tar.gz * +} + clean() { rm -r build } @@ -48,6 +53,7 @@ case $1 in "") configure; build;; "build") configure; build;; "install") configure; build; install;; + "package") package;; "clean") clean;; "uninstall") uninstall;; *)