From ca60ec0d75a67bc2a4bc7be4371ba1524c38e89d Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Wed, 24 Aug 2022 22:51:12 -0500 Subject: [PATCH] Update C++ to use standard SDL MIXER version 2 Co-authored-by: sigonasr2 --- C++/scripts/md5 | 2 +- C++/scripts/web.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/C++/scripts/md5 b/C++/scripts/md5 index 3e77b3f..7cf8083 100644 --- a/C++/scripts/md5 +++ b/C++/scripts/md5 @@ -1,3 +1,3 @@ build.sh:530634457ea9041267c05d4ced95eee1 - commit.sh:d03a46e721060c22ccb146e19d27e70a - -web.sh:241ce74055952325f82f009b494df250 - +web.sh:3dcc2fe7e036359eedd257a864e9a1e1 - diff --git a/C++/scripts/web.sh b/C++/scripts/web.sh index eef8c5b..2e1a1f3 100755 --- a/C++/scripts/web.sh +++ b/C++/scripts/web.sh @@ -1,9 +1,9 @@ #Compiles emscripten instance of this project for the web. #C++ if [ -d "assets" ]; then - em++ -std=c++17 -O2 -s ALLOW_MEMORY_GROWTH=1 -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_LIBPNG=1 $(find . -type f -name "*.cpp") -o ${PROJECT_NAME}.html -I pixelGameEngine.h --preload-file ./assets + em++ -std=c++17 -O2 -s ALLOW_MEMORY_GROWTH=1 -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 $(find . -type f -name "*.cpp") -o ${PROJECT_NAME}.html -I pixelGameEngine.h --preload-file ./assets else - em++ -std=c++17 -O2 -s ALLOW_MEMORY_GROWTH=1 -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_LIBPNG=1 $(find . -type f -name "*.cpp") -o ${PROJECT_NAME}.html -I pixelGameEngine.h + em++ -std=c++17 -O2 -s ALLOW_MEMORY_GROWTH=1 -s MAX_WEBGL_VERSION=2 -s MIN_WEBGL_VERSION=2 -s USE_SDL_MIXER=2 -s USE_LIBPNG=1 $(find . -type f -name "*.cpp") -o ${PROJECT_NAME}.html -I pixelGameEngine.h fi cp buildtemplate.html ${PROJECT_NAME}.html @@ -15,3 +15,4 @@ if [ "$1" == "headless" ]; then else emrun --serve_after_close ${PROJECT_NAME}.html fi +