Mercurial > sdl-ios-xcode
annotate test/acinclude.m4 @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 10 Mar 2010 15:02:58 +0000 |
| parents | 91063c450171 |
| children |
| rev | line source |
|---|---|
| 0 | 1 # Configure paths for SDL |
| 2 # Sam Lantinga 9/21/99 | |
| 3 # stolen from Manish Singh | |
| 4 # stolen back from Frank Belew | |
| 5 # stolen from Manish Singh | |
| 6 # Shamelessly stolen from Owen Taylor | |
| 7 | |
| 8 dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | |
| 9 dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS | |
| 10 dnl | |
|
794
a5defa3b93e1
Updated for the latest version of automake
Sam Lantinga <slouken@libsdl.org>
parents:
489
diff
changeset
|
11 AC_DEFUN([AM_PATH_SDL], |
| 0 | 12 [dnl |
| 13 dnl Get the cflags and libraries from the sdl-config script | |
| 14 dnl | |
| 15 AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], | |
| 16 sdl_prefix="$withval", sdl_prefix="") | |
| 17 AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], | |
| 18 sdl_exec_prefix="$withval", sdl_exec_prefix="") | |
| 19 AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], | |
| 20 , enable_sdltest=yes) | |
| 21 | |
| 22 if test x$sdl_exec_prefix != x ; then | |
|
1755
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
23 sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
24 if test x${SDL_CONFIG+set} != xset ; then |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
25 SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
26 fi |
| 0 | 27 fi |
| 28 if test x$sdl_prefix != x ; then | |
|
1755
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
29 sdl_args="$sdl_args --prefix=$sdl_prefix" |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
30 if test x${SDL_CONFIG+set} != xset ; then |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
31 SDL_CONFIG=$sdl_prefix/bin/sdl-config |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
32 fi |
| 0 | 33 fi |
| 34 | |
|
1755
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
35 if test "x$prefix" != xNONE; then |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
36 PATH="$prefix/bin:$prefix/usr/bin:$PATH" |
|
91063c450171
Don't add NONE/bin to the path - inexplicably fixes building on mingw+msys, apparently
Sam Lantinga <slouken@libsdl.org>
parents:
1550
diff
changeset
|
37 fi |
|
489
d90349051cab
Fixed path problem with sdl.m4 macro file
Sam Lantinga <slouken@libsdl.org>
parents:
224
diff
changeset
|
38 AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) |
| 0 | 39 min_sdl_version=ifelse([$1], ,0.11.0,$1) |
| 40 AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) | |
| 41 no_sdl="" | |
| 42 if test "$SDL_CONFIG" = "no" ; then | |
| 43 no_sdl=yes | |
| 44 else | |
| 45 SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` | |
| 46 SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` | |
| 47 | |
| 48 sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ | |
| 49 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
| 50 sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ | |
| 51 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
| 52 sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ | |
| 53 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
| 54 if test "x$enable_sdltest" = "xyes" ; then | |
| 55 ac_save_CFLAGS="$CFLAGS" | |
|
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
794
diff
changeset
|
56 ac_save_CXXFLAGS="$CXXFLAGS" |
| 0 | 57 ac_save_LIBS="$LIBS" |
| 58 CFLAGS="$CFLAGS $SDL_CFLAGS" | |
|
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
794
diff
changeset
|
59 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" |
| 0 | 60 LIBS="$LIBS $SDL_LIBS" |
| 61 dnl | |
| 62 dnl Now check if the installed SDL is sufficiently new. (Also sanity | |
| 63 dnl checks the results of sdl-config to some extent | |
| 64 dnl | |
| 65 rm -f conf.sdltest | |
| 66 AC_TRY_RUN([ | |
| 67 #include <stdio.h> | |
| 68 #include <stdlib.h> | |
| 69 #include <string.h> | |
| 70 #include "SDL.h" | |
| 71 | |
| 72 char* | |
| 73 my_strdup (char *str) | |
| 74 { | |
| 75 char *new_str; | |
| 76 | |
| 77 if (str) | |
| 78 { | |
| 79 new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); | |
| 80 strcpy (new_str, str); | |
| 81 } | |
| 82 else | |
| 83 new_str = NULL; | |
| 84 | |
| 85 return new_str; | |
| 86 } | |
| 87 | |
| 88 int main (int argc, char *argv[]) | |
| 89 { | |
| 90 int major, minor, micro; | |
| 91 char *tmp_version; | |
| 92 | |
| 93 /* This hangs on some systems (?) | |
| 94 system ("touch conf.sdltest"); | |
| 95 */ | |
| 96 { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } | |
| 97 | |
| 98 /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
| 99 tmp_version = my_strdup("$min_sdl_version"); | |
| 100 if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
| 101 printf("%s, bad version string\n", "$min_sdl_version"); | |
| 102 exit(1); | |
| 103 } | |
| 104 | |
| 105 if (($sdl_major_version > major) || | |
| 106 (($sdl_major_version == major) && ($sdl_minor_version > minor)) || | |
| 107 (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) | |
| 108 { | |
| 109 return 0; | |
| 110 } | |
| 111 else | |
| 112 { | |
| 113 printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); | |
| 114 printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); | |
| 115 printf("*** best to upgrade to the required version.\n"); | |
| 116 printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); | |
| 117 printf("*** to point to the correct copy of sdl-config, and remove the file\n"); | |
| 118 printf("*** config.cache before re-running configure\n"); | |
| 119 return 1; | |
| 120 } | |
| 121 } | |
| 122 | |
| 123 ],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
| 124 CFLAGS="$ac_save_CFLAGS" | |
| 1550 | 125 CXXFLAGS="$ac_save_CXXFLAGS" |
| 0 | 126 LIBS="$ac_save_LIBS" |
| 127 fi | |
| 128 fi | |
| 129 if test "x$no_sdl" = x ; then | |
| 130 AC_MSG_RESULT(yes) | |
| 131 ifelse([$2], , :, [$2]) | |
| 132 else | |
| 133 AC_MSG_RESULT(no) | |
| 134 if test "$SDL_CONFIG" = "no" ; then | |
| 135 echo "*** The sdl-config script installed by SDL could not be found" | |
| 136 echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" | |
| 137 echo "*** your path, or set the SDL_CONFIG environment variable to the" | |
| 138 echo "*** full path to sdl-config." | |
| 139 else | |
| 140 if test -f conf.sdltest ; then | |
| 141 : | |
| 142 else | |
| 143 echo "*** Could not run SDL test program, checking why..." | |
| 144 CFLAGS="$CFLAGS $SDL_CFLAGS" | |
|
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
794
diff
changeset
|
145 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" |
| 0 | 146 LIBS="$LIBS $SDL_LIBS" |
| 147 AC_TRY_LINK([ | |
| 148 #include <stdio.h> | |
| 149 #include "SDL.h" | |
|
1
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
150 |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
151 int main(int argc, char *argv[]) |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
152 { return 0; } |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
153 #undef main |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
154 #define main K_and_R_C_main |
| 0 | 155 ], [ return 0; ], |
| 156 [ echo "*** The test program compiled, but did not run. This usually means" | |
| 157 echo "*** that the run-time linker is not finding SDL or finding the wrong" | |
| 158 echo "*** version of SDL. If it is not finding SDL, you'll need to set your" | |
| 159 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | |
| 160 echo "*** to the installed location Also, make sure you have run ldconfig if that" | |
| 161 echo "*** is required on your system" | |
| 162 echo "***" | |
| 163 echo "*** If you have an old version installed, it is best to remove it, although" | |
| 164 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], | |
| 165 [ echo "*** The test program failed to compile or link. See the file config.log for the" | |
| 166 echo "*** exact error that occured. This usually means SDL was incorrectly installed" | |
| 167 echo "*** or that you have moved SDL since it was installed. In the latter case, you" | |
| 168 echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) | |
| 169 CFLAGS="$ac_save_CFLAGS" | |
|
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
794
diff
changeset
|
170 CXXFLAGS="$ac_save_CXXFLAGS" |
| 0 | 171 LIBS="$ac_save_LIBS" |
| 172 fi | |
| 173 fi | |
| 174 SDL_CFLAGS="" | |
| 175 SDL_LIBS="" | |
| 176 ifelse([$3], , :, [$3]) | |
| 177 fi | |
| 178 AC_SUBST(SDL_CFLAGS) | |
| 179 AC_SUBST(SDL_LIBS) | |
| 180 rm -f conf.sdltest | |
| 181 ]) |