diff --git a/premake4.lua b/premake4.lua index 5a68a39cc..f184d91ba 100644 --- a/premake4.lua +++ b/premake4.lua @@ -451,7 +451,11 @@ function build_link_configuration( package_name, use_ee_icon ) package_name ~= "eephysics" and package_name ~= "eevbo-fbo-batch" ) then - linkoptions { "--preload-file assets/" } + if package_name == "ecode" then + linkoptions { "--preload-file " .. package_name .. "/assets/" } + else + linkoptions { "--preload-file assets/" } + end end end diff --git a/projects/emscripten/make.sh b/projects/emscripten/make.sh index 578297179..880d6f9a6 100755 --- a/projects/emscripten/make.sh +++ b/projects/emscripten/make.sh @@ -2,9 +2,15 @@ # Currently latest emsdk tested and working version: latest-fastcomp # remember to first set the environment # source /path/to/emsdk/emsdk_env.sh -cd $(dirname "$0") +cd $(dirname "$0") || exit premake4 --file=../../premake4.lua --with-gles2 --with-static-eepp --platform=emscripten --with-backend=SDL2 gmake -cd ../../make/emscripten/ +cd ../../make/emscripten/ || exit rm -rf ./assets cp -r ../../bin/assets/ . -emmake make -j`nproc` $@ +rm assets/fonts/NotoColorEmoji.ttf +rm -rf ./ecode +mkdir ecode +cp -r ../../bin/assets/ ecode/assets/ +rm ecode/assets/fonts/NotoColorEmoji.ttf ecode/assets/test.zip ecode/assets/ca-bundle.pem ecode/assets/icon/ee.icns ecode/assets/icon/ee.rc ecode/assets/icon/ee.res ecode/assets/icon/ee.ico ecode/assets/fonts/*.png ecode/assets/fonts/*.fnt ecode/assets/fonts/OpenSans-Regular.ttf +rm -r ecode/assets/atlases ecode/assets/screenshots ecode/assets/cursors ecode/assets/layouts ecode/assets/maps ecode/assets/sounds ecode/assets/sprites ecode/assets/tiles ecode/assets/shaders ecode/assets/ui/uitheme* +emmake make -j"$(nproc)" "$@" diff --git a/projects/emscripten/make_mt.sh b/projects/emscripten/make_mt.sh index 4b613a22f..bdac49d21 100755 --- a/projects/emscripten/make_mt.sh +++ b/projects/emscripten/make_mt.sh @@ -2,9 +2,15 @@ # Currently latest emsdk tested and working version: latest-fastcomp # remember to first set the environment # source /path/to/emsdk/emsdk_env.sh -cd $(dirname "$0") +cd $(dirname "$0") || exit premake4 --file=../../premake4.lua --with-emscripten-pthreads --with-gles2 --with-static-eepp --platform=emscripten --with-backend=SDL2 gmake -cd ../../make/emscripten/ +cd ../../make/emscripten/ || exit rm -rf ./assets cp -r ../../bin/assets/ . -emmake make -j`nproc` $@ +rm assets/fonts/NotoColorEmoji.ttf +rm -rf ./ecode +mkdir ecode +cp -r ../../bin/assets/ ecode/assets/ +rm ecode/assets/fonts/NotoColorEmoji.ttf ecode/assets/test.zip ecode/assets/ca-bundle.pem ecode/assets/icon/ee.icns ecode/assets/icon/ee.rc ecode/assets/icon/ee.res ecode/assets/icon/ee.ico ecode/assets/fonts/*.png ecode/assets/fonts/*.fnt ecode/assets/fonts/OpenSans-Regular.ttf +rm -r ecode/assets/atlases ecode/assets/screenshots ecode/assets/cursors ecode/assets/layouts ecode/assets/maps ecode/assets/sounds ecode/assets/sprites ecode/assets/tiles ecode/assets/shaders ecode/assets/ui/uitheme* +emmake make -j"$(nproc)" "$@" diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index 682dcf32d..f04bfd316 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -2767,6 +2767,8 @@ void App::init( std::string file, const Float& pidelDensity, const std::string& FileSystem::dirAddSlashAtEnd( mResPath ); mIsBundledApp = true; } +#elif EE_PLATFORM == EE_PLATFORM_EMSCRIPTEN + mResPath += "ecode/"; #endif mResPath += "assets"; FileSystem::dirAddSlashAtEnd( mResPath );