diff --git a/.gitignore b/.gitignore index 4eb512c28..f2eb346d1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,10 +12,12 @@ **/*.deb **/*.aps **/.DS_Store +**/obj32 +**/obj64 .vs .vscode -bin -obj +bin32 +bin64 ipch build CPack* diff --git a/archive-win32.sh b/archive-win32.sh index 69b4930d2..943737c02 100644 --- a/archive-win32.sh +++ b/archive-win32.sh @@ -1,4 +1,4 @@ -#!/bin32/sh +#!/bin/sh VERSION=$1 diff --git a/archive-win64.sh b/archive-win64.sh index 0ca44fe6d..7da251d16 100644 --- a/archive-win64.sh +++ b/archive-win64.sh @@ -1,17 +1,15 @@ -#!/bin64/sh +#!/bin/sh VERSION=$1 if [ -z "$VERSION" ]; then - echo "usage: ./archive-win32.sh " + echo "usage: ./archive-win64.sh " exit fi -VANILLA="bin64/dist/musikcube_win32_$VERSION" -MILKDROP="bin64/dist/musikcube_win32_with_milkdrop2_$VERSION" +VANILLA="bin64/dist/musikcube_win64_$VERSION" rm -rf "$VANILLA" -rm -rf "$MILKDROP" mkdir -p "$VANILLA/plugins" mkdir -p "$VANILLA/themes" @@ -23,24 +21,7 @@ cp bin64/release/plugins/*.dll "$VANILLA/plugins" cp bin64/release/themes/*.json "$VANILLA/themes" cp bin64/release/locales/*.json "$VANILLA/locales" cp bin64/release/fonts/*.ttf "$VANILLA/fonts" -rm "$VANILLA/plugins/vis_milk2.dll" pushd $VANILLA -7z a -tzip "musikcube_win32_$VERSION.zip" ./* -mx=9 -mv "musikcube_win32_$VERSION.zip" .. -popd - -mkdir -p "$MILKDROP/plugins" -mkdir -p "$MILKDROP/themes" -mkdir -p "$MILKDROP/locales" -mkdir -p "$MILKDROP/fonts" -cp bin64/release/musikcube.exe "$MILKDROP" -cp bin64/release/*.dll "$MILKDROP" -cp bin64/release/plugins/*.dll "$MILKDROP/plugins" -cp bin64/release/themes/*.json "$MILKDROP/themes" -cp bin64/release/locales/*.json "$MILKDROP/locales" -cp bin64/release/fonts/*.ttf "$MILKDROP/fonts" -cp -rfp bin64/release/plugins/Milkdrop2 "$MILKDROP/plugins" -pushd $MILKDROP -7z a -tzip "musikcube_win32_with_milkdrop2_$VERSION.zip" ./* -mx=9 -mv "musikcube_win32_with_milkdrop2_$VERSION.zip" .. +7z a -tzip "musikcube_win64_$VERSION.zip" ./* -mx=9 +mv "musikcube_win64_$VERSION.zip" .. popd