diff --git a/README.md b/README.md index 591290a..e2a89ff 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,12 @@ Windows: - Windows 7 or later - [.NET Framework 4.5](https://www.microsoft.com/en-us/download/details.aspx?id=42642) - - [OpenAL](https://www.openal.org/downloads/) + - OpenAL (bundled [OpenAL-Soft](https://github.com/kcat/openal-soft) Win32 build in newer releases) macOS/Linux: - [Wine](https://www.winehq.org/download) (will install wine-mono when needed) - - [OpenAL](https://www.openal.org/downloads/) + - OpenAL (bundled [OpenAL-Soft](https://github.com/kcat/openal-soft) Win32 build in newer releases) > For licensing reasons, newer releases do not include an essential library `hcaenc_lite.dll`. However, you can: > @@ -59,7 +59,7 @@ macOS/Linux: If you want to build custom CD jackets: - [Visual C++ Redistributable Packages for Visual Studio 2013](https://www.microsoft.com/en-us/download/details.aspx?id=40784) -- [DirectX 9.0c](https://www.microsoft.com/en-us/download/details.aspx?id=8109) +- [DirectX 9.0c Runtime](https://www.microsoft.com/en-us/download/details.aspx?id=8109) Checked Feb. 09, 2018: Although JacketCreator generates asset bundles for Unity version 5.1.2f1 (original version that CGSS uses), CGSS (using Unity 5.4.5p1) is still able to load and display them. diff --git a/appveyor.yml b/appveyor.yml index 688235b..0533522 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,43 +1,40 @@ # https://www.appveyor.com/docs/appveyor-yml/ -version: 0.7.9.{build} -branches: - only: - - master -skip_tags: true +version: 0.7.12.{build} image: Visual Studio 2017 -build_script: - - cmd: msbuild DereTore.sln /p:Configuration=Release /p:Platform="Any CPU" - - cmd: msbuild DereTore.sln /p:Configuration=Release /p:Platform=x86 environment: - EnableNuGetPackageRestore: true + Configuration: Release + Platform: x86 +build_script: + - cmd: msbuild DereTore.sln /p:Configuration=%CONFIGURATION% /p:Platform="Any CPU" + - cmd: msbuild DereTore.sln /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% before_build: - - nuget update -self - - git submodule update --init --recursive - - nuget restore - - nuget restore external\SharpAL\SharpAL.sln + - cmd: nuget update -self + - cmd: git submodule update --init --recursive + - ps: scripts\nuget_restore.ps1 after_build: - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbMaker/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbMaker/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbUnzip/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbUnzip/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hca2Wav/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hca2Wav/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcacc/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcacc/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcaenc/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcaenc/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/JacketCreator/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/JacketCreator/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/LZ4/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/LZ4/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/MusicToolchain/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/MusicToolchain/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/ScoreViewer/bin/%PLATFORM%/%CONFIGURATION%/*.exe - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/ScoreViewer/bin/%PLATFORM%/%CONFIGURATION%/*.dll - - 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/ScoreViewer/bin/%PLATFORM%/%CONFIGURATION%/*.wav - - copy deretore-toolkit.zip deretore-toolkit-x86-v%APPVEYOR_BUILD_VERSION%-alpha-b%APPVEYOR_BUILD_NUMBER%.zip - - copy deretore-toolkit.zip deretore-toolkit-x86.zip + - ps: .\scripts\extract-openal-soft.ps1 -destination $Env:APPVEYOR_BUILD_FOLDER\Apps\ScoreViewer\bin\$Env:Platform\$Env:Configuration\ + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbMaker/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbMaker/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbUnzip/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/AcbUnzip/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hca2Wav/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hca2Wav/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcacc/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcacc/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcaenc/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/Hcaenc/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/JacketCreator/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/JacketCreator/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/LZ4/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/LZ4/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/MusicToolchain/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/MusicToolchain/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/ScoreViewer/bin/%PLATFORM%/%CONFIGURATION%/*.exe + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/ScoreViewer/bin/%PLATFORM%/%CONFIGURATION%/*.dll + - cmd: 7z a deretore-toolkit.zip -r %APPVEYOR_BUILD_FOLDER%/Apps/ScoreViewer/bin/%PLATFORM%/%CONFIGURATION%/*.wav + - cmd: copy deretore-toolkit.zip deretore-toolkit-x86-v%APPVEYOR_BUILD_VERSION%-alpha-b%APPVEYOR_BUILD_NUMBER%.zip + - cmd: copy deretore-toolkit.zip deretore-toolkit-x86.zip artifacts: - path: deretore-toolkit-x86-v%APPVEYOR_BUILD_VERSION%-alpha-b%APPVEYOR_BUILD_NUMBER%.zip name: WithVersion diff --git a/external/SharpAL b/external/SharpAL index 531c9ff..5f95aee 160000 --- a/external/SharpAL +++ b/external/SharpAL @@ -1 +1 @@ -Subproject commit 531c9ffb838972009bc92f9ddc6c86f6c265ab5d +Subproject commit 5f95aeeda1201173eda72d5816cfe88d9c3e5634 diff --git a/scripts/extract-openal-soft.ps1 b/scripts/extract-openal-soft.ps1 new file mode 100644 index 0000000..bd798ff --- /dev/null +++ b/scripts/extract-openal-soft.ps1 @@ -0,0 +1,20 @@ +param ( + [Parameter(Mandatory=$true)][string]$destination +) + +$openAlSoftVersion = '1.18.2' + +echo "Downloading OpenAL-Soft ($openAlSoftVersion/Windows)..." +(New-Object Net.WebClient).DownloadFile('http://kcat.strangesoft.net/openal-binaries/openal-soft-' + $openAlSoftVersion + '-bin.zip', 'C:\openal-soft.zip') + +echo "Extracting OpenAL-Soft..." + +$7zCommand = '7z x C:\openal-soft.zip -y -oC:\openal-soft-install\ * -r' +$block = [scriptblock]::Create($7zCommand) + +Invoke-Command -ScriptBlock $block + +$openAlDllNewName = [System.IO.Path]::Combine($destination, "openal32.dll") +echo "Moving to $openAlDllNewName ..." +$openAlDllOriginalPath = 'C:\openal-soft-install\openal-soft-' + $openAlSoftVersion + '-bin\bin\Win32\soft_oal.dll' +Move-Item -Path $openAlDllOriginalPath -Destination $openAlDllNewName diff --git a/scripts/nuget_restore.ps1 b/scripts/nuget_restore.ps1 new file mode 100644 index 0000000..2db1573 --- /dev/null +++ b/scripts/nuget_restore.ps1 @@ -0,0 +1,20 @@ +$currentDir = (Get-Item -Path ".\" -Verbose).FullName + +$report = "Working in directory: " + $currentDir +echo $report + +$slnFiles = [System.IO.Directory]::GetFiles($currentDir, "*.sln", [System.IO.SearchOption]::AllDirectories) + +for ($i = 0; $i -lt $slnFiles.Length; ++$i) { + $slnFile = $slnFiles[$i] + $fileInfo = New-Object -TypeName System.IO.FileInfo -ArgumentList $slnFile + $fullName = $fileInfo.FullName + $report = [string]::Format("Restoring {0} ... ({1}/{2})", $fullName, ($i + 1), $slnFiles.Length) + echo $report + $nugetCmd = [string]::Format("nuget restore `"{0}`"", $fullName) + $script = [ScriptBlock]::Create($nugetCmd) + + Invoke-Command -ScriptBlock $script +} + +echo "Done."