diff --git a/SConstruct b/SConstruct index 653279f17..b8a2a709e 100644 --- a/SConstruct +++ b/SConstruct @@ -3534,7 +3534,11 @@ class DXXCommon(LazyObjectConstructor): return self.debug # automatic setup for raspberrypi def default_opengles(self): - if self.raspberrypi in ('yes', 'mesa'): + if self.raspberrypi in ('yes'): + return True + return False + def default_sdl2(self): + if self.raspberrypi in ('mesa'): return True return False @classmethod @@ -3698,7 +3702,7 @@ class DXXCommon(LazyObjectConstructor): ('opengl', True, 'build with OpenGL support'), ('opengles', self.default_opengles, 'build with OpenGL ES support'), ('editor', False, 'include editor into build (!EXPERIMENTAL!)'), - ('sdl2', False, 'use libSDL2+SDL2_mixer (!EXPERIMENTAL!)'), + ('sdl2', self.default_sdl2, 'use libSDL2+SDL2_mixer (!EXPERIMENTAL!)'), ('sdlmixer', True, 'build with SDL_Mixer support for sound and music (includes external music support)'), ('ipv6', False, 'enable UDP/IPv6 for multiplayer'), ('use_udp', True, 'enable UDP support'), diff --git a/d1x-rebirth/README.RPi b/d1x-rebirth/README.RPi index fd1649c55..717a8c467 100644 --- a/d1x-rebirth/README.RPi +++ b/d1x-rebirth/README.RPi @@ -25,12 +25,17 @@ scons raspberrypi=1 egl_lib=EGL opengles_lib=GLESv2 This assumes that the development files (libs/headers) for the VideoCore APIs are located in /opt/vc. You can use rpi_vc_path to specify another location. -If you wish to build against the experimental Mesa VC4 driver, use: +If you wish to build for Raspberry Pi 4B or the experimental Mesa VC4 driver: scons raspberrypi=mesa -This will select the GLES interface by default, but you can select OpenGL by -adding opengles=0. For all other options, check "scons -h". +This will select the GL interface with SDL2 by default, but you can select +GLES & SDL1 by adding "opengles=1 sdl2=0". Keep in mind that as of Raspbian buster, +the Mesa packages no longer ship with GLESv1 headers, making GLES builds impossible. +Additionally, SDL2 is highly recommended, as its KMSDRM video driver is the only +way to run DXX-Rebirth on a Raspberry Pi 4B outside of an Xorg session. + +For all other options, check "scons -h". Currently, there is no direct support for crosscompiling. diff --git a/d2x-rebirth/README.RPi b/d2x-rebirth/README.RPi index fd1649c55..717a8c467 100644 --- a/d2x-rebirth/README.RPi +++ b/d2x-rebirth/README.RPi @@ -25,12 +25,17 @@ scons raspberrypi=1 egl_lib=EGL opengles_lib=GLESv2 This assumes that the development files (libs/headers) for the VideoCore APIs are located in /opt/vc. You can use rpi_vc_path to specify another location. -If you wish to build against the experimental Mesa VC4 driver, use: +If you wish to build for Raspberry Pi 4B or the experimental Mesa VC4 driver: scons raspberrypi=mesa -This will select the GLES interface by default, but you can select OpenGL by -adding opengles=0. For all other options, check "scons -h". +This will select the GL interface with SDL2 by default, but you can select +GLES & SDL1 by adding "opengles=1 sdl2=0". Keep in mind that as of Raspbian buster, +the Mesa packages no longer ship with GLESv1 headers, making GLES builds impossible. +Additionally, SDL2 is highly recommended, as its KMSDRM video driver is the only +way to run DXX-Rebirth on a Raspberry Pi 4B outside of an Xorg session. + +For all other options, check "scons -h". Currently, there is no direct support for crosscompiling.