TakeV
/
dxx-rebirth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Require SDL 2 for macOS builds

This commit is contained in:
Kreeblah 2022-11-11 11:23:52 -08:00
parent 8a36c4c54b
commit 6ec1f8a196
No known key found for this signature in database
GPG Key ID: 6074237BF1AEEDFB
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Brewfile
View File

@ -3,9 +3,6 @@ tap "homebrew/core"
# Install dependencies
brew "scons"
brew "sdl"
brew "sdl_image"
brew "sdl_mixer"
brew "sdl2"
brew "sdl2_image"
brew "sdl2_mixer"

4
INSTALL.markdown
View File

@ -126,11 +126,15 @@ from the Terminal. This may need to be done after each major OS upgrade as well
DXX-Rebirth can be built from the Terminal (via SCons) without Xcode; to build using Xcode requires Xcode to be installed.
When building for Mac OS X, only SDL 2 is currently supported, as SDL 1.2 has long-standing issues with modern versions of the operating system. Terminal builds for Mac OS X default to SDL 2, which is equivalent to passing **sdl2=True** as a parameter to the SCons command.
##### [Homebrew](https://github.com/Homebrew/homebrew/)
The project includes a Brewfile for installing all required dependencies, if you use Homebrew. You can install them with:
* **brew bundle**
**Note:** Because Homebrew only installs libraries and not frameworks, when building for Mac OS X with Homebrew-provided dependencies, you must provide **macos_add_frameworks=False** as a SCons command parameter in order for the build system to look for libraries rather than frameworks.
### Building
Once prerequisites are installed, run **scons** *options* to build. By default, both D1X-Rebirth and D2X-Rebirth are built. To build only D1X-Rebirth, run **scons d1x=1**. To build only D2X-Rebirth, run **scons d2x=1**.

4
SConstruct
View File

@ -3572,7 +3572,7 @@ class DXXCommon(LazyObjectConstructor):
return True
return False
def default_sdl2(self):
if self.raspberrypi in ('mesa',):
if self.raspberrypi in ('mesa',) or self.host_platform == 'darwin':
return True
return False
@classmethod
@ -4050,6 +4050,8 @@ class DXXCommon(LazyObjectConstructor):
# arguments are included.
tools = ('gcc', 'g++', 'applelink')
def adjust_environment(self,program,env):
if self.user_settings.sdl2 == False:
raise SCons.Errors.StopError('macOS builds do not support SDL 1.2.')
macos_add_frameworks = self.user_settings.macos_add_frameworks
if macos_add_frameworks:
# The user may or may not have a private installation of