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

Remove guessed -lSDL on OS X

Browse source 
OS X handles linking differently than other platforms.  Asking to link
to SDL breaks the test.
This commit is contained in:
Kp 2016-02-23 04:18:13 +00:00
parent 42ef6b2e72
commit 401f5581c8
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SConstruct
View file

@ -795,21 +795,21 @@ int main(int argc,char**argv){(void)argc;(void)argv;
@_custom_test @_custom_test
def _check_SDL(self,context): def _check_SDL(self,context):
if self.user_settings.sdl2: if self.user_settings.sdl2:
self.check_libSDL2(context) check_libSDL = self.check_libSDL2
self.check_SDL2_mixer(context) check_SDL_mixer = self.check_SDL2_mixer
else: else:
self.check_libSDL(context) check_libSDL = self.check_libSDL
self.check_SDL_mixer(context) check_SDL_mixer = self.check_SDL_mixer
check_libSDL(context)
check_SDL_mixer(context)
@_implicit_test @_implicit_test
def check_libSDL(self,context,_guess_flags={ def check_libSDL(self,context,_guess_flags={
'CPPFLAGS' : ['-I/usr/include/SDL'], 'LIBS' : ['SDL'] if sys.platform != 'darwin' else [],
'LIBS' : ['SDL'],
}): }):
self._check_libSDL(context, '', _guess_flags) self._check_libSDL(context, '', _guess_flags)
@_implicit_test @_implicit_test
def check_libSDL2(self,context,_guess_flags={ def check_libSDL2(self,context,_guess_flags={
'CPPFLAGS' : ['-I/usr/include/SDL2'], 'LIBS' : ['SDL2'] if sys.platform != 'darwin' else [],
'LIBS' : ['SDL2'],
}): }):
self._check_libSDL(context, '2', _guess_flags) self._check_libSDL(context, '2', _guess_flags)
def _check_libSDL(self,context,sdl2,guess_flags): def _check_libSDL(self,context,sdl2,guess_flags):
@ -855,12 +855,12 @@ int main(int argc,char**argv){(void)argc;(void)argv;
# SDL_mixer/SDL2_mixer use the same -I line as SDL/SDL2 # SDL_mixer/SDL2_mixer use the same -I line as SDL/SDL2
@_implicit_test @_implicit_test
def check_SDL_mixer(self,context,_guess_flags={ def check_SDL_mixer(self,context,_guess_flags={
'LIBS' : ['SDL_mixer'], 'LIBS' : ['SDL_mixer'] if sys.platform != 'darwin' else [],
}): }):
self._check_SDL_mixer(context, '', _guess_flags) self._check_SDL_mixer(context, '', _guess_flags)
@_implicit_test @_implicit_test
def check_SDL2_mixer(self,context,_guess_flags={ def check_SDL2_mixer(self,context,_guess_flags={
'LIBS' : ['SDL2_mixer'], 'LIBS' : ['SDL2_mixer'] if sys.platform != 'darwin' else [],
}): }):
self._check_SDL_mixer(context, '2', _guess_flags) self._check_SDL_mixer(context, '2', _guess_flags)
def _check_SDL_mixer(self,context,sdl2,guess_flags): def _check_SDL_mixer(self,context,sdl2,guess_flags):