diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2012-01-19 01:55:51 -0500 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2012-01-19 01:55:51 -0500 |
| commit | 36f6655efe3652e05a75b65a70294b1ca5590858 (patch) | |
| tree | a68d6a0466d6ed83d7ec574b4604800a9ef0ddf3 /configure | |
| parent | 3d67226719567d73c0d6317e3ad2cb7d4b6c92ec (diff) | |
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.
--HG--
rename : include/SDL_config_generated.h.in => include/SDL_config.h.in
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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" ;; |