pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug #185

Browse source 
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.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401635
This commit is contained in:
Sam Lantinga 2006-04-13 14:14:06 +00:00
parent 458c2abbc5
commit 7a15c646b5
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configure.in
View file

@ -2319,10 +2319,13 @@ case "$host" in
# Next line is broken, and a few files below require Mac OS X (full) # Next line is broken, and a few files below require Mac OS X (full)
ARCH=macosx ARCH=macosx
# HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point is # Mac OS X builds with both the Carbon and OSX APIs at the moment
# -lm which is not needed under Mac OS X. But for some reasons it also EXTRA_CFLAGS="-DTARGET_API_MAC_CARBON -DTARGET_API_MAC_OSX"
# tends to contain spurious -L switches, which we don't want to use
# here or in sdl-config. Hence we reset it. # 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="" EXTRA_LDFLAGS=""
CheckDummyVideo CheckDummyVideo

6
include/SDL_platform.h
View file

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