From f9731064481e7050e59d22795c71ad5bc3f5aa49 Mon Sep 17 00:00:00 2001 From: Michael Martin Date: Sun, 8 Sep 2019 23:15:12 -0700 Subject: [PATCH] SDL2 build for macOS under brew --- sc2/build/unix/config_proginfo_host | 6 ++++++ sc2/src/darwin/SDLMain.m | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host index d05863eb7..709594e5d 100644 --- a/sc2/build/unix/config_proginfo_host +++ b/sc2/build/unix/config_proginfo_host @@ -81,6 +81,12 @@ case "$HOST_SYSTEM" in WINSCW|GCCE|ARMV5) LIB_SDL2_DETECT="false" ;; + Darwin) + LIB_SDL2_DETECT="have_command sdl2-config" + LIB_SDL2_CFLAGS='$(sdl2-config --cflags)' + LIB_SDL2_LDFLAGS='$(sdl2-config --static-libs)' + LIB_SDL2_VERSION='$(sdl2-config --version)' + ;; *) LIB_SDL2_DETECT="have_command sdl2-config" LIB_SDL2_CFLAGS='$(sdl2-config --cflags)' diff --git a/sc2/src/darwin/SDLMain.m b/sc2/src/darwin/SDLMain.m index 5a15162c4..d664b2794 100644 --- a/sc2/src/darwin/SDLMain.m +++ b/sc2/src/darwin/SDLMain.m @@ -10,6 +10,9 @@ #import "port.h" #import SDL_INCLUDE(SDL.h) + +#if SDL_MAJOR_VERSION == 1 + #import "SDLMain.h" #import /* for PATH_MAX */ @@ -282,4 +285,4 @@ main (int argc, char **argv) return 0; } - +#endif