From ec827341146e231511a7c48e3e2990fe4861fe35 Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Fri, 15 Dec 2023 15:57:04 +0000 Subject: [PATCH] Include freetype in web emscripten build script Co-authored-by: sigonasr2 --- C++/scripts/md5 | 2 +- C++/scripts/web.sh | 6 +++--- Java/scripts/filelist | 4 ++-- Java/scripts/md5 | 4 ++-- utils/filelist | 2 +- utils/md5 | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/C++/scripts/md5 b/C++/scripts/md5 index 4e06ad7..e5ca486 100644 --- a/C++/scripts/md5 +++ b/C++/scripts/md5 @@ -4,4 +4,4 @@ debug.sh:8125f303032b6cbc137223df63d10096 - lines.sh:3b907786f7fc9204025993016c9080de - release.sh:b1ce8461a303e8e7aa9ed74259db3873 - temp:d41d8cd98f00b204e9800998ecf8427e - -web.sh:cd3b8a99e208244dee7576bc23c0dc80 - +web.sh:1adf54f3c200922572a24573a0998110 - diff --git a/C++/scripts/web.sh b/C++/scripts/web.sh index 1097efb..5122584 100755 --- a/C++/scripts/web.sh +++ b/C++/scripts/web.sh @@ -12,12 +12,12 @@ source ../emsdk/emsdk_env.sh if [ ! -f "pixelGameEngine_wasm.o" ] then printf "Pixel Game Engine compile object missing. Compiling for the first time..." - em++ -std=c++20 -O2 ${EMSCRIPTEN_CUSTOM_PARAMS} -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 -c pixelGameEngine.cpp -o pixelGameEngine_wasm.o + em++ -std=c++20 -O2 ${EMSCRIPTEN_CUSTOM_PARAMS} -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 -s USE_FREETYPE=1 -c pixelGameEngine.cpp -o pixelGameEngine_wasm.o fi if [ -d "assets" ]; then - em++ -std=c++20 -O2 ${EMSCRIPTEN_CUSTOM_PARAMS} -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 $(find . -type f -name "*.cpp" -not -path "./test/*" -not -name "pixelGameEngine.cpp") pixelGameEngine_wasm.o -o ${PROJECT_NAME}.html --preload-file ./assets + em++ -std=c++20 -O2 ${EMSCRIPTEN_CUSTOM_PARAMS} -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 -s USE_FREETYPE=1 $(find . -type f -name "*.cpp" -not -path "./test/*" -not -name "pixelGameEngine.cpp") pixelGameEngine_wasm.o -o ${PROJECT_NAME}.html --preload-file ./assets else - em++ -std=c++20 -O2 ${EMSCRIPTEN_CUSTOM_PARAMS} -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 $(find . -type f -name "*.cpp" -not -path "./test/*" -not -name "pixelGameEngine.cpp") pixelGameEngine_wasm.o -o ${PROJECT_NAME}.html + em++ -std=c++20 -O2 ${EMSCRIPTEN_CUSTOM_PARAMS} -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 -s USE_FREETYPE=1 $(find . -type f -name "*.cpp" -not -path "./test/*" -not -name "pixelGameEngine.cpp") pixelGameEngine_wasm.o -o ${PROJECT_NAME}.html fi cp buildtemplate.html ${PROJECT_NAME}.html diff --git a/Java/scripts/filelist b/Java/scripts/filelist index 9e5004d..36df723 100644 --- a/Java/scripts/filelist +++ b/Java/scripts/filelist @@ -1,9 +1,9 @@ -build2.sh build.sh +build2.sh clean.sh commit.sh -jar2.sh jar.sh +jar2.sh release.sh update.sh version_info diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 95c3685..1086c00 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,9 +1,9 @@ -build2.sh:b1c6b7c6b2eb19ba54be6824bda8805b - build.sh:5df470d49036bf7565493739aeebeaa8 - +build2.sh:b1c6b7c6b2eb19ba54be6824bda8805b - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:aa77a821884563c9f67ce5455ae0a9a3 - -jar2.sh:7977fc138ee5db798d08c34734f0be93 - jar.sh:821d5a109324d405f05c35c4bb129375 - +jar2.sh:7977fc138ee5db798d08c34734f0be93 - release.sh:027178aa6da76180401a188d8f03af64 - update.sh:3be721658983183efa395984acd96b03 - zip.sh:273f5a83b80a8e54022d60514dfeec0a - diff --git a/utils/filelist b/utils/filelist index 95ad5ff..8a9f471 100644 --- a/utils/filelist +++ b/utils/filelist @@ -1,5 +1,5 @@ .coauthors +.updateDirectories define.sh main.sh search.sh -.updateDirectories diff --git a/utils/md5 b/utils/md5 index 349fa70..af3cdec 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ +.updateDirectories:971afb892e8280cb4c9ad43fb72a46a0 - define.sh:3ecab0dffe2adfb950f3eb7c7061b750 - main.sh:4e6e9f0650ec790ce2c4364db94f0caa - search.sh:30e1842e9a13452ea883bb6516d28e1c - -.updateDirectories:971afb892e8280cb4c9ad43fb72a46a0 -