From 9b653792509248e990a83b3f02b8f9a8ba74295c Mon Sep 17 00:00:00 2001 From: avolkov Date: Wed, 9 Nov 2005 04:25:32 +0000 Subject: [PATCH] Fix MacOSX builds (not SDL_cpuinfo.h in OSX SDL framework) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1974 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/libs/graphics/sdl/scalers.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sc2/src/sc2code/libs/graphics/sdl/scalers.c b/sc2/src/sc2code/libs/graphics/sdl/scalers.c index e6a4ae204..85d2f9fc6 100755 --- a/sc2/src/sc2code/libs/graphics/sdl/scalers.c +++ b/sc2/src/sc2code/libs/graphics/sdl/scalers.c @@ -18,14 +18,19 @@ #include "types.h" #include "libs/graphics/sdl/sdl_common.h" -#include SDL_INCLUDE(SDL_cpuinfo.h) #include "libs/platform.h" #include "scalers.h" #include "scaleint.h" #include "2xscalers.h" -#ifdef MMX_ASM -# include "2xscalers_mmx.h" -#endif +#ifdef USE_PLATFORM_ACCEL +# ifndef __APPLE__ + // MacOS X framework has no SDL_cpuinfo.h for some reason +# include SDL_INCLUDE(SDL_cpuinfo.h) +# endif +# ifdef MMX_ASM +# include "2xscalers_mmx.h" +# endif /* MMX_ASM */ +#endif /* USE_PLATFORM_ACCEL */ typedef enum