Skip to content

Commit 9bd4d29

Browse files
committed
fix gg games starting with "start" button set. always build sdl3 for emscripten build. generate em js build as a fallback.
1 parent d9266b2 commit 9bd4d29

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/workflows/deploy_web.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build Web & Deploy to GH
22
on: [push]
33

44
env:
5-
EM_VERSION: '4.0.7'
5+
EM_VERSION: '4.0.10'
66
EM_CACHE_FOLDER: 'emsdk-cache'
77

88
jobs:
@@ -27,8 +27,6 @@ jobs:
2727

2828
- name: Install and Build # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
2929
run: |
30-
embuilder build zlib --lto
31-
embuilder build sdl3 --lto
3230
cmake --preset emsdk
3331
cmake --build --preset emsdk
3432

src/core/sms.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ static void SMS_reset(struct SMS_Core* sms)
346346
if (SMS_is_system_type_gg(sms))
347347
{
348348
sms->port.gg_regs[0x0] = 0xC0;
349-
sms->port.gg_regs[0x0] = 0x40;
350349
sms->port.gg_regs[0x1] = 0x7F;
351350
sms->port.gg_regs[0x2] = 0xFF;
352351
sms->port.gg_regs[0x3] = 0x00;

src/platforms/sdl3/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if (EMSCRIPTEN)
2222
"-s;--shell-file;${CMAKE_CURRENT_SOURCE_DIR}/emscripten.html"
2323
"-s;EXPORTED_FUNCTIONS=[_main,_malloc,_free]"
2424
"-lidbfs.js"
25-
"-sWASM=1"
25+
"-sWASM=2"
2626
"-sUSE_SDL=3"
2727
"-sALLOW_MEMORY_GROWTH=1"
2828
)
@@ -39,7 +39,7 @@ Set(FETCHCONTENT_QUIET FALSE)
3939

4040
FetchContent_Declare(SDL
4141
GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
42-
GIT_TAG release-3.2.10
42+
GIT_TAG release-3.2.16
4343
GIT_PROGRESS TRUE
4444
FIND_PACKAGE_ARGS NAMES SDL3
4545
)

0 commit comments

Comments
 (0)