From 0a5d2de2e1b05451e942d5cf520152f2b780f1cc Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 19 Jan 2012 01:55:51 -0500 Subject: [PATCH] Switched back to configure generating SDL_config.h It was very confusing to have configure generate an SDL_config.h and then not have it be used when building on Mac OS X or Windows. I'll just have to remember to use SDL_config_windows.h when building official releases that are supposed to be ABI compatible with Visual Studio. --- .hgignore | 1 - Makefile.in | 11 ++--------- configure | 10 +++++----- configure.in | 6 +++--- include/SDL_config.h | 9 ++++----- .../{SDL_config_generated.h.in => SDL_config.h.in} | 6 +++--- 6 files changed, 17 insertions(+), 26 deletions(-) rename include/{SDL_config_generated.h.in => SDL_config.h.in} (98%) diff --git a/.hgignore b/.hgignore index ef76ddaea..dce4e9a6c 100644 --- a/.hgignore +++ b/.hgignore @@ -8,7 +8,6 @@ sdl-config SDL.spec SDL.qpg build -include/SDL_config_generated.h # for Xcode *.orig diff --git a/Makefile.in b/Makefile.in index a8313a519..43bab3dda 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,13 +46,6 @@ HDRS = \ SDL_audio.h \ SDL_blendmode.h \ SDL_clipboard.h \ - SDL_config.h \ - SDL_config_android.h \ - SDL_config_iphoneos.h \ - SDL_config_macosx.h \ - SDL_config_minimal.h \ - SDL_config_nintendods.h \ - SDL_config_windows.h \ SDL_compat.h \ SDL_cpuinfo.h \ SDL_endian.h \ @@ -137,7 +130,7 @@ install-hdrs: update-revision for file in $(HDRS); do \ $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \ done - $(INSTALL) -m 644 include/SDL_config_generated.h $(DESTDIR)$(includedir)/SDL/SDL_config_generated.h + $(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h if test -f include/SDL_revision.h; then \ $(INSTALL) -m 644 include/SDL_revision.h $(DESTDIR)$(includedir)/SDL/SDL_revision.h; \ else \ @@ -162,7 +155,7 @@ uninstall-hdrs: for file in $(HDRS); do \ rm -f $(DESTDIR)$(includedir)/SDL/$$file; \ done - rm -f $(DESTDIR)$(includedir)/SDL/SDL_config_generated.h + rm -f $(DESTDIR)$(includedir)/SDL/SDL_config.h rm -f $(DESTDIR)$(includedir)/SDL/SDL_revision.h -rmdir $(DESTDIR)$(includedir)/SDL uninstall-lib: diff --git a/configure b/configure index 6348d3545..9dfb3ccc2 100755 --- a/configure +++ b/configure @@ -2025,7 +2025,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers include/SDL_config_generated.h" +ac_config_headers="$ac_config_headers include/SDL_config.h" cat >>confdefs.h <<\_ACEOF @@ -15529,11 +15529,11 @@ if test x$srcdir != x.; then elif test -d .hg; then { { echo "$as_me:$LINENO: error: *** When building from Mercurial you should configure and build in a - separate directory so you don't clobber SDL_revision.h + separate directory so you don't clobber SDL_config.h, SDL_revision.h " >&5 echo "$as_me: error: *** When building from Mercurial you should configure and build in a - separate directory so you don't clobber SDL_revision.h + separate directory so you don't clobber SDL_config.h, SDL_revision.h " >&2;} { (exit 1); exit 1; }; } fi @@ -15551,7 +15551,7 @@ esac # Uncomment the following line if you want to force SDL and applications # built with it to be compiled for a particular architecture. #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]") -BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DGENERATED_CONFIG_H" +BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DUSING_GENERATED_CONFIG_H" # The default optimization for SDL 1.3 is -O3 (Bug #31) if test x$orig_CFLAGS = x; then BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'` @@ -28871,7 +28871,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "include/SDL_config_generated.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config_generated.h" ;; + "include/SDL_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config.h" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;; "sdl-config") CONFIG_FILES="$CONFIG_FILES sdl-config" ;; diff --git a/configure.in b/configure.in index 6659d97f4..382f0f554 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(README) -AC_CONFIG_HEADER(include/SDL_config_generated.h) +AC_CONFIG_HEADER(include/SDL_config.h) AC_GNU_SOURCE AC_CONFIG_AUX_DIR(build-scripts) AC_CONFIG_MACRO_DIR([acinclude]) @@ -65,7 +65,7 @@ if test x$srcdir != x.; then elif test -d .hg; then AC_MSG_ERROR([ *** When building from Mercurial you should configure and build in a - separate directory so you don't clobber SDL_revision.h + separate directory so you don't clobber SDL_config.h, SDL_revision.h ]) fi case "$host" in @@ -82,7 +82,7 @@ esac # Uncomment the following line if you want to force SDL and applications # built with it to be compiled for a particular architecture. #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]") -BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DGENERATED_CONFIG_H" +BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DUSING_GENERATED_CONFIG_H" # The default optimization for SDL 1.3 is -O3 (Bug #31) if test x$orig_CFLAGS = x; then BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'` diff --git a/include/SDL_config.h b/include/SDL_config.h index fff8014a7..03ff56f54 100644 --- a/include/SDL_config.h +++ b/include/SDL_config.h @@ -40,13 +40,12 @@ #elif defined(__NINTENDODS__) #include "SDL_config_nintendods.h" #else -#ifdef MINIMAL_CONFIG_H /* This is a minimal configuration just to get SDL running on new platforms */ #include "SDL_config_minimal.h" -#else -/* This is generated by configure for your platform */ -#include "SDL_config_generated.h" -#endif #endif /* platform config */ +#ifdef USING_GENERATED_CONFIG_H +#error Wrong SDL_config.h, check your include path? +#endif + #endif /* _SDL_config_h */ diff --git a/include/SDL_config_generated.h.in b/include/SDL_config.h.in similarity index 98% rename from include/SDL_config_generated.h.in rename to include/SDL_config.h.in index c3f549be8..0a9f40209 100644 --- a/include/SDL_config_generated.h.in +++ b/include/SDL_config.h.in @@ -19,8 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_config_generated_h -#define _SDL_config_generated_h +#ifndef _SDL_config_h +#define _SDL_config_h /** * \file SDL_config.h.in @@ -297,4 +297,4 @@ #undef SDL_ASSEMBLY_ROUTINES #undef SDL_ALTIVEC_BLITTERS -#endif /* _SDL_config_generated_h */ +#endif /* _SDL_config_h */