From fa32c802581b4c32b2a152b40020e6ee821291af Mon Sep 17 00:00:00 2001 From: Michael Martin Date: Sat, 10 Aug 2019 15:04:33 -0700 Subject: [PATCH] Simplify macOS build system to work with brew. Standalone framework-based builds will be reintroduced before the v0.7.1 release. --- sc2/build/unix/config_proginfo_host | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sc2/build/unix/config_proginfo_host b/sc2/build/unix/config_proginfo_host index 3c457f886..5e568e6f6 100644 --- a/sc2/build/unix/config_proginfo_host +++ b/sc2/build/unix/config_proginfo_host @@ -54,14 +54,6 @@ SYSTEM_HOST_LDFLAGS="" ### SDL ### LIB_SDL_NAME="Simple DirectMedia Layer" case "$HOST_SYSTEM" in - Darwin) - LIB_SDL_CFLAGS='-F/Library/Frameworks/ -framework SDL' - LIB_SDL_LDFLAGS='-F/Library/Frameworks/ -framework SDL -framework Cocoa -lobjc' - LIB_SDL_VERSION=$(echo \ - "SDL_MAJOR_VERSION.SDL_MINOR_VERSION.SDL_PATCHLEVEL" | \ - gcc -E $SYSTEM_HOST_CFLAGS $LIB_SDL_CFLAGS -include SDL/SDL_version.h $LIB_SDL_LDFLAGS - | \ - tail -1 | tr -d ' ') - ;; WINSCW|GCCE) LIB_SDL_CFLAGS='-I$BUILD_EPOCROOT/epoc32/include/SDL' LIB_SDL_LDFLAGS='' @@ -203,7 +195,7 @@ case "$HOST_SYSTEM" in ;; Darwin) LIB_vorbisfile_CFLAGS="-D__MACOSX__" - LIB_vorbisfile_LDFLAGS="-framework Ogg -framework Vorbis" + LIB_vorbisfile_LDFLAGS="-lvorbisfile -lvorbis" ;; QNX) LIB_vorbisfile_CFLAGS=""