From 91d0db9f5df5254f64ca833f1805371d692e00e2 Mon Sep 17 00:00:00 2001 From: kamenokonokotan Date: Thu, 8 Sep 2022 00:08:26 +0900 Subject: [PATCH] [Web] fix png fonlder name --- .../Files/Siv3DTest.vcxproj | 298 +++++++++--------- .../Files/Siv3DTest.vcxproj.tpl | 4 +- 2 files changed, 151 insertions(+), 151 deletions(-) diff --git a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj index 3f61a698a..9f27912c6 100644 --- a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj +++ b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj @@ -1,87 +1,87 @@ - - - - - Debug - Emscripten - - - Release - Emscripten - - - - 15.0 - {$guid1$} - $safeprojectname$ - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - HTMLPage - emcc - $(EMSDK)\upstream\emscripten\ - - - HTMLPage - emcc - $(EMSDK)\upstream\emscripten\ - - - - - - - - - - - - - - - - - - - - - $(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\libpng;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_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\libpng;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_WEB)\lib - - - - - + + + + + Debug + Emscripten + + + Release + Emscripten + + + + 15.0 + {$guid1$} + $safeprojectname$ + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + HTMLPage + emcc + $(EMSDK)\upstream\emscripten\ + + + HTMLPage + emcc + $(EMSDK)\upstream\emscripten\ + + + + + + + + + + + + + + + + + + + + + $(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_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 + + + + + @@ -163,9 +163,9 @@ - - - + + + @@ -292,66 +292,66 @@ - - - - - - - - - $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example - -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 - -s EXCEPTION_CATCHING_ALLOWED=["InitSiv3D"] -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 - -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi' ]" - -s ASYNCIFY_ADD="[ 'main','Main()','InitSiv3D','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::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::FetchFileIfNotExists(*)' ]" %(AdditionalOptions) - $(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; - $(ProjectDir)\Templates\Embeddable\web-player.html - true - true - - - - $(IncludePath); - stdcpplatest - -D_XM_NO_INTRINSICS_ - - - - - $(IncludePath); - stdcpplatest - -D_XM_NO_INTRINSICS_ - - - -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 - -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 - -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi' ]" - -s ASYNCIFY_ADD="[ 'main','Main()','InitSiv3D','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::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::FetchFileIfNotExists(*)' ]" %(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; - $(ProjectDir)\Templates\Embeddable\web-player.html - $(LibraryPath);%(AdditionalLinkDirectories) - false - true - true - - - - - - -D_XM_NO_INTRINSICS_ -DSIMDE_NO_VECTOR -DFMT_USE_NONTYPE_TEMPLATE_PARAMETERS=0 - - - - - + + + + + + + + + $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example + -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 + -s EXCEPTION_CATCHING_ALLOWED=["InitSiv3D"] -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 + -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi' ]" + -s ASYNCIFY_ADD="[ 'main','Main()','InitSiv3D','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::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::FetchFileIfNotExists(*)' ]" %(AdditionalOptions) + $(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; + $(ProjectDir)\Templates\Embeddable\web-player.html + true + true + + + + $(IncludePath); + stdcpplatest + -D_XM_NO_INTRINSICS_ + + + + + $(IncludePath); + stdcpplatest + -D_XM_NO_INTRINSICS_ + + + -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 + -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 + -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi' ]" + -s ASYNCIFY_ADD="[ 'main','Main()','InitSiv3D','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::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::FetchFileIfNotExists(*)' ]" %(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; + $(ProjectDir)\Templates\Embeddable\web-player.html + $(LibraryPath);%(AdditionalLinkDirectories) + false + true + true + + + + + + -D_XM_NO_INTRINSICS_ -DSIMDE_NO_VECTOR -DFMT_USE_NONTYPE_TEMPLATE_PARAMETERS=0 + + + + + \ No newline at end of file diff --git a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl index fd0792751..f6a68910b 100644 --- a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl +++ b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl @@ -72,11 +72,11 @@ $(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\libpng;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_WEB)\lib + $(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_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\libpng;$(SIV3D_0_6_5_WEB)\lib\zlib;$(SIV3D_0_6_5_WEB)\lib\SDL2;$(SIV3D_0_6_5_WEB)\lib + $(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