From a7fbca96d35abbab5224f28ceb5251da7af87f70 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Wed, 13 Dec 2017 14:25:03 -0800 Subject: [PATCH] Start using our internal SDL 1.x instead of system SDL 1.x, stage 1 --- Makefile.in | 1 - acinclude.m4 | 29 +-- configure | 70 +------ include/Makefile.in | 1 - src/Makefile.in | 1 - src/builtin/Makefile.in | 1 - src/cpu/Makefile.in | 1 - src/cpu/core_dyn_x86/Makefile.in | 1 - src/cpu/core_full/Makefile.in | 1 - src/cpu/core_normal/Makefile.in | 1 - src/debug/Makefile.in | 1 - src/dos/Makefile.in | 1 - src/fpu/Makefile.in | 1 - src/gui/Makefile.in | 1 - src/hardware/Makefile.in | 1 - src/hardware/parport/Makefile.in | 1 - src/hardware/reSID/Makefile.in | 1 - src/hardware/serialport/Makefile.in | 1 - src/ints/Makefile.in | 1 - src/libs/Makefile.in | 1 - src/libs/gui_tk/Makefile.in | 1 - src/libs/porttalk/Makefile.in | 1 - src/libs/zmbv/Makefile.in | 1 - src/misc/Makefile.in | 1 - src/platform/Makefile.in | 1 - src/shell/Makefile.in | 1 - vs2015/sdl/configure | 0 vs2015/sdl/include/SDL_config.h | 298 ++++++++++++++++++++++++++-- 28 files changed, 293 insertions(+), 128 deletions(-) mode change 100644 => 100755 vs2015/sdl/configure diff --git a/Makefile.in b/Makefile.in index e61218678..a433aa597 100644 --- a/Makefile.in +++ b/Makefile.in @@ -246,7 +246,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/acinclude.m4 b/acinclude.m4 index be7efcd4d..fd6a3ed05 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -62,32 +62,13 @@ AC_ARG_ENABLE(sdl, [ --enable-sdl Enable SDL 1.x], AH_TEMPLATE(C_SDL1,[Set to 1 to enable SDL 1.x support]) - SDL_CONFIG=no if test x$enable_sdlenable = xyes ; then - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl-config - fi - fi - - AC_PATH_PROG(SDL_CONFIG, sdl-config, no) - min_sdl_version=ifelse([$1], ,0.11.0,$1) AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` - AC_DEFINE(C_SDL1,1) - fi + # we use our own, now + SDL_SRC="\$(abs_top_srcdir)/vs2015/sdl" + SDL_CFLAGS="-I$SDL_SRC/include -D_GNU_SOURCE=1 -D_REENTRANT" + SDL_LIBS="-L$SDL_SRC/build/.libs -lSDL -lpthread" + AC_DEFINE(C_SDL1,1) fi AC_SUBST(SDL_CFLAGS) diff --git a/configure b/configure index 9c1856cc4..a5138de34 100755 --- a/configure +++ b/configure @@ -631,7 +631,6 @@ C_MT32_FALSE C_MT32_TRUE SDL_LIBS SDL_CFLAGS -SDL_CONFIG SDL2_LIBS SDL2_CFLAGS SDL2_CONFIG @@ -6905,74 +6904,15 @@ fi - SDL_CONFIG=no if test x$enable_sdlenable = xyes ; then - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl-config - fi - fi - - # Extract the first word of "sdl-config", so it can be a program name with args. -set dummy sdl-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SDL_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $SDL_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" - ;; -esac -fi -SDL_CONFIG=$ac_cv_path_SDL_CONFIG -if test -n "$SDL_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 -$as_echo "$SDL_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - min_sdl_version=$SDL_VERSION { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5 $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` - $as_echo "#define C_SDL1 1" >>confdefs.h + # we use our own, now + SDL_SRC="\$(abs_top_srcdir)/vs2015/sdl" + SDL_CFLAGS="-I$SDL_SRC/include -D_GNU_SOURCE=1 -D_REENTRANT" + SDL_LIBS="-L$SDL_SRC/build/.libs -lSDL -lpthread" + $as_echo "#define C_SDL1 1" >>confdefs.h - fi fi diff --git a/include/Makefile.in b/include/Makefile.in index b6e6c3f01..3e45d547d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -181,7 +181,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/Makefile.in b/src/Makefile.in index ea71d595e..c48e6dbe5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -252,7 +252,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/builtin/Makefile.in b/src/builtin/Makefile.in index 0be220088..20a36b03f 100644 --- a/src/builtin/Makefile.in +++ b/src/builtin/Makefile.in @@ -216,7 +216,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/cpu/Makefile.in b/src/cpu/Makefile.in index 3aa4fb0cd..04b7b273c 100644 --- a/src/cpu/Makefile.in +++ b/src/cpu/Makefile.in @@ -266,7 +266,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/cpu/core_dyn_x86/Makefile.in b/src/cpu/core_dyn_x86/Makefile.in index 31c3bdd33..e9284ceb1 100644 --- a/src/cpu/core_dyn_x86/Makefile.in +++ b/src/cpu/core_dyn_x86/Makefile.in @@ -181,7 +181,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/cpu/core_full/Makefile.in b/src/cpu/core_full/Makefile.in index 381aa0a87..055e6a9ba 100644 --- a/src/cpu/core_full/Makefile.in +++ b/src/cpu/core_full/Makefile.in @@ -181,7 +181,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/cpu/core_normal/Makefile.in b/src/cpu/core_normal/Makefile.in index 5f1f936c3..e6a521076 100644 --- a/src/cpu/core_normal/Makefile.in +++ b/src/cpu/core_normal/Makefile.in @@ -181,7 +181,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/debug/Makefile.in b/src/debug/Makefile.in index ec9080aa1..018ece905 100644 --- a/src/debug/Makefile.in +++ b/src/debug/Makefile.in @@ -221,7 +221,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/dos/Makefile.in b/src/dos/Makefile.in index c6d8a286f..fbba7c8da 100644 --- a/src/dos/Makefile.in +++ b/src/dos/Makefile.in @@ -229,7 +229,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/fpu/Makefile.in b/src/fpu/Makefile.in index 7bcc30541..943b0ab48 100644 --- a/src/fpu/Makefile.in +++ b/src/fpu/Makefile.in @@ -220,7 +220,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/gui/Makefile.in b/src/gui/Makefile.in index c0823960f..918be17a4 100644 --- a/src/gui/Makefile.in +++ b/src/gui/Makefile.in @@ -275,7 +275,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/hardware/Makefile.in b/src/hardware/Makefile.in index ca9a42a15..ea45b3100 100644 --- a/src/hardware/Makefile.in +++ b/src/hardware/Makefile.in @@ -278,7 +278,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/hardware/parport/Makefile.in b/src/hardware/parport/Makefile.in index 37c2bac28..886a5ffe2 100644 --- a/src/hardware/parport/Makefile.in +++ b/src/hardware/parport/Makefile.in @@ -222,7 +222,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/hardware/reSID/Makefile.in b/src/hardware/reSID/Makefile.in index d8d5c51aa..ae7a64025 100644 --- a/src/hardware/reSID/Makefile.in +++ b/src/hardware/reSID/Makefile.in @@ -226,7 +226,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/hardware/serialport/Makefile.in b/src/hardware/serialport/Makefile.in index 37bbd0ac8..f341af21c 100644 --- a/src/hardware/serialport/Makefile.in +++ b/src/hardware/serialport/Makefile.in @@ -223,7 +223,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/ints/Makefile.in b/src/ints/Makefile.in index 4e2c73373..92f25ea44 100644 --- a/src/ints/Makefile.in +++ b/src/ints/Makefile.in @@ -226,7 +226,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in index b7d0208b5..198a4af8b 100644 --- a/src/libs/Makefile.in +++ b/src/libs/Makefile.in @@ -220,7 +220,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/libs/gui_tk/Makefile.in b/src/libs/gui_tk/Makefile.in index 55fa1f4a5..01e9c15d0 100644 --- a/src/libs/gui_tk/Makefile.in +++ b/src/libs/gui_tk/Makefile.in @@ -220,7 +220,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/libs/porttalk/Makefile.in b/src/libs/porttalk/Makefile.in index 0e0952113..99d10e03a 100644 --- a/src/libs/porttalk/Makefile.in +++ b/src/libs/porttalk/Makefile.in @@ -220,7 +220,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/libs/zmbv/Makefile.in b/src/libs/zmbv/Makefile.in index 109c81949..f924df15f 100644 --- a/src/libs/zmbv/Makefile.in +++ b/src/libs/zmbv/Makefile.in @@ -160,7 +160,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/misc/Makefile.in b/src/misc/Makefile.in index 1657f7f27..98d88b4b7 100644 --- a/src/misc/Makefile.in +++ b/src/misc/Makefile.in @@ -210,7 +210,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/platform/Makefile.in b/src/platform/Makefile.in index 5d22f55ec..a7971daf4 100644 --- a/src/platform/Makefile.in +++ b/src/platform/Makefile.in @@ -220,7 +220,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/shell/Makefile.in b/src/shell/Makefile.in index 34434fb60..f67eb06c2 100644 --- a/src/shell/Makefile.in +++ b/src/shell/Makefile.in @@ -209,7 +209,6 @@ SDL2_CFLAGS = @SDL2_CFLAGS@ SDL2_CONFIG = @SDL2_CONFIG@ SDL2_LIBS = @SDL2_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/vs2015/sdl/configure b/vs2015/sdl/configure old mode 100644 new mode 100755 diff --git a/vs2015/sdl/include/SDL_config.h b/vs2015/sdl/include/SDL_config.h index 09ba38a71..00b64e762 100644 --- a/vs2015/sdl/include/SDL_config.h +++ b/vs2015/sdl/include/SDL_config.h @@ -1,3 +1,4 @@ +/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ /* SDL - Simple DirectMedia Layer Copyright (C) 1997-2012 Sam Lantinga @@ -23,23 +24,290 @@ #ifndef _SDL_config_h #define _SDL_config_h +/* This is a set of defines to configure the SDL features */ + +/* General platform specific identifiers */ #include "SDL_platform.h" -/* Add any platform that doesn't build using the configure system */ -#if defined(__DREAMCAST__) -#include "SDL_config_dreamcast.h" -#elif defined(__MACOS__) -#include "SDL_config_macos.h" -#elif defined(__MACOSX__) -#include "SDL_config_macosx.h" -#elif defined(__SYMBIAN32__) -#include "SDL_config_symbian.h" /* must be before win32! */ -#elif defined(__WIN32__) -#include "SDL_config_win32.h" -#elif defined(__OS2__) -#include "SDL_config_os2.h" +/* Make sure that this isn't included by Visual C++ */ +#ifdef _MSC_VER +#error You should copy include/SDL_config.h.default to include/SDL_config.h +#endif + +/* C language features */ +/* #undef const */ +/* #undef inline */ +/* #undef volatile */ + +/* C datatypes */ +/* #undef size_t */ +/* #undef int8_t */ +/* #undef uint8_t */ +/* #undef int16_t */ +/* #undef uint16_t */ +/* #undef int32_t */ +/* #undef uint32_t */ +/* #undef int64_t */ +/* #undef uint64_t */ +/* #undef uintptr_t */ +#define SDL_HAS_64BIT_TYPE 1 + +/* Endianness */ +#define SDL_BYTEORDER 1234 + +/* Comment this if you want to build without any C library requirements */ +#define HAVE_LIBC 1 +#if HAVE_LIBC + +/* Useful headers */ +#define HAVE_ALLOCA_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_MALLOC_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRING_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_MATH_H 1 +/* #undef HAVE_ICONV_H */ +#define HAVE_SIGNAL_H 1 +/* #undef HAVE_ALTIVEC_H */ + +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +#define HAVE_ALLOCA 1 +#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ +#define HAVE_GETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 +#endif +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +/* #undef HAVE_STRLCPY */ +/* #undef HAVE_STRLCAT */ +#define HAVE_STRDUP 1 +/* #undef HAVE__STRREV */ +/* #undef HAVE__STRUPR */ +/* #undef HAVE__STRLWR */ +/* #undef HAVE_INDEX */ +/* #undef HAVE_RINDEX */ +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +#define HAVE_STRSTR 1 +/* #undef HAVE_ITOA */ +/* #undef HAVE__LTOA */ +/* #undef HAVE__UITOA */ +/* #undef HAVE__ULTOA */ +#define HAVE_STRTOL 1 +#define HAVE_STRTOUL 1 +/* #undef HAVE__I64TOA */ +/* #undef HAVE__UI64TOA */ +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +/* #undef HAVE__STRICMP */ +#define HAVE_STRCASECMP 1 +/* #undef HAVE__STRNICMP */ +#define HAVE_STRNCASECMP 1 +#define HAVE_SSCANF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSNPRINTF 1 +/* #undef HAVE_ICONV */ +#define HAVE_SIGACTION 1 +#define HAVE_SA_SIGACTION 1 +#define HAVE_SETJMP 1 +#define HAVE_NANOSLEEP 1 +/* #undef HAVE_CLOCK_GETTIME */ +#define HAVE_GETPAGESIZE 1 +#define HAVE_MPROTECT 1 +#define HAVE_SEM_TIMEDWAIT 1 + #else -#include "SDL_config_minimal.h" -#endif /* platform config */ +/* We may need some replacement for stdarg.h here */ +#include +#endif /* HAVE_LIBC */ + +/* Allow disabling of core subsystems */ +/* #undef SDL_AUDIO_DISABLED */ +/* #undef SDL_CDROM_DISABLED */ +/* #undef SDL_CPUINFO_DISABLED */ +/* #undef SDL_EVENTS_DISABLED */ +/* #undef SDL_FILE_DISABLED */ +/* #undef SDL_JOYSTICK_DISABLED */ +/* #undef SDL_LOADSO_DISABLED */ +/* #undef SDL_THREADS_DISABLED */ +/* #undef SDL_TIMERS_DISABLED */ +/* #undef SDL_VIDEO_DISABLED */ + +/* Enable various audio drivers */ +#define SDL_AUDIO_DRIVER_ALSA 1 +#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2" +/* #undef SDL_AUDIO_DRIVER_ARTS */ +/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */ +/* #undef SDL_AUDIO_DRIVER_BAUDIO */ +/* #undef SDL_AUDIO_DRIVER_BSD */ +/* #undef SDL_AUDIO_DRIVER_COREAUDIO */ +/* #undef SDL_AUDIO_DRIVER_DART */ +/* #undef SDL_AUDIO_DRIVER_DC */ +#define SDL_AUDIO_DRIVER_DISK 1 +#define SDL_AUDIO_DRIVER_DUMMY 1 +/* #undef SDL_AUDIO_DRIVER_DMEDIA */ +/* #undef SDL_AUDIO_DRIVER_DSOUND */ +#define SDL_AUDIO_DRIVER_PULSE 1 +#define SDL_AUDIO_DRIVER_PULSE_DYNAMIC "libpulse-simple.so.0" +/* #undef SDL_AUDIO_DRIVER_ESD */ +/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */ +/* #undef SDL_AUDIO_DRIVER_MINT */ +/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */ +/* #undef SDL_AUDIO_DRIVER_NAS */ +/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */ +#define SDL_AUDIO_DRIVER_OSS 1 +/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */ +/* #undef SDL_AUDIO_DRIVER_PAUD */ +/* #undef SDL_AUDIO_DRIVER_QNXNTO */ +/* #undef SDL_AUDIO_DRIVER_SNDMGR */ +/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */ +/* #undef SDL_AUDIO_DRIVER_WAVEOUT */ + +/* Enable various cdrom drivers */ +/* #undef SDL_CDROM_AIX */ +/* #undef SDL_CDROM_BEOS */ +/* #undef SDL_CDROM_BSDI */ +/* #undef SDL_CDROM_DC */ +/* #undef SDL_CDROM_DUMMY */ +/* #undef SDL_CDROM_FREEBSD */ +#define SDL_CDROM_LINUX 1 +/* #undef SDL_CDROM_MACOS */ +/* #undef SDL_CDROM_MACOSX */ +/* #undef SDL_CDROM_MINT */ +/* #undef SDL_CDROM_OPENBSD */ +/* #undef SDL_CDROM_OS2 */ +/* #undef SDL_CDROM_OSF */ +/* #undef SDL_CDROM_QNX */ +/* #undef SDL_CDROM_WIN32 */ + +/* Enable various input drivers */ +#define SDL_INPUT_LINUXEV 1 +/* #undef SDL_INPUT_TSLIB */ +/* #undef SDL_JOYSTICK_BEOS */ +/* #undef SDL_JOYSTICK_DC */ +/* #undef SDL_JOYSTICK_DUMMY */ +/* #undef SDL_JOYSTICK_IOKIT */ +#define SDL_JOYSTICK_LINUX 1 +/* #undef SDL_JOYSTICK_MACOS */ +/* #undef SDL_JOYSTICK_MINT */ +/* #undef SDL_JOYSTICK_OS2 */ +/* #undef SDL_JOYSTICK_RISCOS */ +/* #undef SDL_JOYSTICK_WINMM */ +/* #undef SDL_JOYSTICK_USBHID */ +/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */ + +/* Enable various shared object loading systems */ +/* #undef SDL_LOADSO_BEOS */ +/* #undef SDL_LOADSO_DLCOMPAT */ +#define SDL_LOADSO_DLOPEN 1 +/* #undef SDL_LOADSO_DUMMY */ +/* #undef SDL_LOADSO_LDG */ +/* #undef SDL_LOADSO_MACOS */ +/* #undef SDL_LOADSO_OS2 */ +/* #undef SDL_LOADSO_WIN32 */ + +/* Enable various threading systems */ +/* #undef SDL_THREAD_BEOS */ +/* #undef SDL_THREAD_DC */ +/* #undef SDL_THREAD_OS2 */ +/* #undef SDL_THREAD_PTH */ +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 +/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */ +/* #undef SDL_THREAD_SPROC */ +/* #undef SDL_THREAD_WIN32 */ + +/* Enable various timer systems */ +/* #undef SDL_TIMER_BEOS */ +/* #undef SDL_TIMER_DC */ +/* #undef SDL_TIMER_DUMMY */ +/* #undef SDL_TIMER_MACOS */ +/* #undef SDL_TIMER_MINT */ +/* #undef SDL_TIMER_OS2 */ +/* #undef SDL_TIMER_RISCOS */ +#define SDL_TIMER_UNIX 1 +/* #undef SDL_TIMER_WIN32 */ +/* #undef SDL_TIMER_WINCE */ + +/* Enable various video drivers */ +/* #undef SDL_VIDEO_DRIVER_AALIB */ +/* #undef SDL_VIDEO_DRIVER_BWINDOW */ +/* #undef SDL_VIDEO_DRIVER_CACA */ +/* #undef SDL_VIDEO_DRIVER_DC */ +/* #undef SDL_VIDEO_DRIVER_DDRAW */ +#define SDL_VIDEO_DRIVER_DGA 1 +/* #undef SDL_VIDEO_DRIVER_DIRECTFB */ +/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */ +#define SDL_VIDEO_DRIVER_DUMMY 1 +#define SDL_VIDEO_DRIVER_FBCON 1 +/* #undef SDL_VIDEO_DRIVER_GAPI */ +/* #undef SDL_VIDEO_DRIVER_GEM */ +/* #undef SDL_VIDEO_DRIVER_GGI */ +/* #undef SDL_VIDEO_DRIVER_IPOD */ +/* #undef SDL_VIDEO_DRIVER_NANOX */ +/* #undef SDL_VIDEO_DRIVER_OS2FS */ +/* #undef SDL_VIDEO_DRIVER_PHOTON */ +/* #undef SDL_VIDEO_DRIVER_PICOGUI */ +/* #undef SDL_VIDEO_DRIVER_PS2GS */ +/* #undef SDL_VIDEO_DRIVER_PS3 */ +/* #undef SDL_VIDEO_DRIVER_QTOPIA */ +/* #undef SDL_VIDEO_DRIVER_QUARTZ */ +/* #undef SDL_VIDEO_DRIVER_RISCOS */ +/* #undef SDL_VIDEO_DRIVER_SVGALIB */ +/* #undef SDL_VIDEO_DRIVER_TOOLBOX */ +/* #undef SDL_VIDEO_DRIVER_VGL */ +/* #undef SDL_VIDEO_DRIVER_WINDIB */ +/* #undef SDL_VIDEO_DRIVER_WSCONS */ +#define SDL_VIDEO_DRIVER_X11 1 +#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "libXrender.so.1" +#define SDL_VIDEO_DRIVER_X11_VIDMODE 1 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 +#define SDL_VIDEO_DRIVER_X11_XME 1 +#define SDL_VIDEO_DRIVER_X11_XRANDR 1 +#define SDL_VIDEO_DRIVER_X11_XV 1 +/* #undef SDL_VIDEO_DRIVER_XBIOS */ + +/* Enable OpenGL support */ +#define SDL_VIDEO_OPENGL 1 +#define SDL_VIDEO_OPENGL_GLX 1 +/* #undef SDL_VIDEO_OPENGL_WGL */ +/* #undef SDL_VIDEO_OPENGL_OSMESA */ +/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */ + +/* Disable screensaver */ +#define SDL_VIDEO_DISABLE_SCREENSAVER 1 + +/* Enable assembly routines */ +#define SDL_ASSEMBLY_ROUTINES 1 +/* #undef SDL_HERMES_BLITTERS */ +/* #undef SDL_ALTIVEC_BLITTERS */ #endif /* _SDL_config_h */