Skip to content
Permalink
Browse files

Fixed bug #185

The SDL platform header shouldn't dictate the OS target API for other
applications.  The build system should define the target API for building
SDL internally.
  • Loading branch information
slouken committed Apr 13, 2006
1 parent 7f137d6 commit c09da7c4f8fd64d64d147ff941a4847ad70d89aa
Showing with 7 additions and 10 deletions.
  1. +7 −4 configure.in
  2. +0 −6 include/SDL_platform.h
@@ -2319,10 +2319,13 @@ case "$host" in
# Next line is broken, and a few files below require Mac OS X (full)
ARCH=macosx

# HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point is
# -lm which is not needed under Mac OS X. But for some reasons it also
# tends to contain spurious -L switches, which we don't want to use
# here or in sdl-config. Hence we reset it.
# Mac OS X builds with both the Carbon and OSX APIs at the moment
EXTRA_CFLAGS="-DTARGET_API_MAC_CARBON -DTARGET_API_MAC_OSX"

# HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point
# is -lm which is not needed under Mac OS X. But for some reasons it
# also tends to contain spurious -L switches, which we don't want to
# use here or in sdl-config. Hence we reset it.
EXTRA_LDFLAGS=""

CheckDummyVideo
@@ -64,16 +64,10 @@
#if defined(macintosh)
#undef __MACOS__
#define __MACOS__ 1
#define TARGET_API_MAC_OS8 1
#define TARGET_API_MAC_CARBON 0
#define TARGET_API_MAC_OSX 0
#endif
#if defined(__GNUC__) && (defined(__APPLE_CC__) || defined(__APPLE_CPP__))
#undef __MACOSX__
#define __MACOSX__ 1
#define TARGET_API_MAC_OS8 0
#define TARGET_API_MAC_CARBON 1
#define TARGET_API_MAC_OSX 1
#endif
#if defined(__NetBSD__)
#undef __NETBSD__

0 comments on commit c09da7c

Please sign in to comment.