diff --git a/.github/workflows/ccpp_web.yml b/.github/workflows/ccpp_web.yml index 1756d5ca8..4fa5910f9 100644 --- a/.github/workflows/ccpp_web.yml +++ b/.github/workflows/ccpp_web.yml @@ -353,8 +353,8 @@ jobs: if: ${{ fromJSON(needs.build.outputs.did-build) || !steps.cache_siv3d_installer.outputs.cache-hit }} working-directory: Web/VisualStudioTemplate/Files run: | - 7z a -tzip "OpenSiv3D(0.6.5)Web.zip" . - cp "OpenSiv3D(0.6.5)Web.zip" .. + 7z a -tzip "OpenSiv3D(0.6.6)Web.zip" . + cp "OpenSiv3D(0.6.6)Web.zip" .. - name: Create Installer if: ${{ fromJSON(needs.build.outputs.did-build) || !steps.cache_siv3d_installer.outputs.cache-hit }} @@ -398,11 +398,11 @@ jobs: working-directory: Web/WindowsInstaller run: | Set-Item Env:Path "$env:VSIXInstaller_Path;$env:Path" - & ".\OpenSiv3D(0.6.5)Web.exe" /SILENT /SUPPRESSMSGBOXES /LOG="InstallLog.Log" - Wait-Process -Name "OpenSiv3D(0.6.5)Web" + & ".\OpenSiv3D(0.6.6)Web.exe" /SILENT /SUPPRESSMSGBOXES /LOG="InstallLog.Log" + Wait-Process -Name "OpenSiv3D(0.6.6)Web" cat InstallLog.Log - $env:SIV3D_0_6_5_WEB = [System.Environment]::GetEnvironmentVariable("SIV3D_0_6_5_WEB","User") - echo "SIV3D_0_6_5_WEB=$env:SIV3D_0_6_5_WEB" >> $env:GITHUB_ENV + $env:SIV3D_0_6_6_WEB = [System.Environment]::GetEnvironmentVariable("SIV3D_0_6_6_WEB","User") + echo "SIV3D_0_6_6_WEB=$env:SIV3D_0_6_6_WEB" >> $env:GITHUB_ENV devenv /installvstemplates - name: Install VSIX @@ -433,7 +433,7 @@ jobs: - name: Create Project run: | mkdir Siv3DTest - 7z x "$env:USERPROFILE\Documents\Visual Studio 2022\Templates\ProjectTemplates\OpenSiv3D(0.6.5)Web.zip" -oSiv3DTest + 7z x "$env:USERPROFILE\Documents\Visual Studio 2022\Templates\ProjectTemplates\OpenSiv3D(0.6.6)Web.zip" -oSiv3DTest cp Web\CI\App\Main.cpp Siv3DTest cd Siv3DTest $Content = Get-Content -path "Siv3DTest.vcxproj" @@ -534,7 +534,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.pre-deploy.outputs.upload_url }} - asset_path: OpenSiv3D(0.6.5)Web.exe + asset_path: OpenSiv3D(0.6.6)Web.exe asset_name: OpenSiv3D-Installer-${{ matrix.config.name }}.exe asset_content_type: application/octet-stream diff --git a/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate b/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate index 190d8313e..d78502ef6 100644 --- a/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate +++ b/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate @@ -1,25 +1,25 @@ - - - OpenSiv3D(0.6.5)Web - A project for creating a Siv3D application - VC - cpp - games - - - 1000 - true - OpenSiv3Dv0_6ForWeb - true - Enabled - true - __TemplateIcon.ico - __PreviewImage.png - - - - Siv3DTest.vcxproj.filters - Main.cpp + + + OpenSiv3D(0.6.6)Web + A project for creating a Siv3D application + VC + cpp + games + + + 1000 + true + OpenSiv3Dv0_6ForWeb + true + Enabled + true + __TemplateIcon.ico + __PreviewImage.png + + + + Siv3DTest.vcxproj.filters + Main.cpp example/LICENSE.txt example/bay.jpg example/csv/config.csv @@ -227,9 +227,9 @@ resources/engine/texture/box-shadow/32.png resources/engine/texture/box-shadow/64.png resources/engine/texture/box-shadow/8.png - - Templates\Embeddable\web-player.html - Templates\Embeddable\web-player.js - - + + Templates\Embeddable\web-player.html + Templates\Embeddable\web-player.js + + \ No newline at end of file diff --git a/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate.tpl b/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate.tpl index 1e57c1e60..a7fba8029 100644 --- a/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate.tpl +++ b/Web/VisualStudioTemplate/Files/MyTemplate.vstemplate.tpl @@ -1,6 +1,6 @@ - OpenSiv3D(0.6.5)Web + OpenSiv3D(0.6.6)Web A project for creating a Siv3D application VC cpp diff --git a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj index 137254f65..c92959983 100644 --- a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj +++ b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj @@ -71,12 +71,12 @@ - $(SIV3D_0_6_5_WEB)\include;$(SIV3D_0_6_5_WEB)\include\ThirdParty;$(IncludePath) - $(SIV3D_0_6_5_WEB)\lib\freetype;$(SIV3D_0_6_5_WEB)\lib\giflib;$(SIV3D_0_6_5_WEB)\lib\harfbuzz;$(SIV3D_0_6_5_WEB)\lib\opencv;$(SIV3D_0_6_5_WEB)\lib\turbojpeg;$(SIV3D_0_6_5_WEB)\lib\webp;$(SIV3D_0_6_5_WEB)\lib\opus;$(SIV3D_0_6_5_WEB)\lib\tiff;$(SIV3D_0_6_5_WEB)\lib\png;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_WEB)\lib + $(SIV3D_0_6_6_WEB)\include;$(SIV3D_0_6_6_WEB)\include\ThirdParty;$(IncludePath) + $(SIV3D_0_6_6_WEB)\lib\freetype;$(SIV3D_0_6_6_WEB)\lib\giflib;$(SIV3D_0_6_6_WEB)\lib\harfbuzz;$(SIV3D_0_6_6_WEB)\lib\opencv;$(SIV3D_0_6_6_WEB)\lib\turbojpeg;$(SIV3D_0_6_6_WEB)\lib\webp;$(SIV3D_0_6_6_WEB)\lib\opus;$(SIV3D_0_6_6_WEB)\lib\tiff;$(SIV3D_0_6_6_WEB)\lib\png;$(SIV3D_0_6_6_WEB)\lib\zlib;$(SIV3D_0_6_6_WEB)\lib\SDL2;$(SIV3D_0_6_6_WEB)\lib - $(SIV3D_0_6_5_WEB)\include;$(SIV3D_0_6_5_WEB)\include\ThirdParty;$(IncludePath) - $(SIV3D_0_6_5_WEB)\lib\freetype;$(SIV3D_0_6_5_WEB)\lib\giflib;$(SIV3D_0_6_5_WEB)\lib\harfbuzz;$(SIV3D_0_6_5_WEB)\lib\opencv;$(SIV3D_0_6_5_WEB)\lib\turbojpeg;$(SIV3D_0_6_5_WEB)\lib\webp;$(SIV3D_0_6_5_WEB)\lib\opus;$(SIV3D_0_6_5_WEB)\lib\tiff;$(SIV3D_0_6_5_WEB)\lib\png;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_WEB)\lib + $(SIV3D_0_6_6_WEB)\include;$(SIV3D_0_6_6_WEB)\include\ThirdParty;$(IncludePath) + $(SIV3D_0_6_6_WEB)\lib\freetype;$(SIV3D_0_6_6_WEB)\lib\giflib;$(SIV3D_0_6_6_WEB)\lib\harfbuzz;$(SIV3D_0_6_6_WEB)\lib\opencv;$(SIV3D_0_6_6_WEB)\lib\turbojpeg;$(SIV3D_0_6_6_WEB)\lib\webp;$(SIV3D_0_6_6_WEB)\lib\opus;$(SIV3D_0_6_6_WEB)\lib\tiff;$(SIV3D_0_6_6_WEB)\lib\png;$(SIV3D_0_6_6_WEB)\lib\zlib;$(SIV3D_0_6_6_WEB)\lib\SDL2;$(SIV3D_0_6_6_WEB)\lib @@ -308,9 +308,9 @@ $(LibraryPath);%(AdditionalLinkDirectories) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; false - $(SIV3D_0_6_5_WEB)\lib\Siv3D.js; - $(SIV3D_0_6_5_WEB)\lib\Siv3D.pre.js; - $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_5_WEB)\lib\Siv3D.post.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.pre.js; + $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_6_WEB)\lib\Siv3D.post.js; $(ProjectDir)\Templates\Embeddable\web-player.html true true @@ -335,9 +335,9 @@ -s ASYNCIFY_ADD="[ 'main','Main()','dynCall_v','dynCall_vi','s3d::TryMain()','s3d::CSystem::init()','s3d::System::Update()','s3d::AACDecoder::decode(*) const','s3d::MP3Decoder::decode(*) const','s3d::CAudioDecoder::decode(*)','s3d::AudioDecoder::Decode(*)','s3d::Wave::Wave(*)','s3d::Audio::Audio(*)','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::GenericDecoder::decode(*) const','s3d::CImageDecoder::decode(*)','s3d::Image::Image(*)','s3d::Texture::Texture(*)','s3d::ImageDecoder::Decode(*)','s3d::ImageDecoder::GetImageInfo(*)','s3d::Model::Model(*)','s3d::CModel::create(*)','s3d::CRenderer2D_GLES3::init()','s3d::CRenderer2D_WebGPU::init()','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::SimpleHTTP::Save(*)','s3d::SimpleHTTP::Load(*)','s3d::SimpleHTTP::Get(*)','s3d::SimpleHTTP::Post(*)','s3d::VideoReader::VideoReader(*)','s3d::VideoReader::open(*)','s3d::Platform::Web::FetchFile(*)' ]" %(AdditionalOptions) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example - $(SIV3D_0_6_5_WEB)\lib\Siv3D.js; - $(SIV3D_0_6_5_WEB)\lib\Siv3D.pre.js; - $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_5_WEB)\lib\Siv3D.post.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.pre.js; + $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_6_WEB)\lib\Siv3D.post.js; $(ProjectDir)\Templates\Embeddable\web-player.html $(LibraryPath);%(AdditionalLinkDirectories) false diff --git a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl index bcac10d53..06dab8c37 100644 --- a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl +++ b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl @@ -71,12 +71,12 @@ - $(SIV3D_0_6_5_WEB)\include;$(SIV3D_0_6_5_WEB)\include\ThirdParty;$(IncludePath) - $(SIV3D_0_6_5_WEB)\lib\freetype;$(SIV3D_0_6_5_WEB)\lib\giflib;$(SIV3D_0_6_5_WEB)\lib\harfbuzz;$(SIV3D_0_6_5_WEB)\lib\opencv;$(SIV3D_0_6_5_WEB)\lib\turbojpeg;$(SIV3D_0_6_5_WEB)\lib\webp;$(SIV3D_0_6_5_WEB)\lib\opus;$(SIV3D_0_6_5_WEB)\lib\tiff;$(SIV3D_0_6_5_WEB)\lib\png;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_WEB)\lib + $(SIV3D_0_6_6_WEB)\include;$(SIV3D_0_6_6_WEB)\include\ThirdParty;$(IncludePath) + $(SIV3D_0_6_6_WEB)\lib\freetype;$(SIV3D_0_6_6_WEB)\lib\giflib;$(SIV3D_0_6_6_WEB)\lib\harfbuzz;$(SIV3D_0_6_6_WEB)\lib\opencv;$(SIV3D_0_6_6_WEB)\lib\turbojpeg;$(SIV3D_0_6_6_WEB)\lib\webp;$(SIV3D_0_6_6_WEB)\lib\opus;$(SIV3D_0_6_6_WEB)\lib\tiff;$(SIV3D_0_6_6_WEB)\lib\png;$(SIV3D_0_6_6_WEB)\lib\zlib;$(SIV3D_0_6_6_WEB)\lib\SDL2;$(SIV3D_0_6_6_WEB)\lib - $(SIV3D_0_6_5_WEB)\include;$(SIV3D_0_6_5_WEB)\include\ThirdParty;$(IncludePath) - $(SIV3D_0_6_5_WEB)\lib\freetype;$(SIV3D_0_6_5_WEB)\lib\giflib;$(SIV3D_0_6_5_WEB)\lib\harfbuzz;$(SIV3D_0_6_5_WEB)\lib\opencv;$(SIV3D_0_6_5_WEB)\lib\turbojpeg;$(SIV3D_0_6_5_WEB)\lib\webp;$(SIV3D_0_6_5_WEB)\lib\opus;$(SIV3D_0_6_5_WEB)\lib\tiff;$(SIV3D_0_6_5_WEB)\lib\png;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_WEB)\lib + $(SIV3D_0_6_6_WEB)\include;$(SIV3D_0_6_6_WEB)\include\ThirdParty;$(IncludePath) + $(SIV3D_0_6_6_WEB)\lib\freetype;$(SIV3D_0_6_6_WEB)\lib\giflib;$(SIV3D_0_6_6_WEB)\lib\harfbuzz;$(SIV3D_0_6_6_WEB)\lib\opencv;$(SIV3D_0_6_6_WEB)\lib\turbojpeg;$(SIV3D_0_6_6_WEB)\lib\webp;$(SIV3D_0_6_6_WEB)\lib\opus;$(SIV3D_0_6_6_WEB)\lib\tiff;$(SIV3D_0_6_6_WEB)\lib\png;$(SIV3D_0_6_6_WEB)\lib\zlib;$(SIV3D_0_6_6_WEB)\lib\SDL2;$(SIV3D_0_6_6_WEB)\lib @@ -101,9 +101,9 @@ ${ExampleItems} $(LibraryPath);%(AdditionalLinkDirectories) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; false - $(SIV3D_0_6_5_WEB)\lib\Siv3D.js; - $(SIV3D_0_6_5_WEB)\lib\Siv3D.pre.js; - $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_5_WEB)\lib\Siv3D.post.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.pre.js; + $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_6_WEB)\lib\Siv3D.post.js; $(ProjectDir)\Templates\Embeddable\web-player.html true true @@ -128,9 +128,9 @@ ${ExampleItems} -s ASYNCIFY_ADD="[ 'main','Main()','dynCall_v','dynCall_vi','s3d::TryMain()','s3d::CSystem::init()','s3d::System::Update()','s3d::AACDecoder::decode(*) const','s3d::MP3Decoder::decode(*) const','s3d::CAudioDecoder::decode(*)','s3d::AudioDecoder::Decode(*)','s3d::Wave::Wave(*)','s3d::Audio::Audio(*)','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::GenericDecoder::decode(*) const','s3d::CImageDecoder::decode(*)','s3d::Image::Image(*)','s3d::Texture::Texture(*)','s3d::ImageDecoder::Decode(*)','s3d::ImageDecoder::GetImageInfo(*)','s3d::Model::Model(*)','s3d::CModel::create(*)','s3d::CRenderer2D_GLES3::init()','s3d::CRenderer2D_WebGPU::init()','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::SimpleHTTP::Save(*)','s3d::SimpleHTTP::Load(*)','s3d::SimpleHTTP::Get(*)','s3d::SimpleHTTP::Post(*)','s3d::VideoReader::VideoReader(*)','s3d::VideoReader::open(*)','s3d::Platform::Web::FetchFile(*)' ]" %(AdditionalOptions) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example - $(SIV3D_0_6_5_WEB)\lib\Siv3D.js; - $(SIV3D_0_6_5_WEB)\lib\Siv3D.pre.js; - $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_5_WEB)\lib\Siv3D.post.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.js; + $(SIV3D_0_6_6_WEB)\lib\Siv3D.pre.js; + $(ProjectDir)\Templates\Embeddable\web-player.js;$(SIV3D_0_6_6_WEB)\lib\Siv3D.post.js; $(ProjectDir)\Templates\Embeddable\web-player.html $(LibraryPath);%(AdditionalLinkDirectories) false diff --git a/Web/WindowsInstaller/setup.iss b/Web/WindowsInstaller/setup.iss index 0aed0853d..aed4d1402 100644 --- a/Web/WindowsInstaller/setup.iss +++ b/Web/WindowsInstaller/setup.iss @@ -1,12 +1,12 @@ [Setup] -AppName=OpenSiv3D(0.6.5) for Web -AppVersion=0.6.5 +AppName=OpenSiv3D(0.6.6) for Web +AppVersion=0.6.6 WizardStyle=modern SetupIconFile=..\..\WindowsDesktop\App\icon.ico -OutputBaseFilename=OpenSiv3D(0.6.5)Web -DefaultDirName={userdocs}\OpenSiv3D_0.6.5_Web -VersionInfoVersion=0.6.5.6 -VersionInfoDescription=OpenSiv3D (0.6.5) for Web Installer +OutputBaseFilename=OpenSiv3D(0.6.6)Web +DefaultDirName={userdocs}\OpenSiv3D_0.6.6_Web +VersionInfoVersion=0.6.6.1 +VersionInfoDescription=OpenSiv3D (0.6.6) for Web Installer Compression=lzma2 SolidCompression=yes ChangesEnvironment=yes @@ -29,10 +29,10 @@ Source: "..\Siv3D.js"; DestDir: "{app}\lib" Source: "..\Siv3D.pre.js"; DestDir: "{app}\lib" Source: "..\Siv3D.post.js"; DestDir: "{app}\lib" Source: "..\Package\lib\Siv3D\*"; DestDir: "{app}\lib"; Flags: recursesubdirs -Source: "..\VisualStudioTemplate\OpenSiv3D(0.6.5)Web.zip"; DestDir: "{userdocs}\Visual Studio 2017\Templates\ProjectTemplates" -Source: "..\VisualStudioTemplate\OpenSiv3D(0.6.5)Web.zip"; DestDir: "{userdocs}\Visual Studio 2019\Templates\ProjectTemplates" -Source: "..\VisualStudioTemplate\OpenSiv3D(0.6.5)Web.zip"; DestDir: "{userdocs}\Visual Studio 2022\Templates\ProjectTemplates" +Source: "..\VisualStudioTemplate\OpenSiv3D(0.6.6)Web.zip"; DestDir: "{userdocs}\Visual Studio 2017\Templates\ProjectTemplates" +Source: "..\VisualStudioTemplate\OpenSiv3D(0.6.6)Web.zip"; DestDir: "{userdocs}\Visual Studio 2019\Templates\ProjectTemplates" +Source: "..\VisualStudioTemplate\OpenSiv3D(0.6.6)Web.zip"; DestDir: "{userdocs}\Visual Studio 2022\Templates\ProjectTemplates" [Registry] -Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName: "SIV3D_0_6_5_WEB"; \ +Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName: "SIV3D_0_6_6_WEB"; \ ValueData: "{app}"; Flags: preservestringtype