From c503eccd9da268ec59638a4954247f9dd7701cc7 Mon Sep 17 00:00:00 2001 From: iProgramInCpp Date: Sun, 22 Oct 2023 10:52:38 +0300 Subject: [PATCH] * Move AppPlatform_emscripten to the sdl directory As pointed out by #82, the behavior before this commit is unintuitive. --- build-wasm.bat | 2 +- platforms/{emscripten => sdl}/AppPlatform_emscripten.cpp | 0 platforms/{emscripten => sdl}/AppPlatform_emscripten.hpp | 0 platforms/sdl/CMakeLists.txt | 2 +- platforms/sdl/main.cpp | 2 +- platforms/{emscripten => sdl}/wasm_shell.html | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename platforms/{emscripten => sdl}/AppPlatform_emscripten.cpp (100%) rename platforms/{emscripten => sdl}/AppPlatform_emscripten.hpp (100%) rename platforms/{emscripten => sdl}/wasm_shell.html (100%) diff --git a/build-wasm.bat b/build-wasm.bat index e52043f..9965a56 100644 --- a/build-wasm.bat +++ b/build-wasm.bat @@ -44,7 +44,7 @@ cmake --build . ::bundle echo * Copying bundle data over. copy reminecraftpe.* ..\dist -copy ..\..\platforms\emscripten\wasm_shell.html ..\dist\reminecraftpe.html +copy ..\..\platforms\sdl\wasm_shell.html ..\dist\reminecraftpe.html copy ..\..\thirdparty\coi-serviceworker\coi-serviceworker.min.js ..\dist ::for me only diff --git a/platforms/emscripten/AppPlatform_emscripten.cpp b/platforms/sdl/AppPlatform_emscripten.cpp similarity index 100% rename from platforms/emscripten/AppPlatform_emscripten.cpp rename to platforms/sdl/AppPlatform_emscripten.cpp diff --git a/platforms/emscripten/AppPlatform_emscripten.hpp b/platforms/sdl/AppPlatform_emscripten.hpp similarity index 100% rename from platforms/emscripten/AppPlatform_emscripten.hpp rename to platforms/sdl/AppPlatform_emscripten.hpp diff --git a/platforms/sdl/CMakeLists.txt b/platforms/sdl/CMakeLists.txt index 7246b76..4d34dcf 100644 --- a/platforms/sdl/CMakeLists.txt +++ b/platforms/sdl/CMakeLists.txt @@ -33,7 +33,7 @@ if(EMSCRIPTEN) add_executable(reminecraftpe main.cpp AppPlatform_sdlbase.cpp - ../emscripten/AppPlatform_emscripten.cpp + AppPlatform_emscripten.cpp ../openal/SoundSystemAL.cpp ) else() diff --git a/platforms/sdl/main.cpp b/platforms/sdl/main.cpp index 96b8f05..7c40bf4 100644 --- a/platforms/sdl/main.cpp +++ b/platforms/sdl/main.cpp @@ -6,7 +6,7 @@ #include "client/app/App.hpp" #if defined(__EMSCRIPTEN__) -#include "../emscripten/AppPlatform_emscripten.hpp" +#include "AppPlatform_emscripten.hpp" typedef AppPlatform_emscripten UsedAppPlatform; #else #include "AppPlatform_sdl.hpp" diff --git a/platforms/emscripten/wasm_shell.html b/platforms/sdl/wasm_shell.html similarity index 100% rename from platforms/emscripten/wasm_shell.html rename to platforms/sdl/wasm_shell.html