Update build scripts, changelog, commit hash.

This commit is contained in:
casey langen 2023-02-03 22:23:37 -08:00
parent 0ead12be21
commit 5a6aa7862f
4 changed files with 37 additions and 59 deletions

View File

@ -2,6 +2,8 @@
* fixed a bug in `ffmpegdecoder` that could cause the app to crash when
releasing a stream.
* fixed `milkdrop2` plugin to work on 64-bit machines, and include it by default
for both win32 and win64 releases.
* fixed unicode character parsing in musikcube-cmd.exe
* merged upstream PDCursesMod changes
* update essential build shell scripts to use `sh` instead of `bash` to improve

View File

@ -11,69 +11,46 @@ fi
# 32-bit
#
VANILLA="dist/musikcube_win32_$VERSION"
MILKDROP="dist/musikcube_win32_with_milkdrop2_$VERSION"
rm -rf "$VANILLA"
rm -rf "$MILKDROP"
mkdir -p "$VANILLA/plugins"
mkdir -p "$VANILLA/themes"
mkdir -p "$VANILLA/locales"
mkdir -p "$VANILLA/fonts"
cp bin32/release/musikcube.exe "$VANILLA"
cp bin32/release/musikcube-cmd.exe "$VANILLA"
cp bin32/release/*.dll "$VANILLA"
cp bin32/release/plugins/*.dll "$VANILLA/plugins"
cp bin32/release/themes/*.json "$VANILLA/themes"
cp bin32/release/locales/*.json "$VANILLA/locales"
cp bin32/release/fonts/*.ttf "$VANILLA/fonts"
rm "$VANILLA/plugins/vis_milk2.dll"
rm "$VANILLA/musikcore.dll"
pushd $VANILLA
WIN32="dist/musikcube_win32_$VERSION"
rm -rf "$WIN32"
mkdir -p "$WIN32/plugins"
mkdir -p "$WIN32/themes"
mkdir -p "$WIN32/locales"
mkdir -p "$WIN32/fonts"
cp bin32/release/musikcube.exe "$WIN32"
cp bin32/release/musikcube-cmd.exe "$WIN32"
cp bin32/release/*.dll "$WIN32"
cp bin32/release/plugins/*.dll "$WIN32/plugins"
cp bin32/release/themes/*.json "$WIN32/themes"
cp bin32/release/locales/*.json "$WIN32/locales"
cp bin32/release/fonts/*.ttf "$WIN32/fonts"
cp -rfp bin32/release/plugins/Milkdrop2 "$WIN32/plugins"
rm "$WIN32/musikcore.dll"
pushd $WIN32
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 bin32/release/musikcube.exe "$MILKDROP"
cp bin32/release/musikcube-cmd.exe "$MILKDROP"
cp bin32/release/*.dll "$MILKDROP"
cp bin32/release/plugins/*.dll "$MILKDROP/plugins"
cp bin32/release/themes/*.json "$MILKDROP/themes"
cp bin32/release/locales/*.json "$MILKDROP/locales"
cp bin32/release/fonts/*.ttf "$MILKDROP/fonts"
cp -rfp bin32/release/plugins/Milkdrop2 "$MILKDROP/plugins"
rm "$MILKDROP/musikcore.dll"
pushd $MILKDROP
7z a -tzip "musikcube_win32_with_milkdrop2_$VERSION.zip" ./* -mx=9
mv "musikcube_win32_with_milkdrop2_$VERSION.zip" ..
popd
#
# 64-bit
#
VANILLA="dist/musikcube_win64_$VERSION"
rm -rf "$VANILLA"
mkdir -p "$VANILLA/plugins"
mkdir -p "$VANILLA/themes"
mkdir -p "$VANILLA/locales"
mkdir -p "$VANILLA/fonts"
cp bin64/release/musikcube.exe "$VANILLA"
cp bin64/release/musikcube-cmd.exe "$VANILLA"
cp bin64/release/*.dll "$VANILLA"
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/musikcore.dll"
pushd $VANILLA
WIN64="dist/musikcube_win64_$VERSION"
rm -rf "$WIN64"
mkdir -p "$WIN64/plugins"
mkdir -p "$WIN64/themes"
mkdir -p "$WIN64/locales"
mkdir -p "$WIN64/fonts"
cp bin64/release/musikcube.exe "$WIN64"
cp bin64/release/musikcube-cmd.exe "$WIN64"
cp bin64/release/*.dll "$WIN64"
cp bin64/release/plugins/*.dll "$WIN64/plugins"
cp bin64/release/themes/*.json "$WIN64/themes"
cp bin64/release/locales/*.json "$WIN64/locales"
cp bin64/release/fonts/*.ttf "$WIN64/fonts"
cp -rfp bin64/release/plugins/Milkdrop2 "$WIN64/plugins"
rm "$WIN64/musikcore.dll"
pushd $WIN64
7z a -tzip "musikcube_win64_$VERSION.zip" ./* -mx=9
mv "musikcube_win64_$VERSION.zip" ..
popd

View File

@ -6,14 +6,13 @@ SET scriptdir=%~dp0
call %scriptdir%\clean-win.bat
echo "*** BUILDING MILKDROP ***"
MSBuild.exe ../milkdrop2-musikcube/milkdrop2-musikcube.sln /m /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=Win32
echo "*** BUILDING WIN32 ***"
MSBuild.exe ../milkdrop2-musikcube/milkdrop2-musikcube.sln /m /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=Win32
MSBuild.exe musikcube.sln /m /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=Win32
MSBuild.exe musikcube.sln /target:musikcube /m /nologo /verbosity:minimal /p:ExternalCompilerOptions=PDCURSES_WINCON /p:Configuration=Release /p:Platform=Win32 /p:ForceImportAfterCppTargets=%scriptdir%\windows-cmd.props
echo "*** BUILDING x64 ***"
MSBuild.exe ../milkdrop2-musikcube/milkdrop2-musikcube.sln /m /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=x64
MSBuild.exe musikcube.sln /m /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=x64
MSBuild.exe musikcube.sln /target:musikcube /m /nologo /verbosity:minimal /p:ExternalCompilerOptions=PDCURSES_WINCON /p:Configuration=Release /p:Platform=x64 /p:ForceImportAfterCppTargets=%scriptdir%\windows-cmd.props

View File

@ -39,7 +39,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 99
#define VERSION_PATCH 5
#define VERSION_COMMIT_HASH "#84ba3fa6"
#define VERSION_COMMIT_HASH "#0ead12be"
#define VERSION "0.99.5"
namespace musik {