Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-13 04:42:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

emscripten build improvements.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-06-08 02:19:01 -03:00
parent bbecb4cc1b
commit a30c82089f
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
premake4.lua
View File

@@ -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

12
projects/emscripten/make.sh
View File

@@ -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)" "$@"

12
projects/emscripten/make_mt.sh
View File

@@ -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)" "$@"

2
src/tools/ecode/ecode.cpp
View File

@@ -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 );