annotate autogen.sh @ 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 c8d350c981ff
children
rev   line source
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
1 #!/bin/sh
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
2 #
1376
4a47f20705eb I don't think we need aclocal anymore (comes from the automake package)
Sam Lantinga <slouken@libsdl.org>
parents: 1361
diff changeset
3 echo "Generating build information using autoconf"
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
4 echo "This may take a while ..."
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
5
3377
c8d350c981ff gcc can't generate dependencies for a file that doesn't exist, so first create SDL_revision.h
Sam Lantinga <slouken@libsdl.org>
parents: 3342
diff changeset
6 # Generate SDL_revision.h
c8d350c981ff gcc can't generate dependencies for a file that doesn't exist, so first create SDL_revision.h
Sam Lantinga <slouken@libsdl.org>
parents: 3342
diff changeset
7 sh build-scripts/updaterev.sh
c8d350c981ff gcc can't generate dependencies for a file that doesn't exist, so first create SDL_revision.h
Sam Lantinga <slouken@libsdl.org>
parents: 3342
diff changeset
8
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
9 # Regenerate configuration files
3342
3da232c5980a Split acinclude.m4 into its constituent parts for easy upgrading
Sam Lantinga <slouken@libsdl.org>
parents: 1832
diff changeset
10 cat acinclude/* >aclocal.m4
1564
4950a25bd91e Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents: 1563
diff changeset
11 found=false
1832
c687a8691de3 Added yet another variant of autoconf to the list
Sam Lantinga <slouken@libsdl.org>
parents: 1564
diff changeset
12 for autoconf in autoconf autoconf259 autoconf-2.59
1564
4950a25bd91e Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents: 1563
diff changeset
13 do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
1563
b054590b967a Fall back to autogen259 if autogen isn't available
Sam Lantinga <slouken@libsdl.org>
parents: 1380
diff changeset
14 done
1564
4950a25bd91e Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents: 1563
diff changeset
15 if test x$found = xfalse; then
4950a25bd91e Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents: 1563
diff changeset
16 echo "Couldn't find autoconf, aborting"
4950a25bd91e Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents: 1563
diff changeset
17 exit 1
4950a25bd91e Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents: 1563
diff changeset
18 fi
1380
d94b080ff6ce Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents: 1376
diff changeset
19 (cd test; sh autogen.sh)
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
20
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
21 # Run configure for this platform
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
22 echo "Now you are ready to run ./configure"