Skip to content

Commit f2c7b97

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 3e49e31 commit f2c7b97

59 files changed

Lines changed: 24 additions & 18 deletions

Some content is hidden

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

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
@@ -1476,11 +1476,12 @@ var LEGALIZE_JS_FFI = true;
14761476

14771477
// Ports
14781478

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

0 commit comments

Comments
 (0)