Skip to content

Commit 54f6512

Browse files
committed
Fix fakesdl headers when SDL directory included
We introduced the `fakesdl` headers back in emscripten-core#18443 so that anyone trying to use SDL without using `-sUSE_SDL` (or similar) would see an error. However we only covered the `SDL_xx.h` include case not the `SDL/SDL_xx.h` use case. This means that some users were not seeing the errors they should, including a few of our test cases. Split out from emscripten-core#26275
1 parent dcf2f84 commit 54f6512

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+30
-18
lines changed

ChangeLog.md

Lines changed: 4 additions & 0 deletions

site/source/docs/tools_reference/settings_reference.rst

Lines changed: 6 additions & 5 deletions

src/settings.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,11 +1471,12 @@ var LEGALIZE_JS_FFI = true;
14711471

14721472
// Ports
14731473

1474-
// Specify the SDL version that is being linked against.
1475-
// 1, the default, is 1.3, which is implemented in JS
1476-
// 2 is a port of the SDL C code on emscripten-ports
1477-
// When AUTO_JS_LIBRARIES is set to 0 this defaults to 0 and SDL
1478-
// is not linked in.
1474+
// Specify the SDL version that is being linked against:
1475+
//
1476+
// - 0, the default, means no SDL headers or libraries will be used.
1477+
// - 1 is a port of SDL 1.3, implemented in JS.
1478+
// - 2 and 3 are upstream ports build from the official SDL codebase.
1479+
//
14791480
// Alternate syntax for using the port: --use-port=sdl2
14801481
// [compile+link]
14811482
var USE_SDL = 0;
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)