Updated to SDL 2.0, and SDL 2.0 can now be installed coexisting with SDL 1.2
authorSam Lantinga <slouken@libsdl.org>
Sun, 22 Jan 2012 17:21:00 -0500
changeset 6250cce0ddcf6747
parent 6248 7fe4b2b78acc
child 6251 3e8c673cad58
Updated to SDL 2.0, and SDL 2.0 can now be installed coexisting with SDL 1.2
.hgignore
COPYING
Makefile.in
VisualC/SDL/SDL_VS2008.vcproj
VisualC/SDLmain/SDLmain_VS2008.vcproj
VisualC/clean.sh
VisualC/tests/checkkeys/checkkeys_VS2008.vcproj
VisualC/tests/graywin/graywin_VS2008.vcproj
VisualC/tests/loopwave/loopwave_VS2008.vcproj
VisualC/tests/testalpha/testalpha_VS2008.vcproj
VisualC/tests/testatomic/testatomic_VS2008.vcproj
VisualC/tests/testcursor/testcursor_VS2008.vcproj
VisualC/tests/testdraw2/testdraw2_VS2008.vcproj
VisualC/tests/testfile/testfile_VS2008.vcproj
VisualC/tests/testgamma/testgamma_VS2008.vcproj
VisualC/tests/testgesture/testgesture_VS2008.vcproj
VisualC/tests/testgl/testgl_VS2008.vcproj
VisualC/tests/testgl2/testgl2_VS2008.vcproj
VisualC/tests/testjoystick/testjoystick_VS2008.vcproj
VisualC/tests/testoverlay/testoverlay_VS2008.vcproj
VisualC/tests/testoverlay2/testoverlay2_VS2008.vcproj
VisualC/tests/testplatform/testplatform_VS2008.vcproj
VisualC/tests/testpower/testpower_VS2008.vcproj
VisualC/tests/testrendertarget/testrendertarget_VS2008.vcproj
VisualC/tests/testscale/testscale_VS2008.vcproj
VisualC/tests/testshape/testshape_VS2008.vcproj
VisualC/tests/testsprite/testsprite_VS2008.vcproj
VisualC/tests/testsprite2/testsprite2_VS2008.vcproj
VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj
VisualC/tests/testwin/testwin_VS2008.vcproj
VisualC/tests/testwm/testwm_VS2008.vcproj
Xcode/SDL/SDL.xcodeproj/project.pbxproj
Xcode/SDL/pkg-support/resources/License.rtf
Xcode/SDL/pkg-support/resources/License.txt
Xcode/SDL/pkg-support/resources/ReadMe.txt
Xcode/SDL/pkg-support/resources/SDL_DS_Store
Xcode/SDL/pkg-support/resources/UniversalBinaryNotes.rtf
configure
configure.in
include/SDL_version.h
sdl-config.in
sdl.m4
sdl.pc.in
sdl2-config.in
sdl2.m4
sdl2.pc.in
test/acinclude.m4
test/aclocal.m4
test/configure
test/configure.in
     1.1 --- a/.hgignore	Sun Jan 22 01:29:26 2012 -0500
     1.2 +++ b/.hgignore	Sun Jan 22 17:21:00 2012 -0500
     1.3 @@ -5,8 +5,7 @@
     1.4  config.status
     1.5  Makefile
     1.6  sdl-config
     1.7 -SDL.spec
     1.8 -SDL.qpg
     1.9 +SDL2.spec
    1.10  build
    1.11  
    1.12  # for Xcode
    1.13 @@ -37,7 +36,7 @@
    1.14  test/config.log
    1.15  test/config.status
    1.16  test/Makefile
    1.17 -test/SDL.dll
    1.18 +test/SDL2.dll
    1.19  test/checkkeys
    1.20  test/graywin
    1.21  test/loopwave
     2.1 --- a/COPYING	Sun Jan 22 01:29:26 2012 -0500
     2.2 +++ b/COPYING	Sun Jan 22 17:21:00 2012 -0500
     2.3 @@ -1,6 +1,6 @@
     2.4  
     2.5  Simple DirectMedia Layer
     2.6 -Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
     2.7 +Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     2.8    
     2.9  This software is provided 'as-is', without any express or implied
    2.10  warranty.  In no event will the authors be held liable for any damages
     3.1 --- a/Makefile.in	Sun Jan 22 01:29:26 2012 -0500
     3.2 +++ b/Makefile.in	Sun Jan 22 17:21:00 2012 -0500
     3.3 @@ -12,7 +12,7 @@
     3.4  datadir	= @datadir@
     3.5  auxdir	= @ac_aux_dir@
     3.6  distpath = $(srcdir)/..
     3.7 -distdir = SDL-@SDL_VERSION@
     3.8 +distdir = SDL2-@SDL_VERSION@
     3.9  distfile = $(distdir).tar.gz
    3.10  
    3.11  @SET_MAKE@
    3.12 @@ -29,15 +29,15 @@
    3.13  RANLIB	= @RANLIB@
    3.14  WINDRES	= @WINDRES@
    3.15  
    3.16 -TARGET  = libSDL.la
    3.17 +TARGET  = libSDL2.la
    3.18  OBJECTS = @OBJECTS@
    3.19  VERSION_OBJECTS = @VERSION_OBJECTS@
    3.20  
    3.21 -SDLMAIN_TARGET = libSDLmain.a
    3.22 +SDLMAIN_TARGET = libSDL2main.a
    3.23  SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
    3.24  
    3.25 -SRC_DIST = acinclude Android.mk autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iOS
    3.26 -GEN_DIST = SDL.spec
    3.27 +SRC_DIST = acinclude Android.mk autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iOS
    3.28 +GEN_DIST = SDL2.spec
    3.29  
    3.30  HDRS = \
    3.31  	SDL.h \
    3.32 @@ -124,17 +124,17 @@
    3.33  install: all install-bin install-hdrs install-lib install-data
    3.34  install-bin:
    3.35  	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(bindir)
    3.36 -	$(INSTALL) -m 755 sdl-config $(DESTDIR)$(bindir)/sdl-config
    3.37 +	$(INSTALL) -m 755 sdl2-config $(DESTDIR)$(bindir)/sdl2-config
    3.38  install-hdrs: update-revision
    3.39 -	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(includedir)/SDL
    3.40 +	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(includedir)/SDL2
    3.41  	for file in $(HDRS); do \
    3.42 -	    $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \
    3.43 +	    $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL2/$$file; \
    3.44  	done
    3.45 -	$(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h
    3.46 +	$(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL2/SDL_config.h
    3.47  	if test -f include/SDL_revision.h; then \
    3.48 -	    $(INSTALL) -m 644 include/SDL_revision.h $(DESTDIR)$(includedir)/SDL/SDL_revision.h; \
    3.49 +	    $(INSTALL) -m 644 include/SDL_revision.h $(DESTDIR)$(includedir)/SDL2/SDL_revision.h; \
    3.50  	else \
    3.51 -	    $(INSTALL) -m 644 $(srcdir)/include/SDL_revision.h $(DESTDIR)$(includedir)/SDL/SDL_revision.h; \
    3.52 +	    $(INSTALL) -m 644 $(srcdir)/include/SDL_revision.h $(DESTDIR)$(includedir)/SDL2/SDL_revision.h; \
    3.53  	fi
    3.54  
    3.55  install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
    3.56 @@ -144,34 +144,33 @@
    3.57  	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
    3.58  install-data:
    3.59  	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
    3.60 -	$(INSTALL) -m 644 $(srcdir)/sdl.m4 $(DESTDIR)$(datadir)/aclocal/sdl.m4
    3.61 +	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
    3.62  	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
    3.63 -	$(INSTALL) -m 644 sdl.pc $(DESTDIR)$(libdir)/pkgconfig
    3.64 +	$(INSTALL) -m 644 sdl2.pc $(DESTDIR)$(libdir)/pkgconfig
    3.65  
    3.66  uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data
    3.67  uninstall-bin:
    3.68 -	rm -f $(DESTDIR)$(bindir)/sdl-config
    3.69 +	rm -f $(DESTDIR)$(bindir)/sdl2-config
    3.70  uninstall-hdrs:
    3.71  	for file in $(HDRS); do \
    3.72 -	    rm -f $(DESTDIR)$(includedir)/SDL/$$file; \
    3.73 +	    rm -f $(DESTDIR)$(includedir)/SDL2/$$file; \
    3.74  	done
    3.75 -	rm -f $(DESTDIR)$(includedir)/SDL/SDL_config.h
    3.76 -	rm -f $(DESTDIR)$(includedir)/SDL/SDL_revision.h
    3.77 -	-rmdir $(DESTDIR)$(includedir)/SDL
    3.78 +	rm -f $(DESTDIR)$(includedir)/SDL2/SDL_config.h
    3.79 +	rm -f $(DESTDIR)$(includedir)/SDL2/SDL_revision.h
    3.80 +	-rmdir $(DESTDIR)$(includedir)/SDL2
    3.81  uninstall-lib:
    3.82  	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(TARGET)
    3.83  	rm -f $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
    3.84  uninstall-data:
    3.85 -	rm -f $(DESTDIR)$(datadir)/aclocal/sdl.m4
    3.86 -	rm -f $(DESTDIR)$(libdir)/pkgconfig/sdl.pc
    3.87 +	rm -f $(DESTDIR)$(datadir)/aclocal/sdl2.m4
    3.88 +	rm -f $(DESTDIR)$(libdir)/pkgconfig/sdl2.pc
    3.89  
    3.90  clean:
    3.91  	rm -rf $(objects)
    3.92  	if test -f test/Makefile; then (cd test; $(MAKE) $@); fi
    3.93  
    3.94  distclean: clean
    3.95 -	rm -f Makefile Makefile.rules sdl-config
    3.96 -	rm -f SDL.qpg
    3.97 +	rm -f Makefile Makefile.rules sdl2-config
    3.98  	rm -f config.status config.cache config.log libtool
    3.99  	rm -rf $(srcdir)/autom4te*
   3.100  	find $(srcdir) \( \
     4.1 --- a/VisualC/SDL/SDL_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
     4.2 +++ b/VisualC/SDL/SDL_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
     4.3 @@ -2,7 +2,7 @@
     4.4  <VisualStudioProject
     4.5  	ProjectType="Visual C++"
     4.6  	Version="9.00"
     4.7 -	Name="SDL"
     4.8 +	Name="SDL2"
     4.9  	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
    4.10  	RootNamespace="SDL"
    4.11  	TargetFrameworkVersion="131072"
     5.1 --- a/VisualC/SDLmain/SDLmain_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
     5.2 +++ b/VisualC/SDLmain/SDLmain_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
     5.3 @@ -2,7 +2,7 @@
     5.4  <VisualStudioProject
     5.5  	ProjectType="Visual C++"
     5.6  	Version="9.00"
     5.7 -	Name="SDLmain"
     5.8 +	Name="SDL2main"
     5.9  	ProjectGUID="{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
    5.10  	RootNamespace="SDLmain"
    5.11  	TargetFrameworkVersion="131072"
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/VisualC/clean.sh	Sun Jan 22 17:21:00 2012 -0500
     6.3 @@ -0,0 +1,5 @@
     6.4 +find . -type d -name 'Debug' -exec rm -rv {} \;
     6.5 +find . -type d -name 'Release' -exec rm -rv {} \;
     6.6 +find . -type f -name '*.user' -exec rm -v {} \;
     6.7 +find . -type f -name '*.ncb' -exec rm -v {} \;
     6.8 +find . -type f -name '*.suo' -exec rm -v {} \;
     7.1 --- a/VisualC/tests/checkkeys/checkkeys_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
     7.2 +++ b/VisualC/tests/checkkeys/checkkeys_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
     7.3 @@ -100,7 +100,7 @@
     7.4  			<Tool
     7.5  				Name="VCPostBuildEventTool"
     7.6  				Description="Copy SDL"
     7.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
     7.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
     7.9  			/>
    7.10  		</Configuration>
    7.11  		<Configuration
    7.12 @@ -188,7 +188,7 @@
    7.13  			<Tool
    7.14  				Name="VCPostBuildEventTool"
    7.15  				Description="Copy SDL"
    7.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    7.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    7.18  			/>
    7.19  		</Configuration>
    7.20  	</Configurations>
     8.1 --- a/VisualC/tests/graywin/graywin_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
     8.2 +++ b/VisualC/tests/graywin/graywin_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
     8.3 @@ -100,7 +100,7 @@
     8.4  			<Tool
     8.5  				Name="VCPostBuildEventTool"
     8.6  				Description="Copy SDL"
     8.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
     8.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
     8.9  			/>
    8.10  		</Configuration>
    8.11  		<Configuration
    8.12 @@ -188,7 +188,7 @@
    8.13  			<Tool
    8.14  				Name="VCPostBuildEventTool"
    8.15  				Description="Copy SDL"
    8.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    8.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    8.18  			/>
    8.19  		</Configuration>
    8.20  	</Configurations>
     9.1 --- a/VisualC/tests/loopwave/loopwave_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
     9.2 +++ b/VisualC/tests/loopwave/loopwave_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
     9.3 @@ -100,7 +100,7 @@
     9.4  			<Tool
     9.5  				Name="VCPostBuildEventTool"
     9.6  				Description="Copy SDL"
     9.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
     9.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
     9.9  			/>
    9.10  		</Configuration>
    9.11  		<Configuration
    9.12 @@ -188,7 +188,7 @@
    9.13  			<Tool
    9.14  				Name="VCPostBuildEventTool"
    9.15  				Description="Copy SDL"
    9.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    9.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    9.18  			/>
    9.19  		</Configuration>
    9.20  	</Configurations>
    10.1 --- a/VisualC/tests/testalpha/testalpha_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    10.2 +++ b/VisualC/tests/testalpha/testalpha_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    10.3 @@ -100,7 +100,7 @@
    10.4  			<Tool
    10.5  				Name="VCPostBuildEventTool"
    10.6  				Description="Copy SDL and data files"
    10.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    10.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    10.9  			/>
   10.10  		</Configuration>
   10.11  		<Configuration
   10.12 @@ -188,7 +188,7 @@
   10.13  			<Tool
   10.14  				Name="VCPostBuildEventTool"
   10.15  				Description="Copy SDL and data files"
   10.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   10.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   10.18  			/>
   10.19  		</Configuration>
   10.20  	</Configurations>
    11.1 --- a/VisualC/tests/testatomic/testatomic_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    11.2 +++ b/VisualC/tests/testatomic/testatomic_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    11.3 @@ -100,7 +100,7 @@
    11.4  			<Tool
    11.5  				Name="VCPostBuildEventTool"
    11.6  				Description="Copy SDL"
    11.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    11.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    11.9  			/>
   11.10  		</Configuration>
   11.11  		<Configuration
   11.12 @@ -188,7 +188,7 @@
   11.13  			<Tool
   11.14  				Name="VCPostBuildEventTool"
   11.15  				Description="Copy SDL"
   11.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   11.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   11.18  			/>
   11.19  		</Configuration>
   11.20  	</Configurations>
    12.1 --- a/VisualC/tests/testcursor/testcursor_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    12.2 +++ b/VisualC/tests/testcursor/testcursor_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    12.3 @@ -102,7 +102,7 @@
    12.4  			<Tool
    12.5  				Name="VCPostBuildEventTool"
    12.6  				Description="Copy SDL and data files"
    12.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    12.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    12.9  			/>
   12.10  		</Configuration>
   12.11  		<Configuration
   12.12 @@ -192,7 +192,7 @@
   12.13  			<Tool
   12.14  				Name="VCPostBuildEventTool"
   12.15  				Description="Copy SDL and data files"
   12.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   12.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   12.18  			/>
   12.19  		</Configuration>
   12.20  	</Configurations>
    13.1 --- a/VisualC/tests/testdraw2/testdraw2_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    13.2 +++ b/VisualC/tests/testdraw2/testdraw2_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    13.3 @@ -100,7 +100,7 @@
    13.4  			<Tool
    13.5  				Name="VCPostBuildEventTool"
    13.6  				Description="Copy SDL"
    13.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    13.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    13.9  			/>
   13.10  		</Configuration>
   13.11  		<Configuration
   13.12 @@ -188,7 +188,7 @@
   13.13  			<Tool
   13.14  				Name="VCPostBuildEventTool"
   13.15  				Description="Copy SDL"
   13.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   13.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   13.18  			/>
   13.19  		</Configuration>
   13.20  	</Configurations>
    14.1 --- a/VisualC/tests/testfile/testfile_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    14.2 +++ b/VisualC/tests/testfile/testfile_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    14.3 @@ -100,7 +100,7 @@
    14.4  			<Tool
    14.5  				Name="VCPostBuildEventTool"
    14.6  				Description="Copy SDL"
    14.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    14.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    14.9  			/>
   14.10  		</Configuration>
   14.11  		<Configuration
   14.12 @@ -188,7 +188,7 @@
   14.13  			<Tool
   14.14  				Name="VCPostBuildEventTool"
   14.15  				Description="Copy SDL"
   14.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   14.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   14.18  			/>
   14.19  		</Configuration>
   14.20  	</Configurations>
    15.1 --- a/VisualC/tests/testgamma/testgamma_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    15.2 +++ b/VisualC/tests/testgamma/testgamma_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    15.3 @@ -100,7 +100,7 @@
    15.4  			<Tool
    15.5  				Name="VCPostBuildEventTool"
    15.6  				Description="Copy SDL and data files"
    15.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
    15.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
    15.9  			/>
   15.10  		</Configuration>
   15.11  		<Configuration
   15.12 @@ -188,7 +188,7 @@
   15.13  			<Tool
   15.14  				Name="VCPostBuildEventTool"
   15.15  				Description="Copy SDL and data files"
   15.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
   15.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
   15.18  			/>
   15.19  		</Configuration>
   15.20  	</Configurations>
    16.1 --- a/VisualC/tests/testgesture/testgesture_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    16.2 +++ b/VisualC/tests/testgesture/testgesture_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    16.3 @@ -100,7 +100,7 @@
    16.4  			<Tool
    16.5  				Name="VCPostBuildEventTool"
    16.6  				Description="Copy SDL"
    16.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    16.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    16.9  			/>
   16.10  		</Configuration>
   16.11  		<Configuration
   16.12 @@ -188,7 +188,7 @@
   16.13  			<Tool
   16.14  				Name="VCPostBuildEventTool"
   16.15  				Description="Copy SDL"
   16.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   16.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   16.18  			/>
   16.19  		</Configuration>
   16.20  	</Configurations>
    17.1 --- a/VisualC/tests/testgl/testgl_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    17.2 +++ b/VisualC/tests/testgl/testgl_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    17.3 @@ -101,7 +101,7 @@
    17.4  			<Tool
    17.5  				Name="VCPostBuildEventTool"
    17.6  				Description="Copy SDL"
    17.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    17.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    17.9  			/>
   17.10  		</Configuration>
   17.11  		<Configuration
   17.12 @@ -190,7 +190,7 @@
   17.13  			<Tool
   17.14  				Name="VCPostBuildEventTool"
   17.15  				Description="Copy SDL"
   17.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   17.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   17.18  			/>
   17.19  		</Configuration>
   17.20  	</Configurations>
    18.1 --- a/VisualC/tests/testgl2/testgl2_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    18.2 +++ b/VisualC/tests/testgl2/testgl2_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    18.3 @@ -101,7 +101,7 @@
    18.4  			<Tool
    18.5  				Name="VCPostBuildEventTool"
    18.6  				Description="Copy SDL"
    18.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    18.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    18.9  			/>
   18.10  		</Configuration>
   18.11  		<Configuration
   18.12 @@ -190,7 +190,7 @@
   18.13  			<Tool
   18.14  				Name="VCPostBuildEventTool"
   18.15  				Description="Copy SDL"
   18.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   18.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   18.18  			/>
   18.19  		</Configuration>
   18.20  	</Configurations>
    19.1 --- a/VisualC/tests/testjoystick/testjoystick_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    19.2 +++ b/VisualC/tests/testjoystick/testjoystick_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    19.3 @@ -100,7 +100,7 @@
    19.4  			<Tool
    19.5  				Name="VCPostBuildEventTool"
    19.6  				Description="Copy SDL"
    19.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    19.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    19.9  			/>
   19.10  		</Configuration>
   19.11  		<Configuration
   19.12 @@ -188,7 +188,7 @@
   19.13  			<Tool
   19.14  				Name="VCPostBuildEventTool"
   19.15  				Description="Copy SDL"
   19.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   19.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   19.18  			/>
   19.19  		</Configuration>
   19.20  	</Configurations>
    20.1 --- a/VisualC/tests/testoverlay/testoverlay_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    20.2 +++ b/VisualC/tests/testoverlay/testoverlay_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    20.3 @@ -100,7 +100,7 @@
    20.4  			<Tool
    20.5  				Name="VCPostBuildEventTool"
    20.6  				Description="Copy SDL and data files"
    20.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
    20.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
    20.9  			/>
   20.10  		</Configuration>
   20.11  		<Configuration
   20.12 @@ -188,7 +188,7 @@
   20.13  			<Tool
   20.14  				Name="VCPostBuildEventTool"
   20.15  				Description="Copy SDL and data files"
   20.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
   20.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
   20.18  			/>
   20.19  		</Configuration>
   20.20  	</Configurations>
    21.1 --- a/VisualC/tests/testoverlay2/testoverlay2_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    21.2 +++ b/VisualC/tests/testoverlay2/testoverlay2_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    21.3 @@ -100,7 +100,7 @@
    21.4  			<Tool
    21.5  				Name="VCPostBuildEventTool"
    21.6  				Description="Copy SDL and data files"
    21.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\moose.dat&quot; &quot;$(ProjectDir)\moose.dat&quot;&#x0D;&#x0A;"
    21.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\moose.dat&quot; &quot;$(ProjectDir)\moose.dat&quot;&#x0D;&#x0A;"
    21.9  			/>
   21.10  		</Configuration>
   21.11  		<Configuration
   21.12 @@ -188,7 +188,7 @@
   21.13  			<Tool
   21.14  				Name="VCPostBuildEventTool"
   21.15  				Description="Copy SDL and data files"
   21.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\moose.dat&quot; &quot;$(ProjectDir)\moose.dat&quot;&#x0D;&#x0A;"
   21.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\moose.dat&quot; &quot;$(ProjectDir)\moose.dat&quot;&#x0D;&#x0A;"
   21.18  			/>
   21.19  		</Configuration>
   21.20  	</Configurations>
    22.1 --- a/VisualC/tests/testplatform/testplatform_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    22.2 +++ b/VisualC/tests/testplatform/testplatform_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    22.3 @@ -102,7 +102,7 @@
    22.4  			<Tool
    22.5  				Name="VCPostBuildEventTool"
    22.6  				Description="Copy SDL"
    22.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    22.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    22.9  			/>
   22.10  		</Configuration>
   22.11  		<Configuration
   22.12 @@ -192,7 +192,7 @@
   22.13  			<Tool
   22.14  				Name="VCPostBuildEventTool"
   22.15  				Description="Copy SDL"
   22.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   22.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   22.18  			/>
   22.19  		</Configuration>
   22.20  	</Configurations>
    23.1 --- a/VisualC/tests/testpower/testpower_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    23.2 +++ b/VisualC/tests/testpower/testpower_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    23.3 @@ -100,7 +100,7 @@
    23.4  			<Tool
    23.5  				Name="VCPostBuildEventTool"
    23.6  				Description="Copy SDL"
    23.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    23.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    23.9  			/>
   23.10  		</Configuration>
   23.11  		<Configuration
   23.12 @@ -188,7 +188,7 @@
   23.13  			<Tool
   23.14  				Name="VCPostBuildEventTool"
   23.15  				Description="Copy SDL"
   23.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   23.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   23.18  			/>
   23.19  		</Configuration>
   23.20  	</Configurations>
    24.1 --- a/VisualC/tests/testrendertarget/testrendertarget_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    24.2 +++ b/VisualC/tests/testrendertarget/testrendertarget_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    24.3 @@ -100,7 +100,7 @@
    24.4  			<Tool
    24.5  				Name="VCPostBuildEventTool"
    24.6  				Description="Copy SDL and data files"
    24.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
    24.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
    24.9  			/>
   24.10  		</Configuration>
   24.11  		<Configuration
   24.12 @@ -188,7 +188,7 @@
   24.13  			<Tool
   24.14  				Name="VCPostBuildEventTool"
   24.15  				Description="Copy SDL and data files"
   24.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
   24.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
   24.18  			/>
   24.19  		</Configuration>
   24.20  	</Configurations>
    25.1 --- a/VisualC/tests/testscale/testscale_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    25.2 +++ b/VisualC/tests/testscale/testscale_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    25.3 @@ -100,7 +100,7 @@
    25.4  			<Tool
    25.5  				Name="VCPostBuildEventTool"
    25.6  				Description="Copy SDL and data files"
    25.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
    25.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
    25.9  			/>
   25.10  		</Configuration>
   25.11  		<Configuration
   25.12 @@ -188,7 +188,7 @@
   25.13  			<Tool
   25.14  				Name="VCPostBuildEventTool"
   25.15  				Description="Copy SDL and data files"
   25.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
   25.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;"
   25.18  			/>
   25.19  		</Configuration>
   25.20  	</Configurations>
    26.1 --- a/VisualC/tests/testshape/testshape_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    26.2 +++ b/VisualC/tests/testshape/testshape_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    26.3 @@ -100,7 +100,7 @@
    26.4  			<Tool
    26.5  				Name="VCPostBuildEventTool"
    26.6  				Description="Copy SDL"
    26.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    26.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    26.9  			/>
   26.10  		</Configuration>
   26.11  		<Configuration
   26.12 @@ -188,7 +188,7 @@
   26.13  			<Tool
   26.14  				Name="VCPostBuildEventTool"
   26.15  				Description="Copy SDL"
   26.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   26.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   26.18  			/>
   26.19  		</Configuration>
   26.20  	</Configurations>
    27.1 --- a/VisualC/tests/testsprite/testsprite_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    27.2 +++ b/VisualC/tests/testsprite/testsprite_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    27.3 @@ -100,7 +100,7 @@
    27.4  			<Tool
    27.5  				Name="VCPostBuildEventTool"
    27.6  				Description="Copy SDL and data files"
    27.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    27.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    27.9  			/>
   27.10  		</Configuration>
   27.11  		<Configuration
   27.12 @@ -188,7 +188,7 @@
   27.13  			<Tool
   27.14  				Name="VCPostBuildEventTool"
   27.15  				Description="Copy SDL and data files"
   27.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   27.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   27.18  			/>
   27.19  		</Configuration>
   27.20  	</Configurations>
    28.1 --- a/VisualC/tests/testsprite2/testsprite2_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    28.2 +++ b/VisualC/tests/testsprite2/testsprite2_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    28.3 @@ -100,7 +100,7 @@
    28.4  			<Tool
    28.5  				Name="VCPostBuildEventTool"
    28.6  				Description="Copy SDL and data files"
    28.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    28.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
    28.9  			/>
   28.10  		</Configuration>
   28.11  		<Configuration
   28.12 @@ -188,7 +188,7 @@
   28.13  			<Tool
   28.14  				Name="VCPostBuildEventTool"
   28.15  				Description="Copy SDL and data files"
   28.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   28.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\icon.bmp&quot; &quot;$(ProjectDir)\icon.bmp&quot;&#x0D;&#x0A;"
   28.18  			/>
   28.19  		</Configuration>
   28.20  	</Configurations>
    29.1 --- a/VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    29.2 +++ b/VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    29.3 @@ -100,7 +100,7 @@
    29.4  			<Tool
    29.5  				Name="VCPostBuildEventTool"
    29.6  				Description="Copy SDL"
    29.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    29.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    29.9  			/>
   29.10  		</Configuration>
   29.11  		<Configuration
   29.12 @@ -188,7 +188,7 @@
   29.13  			<Tool
   29.14  				Name="VCPostBuildEventTool"
   29.15  				Description="Copy SDL"
   29.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   29.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   29.18  			/>
   29.19  		</Configuration>
   29.20  	</Configurations>
    30.1 --- a/VisualC/tests/testwin/testwin_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    30.2 +++ b/VisualC/tests/testwin/testwin_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    30.3 @@ -100,7 +100,7 @@
    30.4  			<Tool
    30.5  				Name="VCPostBuildEventTool"
    30.6  				Description="Copy SDL and data files"
    30.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
    30.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
    30.9  			/>
   30.10  		</Configuration>
   30.11  		<Configuration
   30.12 @@ -188,7 +188,7 @@
   30.13  			<Tool
   30.14  				Name="VCPostBuildEventTool"
   30.15  				Description="Copy SDL and data files"
   30.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
   30.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;&#x0D;&#x0A;copy &quot;$(SolutionDir)\..\test\sample.bmp&quot; &quot;$(ProjectDir)\sample.bmp&quot;&#x0D;&#x0A;"
   30.18  			/>
   30.19  		</Configuration>
   30.20  	</Configurations>
    31.1 --- a/VisualC/tests/testwm/testwm_VS2008.vcproj	Sun Jan 22 01:29:26 2012 -0500
    31.2 +++ b/VisualC/tests/testwm/testwm_VS2008.vcproj	Sun Jan 22 17:21:00 2012 -0500
    31.3 @@ -100,7 +100,7 @@
    31.4  			<Tool
    31.5  				Name="VCPostBuildEventTool"
    31.6  				Description="Copy SDL"
    31.7 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
    31.8 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
    31.9  			/>
   31.10  		</Configuration>
   31.11  		<Configuration
   31.12 @@ -188,7 +188,7 @@
   31.13  			<Tool
   31.14  				Name="VCPostBuildEventTool"
   31.15  				Description="Copy SDL"
   31.16 -				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll&quot; &quot;$(TargetDir)\SDL.dll&quot;"
   31.17 +				CommandLine="copy &quot;$(SolutionDir)\SDL\$(ConfigurationName)\SDL2.dll&quot; &quot;$(TargetDir)\SDL2.dll&quot;"
   31.18  			/>
   31.19  		</Configuration>
   31.20  	</Configurations>
    32.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sun Jan 22 01:29:26 2012 -0500
    32.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sun Jan 22 17:21:00 2012 -0500
    32.3 @@ -62,8 +62,8 @@
    32.4  		006E94A8119511A1001DE610 /* sample.wav in Resources */ = {isa = PBXBuildFile; fileRef = 006E94A1119511A1001DE610 /* sample.wav */; };
    32.5  		006E94A9119511A1001DE610 /* utf8.txt in Resources */ = {isa = PBXBuildFile; fileRef = 006E94A2119511A1001DE610 /* utf8.txt */; };
    32.6  		006E94BC11951217001DE610 /* read in Copy rwops */ = {isa = PBXBuildFile; fileRef = 00D8DA121195093100638393 /* read */; };
    32.7 -		006E94EF11951255001DE610 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BECDF66C0761BA81005FE872 /* SDL.framework */; };
    32.8 -		006E94F01195125B001DE610 /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = BECDF66C0761BA81005FE872 /* SDL.framework */; };
    32.9 +		006E94EF11951255001DE610 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BECDF66C0761BA81005FE872 /* SDL2.framework */; };
   32.10 +		006E94F01195125B001DE610 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = BECDF66C0761BA81005FE872 /* SDL2.framework */; };
   32.11  		007317A20858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; };
   32.12  		007317A30858DECD00B2BC32 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; };
   32.13  		007317A40858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; };
   32.14 @@ -536,7 +536,7 @@
   32.15  			dstPath = "";
   32.16  			dstSubfolderSpec = 10;
   32.17  			files = (
   32.18 -				006E94F01195125B001DE610 /* SDL.framework in Copy Frameworks */,
   32.19 +				006E94F01195125B001DE610 /* SDL2.framework in Copy Frameworks */,
   32.20  			);
   32.21  			name = "Copy Frameworks";
   32.22  			runOnlyForDeploymentPostprocessing = 0;
   32.23 @@ -840,8 +840,8 @@
   32.24  		B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_cpuinfo.h; path = ../../include/SDL_cpuinfo.h; sourceTree = SOURCE_ROOT; };
   32.25  		B2CF8DC705C4450500E5DC7F /* SDL_name.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_name.h; path = ../../include/SDL_name.h; sourceTree = SOURCE_ROOT; };
   32.26  		BECDF66B0761BA81005FE872 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
   32.27 -		BECDF66C0761BA81005FE872 /* SDL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL.framework; sourceTree = BUILT_PRODUCTS_DIR; };
   32.28 -		BECDF6B30761BA81005FE872 /* libSDL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL.a; sourceTree = BUILT_PRODUCTS_DIR; };
   32.29 +		BECDF66C0761BA81005FE872 /* SDL2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
   32.30 +		BECDF6B30761BA81005FE872 /* libSDL2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2.a; sourceTree = BUILT_PRODUCTS_DIR; };
   32.31  		BECDF6BE0761BA81005FE872 /* Standard DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Standard DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
   32.32  		BECDF6C30761BA81005FE872 /* Developer Extras Package */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Developer Extras Package"; sourceTree = BUILT_PRODUCTS_DIR; };
   32.33  		F59C70FF00D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
   32.34 @@ -860,7 +860,7 @@
   32.35  			isa = PBXFrameworksBuildPhase;
   32.36  			buildActionMask = 2147483647;
   32.37  			files = (
   32.38 -				006E94EF11951255001DE610 /* SDL.framework in Frameworks */,
   32.39 +				006E94EF11951255001DE610 /* SDL2.framework in Frameworks */,
   32.40  			);
   32.41  			runOnlyForDeploymentPostprocessing = 0;
   32.42  		};
   32.43 @@ -1067,8 +1067,8 @@
   32.44  			isa = PBXGroup;
   32.45  			children = (
   32.46  				089C1665FE841158C02AAC07 /* Resources */,
   32.47 -				BECDF66C0761BA81005FE872 /* SDL.framework */,
   32.48 -				BECDF6B30761BA81005FE872 /* libSDL.a */,
   32.49 +				BECDF66C0761BA81005FE872 /* SDL2.framework */,
   32.50 +				BECDF6B30761BA81005FE872 /* libSDL2.a */,
   32.51  				BECDF6BE0761BA81005FE872 /* Standard DMG */,
   32.52  				BECDF6C30761BA81005FE872 /* Developer Extras Package */,
   32.53  				00D8D9EF1195090700638393 /* testsdl.app */,
   32.54 @@ -1886,7 +1886,7 @@
   32.55  			name = Framework;
   32.56  			productInstallPath = "@executable_path/../Frameworks";
   32.57  			productName = SDL;
   32.58 -			productReference = BECDF66C0761BA81005FE872 /* SDL.framework */;
   32.59 +			productReference = BECDF66C0761BA81005FE872 /* SDL2.framework */;
   32.60  			productType = "com.apple.product-type.framework";
   32.61  		};
   32.62  		BECDF66D0761BA81005FE872 /* Static Library */ = {
   32.63 @@ -1906,7 +1906,7 @@
   32.64  			name = "Static Library";
   32.65  			productInstallPath = /usr/local/lib;
   32.66  			productName = "Static Library";
   32.67 -			productReference = BECDF6B30761BA81005FE872 /* libSDL.a */;
   32.68 +			productReference = BECDF6B30761BA81005FE872 /* libSDL2.a */;
   32.69  			productType = "com.apple.product-type.library.static";
   32.70  		};
   32.71  		BECDF6BB0761BA81005FE872 /* Standard DMG */ = {
   32.72 @@ -2030,7 +2030,7 @@
   32.73  			);
   32.74  			runOnlyForDeploymentPostprocessing = 0;
   32.75  			shellPath = /bin/sh;
   32.76 -			shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nmkdir -p build/dmg-tmp/devel-lite\n/Developer/Tools/CpMac -r $TARGET_BUILD_DIR/SDL.framework build/dmg-tmp/\n\n# strip moved to Xcode native mechanism\n# strip -x build/dmg-tmp/SDL.framework/SDL\n\ncp pkg-support/resources/License.rtf build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/ReadMeDevLite.txt build/dmg-tmp/devel-lite\ncp pkg-support/resources/UniversalBinaryNotes.rtf build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\nfind -d build/dmg-tmp -type d -name .svn -exec rm -rf \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL -srcfolder build/dmg-tmp build/SDL.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n\n# compress it???\n#(cd build; gnutar -zcvf SDL.dmg.tar.gz SDL.dmg)";
   32.77 +			shellScript = "# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\nmkdir -p build/dmg-tmp/devel-lite\n/Developer/Tools/CpMac -r $TARGET_BUILD_DIR/SDL2.framework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/ReadMeDevLite.txt build/dmg-tmp/devel-lite\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL2 -srcfolder build/dmg-tmp build/SDL2.dmg\n\n# clean up\nrm -rf build/dmg-tmp";
   32.78  		};
   32.79  		BECDF6C20761BA81005FE872 /* ShellScript */ = {
   32.80  			isa = PBXShellScriptBuildPhase;
   32.81 @@ -2347,12 +2347,12 @@
   32.82  			buildSettings = {
   32.83  				DYLIB_COMPATIBILITY_VERSION = 1;
   32.84  				DYLIB_CURRENT_VERSION = 1;
   32.85 -				FRAMEWORK_VERSION = B;
   32.86 +				FRAMEWORK_VERSION = A;
   32.87  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   32.88  				INFOPLIST_FILE = "Info-Framework.plist";
   32.89  				INSTALL_PATH = "@rpath";
   32.90  				OTHER_LDFLAGS = "-liconv";
   32.91 -				PRODUCT_NAME = SDL;
   32.92 +				PRODUCT_NAME = SDL2;
   32.93  				WRAPPER_EXTENSION = framework;
   32.94  			};
   32.95  			name = Release;
   32.96 @@ -2369,7 +2369,7 @@
   32.97  				);
   32.98  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   32.99  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
  32.100 -				PRODUCT_NAME = SDL;
  32.101 +				PRODUCT_NAME = SDL2;
  32.102  			};
  32.103  			name = Release;
  32.104  		};
  32.105 @@ -2409,12 +2409,12 @@
  32.106  			buildSettings = {
  32.107  				DYLIB_COMPATIBILITY_VERSION = 1;
  32.108  				DYLIB_CURRENT_VERSION = 1;
  32.109 -				FRAMEWORK_VERSION = B;
  32.110 +				FRAMEWORK_VERSION = A;
  32.111  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
  32.112  				INFOPLIST_FILE = "Info-Framework.plist";
  32.113  				INSTALL_PATH = "@rpath";
  32.114  				OTHER_LDFLAGS = "-liconv";
  32.115 -				PRODUCT_NAME = SDL;
  32.116 +				PRODUCT_NAME = SDL2;
  32.117  				WRAPPER_EXTENSION = framework;
  32.118  			};
  32.119  			name = Debug;
  32.120 @@ -2431,7 +2431,7 @@
  32.121  				);
  32.122  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
  32.123  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
  32.124 -				PRODUCT_NAME = SDL;
  32.125 +				PRODUCT_NAME = SDL2;
  32.126  			};
  32.127  			name = Debug;
  32.128  		};
    33.1 --- a/Xcode/SDL/pkg-support/resources/License.rtf	Sun Jan 22 01:29:26 2012 -0500
    33.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.3 @@ -1,283 +0,0 @@
    33.4 -{\rtf1\mac\ansicpg10000\cocoartf102
    33.5 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
    33.6 -}
    33.7 -{\colortbl;\red255\green255\blue255;\red64\green64\blue64;}
    33.8 -\paperw11900\paperh16840\margl1440\margr1440\vieww9080\viewh13160\viewkind0
    33.9 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qc
   33.10 -
   33.11 -\f0\b\fs36 \cf0 GNU LESSER GENERAL PUBLIC LICENSE
   33.12 -\fs24 \
   33.13 -Version 2.1, February 1999
   33.14 -\f1\b0 \
   33.15 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
   33.16 -\cf0 \
   33.17 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qc
   33.18 -
   33.19 -\f2\i \cf0  Copyright (C) 1991, 1999 Free Software Foundation, Inc.\
   33.20 -     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\
   33.21 - Everyone is permitted to copy and distribute verbatim copies\
   33.22 - of this license document, but changing it is not allowed.\
   33.23 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
   33.24 -
   33.25 -\f1\i0 \cf0 \
   33.26 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
   33.27 -\cf2 [This is the first released version of the Lesser GPL.  It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]\cf0 \
   33.28 -\
   33.29 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qc
   33.30 -
   33.31 -\f0\b \cf0 Preamble
   33.32 -\f1\b0 \
   33.33 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
   33.34 -\cf0 \
   33.35 -The licenses for most software are designed to take away your freedom to share and change it.  By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.\
   33.36 -\
   33.37 -This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it.  You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.\
   33.38 -\
   33.39 -When we speak of free software, we are referring to freedom of use, not price.  Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.\
   33.40 -\
   33.41 -To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights.  These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.\
   33.42 -\
   33.43 -For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you.  You must make sure that they, too, receive or can get the source code.  If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it.  And you must show them these terms so they know their rights.\
   33.44 -\
   33.45 -We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.\
   33.46 -\
   33.47 -To protect each distributor, we want to make it very clear that there is no warranty for the free library.  Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.\
   33.48 -\
   33.49 -Finally, software patents pose a constant threat to the existence of any free program.  We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder.  Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.\
   33.50 -\
   33.51 -Most GNU software, including some libraries, is covered by the ordinary GNU General Public License.  This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License.  We this license for certain libraries in order to permit linking those libraries into non-free programs.\
   33.52 -\
   33.53 -When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library.  The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom.  The Lesser General Public License permits more lax criteria for linking other code with the library.\
   33.54 -\
   33.55 -We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License.  It also provides other free software developers Less of an advantage over competing non-free programs.  These disadvantages are the reason we use the ordinary General Public License for many libraries.  However, the Lesser license provides advantages in certain special circumstances.\
   33.56 -\
   33.57 -For example, on rare occasions, there may be a special need to encourage widest possible use of a certain library, so that it becomes a de-facto standard.  To achieve this, non-free programs must be allowed to use the library.  A more frequent case is that a free library does the same job as widely used non-free libraries.  In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.\
   33.58 -\
   33.59 -Another cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software.  For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.\
   33.60 -\
   33.61 -Although the Lesser General Public License is Less protective of the users' freedom, it does insure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.\
   33.62 -\
   33.63 -The precise terms and conditions for copying, distribution and modification follow.  Pay close attention to the difference between a "work based on the library" and a "work that uses the library".  The former contains code derived from the library, whereas the latter must be combined with the library in order to run.\
   33.64 -\
   33.65 -\
   33.66 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qc
   33.67 -
   33.68 -\f0\b \cf0 GNU LESSER GENERAL PUBLIC LICENSE\
   33.69 -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\
   33.70 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
   33.71 -
   33.72 -\f1\b0 \cf0 \
   33.73 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
   33.74 -
   33.75 -\f0\b \cf0 0.
   33.76 -\f1\b0  This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".\
   33.77 -\
   33.78 -A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.\
   33.79 -\
   33.80 -The "Library", below, refers to any such software library or work which has been distributed under these terms.  A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language.  (Hereinafter, translation is included without limitation in the term "modification".)\
   33.81 -\
   33.82 -"Source code" for a work means the preferred form of the work for making modifications to it.  For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.\
   33.83 -\
   33.84 -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope.  The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it).  Whether that is true depends on what the Library does and what the program that uses the Library does.\
   33.85 -  \
   33.86 -
   33.87 -\f0\b 1.
   33.88 -\f1\b0  You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.\
   33.89 -\
   33.90 -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\
   33.91 -\
   33.92 -
   33.93 -\f0\b 2.
   33.94 -\f1\b0  You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\
   33.95 -\
   33.96 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\li240\ql\qnatural
   33.97 -
   33.98 -\f0\b \cf0 a)
   33.99 -\f1\b0  The modified work must itself be a software library.\
  33.100 -\
  33.101 -
  33.102 -\f0\b b)
  33.103 -\f1\b0  You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.\
  33.104 -\
  33.105 -
  33.106 -\f0\b c)
  33.107 -\f1\b0  You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.\
  33.108 -\
  33.109 -
  33.110 -\f0\b d)
  33.111 -\f1\b0  If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.\
  33.112 -\
  33.113 -(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application.  Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)\
  33.114 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.115 -\cf0 \
  33.116 -These requirements apply to the modified work as a whole.  If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works.  But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\
  33.117 -\
  33.118 -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.\
  33.119 -\
  33.120 -In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\
  33.121 -\
  33.122 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.123 -
  33.124 -\f0\b \cf0 3.
  33.125 -\f1\b0  You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library.  To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License.  (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.)  Do not make any other change in these notices.\
  33.126 -\
  33.127 -Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.\
  33.128 -\
  33.129 -This option is useful when you wish to copy part of the code of the Library into a program that is not a library.\
  33.130 -\
  33.131 -
  33.132 -\f0\b 4. 
  33.133 -\f1\b0 You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.\
  33.134 -\
  33.135 -If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.\
  33.136 -\
  33.137 -
  33.138 -\f0\b 5.
  33.139 -\f1\b0  A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library".  Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.\
  33.140 -\
  33.141 -However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library".  The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.\
  33.142 -\
  33.143 -When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library.  The threshold for this to be true is not precisely defined by law.\
  33.144 -\
  33.145 -If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work.  (Executables containing this object code plus portions of the Library will still fall under Section 6.)\
  33.146 -\
  33.147 -Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.\
  33.148 -\
  33.149 -
  33.150 -\f0\b 6.
  33.151 -\f1\b0  As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.\
  33.152 -\
  33.153 -You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License.  You must supply a copy of this License.  If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License.  Also, you must do one of these things:\
  33.154 -\
  33.155 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\li240\ql\qnatural
  33.156 -
  33.157 -\f0\b \cf0 a)
  33.158 -\f1\b0  Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library.  (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)\
  33.159 -\
  33.160 -
  33.161 -\f0\b b)
  33.162 -\f1\b0  Use a suitable shared library mechanism for linking with the Library.  A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.\
  33.163 -\
  33.164 -
  33.165 -\f0\b c)
  33.166 -\f1\b0  Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.\
  33.167 -\
  33.168 -
  33.169 -\f0\b d)
  33.170 -\f1\b0  If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.\
  33.171 -\
  33.172 -
  33.173 -\f0\b e)
  33.174 -\f1\b0  Verify that the user has already received a copy of these materials or that you have already sent this user a copy.\
  33.175 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.176 -\cf0 \
  33.177 -For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it.  However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\
  33.178 -\
  33.179 -It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system.  Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.\
  33.180 -\
  33.181 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.182 -
  33.183 -\f0\b \cf0 7.
  33.184 -\f1\b0  You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:\
  33.185 -\
  33.186 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\li240\ql\qnatural
  33.187 -
  33.188 -\f0\b \cf0 a)
  33.189 -\f1\b0  Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities.  This must be distributed under the terms of the Sections above.\
  33.190 -\
  33.191 -
  33.192 -\f0\b b)
  33.193 -\f1\b0  Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.\
  33.194 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.195 -\cf0 \
  33.196 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.197 -
  33.198 -\f0\b \cf0 8.
  33.199 -\f1\b0  You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License.  Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License.  However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\
  33.200 -\
  33.201 -
  33.202 -\f0\b 9.
  33.203 -\f1\b0  You are not required to accept this License, since you have not signed it.  However, nothing else grants you permission to modify or distribute the Library or its derivative works.  These actions are prohibited by law if you do not accept this License.  Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.\
  33.204 -\
  33.205 -
  33.206 -\f0\b 10.
  33.207 -\f1\b0  Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions.  You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.\
  33.208 -\
  33.209 -
  33.210 -\f0\b 11.
  33.211 -\f1\b0  If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License.  If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all.  For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.\
  33.212 -\
  33.213 -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.\
  33.214 -\
  33.215 -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices.  Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\
  33.216 -\
  33.217 -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\
  33.218 -\
  33.219 -
  33.220 -\f0\b 12.
  33.221 -\f1\b0  If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded.  In such case, this License incorporates the limitation as if written in the body of this License.\
  33.222 -\
  33.223 -
  33.224 -\f0\b 13.
  33.225 -\f1\b0  The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\
  33.226 -\
  33.227 -Each version is given a distinguishing version number.  If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation.  If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.\
  33.228 -\
  33.229 -
  33.230 -\f0\b 14.
  33.231 -\f1\b0  If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission.  For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this.  Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\
  33.232 -\
  33.233 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qc
  33.234 -
  33.235 -\f0\b \cf0 NO WARRANTY
  33.236 -\f1\b0 \
  33.237 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.238 -\cf0 \
  33.239 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.240 -
  33.241 -\f0\b \cf0 15.
  33.242 -\f1\b0  BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\
  33.243 -\
  33.244 -
  33.245 -\f0\b 16.
  33.246 -\f1\b0  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\
  33.247 -\
  33.248 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qc
  33.249 -
  33.250 -\f0\b \cf0 END OF TERMS AND CONDITIONS
  33.251 -\f1\b0 \
  33.252 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.253 -\cf0 \
  33.254 -\
  33.255 -How to Apply These Terms to Your New Libraries\
  33.256 -\
  33.257 -If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change.  You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).\
  33.258 -\
  33.259 -To apply these terms, attach the following notices to the library.  It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\
  33.260 -\
  33.261 -\pard\tx220\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\li240\ql\qnatural
  33.262 -\cf0 <one line to give the library's name and a brief idea of what it does.>\
  33.263 -Copyright (C) <year>  <name of author>\
  33.264 -\
  33.265 -This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\
  33.266 -\
  33.267 -This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.\
  33.268 -\
  33.269 -You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\
  33.270 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.271 -\cf0 \
  33.272 -Also add information on how to contact you by electronic and paper mail.\
  33.273 -\
  33.274 -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary.  Here is a sample; alter the names:\
  33.275 -\
  33.276 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\li240\ql\qnatural
  33.277 -\cf0 Yoyodyne, Inc., hereby disclaims all copyright interest in the library\
  33.278 -`Frob' (a library for tweaking knobs) written by James Random Hacker.\
  33.279 -\
  33.280 -<signature of Ty Coon>, 1 April 1990\
  33.281 -Ty Coon, President of Vice\
  33.282 -\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
  33.283 -\cf0 \
  33.284 -That's all there is to it!\
  33.285 -\
  33.286 -}
  33.287 \ No newline at end of file
    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/Xcode/SDL/pkg-support/resources/License.txt	Sun Jan 22 17:21:00 2012 -0500
    34.3 @@ -0,0 +1,19 @@
    34.4 +
    34.5 +Simple DirectMedia Layer
    34.6 +Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
    34.7 +  
    34.8 +This software is provided 'as-is', without any express or implied
    34.9 +warranty.  In no event will the authors be held liable for any damages
   34.10 +arising from the use of this software.
   34.11 +
   34.12 +Permission is granted to anyone to use this software for any purpose,
   34.13 +including commercial applications, and to alter it and redistribute it
   34.14 +freely, subject to the following restrictions:
   34.15 +  
   34.16 +1. The origin of this software must not be misrepresented; you must not
   34.17 +   claim that you wrote the original software. If you use this software
   34.18 +   in a product, an acknowledgment in the product documentation would be
   34.19 +   appreciated but is not required. 
   34.20 +2. Altered source versions must be plainly marked as such, and must not be
   34.21 +   misrepresented as being the original software.
   34.22 +3. This notice may not be removed or altered from any source distribution.
    35.1 --- a/Xcode/SDL/pkg-support/resources/ReadMe.txt	Sun Jan 22 01:29:26 2012 -0500
    35.2 +++ b/Xcode/SDL/pkg-support/resources/ReadMe.txt	Sun Jan 22 17:21:00 2012 -0500
    35.3 @@ -5,17 +5,17 @@
    35.4  The Simple DirectMedia Layer library source code is available from: 
    35.5  http://www.libsdl.org/
    35.6  
    35.7 -This library is distributed under the terms of the GNU LGPL license: 
    35.8 -http://www.gnu.org/copyleft/lesser.html
    35.9 +This library is distributed under the terms of the zlib license: 
   35.10 +http://zlib.net/zlib_license.html
   35.11  
   35.12  
   35.13 -This packages contains the SDL.framework for OS X. 
   35.14 +This packages contains the SDL framework for OS X. 
   35.15  Conforming with Apple guidelines, this framework 
   35.16  contains both the SDL runtime component and development header files.
   35.17  
   35.18  
   35.19  To Install:
   35.20 -Copy the SDL.framework to /Library/Frameworks
   35.21 +Copy the SDL2.framework to /Library/Frameworks
   35.22  
   35.23  You may alternatively install it in <Your home directory>/Library/Frameworks 
   35.24  if your access privileges are not high enough. 
   35.25 @@ -36,136 +36,3 @@
   35.26  	SDL, thus the videos are recommended for everybody getting started with
   35.27  	developing on Mac OS X. (You can skim over the PlugIns stuff since SDL
   35.28  	doesn't have any PlugIns to worry about.)
   35.29 -
   35.30 -
   35.31 -
   35.32 -(Partial) History of PB/Xcode projects:
   35.33 -2009-09-21 - Added 64-bit for Snow Leopard. 10.4 is the new minimum requirement.
   35.34 -	Removed 'no X11' targets as 
   35.35 -	new codebase will assume you have them. Also removed specific #defines
   35.36 -	for X11, but needed to add search path to /usr/X11R6/include
   35.37 -	
   35.38 -2007-12-31 - Enabled strip -x in the Xcode settings and removed it 
   35.39 -	from the Build DMG script.
   35.40 -	Added a per-arch setting for the Deployment targets for OTHER_LDFLAGS_ppc
   35.41 -	to re-enable prebinding.
   35.42 -	Need to remember to copy these changes to the SDL satellite projects.
   35.43 -
   35.44 -2007-12-30 - Updated documentation to reflect new installation paths for
   35.45 -	Xcode project templates under Leopard (Xcode 2.5/3.0).
   35.46 -
   35.47 -????-??-?? - Added extra targets for building formal releases against the
   35.48 -	10.2 SDK so we don't have to keep modifying the settings.
   35.49 -
   35.50 -????-??-?? - Added fancy DMG (background logo) support with automation.
   35.51 -
   35.52 -2006-05-09 - Added shell script phase to deal with new SDL_config.h 
   35.53 -	behavior. Encountered what seems to be an Xcode bug with 
   35.54 -	multiple files of the same name, even when conditional compiling
   35.55 -	is controlled by custom #defines (SDL_sysloadso.c). Multiple or
   35.56 -	undefined symbols are the result of this.
   35.57 -	Recommended that macosx/SDL_sysloadso.c be modified to directly 
   35.58 -	include the dlopen version of the file via #ifdef's so only
   35.59 -	one version needs to exist. Filed a formal bug report with Apple 
   35.60 -	about this (4542369).
   35.61 -
   35.62 -2006-03-22 - gcc 4 visibility features have been added to the code base so I 
   35.63 -	enabled the switch in Xcode to take advantage of it. Be aware that only
   35.64 -	our x86 builds will be exposed to this feature as we still build ppc 
   35.65 -	with gcc 3.3.
   35.66 -	
   35.67 -	Christian Walther has sent me some great feedback on things that are 
   35.68 -	broken, so I have made some of these fixes. Among the issues are
   35.69 -	compatibility and current library versions are not set to 1 (breaks
   35.70 -	backwards compatibility), documentation errors, resource copying 
   35.71 -	location problems for the SDLTest apps, missing HAVE_OPENGL and
   35.72 -	OpenGL.framework linking in testgl.
   35.73 -	(Eric Wing)
   35.74 -
   35.75 -2006-03-17 - Because the X11 headers are not installed by default with Xcode,
   35.76 -	we decided to offer two variants of the same targets (one with X11 stuff
   35.77 -	and one without). By default, since the X11 stuff does not necessarily 
   35.78 -	conflict with the native stuff, we build the libraries with the X11 stuff 
   35.79 -	so advanced developers can access it by default. However, in the case
   35.80 -	that a developer did not install X11 (or just doesn't want the extra bloat),
   35.81 -	the user may directly select those targets and build those instead.
   35.82 -	
   35.83 -	Once again, we are attempting to remove the exported symbols file. If 
   35.84 -	I recall correctly, the clashing symbol problems we got were related
   35.85 -	to the CD-ROM code which was formerly in C++. Now that the C++ code
   35.86 -	has been purged, we are speculating that we might be able to remove
   35.87 -	the exports file safely. The long term solution is to utilize gcc 4's
   35.88 -	visibility features.
   35.89 -
   35.90 -	For the developer extras package, I changed the package format 
   35.91 -	from a .pkg based installer to a .dmg to avoid requiring 
   35.92 -	administrator/root to access contents, for better 
   35.93 -	transparency, and to allow users to more easily control which components 
   35.94 -	they actually want to install.
   35.95 -	I also made changes and updates to the PB/Xcode project templates (see Developer ReadMe).
   35.96 -	(Eric Wing)
   35.97 -
   35.98 -2006-03-07 - The entire code base has been reorganized and platform specific 
   35.99 -	defines have been pushed into header files (SDL_config_*.h). This means 
  35.100 -	that defines that previously had to be defined in the Xcode projects can 
  35.101 -	be removed (which I have started doing). Furthermore, it appears that the 
  35.102 -	MMX/SSE code has been rewritten and refactored so it now compiles without 
  35.103 -	nasm and without making us do strange things to support OS X. However, this 
  35.104 -	Xcode project still employs architecture specific build options in order to 
  35.105 -	achieve the mandated 10.2 compatibility. As a result of the code base changes, 
  35.106 -	there are new public headers. But also as a result of these changes, there are 
  35.107 -	also new headers that qualify as "PrivateHeaders". Private Headers are headers 
  35.108 -	that must be exported because a public header includes them, but users shouldn't 
  35.109 -	directly invoke these. SDL_config_macosx.h and SDL_config_dreamcast.h are 
  35.110 -	examples of this. We have considered marking these headers as Private, but it 
  35.111 -	requires that the public headers invoke them via framework conventions, i.e.
  35.112 -	#include <FrameworkName/Header.h>
  35.113 -	e.g.
  35.114 -	#include <SDL/SDL_config_macosx.h>
  35.115 -	and not
  35.116 -	#include "SDL_config_macosx.h"
  35.117 -	However this imposes the restriction that non-framework distributions must
  35.118 -	 place their headers in a directory called SDL/ (and not SDL11/ like FreeBSD). 
  35.119 -	 Currently, I do not believe this would pose a problem for any of the current 
  35.120 -	 distributions (Fink, DarwinPorts). Or alternatively, users could be 
  35.121 -	 expected/forced to also include the header path: 
  35.122 -	 -I/Library/Frameworks/SDL.framework/PrivateHeaders, 
  35.123 -	 but most people would probably not read the documentation on this. 
  35.124 -	 But currently, we have decided to be conservative and have opted not to 
  35.125 -	 use the PrivateHeaders feature.
  35.126 -	(Eric Wing)
  35.127 -
  35.128 -2006-01-31 - Updates to build Universal Binaries while retaining 10.2 compatibility. 
  35.129 -	We were unable to get MMX/SSE support enabled. It is believed that a rewrite of 
  35.130 -	the assembly code will be necessary to make it position independent and not 
  35.131 -	require nasm. Altivec has finally been enabled for PPC. (Eric Wing)
  35.132 -
  35.133 -2005-09-?? - Had to add back the exports file because it was causing build problems
  35.134 -	for some cases. (Eric Wing)
  35.135 -
  35.136 -2005-08-21 - First entry in history. Updated for SDL 1.2.9 and Xcode 2.1. Getting 
  35.137 -	ready for Universal Binaries. Removed the .pkg system for .dmg for due to problems 
  35.138 -	with broken packages in the past several SDL point releases. Removed usage of SDL 
  35.139 -	exports file because it has become another point of failure. Introduced new documentation 
  35.140 -	about SDLMain and how to compile in an devel-lite section of the SDL.dmg. (Eric Wing)
  35.141 -
  35.142 -Before history:
  35.143 -SDL 1.2.6? to 1.2.8
  35.144 -Started updating Project Builder projects to Xcode for Panther and Tiger. Also removed 
  35.145 -the system that split the single framework into separate runtime and headers frameworks. 
  35.146 -This is against Apple conventions and causes problems on multiuser systems. 
  35.147 -We now distribute a single framework.
  35.148 -The .pkg system has repeatedly been broken with every new release of OS X. 
  35.149 -With 1.2.8, started migrating stuff to .dmg based system to simplify distribution process. 
  35.150 -Tried updating the exports file and Perl script generation system for changing syntax. (Eric Wing)
  35.151 -
  35.152 -Pre-SDL 1.2.6 
  35.153 -Created Project Builder projects for SDL and .pkg based distribution system. (Darrell Walisser)
  35.154 -
  35.155 -
  35.156 -
  35.157 -
  35.158 -
  35.159 -
  35.160 -
  35.161 -
    36.1 Binary file Xcode/SDL/pkg-support/resources/SDL_DS_Store has changed
    37.1 --- a/Xcode/SDL/pkg-support/resources/UniversalBinaryNotes.rtf	Sun Jan 22 01:29:26 2012 -0500
    37.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.3 @@ -1,150 +0,0 @@
    37.4 -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf110
    37.5 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaGrande;\f2\fmodern\fcharset0 Courier-Oblique;
    37.6 -}
    37.7 -{\colortbl;\red255\green255\blue255;}
    37.8 -{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}}
    37.9 -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
   37.10 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
   37.11 -
   37.12 -\f0\b\fs24 \cf0 64-bit Universal Binary Notes:\
   37.13 -
   37.14 -\b0 \
   37.15 -SDL 1.2.14 is our first release with Snow Leopard on the market. In order to make SDL compile and run in 64-bit, we had to remove code that depended on deprecated Mac APIs and move over to more modern Mac APIs.\
   37.16 -\
   37.17 -In addition, Apple has stopped shipping gcc 3.3 and the 10.3 SDK.\
   37.18 -\
   37.19 -Because of all these combined factors, we have made the decision to make Mac OS X 10.4 the new minimum requirement for SDL.\
   37.20 -\
   37.21 -Our official SDL.framework is compiled as a 3-way Universal Binary (64-bit Intel, 32-bit Intel, 32-bit PowerPC.)\
   37.22 -\
   37.23 -Certain APIs that SDL relies on were not made 64-bit ready by Apple until 10.6. This means even though 10.5 had preliminary 64-bit support, SDL will not compile or run correctly in 64-bit mode on 10.5. So there are two fallout items from this.\
   37.24 -\
   37.25 -First, you can only compile 64-bit code on Snow Leopard or greater (which removes the possibility of 64-bit PowerPC). \
   37.26 -\
   37.27 -Second, this presents a corner-case where if you have a 64-bit Intel executable in your Universal binary and try to run on 10.5 on an 64-bit Intel Mac, it will launch and crash. To force 10.5 to use the 32-bit version instead of the 64-bit, you should set the LaunchServices key, LSMinimumSystemVersionByArchitecture, in your application's Info.plist. Our SDL/Xcode templates for Snow Leopard already set this up for you.\
   37.28 -\
   37.29 -\
   37.30 -One additional fallout item is we had to remove the SDL Custom Cocoa Xcode template project. It depended on NSQuickTimeView which was deprecated and removed from the SDL codebase. It may still be possible to recreate the behavior that this template demonstrated, but we would need a volunteer to investigate this.\
   37.31 -\
   37.32 -\
   37.33 -\
   37.34 -In addition, the SDL satellite projects were affected by the 64-bit transition.\
   37.35 -\
   37.36 -- SDL_mixer depended on legacy Quicktime for midi playback support. We had to disable midi. (Recall that we also disabled MP3 support awhile back because we never got SMPEG working during the Tiger/Intel transition.) To fix this, we would need a native Core Audio backend for SDL_mixer.\
   37.37 -\
   37.38 -- Since we have changed the baseline to 10.4, we took this opportunity to switch SDL_image over to a new native ImageIO based backend. This makes the binary about 10x smaller, greatly simplifies our maintenance requirements and build process as we no longer have to maintain build systems for 3rd party dependencies, and gives us access to more image formats.\
   37.39 -\
   37.40 -- The static library target for SDL_ttf no longer works because we no longer have access to a libfreetype.a. We have been relying on Apple's supplied libfreetype.a, but they stopped shipping a static version starting in 10.5 which means we have no static 64-bit version. But since 10.4 is our new baseline, all these systems should have libfreetype.dylib installed, so it shouldn't be much of a problem to use SDL_ttf as a dynamic library which dynamically links to libfreetype.\
   37.41 -\
   37.42 -\
   37.43 --Eric Wing 2009-09-23\
   37.44 -
   37.45 -\b \
   37.46 -\
   37.47 -\
   37.48 -\
   37.49 -Universal Binary Notes: (historical, somewhat obsolete)\
   37.50 -
   37.51 -\b0 \
   37.52 -Below is an overview of what we had to do to build Universal Binaries for SDL (and satellites). The document is provided to help others understand what the heck we had to do to get this to work so they know (and don't break) any settings we have set to accomplish this. It also describes areas of problems for those who might attempt to fix them after us.\
   37.53 -\
   37.54 -\
   37.55 -It turns out that developing a Universal Binary for SDL was a painful process, but not for the typical reasons affecting most other developers. SDL is already platform clean and has an Xcode project which are usually the two biggest obstacles. (The only real code bug we had to fix was in SDL_mixer, but that was due to a Quicktime issue so we can blame the Quicktime authors.)\
   37.56 -\
   37.57 -But developing a Universal Binary was painful to us for several reasons:\
   37.58 -\
   37.59 -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural
   37.60 -\ls1\ilvl0\cf0 {\listtext	\'95	}SDL must retain compatibility with 10.2 (Jaguar)\
   37.61 -\
   37.62 -{\listtext	\'95	}SDL has processor specific optimizations (Altivec, MMX/SSE)\
   37.63 -\
   37.64 -{\listtext	\'95	}The SDL satellites (SDL_mixer, SDL_image, SDL_ttf) have 3rd party dependencies  which we currently statically link against. All of these dependencies needed to be updated/recompiled with the same above constraints.\
   37.65 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
   37.66 -\cf0 \
   37.67 -For retaining compatibility with 10.2, we have experimentally determined that there is no reliable way to use gcc 4.0.x to compile a binary that works under Jaguar. With the gcc 4.0 that shipped in Xcode 2.1, libgcc_s was automatically linked against. This library does not exist on systems prior to 10.3.9. After filing a bug report, Apple removed this automatic linking in gcc 4.0.1 which shipped with Xcode 2.2, but we discovered that we suffered from undefined symbols to things in the printf family library. (They seem to be new symbols related to printing long doubles, etc.)\
   37.68 -\
   37.69 -So to accomplish our compatibility goals, we had to find and exploit some lesser known features of Xcode that allow us to specify architecture specific build flags found here:\
   37.70 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
   37.71 -{\field{\*\fldinst{HYPERLINK "http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeUserGuide/Contents/Resources/en.lproj/05_07_bs_building_product/chapter_33_section_6.html#//apple_ref/doc/uid/TP40002693-SW3"}}{\fldrslt \cf0 http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeUserGuide/Contents/Resources/en.lproj/05_07_bs_building_product/chapter_33_section_6.html#//apple_ref/doc/uid/TP40002693-SW3}}\
   37.72 -\
   37.73 -The first and most important of these is the 
   37.74 -\f1 GCC_VERSION flag which lets us set gcc 3.3 for PowerPC and gcc 4.0 for Intel.\
   37.75 -\
   37.76 -But we also needed to verify other options such as the deployment target and SDK. Experimentally, we found that the Deployment target did very little for us except retain prebinding. Setting it to anything less than 10.4 allows for prebinding to remain active.\
   37.77 -\
   37.78 -For the SDK's, we found that Apple does link against different versions of system components. But experimentally, we discovered we could still link to the 10.4u SDK and things would still work on Jaguar. Ideally we should probably link to the 10.2.8 SDK for PowerPC. But in reality, most people don't install the 10.2.8 SDK on their system (it is not a default component) so we didn't want to confuse people as setting this would likely cause people's compile to fail the first time they try and they would have to understand the reason for this. We did leave the architecture specific SDKROOT option set explicitly to make it easy to change in case we need to.\
   37.79 -\
   37.80 -For the Altivec and MMX/SSE options, we had to use architecture specific build flags. Furthermore, to use SSE, we also had to include the assembly code. This caused us problems because there is no easy way to tell Xcode to use files only for a specific architecture. So the PowerPC side got confused on the .asm files and would fail to compile. \
   37.81 -\
   37.82 -Pushing forward, we ignored PPC for the moment to see if we could at least build an optimized x86 build and then use lipo manually to merge the results. We encountered additional problems. First the alignment needed to be changed for reasons outside my knowledge base. We changed all instances of .align 16 to .align 8. This seemed to fix the compile problems. But at the linking stage, we got errors such as:\
   37.83 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li640\fi-640\ql\qnatural\pardirnatural
   37.84 -
   37.85 -\f2\i\fs22 \cf0 ld: /Users/ewing/DEVELOPMENT/CODETEST/UniversalBinarySDL/SDL12/Xcode/SDL/build/SDL.build/Deployment/Framework.build/Objects-normal/i386/SDL_yuv_mmx.o has local relocation entries in non-writable section (__TEXT,__text)\
   37.86 -/usr/bin/libtool: internal link edit command failed\
   37.87 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
   37.88 -
   37.89 -\f1\i0\fs24 \cf0 \
   37.90 -Our belief is that the assembly code is not position independent and thus will not work for us. We double checked for any OS X gcc flags that control position independence, but everything seemed to be in order. As such, we cannot compile MMX/SSE optimizations until they are rewritten, preferably without the nasm requirement to accommodate the dual PPC/x86 Xcode limitations.\
   37.91 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
   37.92 -\cf0 \
   37.93 -So for now, we have unchecked (checkbox) the assembly specific files in the Xcode project and have removed the -DUSE_ASMBLIT flag from OTHER_CFLAGS_i386. To reactivate this stuff, you will need to recheck the boxes and re-add the flag.\
   37.94 -\
   37.95 -The files are\
   37.96 -SDL_mixer_MMX.c/h\
   37.97 -The files under hermes\
   37.98 -and SDL_yuv_mmx.c\
   37.99 -\
  37.100 -\
  37.101 -\
  37.102 -For the SDL satellites, it was more of the same. The painful part was that the 3rd library dependencies needed to be rebuilt. (Some of our libraries were out of date, so this was an opportunity to update them.) But this meant changing those build systems as well. \
  37.103 -\
  37.104 -These are the versions I used:\
  37.105 -libpng-1.2.8\
  37.106 -libjpeg-6b\
  37.107 -libogg-1.1.3\
  37.108 -libvorbis-1.1.2\
  37.109 -smpeg cvs\
  37.110 -\
  37.111 -We found that Apple already had a libfreetype in the 10.4u SDK so we just used that one which seemed to work. (For the record, the question did come up of why we statically link against this when it seems to be a standard component on Panther and Tiger. We double checked, and it did not seem to be in Jaguar. So that's why.)\
  37.112 -\
  37.113 -The old libpng turned out to be from the 1.0.x branch so we needed to replace all the headers we had as well. Updating to the 1.2.x branch didn't seem to cause any problems we could detect.\
  37.114 -\
  37.115 -libpng and libjpeg lack an Xcode project so we mucked with their build system to produce Universal Binaries. But since we needed PPC to be compiled with 3.3 and Intel to be compiled with 4.0, it ended up that we built multiple times changing the compiler, and then using lipo to strip and combine the binaries.\
  37.116 -\
  37.117 -libogg/libvorbis did contain Xcode projects, but didn't build static libraries so we had to add that. We also discovered that not building with gcc 3.3 caused us addition missing symbol runtime problems with float versions of math functions (sinf, sqrtf, etc).\
  37.118 -\
  37.119 -It seems that once upon a time, the SDL_mixer framework supported MP3's via SMPEG, but this disappeared at some point. I don't know why or how this happened. But I also don't know how SMPEG was ever used with the framework as there was no preexisting infrastructure as with the other libraries. So I have attempted to correct this oversight, however, the SMPEG framework itself has MMX code which has also turned out to be problematic. I am getting compiler errors of "
  37.120 -\f2\i\fs22 Unknown pseudo-op:"
  37.121 -\f1\i0\fs24 for 
  37.122 -\f2\i\fs22 .type 
  37.123 -\f1\i0\fs24 and 
  37.124 -\f2\i\fs22 .size. 
  37.125 -\f1\i0\fs24 \
  37.126 -So SMPEG is currently compiled without MMX optimizations.\
  37.127 -\
  37.128 -\
  37.129 -\
  37.130 -\
  37.131 -Addendum: \
  37.132 -2006-03-06:\
  37.133 -The main SDL code base (not the satellites) have undergone an overhaul. The required platform specific defines have been moved out of the build system into platform specific header files (SDL_config_*.h). This allows us to simplify the Xcode projects somewhat, but we still must maintain the architecture specific build options to invoke gcc 3.3 to maintain our mandated 10.2 compatibilty requirement.\
  37.134 -\
  37.135 -Also it appears that the MMX/SSE code has been rewritten as well so that the obstacles we faced in compiling in these optimizations are no longer problems. The binaries we produce should now contain the processor specific optimizations. (Remember this note only applies to SDL and not the satellites, such as SMPEG.)\
  37.136 -\
  37.137 -\
  37.138 -\
  37.139 -Contributers:\
  37.140 -Eric Wing (Xcode projects, 3rd party dependencies, documentation)\
  37.141 -Christian Walther (10.2.8 and 10.3.9 testing/verification)\
  37.142 -Ryan Gordon (converted C++ code in SDL/OSX code base to pure C)\
  37.143 -Martin Storsj\'f6 (libgcc_s testing/verification)\
  37.144 -Stephane Marchesin (MMX/SSE code expert)\
  37.145 -\
  37.146 -\
  37.147 -\
  37.148 -\
  37.149 -\
  37.150 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
  37.151 -
  37.152 -\f0 \cf0 \
  37.153 -}
  37.154 \ No newline at end of file
    38.1 --- a/configure	Sun Jan 22 01:29:26 2012 -0500
    38.2 +++ b/configure	Sun Jan 22 17:21:00 2012 -0500
    38.3 @@ -2070,7 +2070,7 @@
    38.4  
    38.5  #
    38.6  # Making releases:
    38.7 -# Edit include/SDL/SDL_version.h and change the version, then:
    38.8 +# Edit include/SDL_version.h and change the version, then:
    38.9  #   SDL_MICRO_VERSION += 1;
   38.10  #   SDL_INTERFACE_AGE += 1;
   38.11  #   SDL_BINARY_AGE += 1;
   38.12 @@ -2078,8 +2078,8 @@
   38.13  # if backwards compatibility has been broken,
   38.14  # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
   38.15  #
   38.16 -SDL_MAJOR_VERSION=1
   38.17 -SDL_MINOR_VERSION=3
   38.18 +SDL_MAJOR_VERSION=2
   38.19 +SDL_MINOR_VERSION=0
   38.20  SDL_MICRO_VERSION=0
   38.21  SDL_INTERFACE_AGE=0
   38.22  SDL_BINARY_AGE=0
   38.23 @@ -15552,7 +15552,7 @@
   38.24  # built with it to be compiled for a particular architecture.
   38.25  #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]")
   38.26  BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DUSING_GENERATED_CONFIG_H"
   38.27 -# The default optimization for SDL 1.3 is -O3 (Bug #31)
   38.28 +# The default optimization for SDL is -O3 (Bug #31)
   38.29  if test x$orig_CFLAGS = x; then
   38.30      BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'`
   38.31  fi
   38.32 @@ -15569,7 +15569,7 @@
   38.33  #    fi
   38.34  #done
   38.35  SDL_CFLAGS="$BASE_CFLAGS"
   38.36 -SDL_LIBS="-lSDL $BASE_LDFLAGS"
   38.37 +SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
   38.38  CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
   38.39  CFLAGS="$CFLAGS $EXTRA_CFLAGS"
   38.40  LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
   38.41 @@ -27471,7 +27471,7 @@
   38.42          # The Windows platform requires special setup
   38.43          SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
   38.44          EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
   38.45 -        EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
   38.46 +        EXTRA_LDFLAGS="-lSDL2main $EXTRA_LDFLAGS"
   38.47          ;;
   38.48      *-*-cygwin* | *-*-mingw32*)
   38.49          ARCH=win32
   38.50 @@ -27618,7 +27618,7 @@
   38.51              have_loadso=yes
   38.52          fi
   38.53          # Set up the system libraries we need
   38.54 -        # SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME
   38.55 +        # SDL is unicode, and unicows emulates this on Windows 98/ME
   38.56          # You can get this here: http://libunicows.sourceforge.net/
   38.57          #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
   38.58          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
   38.59 @@ -27626,7 +27626,7 @@
   38.60          VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
   38.61          SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
   38.62          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
   38.63 -        SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
   38.64 +        SDL_LIBS="-lmingw32 -lSDL2main $SDL_LIBS -mwindows"
   38.65          ;;
   38.66      *-*-beos* | *-*-haiku*)
   38.67          ARCH=beos
   38.68 @@ -27903,7 +27903,7 @@
   38.69  case "$ARCH" in
   38.70    macosx)
   38.71      # Evil hack to allow static linking on Mac OS X
   38.72 -    SDL_STATIC_LIBS="\${libdir}/libSDL.a $EXTRA_LDFLAGS"
   38.73 +    SDL_STATIC_LIBS="\${libdir}/libSDL2.a $EXTRA_LDFLAGS"
   38.74      ;;
   38.75    *)
   38.76      SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
   38.77 @@ -27956,7 +27956,7 @@
   38.78  $SDLMAIN_DEPENDS
   38.79  __EOF__
   38.80  
   38.81 -ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl-config SDL.spec sdl.pc"
   38.82 +ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc"
   38.83  
   38.84  cat >confcache <<\_ACEOF
   38.85  # This file is a shell script that caches the results of configure
   38.86 @@ -28874,9 +28874,9 @@
   38.87      "include/SDL_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config.h" ;;
   38.88      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
   38.89      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;;
   38.90 -    "sdl-config") CONFIG_FILES="$CONFIG_FILES sdl-config" ;;
   38.91 -    "SDL.spec") CONFIG_FILES="$CONFIG_FILES SDL.spec" ;;
   38.92 -    "sdl.pc") CONFIG_FILES="$CONFIG_FILES sdl.pc" ;;
   38.93 +    "sdl2-config") CONFIG_FILES="$CONFIG_FILES sdl2-config" ;;
   38.94 +    "SDL2.spec") CONFIG_FILES="$CONFIG_FILES SDL2.spec" ;;
   38.95 +    "sdl2.pc") CONFIG_FILES="$CONFIG_FILES sdl2.pc" ;;
   38.96  
   38.97    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
   38.98  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    39.1 --- a/configure.in	Sun Jan 22 01:29:26 2012 -0500
    39.2 +++ b/configure.in	Sun Jan 22 17:21:00 2012 -0500
    39.3 @@ -11,7 +11,7 @@
    39.4  dnl Set various version strings - taken gratefully from the GTk sources
    39.5  #
    39.6  # Making releases:
    39.7 -# Edit include/SDL/SDL_version.h and change the version, then:
    39.8 +# Edit include/SDL_version.h and change the version, then:
    39.9  #   SDL_MICRO_VERSION += 1;
   39.10  #   SDL_INTERFACE_AGE += 1;
   39.11  #   SDL_BINARY_AGE += 1;
   39.12 @@ -19,8 +19,8 @@
   39.13  # if backwards compatibility has been broken,
   39.14  # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
   39.15  #
   39.16 -SDL_MAJOR_VERSION=1
   39.17 -SDL_MINOR_VERSION=3
   39.18 +SDL_MAJOR_VERSION=2
   39.19 +SDL_MINOR_VERSION=0
   39.20  SDL_MICRO_VERSION=0
   39.21  SDL_INTERFACE_AGE=0
   39.22  SDL_BINARY_AGE=0
   39.23 @@ -83,7 +83,7 @@
   39.24  # built with it to be compiled for a particular architecture.
   39.25  #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]")
   39.26  BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DUSING_GENERATED_CONFIG_H"
   39.27 -# The default optimization for SDL 1.3 is -O3 (Bug #31)
   39.28 +# The default optimization for SDL is -O3 (Bug #31)
   39.29  if test x$orig_CFLAGS = x; then
   39.30      BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'`
   39.31  fi
   39.32 @@ -100,7 +100,7 @@
   39.33  #    fi
   39.34  #done
   39.35  SDL_CFLAGS="$BASE_CFLAGS"
   39.36 -SDL_LIBS="-lSDL $BASE_LDFLAGS"
   39.37 +SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
   39.38  CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
   39.39  CFLAGS="$CFLAGS $EXTRA_CFLAGS"
   39.40  LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
   39.41 @@ -2249,7 +2249,7 @@
   39.42          # The Windows platform requires special setup
   39.43          SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
   39.44          EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
   39.45 -        EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
   39.46 +        EXTRA_LDFLAGS="-lSDL2main $EXTRA_LDFLAGS"
   39.47          ;;
   39.48      *-*-cygwin* | *-*-mingw32*)
   39.49          ARCH=win32
   39.50 @@ -2344,7 +2344,7 @@
   39.51              have_loadso=yes
   39.52          fi
   39.53          # Set up the system libraries we need
   39.54 -        # SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME
   39.55 +        # SDL is unicode, and unicows emulates this on Windows 98/ME
   39.56          # You can get this here: http://libunicows.sourceforge.net/
   39.57          #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
   39.58          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
   39.59 @@ -2352,7 +2352,7 @@
   39.60          VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
   39.61          SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
   39.62          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
   39.63 -        SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
   39.64 +        SDL_LIBS="-lmingw32 -lSDL2main $SDL_LIBS -mwindows"
   39.65          ;;
   39.66      *-*-beos* | *-*-haiku*)
   39.67          ARCH=beos
   39.68 @@ -2562,7 +2562,7 @@
   39.69  case "$ARCH" in
   39.70    macosx)
   39.71      # Evil hack to allow static linking on Mac OS X
   39.72 -    SDL_STATIC_LIBS="\${libdir}/libSDL.a $EXTRA_LDFLAGS"
   39.73 +    SDL_STATIC_LIBS="\${libdir}/libSDL2.a $EXTRA_LDFLAGS"
   39.74      ;;
   39.75    *)
   39.76      SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
   39.77 @@ -2618,6 +2618,6 @@
   39.78  __EOF__
   39.79  
   39.80  AC_CONFIG_FILES([
   39.81 -    Makefile:Makefile.in:Makefile.rules sdl-config SDL.spec sdl.pc
   39.82 +    Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc
   39.83  ])
   39.84  AC_OUTPUT
    40.1 --- a/include/SDL_version.h	Sun Jan 22 01:29:26 2012 -0500
    40.2 +++ b/include/SDL_version.h	Sun Jan 22 17:21:00 2012 -0500
    40.3 @@ -59,8 +59,8 @@
    40.4  
    40.5  /* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
    40.6  */
    40.7 -#define SDL_MAJOR_VERSION	1
    40.8 -#define SDL_MINOR_VERSION	3
    40.9 +#define SDL_MAJOR_VERSION	2
   40.10 +#define SDL_MINOR_VERSION	0
   40.11  #define SDL_PATCHLEVEL		0
   40.12  
   40.13  /**
    41.1 --- a/sdl-config.in	Sun Jan 22 01:29:26 2012 -0500
    41.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    41.3 @@ -1,60 +0,0 @@
    41.4 -#!/bin/sh
    41.5 -
    41.6 -prefix=@prefix@
    41.7 -exec_prefix=@exec_prefix@
    41.8 -exec_prefix_set=no
    41.9 -libdir=@libdir@
   41.10 -
   41.11 -@ENABLE_STATIC_FALSE@usage="\
   41.12 -@ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
   41.13 -@ENABLE_STATIC_TRUE@usage="\
   41.14 -@ENABLE_STATIC_TRUE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
   41.15 -
   41.16 -if test $# -eq 0; then
   41.17 -      echo "${usage}" 1>&2
   41.18 -      exit 1
   41.19 -fi
   41.20 -
   41.21 -while test $# -gt 0; do
   41.22 -  case "$1" in
   41.23 -  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
   41.24 -  *) optarg= ;;
   41.25 -  esac
   41.26 -
   41.27 -  case $1 in
   41.28 -    --prefix=*)
   41.29 -      prefix=$optarg
   41.30 -      if test $exec_prefix_set = no ; then
   41.31 -        exec_prefix=$optarg
   41.32 -      fi
   41.33 -      ;;
   41.34 -    --prefix)
   41.35 -      echo $prefix
   41.36 -      ;;
   41.37 -    --exec-prefix=*)
   41.38 -      exec_prefix=$optarg
   41.39 -      exec_prefix_set=yes
   41.40 -      ;;
   41.41 -    --exec-prefix)
   41.42 -      echo $exec_prefix
   41.43 -      ;;
   41.44 -    --version)
   41.45 -      echo @SDL_VERSION@
   41.46 -      ;;
   41.47 -    --cflags)
   41.48 -      echo -I@includedir@/SDL @SDL_CFLAGS@
   41.49 -      ;;
   41.50 -@ENABLE_SHARED_TRUE@    --libs)
   41.51 -@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
   41.52 -@ENABLE_SHARED_TRUE@      ;;
   41.53 -@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
   41.54 -@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
   41.55 -@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
   41.56 -@ENABLE_STATIC_TRUE@      ;;
   41.57 -    *)
   41.58 -      echo "${usage}" 1>&2
   41.59 -      exit 1
   41.60 -      ;;
   41.61 -  esac
   41.62 -  shift
   41.63 -done
    42.1 --- a/sdl.m4	Sun Jan 22 01:29:26 2012 -0500
    42.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    42.3 @@ -1,205 +0,0 @@
    42.4 -# Configure paths for SDL
    42.5 -# Sam Lantinga 9/21/99
    42.6 -# stolen from Manish Singh
    42.7 -# stolen back from Frank Belew
    42.8 -# stolen from Manish Singh
    42.9 -# Shamelessly stolen from Owen Taylor
   42.10 -
   42.11 -# serial 1
   42.12 -
   42.13 -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
   42.14 -dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
   42.15 -dnl
   42.16 -AC_DEFUN([AM_PATH_SDL],
   42.17 -[dnl 
   42.18 -dnl Get the cflags and libraries from the sdl-config script
   42.19 -dnl
   42.20 -AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
   42.21 -            sdl_prefix="$withval", sdl_prefix="")
   42.22 -AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
   42.23 -            sdl_exec_prefix="$withval", sdl_exec_prefix="")
   42.24 -AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
   42.25 -		    , enable_sdltest=yes)
   42.26 -
   42.27 -  min_sdl_version=ifelse([$1], ,1.2.0,$1)
   42.28 -
   42.29 -  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
   42.30 -    PKG_CHECK_MODULES(SDL, [sdl >= $min_sdl_version],
   42.31 -           [sdl_pc=yes],
   42.32 -           [dnl
   42.33 -             AC_MSG_RESULT(no)
   42.34 -             sdl_pc=no
   42.35 -           ])
   42.36 -  else
   42.37 -    sdl_pc=no
   42.38 -    if test x$sdl_exec_prefix != x ; then
   42.39 -      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
   42.40 -      if test x${SDL_CONFIG+set} != xset ; then
   42.41 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
   42.42 -      fi
   42.43 -    fi
   42.44 -    if test x$sdl_prefix != x ; then
   42.45 -      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
   42.46 -      if test x${SDL_CONFIG+set} != xset ; then
   42.47 -        SDL_CONFIG=$sdl_prefix/bin/sdl-config
   42.48 -      fi
   42.49 -    fi
   42.50 -  fi
   42.51 -
   42.52 -  if test "x$sdl_pc" = xyes ; then
   42.53 -    no_sdl=""
   42.54 -    SDL_CONFIG="pkg-config sdl"
   42.55 -  else
   42.56 -    as_save_PATH="$PATH"
   42.57 -    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
   42.58 -      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   42.59 -    fi
   42.60 -    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   42.61 -    PATH="$as_save_PATH"
   42.62 -    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   42.63 -    no_sdl=""
   42.64 -
   42.65 -    if test "$SDL_CONFIG" = "no" ; then
   42.66 -      no_sdl=yes
   42.67 -    else
   42.68 -      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
   42.69 -      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
   42.70 -
   42.71 -      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
   42.72 -             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
   42.73 -      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
   42.74 -             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
   42.75 -      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   42.76 -             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
   42.77 -      if test "x$enable_sdltest" = "xyes" ; then
   42.78 -        ac_save_CFLAGS="$CFLAGS"
   42.79 -        ac_save_CXXFLAGS="$CXXFLAGS"
   42.80 -        ac_save_LIBS="$LIBS"
   42.81 -        CFLAGS="$CFLAGS $SDL_CFLAGS"
   42.82 -        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   42.83 -        LIBS="$LIBS $SDL_LIBS"
   42.84 -dnl
   42.85 -dnl Now check if the installed SDL is sufficiently new. (Also sanity
   42.86 -dnl checks the results of sdl-config to some extent
   42.87 -dnl
   42.88 -      rm -f conf.sdltest
   42.89 -      AC_TRY_RUN([
   42.90 -#include <stdio.h>
   42.91 -#include <stdlib.h>
   42.92 -#include <string.h>
   42.93 -#include "SDL.h"
   42.94 -
   42.95 -char*
   42.96 -my_strdup (char *str)
   42.97 -{
   42.98 -  char *new_str;
   42.99 -  
  42.100 -  if (str)
  42.101 -    {
  42.102 -      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
  42.103 -      strcpy (new_str, str);
  42.104 -    }
  42.105 -  else
  42.106 -    new_str = NULL;
  42.107 -  
  42.108 -  return new_str;
  42.109 -}
  42.110 -
  42.111 -int main (int argc, char *argv[])
  42.112 -{
  42.113 -  int major, minor, micro;
  42.114 -  char *tmp_version;
  42.115 -
  42.116 -  /* This hangs on some systems (?)
  42.117 -  system ("touch conf.sdltest");
  42.118 -  */
  42.119 -  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
  42.120 -
  42.121 -  /* HP/UX 9 (%@#!) writes to sscanf strings */
  42.122 -  tmp_version = my_strdup("$min_sdl_version");
  42.123 -  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
  42.124 -     printf("%s, bad version string\n", "$min_sdl_version");
  42.125 -     exit(1);
  42.126 -   }
  42.127 -
  42.128 -   if (($sdl_major_version > major) ||
  42.129 -      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
  42.130 -      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
  42.131 -    {
  42.132 -      return 0;
  42.133 -    }
  42.134 -  else
  42.135 -    {
  42.136 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  42.137 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
  42.138 -      printf("*** best to upgrade to the required version.\n");
  42.139 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
  42.140 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
  42.141 -      printf("*** config.cache before re-running configure\n");
  42.142 -      return 1;
  42.143 -    }
  42.144 -}
  42.145 -
  42.146 -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
  42.147 -        CFLAGS="$ac_save_CFLAGS"
  42.148 -        CXXFLAGS="$ac_save_CXXFLAGS"
  42.149 -        LIBS="$ac_save_LIBS"
  42.150 -      fi
  42.151 -    fi
  42.152 -    if test "x$no_sdl" = x ; then
  42.153 -      AC_MSG_RESULT(yes)
  42.154 -    else
  42.155 -      AC_MSG_RESULT(no)
  42.156 -    fi
  42.157 -  fi
  42.158 -  if test "x$no_sdl" = x ; then
  42.159 -     ifelse([$2], , :, [$2])
  42.160 -  else
  42.161 -     if test "$SDL_CONFIG" = "no" ; then
  42.162 -       echo "*** The sdl-config script installed by SDL could not be found"
  42.163 -       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
  42.164 -       echo "*** your path, or set the SDL_CONFIG environment variable to the"
  42.165 -       echo "*** full path to sdl-config."
  42.166 -     else
  42.167 -       if test -f conf.sdltest ; then
  42.168 -        :
  42.169 -       else
  42.170 -          echo "*** Could not run SDL test program, checking why..."
  42.171 -          CFLAGS="$CFLAGS $SDL_CFLAGS"
  42.172 -          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  42.173 -          LIBS="$LIBS $SDL_LIBS"
  42.174 -          AC_TRY_LINK([
  42.175 -#include <stdio.h>
  42.176 -#include "SDL.h"
  42.177 -
  42.178 -int main(int argc, char *argv[])
  42.179 -{ return 0; }
  42.180 -#undef  main
  42.181 -#define main K_and_R_C_main
  42.182 -],      [ return 0; ],
  42.183 -        [ echo "*** The test program compiled, but did not run. This usually means"
  42.184 -          echo "*** that the run-time linker is not finding SDL or finding the wrong"
  42.185 -          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
  42.186 -          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
  42.187 -          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
  42.188 -          echo "*** is required on your system"
  42.189 -	  echo "***"
  42.190 -          echo "*** If you have an old version installed, it is best to remove it, although"
  42.191 -          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
  42.192 -        [ echo "*** The test program failed to compile or link. See the file config.log for the"
  42.193 -          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
  42.194 -          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
  42.195 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
  42.196 -          CFLAGS="$ac_save_CFLAGS"
  42.197 -          CXXFLAGS="$ac_save_CXXFLAGS"
  42.198 -          LIBS="$ac_save_LIBS"
  42.199 -       fi
  42.200 -     fi
  42.201 -     SDL_CFLAGS=""
  42.202 -     SDL_LIBS=""
  42.203 -     ifelse([$3], , :, [$3])
  42.204 -  fi
  42.205 -  AC_SUBST(SDL_CFLAGS)
  42.206 -  AC_SUBST(SDL_LIBS)
  42.207 -  rm -f conf.sdltest
  42.208 -])
    43.1 --- a/sdl.pc.in	Sun Jan 22 01:29:26 2012 -0500
    43.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    43.3 @@ -1,15 +0,0 @@
    43.4 -# sdl pkg-config source file
    43.5 -
    43.6 -prefix=@prefix@
    43.7 -exec_prefix=@exec_prefix@
    43.8 -libdir=@libdir@
    43.9 -includedir=@includedir@
   43.10 -
   43.11 -Name: sdl
   43.12 -Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.
   43.13 -Version: @SDL_VERSION@
   43.14 -Requires:
   43.15 -Conflicts:
   43.16 -Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
   43.17 -Libs.private: @SDL_STATIC_LIBS@
   43.18 -Cflags: -I${includedir}/SDL @SDL_CFLAGS@
    44.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    44.2 +++ b/sdl2-config.in	Sun Jan 22 17:21:00 2012 -0500
    44.3 @@ -0,0 +1,60 @@
    44.4 +#!/bin/sh
    44.5 +
    44.6 +prefix=@prefix@
    44.7 +exec_prefix=@exec_prefix@
    44.8 +exec_prefix_set=no
    44.9 +libdir=@libdir@
   44.10 +
   44.11 +@ENABLE_STATIC_FALSE@usage="\
   44.12 +@ENABLE_STATIC_FALSE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
   44.13 +@ENABLE_STATIC_TRUE@usage="\
   44.14 +@ENABLE_STATIC_TRUE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
   44.15 +
   44.16 +if test $# -eq 0; then
   44.17 +      echo "${usage}" 1>&2
   44.18 +      exit 1
   44.19 +fi
   44.20 +
   44.21 +while test $# -gt 0; do
   44.22 +  case "$1" in
   44.23 +  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
   44.24 +  *) optarg= ;;
   44.25 +  esac
   44.26 +
   44.27 +  case $1 in
   44.28 +    --prefix=*)
   44.29 +      prefix=$optarg
   44.30 +      if test $exec_prefix_set = no ; then
   44.31 +        exec_prefix=$optarg
   44.32 +      fi
   44.33 +      ;;
   44.34 +    --prefix)
   44.35 +      echo $prefix
   44.36 +      ;;
   44.37 +    --exec-prefix=*)
   44.38 +      exec_prefix=$optarg
   44.39 +      exec_prefix_set=yes
   44.40 +      ;;
   44.41 +    --exec-prefix)
   44.42 +      echo $exec_prefix
   44.43 +      ;;
   44.44 +    --version)
   44.45 +      echo @SDL_VERSION@
   44.46 +      ;;
   44.47 +    --cflags)
   44.48 +      echo -I@includedir@/SDL2 @SDL_CFLAGS@
   44.49 +      ;;
   44.50 +@ENABLE_SHARED_TRUE@    --libs)
   44.51 +@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
   44.52 +@ENABLE_SHARED_TRUE@      ;;
   44.53 +@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
   44.54 +@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
   44.55 +@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
   44.56 +@ENABLE_STATIC_TRUE@      ;;
   44.57 +    *)
   44.58 +      echo "${usage}" 1>&2
   44.59 +      exit 1
   44.60 +      ;;
   44.61 +  esac
   44.62 +  shift
   44.63 +done
    45.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    45.2 +++ b/sdl2.m4	Sun Jan 22 17:21:00 2012 -0500
    45.3 @@ -0,0 +1,202 @@
    45.4 +# Configure paths for SDL
    45.5 +# Sam Lantinga 9/21/99
    45.6 +# stolen from Manish Singh
    45.7 +# stolen back from Frank Belew
    45.8 +# stolen from Manish Singh
    45.9 +# Shamelessly stolen from Owen Taylor
   45.10 +
   45.11 +# serial 1
   45.12 +
   45.13 +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
   45.14 +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
   45.15 +dnl
   45.16 +AC_DEFUN([AM_PATH_SDL],
   45.17 +[dnl 
   45.18 +dnl Get the cflags and libraries from the sdl2-config script
   45.19 +dnl
   45.20 +AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
   45.21 +            sdl_prefix="$withval", sdl_prefix="")
   45.22 +AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
   45.23 +            sdl_exec_prefix="$withval", sdl_exec_prefix="")
   45.24 +AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
   45.25 +		    , enable_sdltest=yes)
   45.26 +
   45.27 +  min_sdl_version=ifelse([$1], ,0.9.0,$1)
   45.28 +
   45.29 +  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
   45.30 +    PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version],
   45.31 +           [sdl_pc=yes],
   45.32 +           [sdl_pc=no])
   45.33 +  else
   45.34 +    sdl_pc=no
   45.35 +    if test x$sdl_exec_prefix != x ; then
   45.36 +      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
   45.37 +      if test x${SDL_CONFIG+set} != xset ; then
   45.38 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
   45.39 +      fi
   45.40 +    fi
   45.41 +    if test x$sdl_prefix != x ; then
   45.42 +      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
   45.43 +      if test x${SDL_CONFIG+set} != xset ; then
   45.44 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
   45.45 +      fi
   45.46 +    fi
   45.47 +  fi
   45.48 +
   45.49 +  if test "x$sdl_pc" = xyes ; then
   45.50 +    no_sdl=""
   45.51 +    SDL_CONFIG="pkg-config sdl2"
   45.52 +  else
   45.53 +    as_save_PATH="$PATH"
   45.54 +    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
   45.55 +      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   45.56 +    fi
   45.57 +    AC_PATH_PROG(SDL_CONFIG, sdl2-config, no, [$PATH])
   45.58 +    PATH="$as_save_PATH"
   45.59 +    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   45.60 +    no_sdl=""
   45.61 +
   45.62 +    if test "$SDL_CONFIG" = "no" ; then
   45.63 +      no_sdl=yes
   45.64 +    else
   45.65 +      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
   45.66 +      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
   45.67 +
   45.68 +      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
   45.69 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
   45.70 +      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
   45.71 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
   45.72 +      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   45.73 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
   45.74 +      if test "x$enable_sdltest" = "xyes" ; then
   45.75 +        ac_save_CFLAGS="$CFLAGS"
   45.76 +        ac_save_CXXFLAGS="$CXXFLAGS"
   45.77 +        ac_save_LIBS="$LIBS"
   45.78 +        CFLAGS="$CFLAGS $SDL_CFLAGS"
   45.79 +        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   45.80 +        LIBS="$LIBS $SDL_LIBS"
   45.81 +dnl
   45.82 +dnl Now check if the installed SDL is sufficiently new. (Also sanity
   45.83 +dnl checks the results of sdl2-config to some extent
   45.84 +dnl
   45.85 +      rm -f conf.sdltest
   45.86 +      AC_TRY_RUN([
   45.87 +#include <stdio.h>
   45.88 +#include <stdlib.h>
   45.89 +#include <string.h>
   45.90 +#include "SDL.h"
   45.91 +
   45.92 +char*
   45.93 +my_strdup (char *str)
   45.94 +{
   45.95 +  char *new_str;
   45.96 +  
   45.97 +  if (str)
   45.98 +    {
   45.99 +      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
  45.100 +      strcpy (new_str, str);
  45.101 +    }
  45.102 +  else
  45.103 +    new_str = NULL;
  45.104 +  
  45.105 +  return new_str;
  45.106 +}
  45.107 +
  45.108 +int main (int argc, char *argv[])
  45.109 +{
  45.110 +  int major, minor, micro;
  45.111 +  char *tmp_version;
  45.112 +
  45.113 +  /* This hangs on some systems (?)
  45.114 +  system ("touch conf.sdltest");
  45.115 +  */
  45.116 +  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
  45.117 +
  45.118 +  /* HP/UX 9 (%@#!) writes to sscanf strings */
  45.119 +  tmp_version = my_strdup("$min_sdl_version");
  45.120 +  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
  45.121 +     printf("%s, bad version string\n", "$min_sdl_version");
  45.122 +     exit(1);
  45.123 +   }
  45.124 +
  45.125 +   if (($sdl_major_version > major) ||
  45.126 +      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
  45.127 +      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
  45.128 +    {
  45.129 +      return 0;
  45.130 +    }
  45.131 +  else
  45.132 +    {
  45.133 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  45.134 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
  45.135 +      printf("*** best to upgrade to the required version.\n");
  45.136 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
  45.137 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
  45.138 +      printf("*** config.cache before re-running configure\n");
  45.139 +      return 1;
  45.140 +    }
  45.141 +}
  45.142 +
  45.143 +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
  45.144 +        CFLAGS="$ac_save_CFLAGS"
  45.145 +        CXXFLAGS="$ac_save_CXXFLAGS"
  45.146 +        LIBS="$ac_save_LIBS"
  45.147 +      fi
  45.148 +    fi
  45.149 +    if test "x$no_sdl" = x ; then
  45.150 +      AC_MSG_RESULT(yes)
  45.151 +    else
  45.152 +      AC_MSG_RESULT(no)
  45.153 +    fi
  45.154 +  fi
  45.155 +  if test "x$no_sdl" = x ; then
  45.156 +     ifelse([$2], , :, [$2])
  45.157 +  else
  45.158 +     if test "$SDL_CONFIG" = "no" ; then
  45.159 +       echo "*** The sdl2-config script installed by SDL could not be found"
  45.160 +       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
  45.161 +       echo "*** your path, or set the SDL_CONFIG environment variable to the"
  45.162 +       echo "*** full path to sdl2-config."
  45.163 +     else
  45.164 +       if test -f conf.sdltest ; then
  45.165 +        :
  45.166 +       else
  45.167 +          echo "*** Could not run SDL test program, checking why..."
  45.168 +          CFLAGS="$CFLAGS $SDL_CFLAGS"
  45.169 +          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  45.170 +          LIBS="$LIBS $SDL_LIBS"
  45.171 +          AC_TRY_LINK([
  45.172 +#include <stdio.h>
  45.173 +#include "SDL.h"
  45.174 +
  45.175 +int main(int argc, char *argv[])
  45.176 +{ return 0; }
  45.177 +#undef  main
  45.178 +#define main K_and_R_C_main
  45.179 +],      [ return 0; ],
  45.180 +        [ echo "*** The test program compiled, but did not run. This usually means"
  45.181 +          echo "*** that the run-time linker is not finding SDL or finding the wrong"
  45.182 +          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
  45.183 +          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
  45.184 +          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
  45.185 +          echo "*** is required on your system"
  45.186 +	  echo "***"
  45.187 +          echo "*** If you have an old version installed, it is best to remove it, although"
  45.188 +          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
  45.189 +        [ echo "*** The test program failed to compile or link. See the file config.log for the"
  45.190 +          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
  45.191 +          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
  45.192 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ])
  45.193 +          CFLAGS="$ac_save_CFLAGS"
  45.194 +          CXXFLAGS="$ac_save_CXXFLAGS"
  45.195 +          LIBS="$ac_save_LIBS"
  45.196 +       fi
  45.197 +     fi
  45.198 +     SDL_CFLAGS=""
  45.199 +     SDL_LIBS=""
  45.200 +     ifelse([$3], , :, [$3])
  45.201 +  fi
  45.202 +  AC_SUBST(SDL_CFLAGS)
  45.203 +  AC_SUBST(SDL_LIBS)
  45.204 +  rm -f conf.sdltest
  45.205 +])
    46.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    46.2 +++ b/sdl2.pc.in	Sun Jan 22 17:21:00 2012 -0500
    46.3 @@ -0,0 +1,15 @@
    46.4 +# sdl pkg-config source file
    46.5 +
    46.6 +prefix=@prefix@
    46.7 +exec_prefix=@exec_prefix@
    46.8 +libdir=@libdir@
    46.9 +includedir=@includedir@
   46.10 +
   46.11 +Name: sdl2
   46.12 +Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.
   46.13 +Version: @SDL_VERSION@
   46.14 +Requires:
   46.15 +Conflicts:
   46.16 +Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
   46.17 +Libs.private: @SDL_STATIC_LIBS@
   46.18 +Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@
    47.1 --- a/test/acinclude.m4	Sun Jan 22 01:29:26 2012 -0500
    47.2 +++ b/test/acinclude.m4	Sun Jan 22 17:21:00 2012 -0500
    47.3 @@ -5,12 +5,14 @@
    47.4  # stolen from Manish Singh
    47.5  # Shamelessly stolen from Owen Taylor
    47.6  
    47.7 +# serial 1
    47.8 +
    47.9  dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
   47.10  dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
   47.11  dnl
   47.12  AC_DEFUN([AM_PATH_SDL],
   47.13  [dnl 
   47.14 -dnl Get the cflags and libraries from the sdl-config script
   47.15 +dnl Get the cflags and libraries from the sdl2-config script
   47.16  dnl
   47.17  AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
   47.18              sdl_prefix="$withval", sdl_prefix="")
   47.19 @@ -19,48 +21,63 @@
   47.20  AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
   47.21  		    , enable_sdltest=yes)
   47.22  
   47.23 -  if test x$sdl_exec_prefix != x ; then
   47.24 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
   47.25 -    if test x${SDL_CONFIG+set} != xset ; then
   47.26 -       SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
   47.27 +  min_sdl_version=ifelse([$1], ,0.9.0,$1)
   47.28 +
   47.29 +  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
   47.30 +    PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version],
   47.31 +           [sdl_pc=yes],
   47.32 +           [sdl_pc=no])
   47.33 +  else
   47.34 +    sdl_pc=no
   47.35 +    if test x$sdl_exec_prefix != x ; then
   47.36 +      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
   47.37 +      if test x${SDL_CONFIG+set} != xset ; then
   47.38 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
   47.39 +      fi
   47.40      fi
   47.41 -  fi
   47.42 -  if test x$sdl_prefix != x ; then
   47.43 -    sdl_args="$sdl_args --prefix=$sdl_prefix"
   47.44 -    if test x${SDL_CONFIG+set} != xset ; then
   47.45 -       SDL_CONFIG=$sdl_prefix/bin/sdl-config
   47.46 +    if test x$sdl_prefix != x ; then
   47.47 +      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
   47.48 +      if test x${SDL_CONFIG+set} != xset ; then
   47.49 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
   47.50 +      fi
   47.51      fi
   47.52    fi
   47.53  
   47.54 -  if test "x$prefix" != xNONE; then
   47.55 -    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   47.56 -  fi
   47.57 -  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   47.58 -  min_sdl_version=ifelse([$1], ,0.11.0,$1)
   47.59 -  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   47.60 -  no_sdl=""
   47.61 -  if test "$SDL_CONFIG" = "no" ; then
   47.62 -    no_sdl=yes
   47.63 +  if test "x$sdl_pc" = xyes ; then
   47.64 +    no_sdl=""
   47.65 +    SDL_CONFIG="pkg-config sdl2"
   47.66    else
   47.67 -    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
   47.68 -    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
   47.69 +    as_save_PATH="$PATH"
   47.70 +    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
   47.71 +      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   47.72 +    fi
   47.73 +    AC_PATH_PROG(SDL_CONFIG, sdl2-config, no, [$PATH])
   47.74 +    PATH="$as_save_PATH"
   47.75 +    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   47.76 +    no_sdl=""
   47.77  
   47.78 -    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
   47.79 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
   47.80 -    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
   47.81 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
   47.82 -    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   47.83 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
   47.84 -    if test "x$enable_sdltest" = "xyes" ; then
   47.85 -      ac_save_CFLAGS="$CFLAGS"
   47.86 -      ac_save_CXXFLAGS="$CXXFLAGS"
   47.87 -      ac_save_LIBS="$LIBS"
   47.88 -      CFLAGS="$CFLAGS $SDL_CFLAGS"
   47.89 -      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   47.90 -      LIBS="$LIBS $SDL_LIBS"
   47.91 +    if test "$SDL_CONFIG" = "no" ; then
   47.92 +      no_sdl=yes
   47.93 +    else
   47.94 +      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
   47.95 +      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
   47.96 +
   47.97 +      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
   47.98 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
   47.99 +      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
  47.100 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
  47.101 +      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
  47.102 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
  47.103 +      if test "x$enable_sdltest" = "xyes" ; then
  47.104 +        ac_save_CFLAGS="$CFLAGS"
  47.105 +        ac_save_CXXFLAGS="$CXXFLAGS"
  47.106 +        ac_save_LIBS="$LIBS"
  47.107 +        CFLAGS="$CFLAGS $SDL_CFLAGS"
  47.108 +        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  47.109 +        LIBS="$LIBS $SDL_LIBS"
  47.110  dnl
  47.111  dnl Now check if the installed SDL is sufficiently new. (Also sanity
  47.112 -dnl checks the results of sdl-config to some extent
  47.113 +dnl checks the results of sdl2-config to some extent
  47.114  dnl
  47.115        rm -f conf.sdltest
  47.116        AC_TRY_RUN([
  47.117 @@ -110,32 +127,36 @@
  47.118      }
  47.119    else
  47.120      {
  47.121 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  47.122 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
  47.123 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  47.124 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
  47.125        printf("*** best to upgrade to the required version.\n");
  47.126 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
  47.127 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
  47.128 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
  47.129 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
  47.130        printf("*** config.cache before re-running configure\n");
  47.131        return 1;
  47.132      }
  47.133  }
  47.134  
  47.135  ],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
  47.136 -       CFLAGS="$ac_save_CFLAGS"
  47.137 -       CXXFLAGS="$ac_save_CXXFLAGS"
  47.138 -       LIBS="$ac_save_LIBS"
  47.139 -     fi
  47.140 +        CFLAGS="$ac_save_CFLAGS"
  47.141 +        CXXFLAGS="$ac_save_CXXFLAGS"
  47.142 +        LIBS="$ac_save_LIBS"
  47.143 +      fi
  47.144 +    fi
  47.145 +    if test "x$no_sdl" = x ; then
  47.146 +      AC_MSG_RESULT(yes)
  47.147 +    else
  47.148 +      AC_MSG_RESULT(no)
  47.149 +    fi
  47.150    fi
  47.151    if test "x$no_sdl" = x ; then
  47.152 -     AC_MSG_RESULT(yes)
  47.153 -     ifelse([$2], , :, [$2])     
  47.154 +     ifelse([$2], , :, [$2])
  47.155    else
  47.156 -     AC_MSG_RESULT(no)
  47.157       if test "$SDL_CONFIG" = "no" ; then
  47.158 -       echo "*** The sdl-config script installed by SDL could not be found"
  47.159 +       echo "*** The sdl2-config script installed by SDL could not be found"
  47.160         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
  47.161         echo "*** your path, or set the SDL_CONFIG environment variable to the"
  47.162 -       echo "*** full path to sdl-config."
  47.163 +       echo "*** full path to sdl2-config."
  47.164       else
  47.165         if test -f conf.sdltest ; then
  47.166          :
  47.167 @@ -165,7 +186,7 @@
  47.168          [ echo "*** The test program failed to compile or link. See the file config.log for the"
  47.169            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
  47.170            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
  47.171 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
  47.172 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ])
  47.173            CFLAGS="$ac_save_CFLAGS"
  47.174            CXXFLAGS="$ac_save_CXXFLAGS"
  47.175            LIBS="$ac_save_LIBS"
  47.176 @@ -179,3 +200,160 @@
  47.177    AC_SUBST(SDL_LIBS)
  47.178    rm -f conf.sdltest
  47.179  ])
  47.180 +# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
  47.181 +# serial 1 (pkg-config-0.24)
  47.182 +# 
  47.183 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
  47.184 +#
  47.185 +# This program is free software; you can redistribute it and/or modify
  47.186 +# it under the terms of the GNU General Public License as published by
  47.187 +# the Free Software Foundation; either version 2 of the License, or
  47.188 +# (at your option) any later version.
  47.189 +#
  47.190 +# This program is distributed in the hope that it will be useful, but
  47.191 +# WITHOUT ANY WARRANTY; without even the implied warranty of
  47.192 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  47.193 +# General Public License for more details.
  47.194 +#
  47.195 +# You should have received a copy of the GNU General Public License
  47.196 +# along with this program; if not, write to the Free Software
  47.197 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  47.198 +#
  47.199 +# As a special exception to the GNU General Public License, if you
  47.200 +# distribute this file as part of a program that contains a
  47.201 +# configuration script generated by Autoconf, you may include it under
  47.202 +# the same distribution terms that you use for the rest of that program.
  47.203 +
  47.204 +# PKG_PROG_PKG_CONFIG([MIN-VERSION])
  47.205 +# ----------------------------------
  47.206 +AC_DEFUN([PKG_PROG_PKG_CONFIG],
  47.207 +[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
  47.208 +m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
  47.209 +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
  47.210 +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
  47.211 +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
  47.212 +
  47.213 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
  47.214 +	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
  47.215 +fi
  47.216 +if test -n "$PKG_CONFIG"; then
  47.217 +	_pkg_min_version=m4_default([$1], [0.9.0])
  47.218 +	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
  47.219 +	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
  47.220 +		AC_MSG_RESULT([yes])
  47.221 +	else
  47.222 +		AC_MSG_RESULT([no])
  47.223 +		PKG_CONFIG=""
  47.224 +	fi
  47.225 +fi[]dnl
  47.226 +])# PKG_PROG_PKG_CONFIG
  47.227 +
  47.228 +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
  47.229 +#
  47.230 +# Check to see whether a particular set of modules exists.  Similar
  47.231 +# to PKG_CHECK_MODULES(), but does not set variables or print errors.
  47.232 +#
  47.233 +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
  47.234 +# only at the first occurence in configure.ac, so if the first place
  47.235 +# it's called might be skipped (such as if it is within an "if", you
  47.236 +# have to call PKG_CHECK_EXISTS manually
  47.237 +# --------------------------------------------------------------
  47.238 +AC_DEFUN([PKG_CHECK_EXISTS],
  47.239 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
  47.240 +if test -n "$PKG_CONFIG" && \
  47.241 +    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
  47.242 +  m4_default([$2], [:])
  47.243 +m4_ifvaln([$3], [else
  47.244 +  $3])dnl
  47.245 +fi])
  47.246 +
  47.247 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
  47.248 +# ---------------------------------------------
  47.249 +m4_define([_PKG_CONFIG],
  47.250 +[if test -n "$$1"; then
  47.251 +    pkg_cv_[]$1="$$1"
  47.252 + elif test -n "$PKG_CONFIG"; then
  47.253 +    PKG_CHECK_EXISTS([$3],
  47.254 +                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
  47.255 +		     [pkg_failed=yes])
  47.256 + else
  47.257 +    pkg_failed=untried
  47.258 +fi[]dnl
  47.259 +])# _PKG_CONFIG
  47.260 +
  47.261 +# _PKG_SHORT_ERRORS_SUPPORTED
  47.262 +# -----------------------------
  47.263 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
  47.264 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
  47.265 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  47.266 +        _pkg_short_errors_supported=yes
  47.267 +else
  47.268 +        _pkg_short_errors_supported=no
  47.269 +fi[]dnl
  47.270 +])# _PKG_SHORT_ERRORS_SUPPORTED
  47.271 +
  47.272 +
  47.273 +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
  47.274 +# [ACTION-IF-NOT-FOUND])
  47.275 +#
  47.276 +#
  47.277 +# Note that if there is a possibility the first call to
  47.278 +# PKG_CHECK_MODULES might not happen, you should be sure to include an
  47.279 +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
  47.280 +#
  47.281 +#
  47.282 +# --------------------------------------------------------------
  47.283 +AC_DEFUN([PKG_CHECK_MODULES],
  47.284 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
  47.285 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
  47.286 +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
  47.287 +
  47.288 +pkg_failed=no
  47.289 +AC_MSG_CHECKING([for $1])
  47.290 +
  47.291 +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
  47.292 +_PKG_CONFIG([$1][_LIBS], [libs], [$2])
  47.293 +
  47.294 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
  47.295 +and $1[]_LIBS to avoid the need to call pkg-config.
  47.296 +See the pkg-config man page for more details.])
  47.297 +
  47.298 +if test $pkg_failed = yes; then
  47.299 +   	AC_MSG_RESULT([no])
  47.300 +        _PKG_SHORT_ERRORS_SUPPORTED
  47.301 +        if test $_pkg_short_errors_supported = yes; then
  47.302 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
  47.303 +        else 
  47.304 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
  47.305 +        fi
  47.306 +	# Put the nasty error message in config.log where it belongs
  47.307 +	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
  47.308 +
  47.309 +	m4_default([$4], [AC_MSG_ERROR(
  47.310 +[Package requirements ($2) were not met:
  47.311 +
  47.312 +$$1_PKG_ERRORS
  47.313 +
  47.314 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
  47.315 +installed software in a non-standard prefix.
  47.316 +
  47.317 +_PKG_TEXT])dnl
  47.318 +        ])
  47.319 +elif test $pkg_failed = untried; then
  47.320 +     	AC_MSG_RESULT([no])
  47.321 +	m4_default([$4], [AC_MSG_FAILURE(
  47.322 +[The pkg-config script could not be found or is too old.  Make sure it
  47.323 +is in your PATH or set the PKG_CONFIG environment variable to the full
  47.324 +path to pkg-config.
  47.325 +
  47.326 +_PKG_TEXT
  47.327 +
  47.328 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
  47.329 +        ])
  47.330 +else
  47.331 +	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
  47.332 +	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
  47.333 +        AC_MSG_RESULT([yes])
  47.334 +	$3
  47.335 +fi[]dnl
  47.336 +])# PKG_CHECK_MODULES
    48.1 --- a/test/aclocal.m4	Sun Jan 22 01:29:26 2012 -0500
    48.2 +++ b/test/aclocal.m4	Sun Jan 22 17:21:00 2012 -0500
    48.3 @@ -5,12 +5,14 @@
    48.4  # stolen from Manish Singh
    48.5  # Shamelessly stolen from Owen Taylor
    48.6  
    48.7 +# serial 1
    48.8 +
    48.9  dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
   48.10  dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
   48.11  dnl
   48.12  AC_DEFUN([AM_PATH_SDL],
   48.13  [dnl 
   48.14 -dnl Get the cflags and libraries from the sdl-config script
   48.15 +dnl Get the cflags and libraries from the sdl2-config script
   48.16  dnl
   48.17  AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
   48.18              sdl_prefix="$withval", sdl_prefix="")
   48.19 @@ -19,48 +21,63 @@
   48.20  AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
   48.21  		    , enable_sdltest=yes)
   48.22  
   48.23 -  if test x$sdl_exec_prefix != x ; then
   48.24 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
   48.25 -    if test x${SDL_CONFIG+set} != xset ; then
   48.26 -       SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
   48.27 +  min_sdl_version=ifelse([$1], ,0.9.0,$1)
   48.28 +
   48.29 +  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
   48.30 +    PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version],
   48.31 +           [sdl_pc=yes],
   48.32 +           [sdl_pc=no])
   48.33 +  else
   48.34 +    sdl_pc=no
   48.35 +    if test x$sdl_exec_prefix != x ; then
   48.36 +      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
   48.37 +      if test x${SDL_CONFIG+set} != xset ; then
   48.38 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
   48.39 +      fi
   48.40      fi
   48.41 -  fi
   48.42 -  if test x$sdl_prefix != x ; then
   48.43 -    sdl_args="$sdl_args --prefix=$sdl_prefix"
   48.44 -    if test x${SDL_CONFIG+set} != xset ; then
   48.45 -       SDL_CONFIG=$sdl_prefix/bin/sdl-config
   48.46 +    if test x$sdl_prefix != x ; then
   48.47 +      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
   48.48 +      if test x${SDL_CONFIG+set} != xset ; then
   48.49 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
   48.50 +      fi
   48.51      fi
   48.52    fi
   48.53  
   48.54 -  if test "x$prefix" != xNONE; then
   48.55 -    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   48.56 -  fi
   48.57 -  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   48.58 -  min_sdl_version=ifelse([$1], ,0.11.0,$1)
   48.59 -  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   48.60 -  no_sdl=""
   48.61 -  if test "$SDL_CONFIG" = "no" ; then
   48.62 -    no_sdl=yes
   48.63 +  if test "x$sdl_pc" = xyes ; then
   48.64 +    no_sdl=""
   48.65 +    SDL_CONFIG="pkg-config sdl2"
   48.66    else
   48.67 -    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
   48.68 -    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
   48.69 +    as_save_PATH="$PATH"
   48.70 +    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
   48.71 +      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   48.72 +    fi
   48.73 +    AC_PATH_PROG(SDL_CONFIG, sdl2-config, no, [$PATH])
   48.74 +    PATH="$as_save_PATH"
   48.75 +    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   48.76 +    no_sdl=""
   48.77  
   48.78 -    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
   48.79 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
   48.80 -    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
   48.81 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
   48.82 -    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   48.83 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
   48.84 -    if test "x$enable_sdltest" = "xyes" ; then
   48.85 -      ac_save_CFLAGS="$CFLAGS"
   48.86 -      ac_save_CXXFLAGS="$CXXFLAGS"
   48.87 -      ac_save_LIBS="$LIBS"
   48.88 -      CFLAGS="$CFLAGS $SDL_CFLAGS"
   48.89 -      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   48.90 -      LIBS="$LIBS $SDL_LIBS"
   48.91 +    if test "$SDL_CONFIG" = "no" ; then
   48.92 +      no_sdl=yes
   48.93 +    else
   48.94 +      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
   48.95 +      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
   48.96 +
   48.97 +      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
   48.98 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
   48.99 +      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
  48.100 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
  48.101 +      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
  48.102 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
  48.103 +      if test "x$enable_sdltest" = "xyes" ; then
  48.104 +        ac_save_CFLAGS="$CFLAGS"
  48.105 +        ac_save_CXXFLAGS="$CXXFLAGS"
  48.106 +        ac_save_LIBS="$LIBS"
  48.107 +        CFLAGS="$CFLAGS $SDL_CFLAGS"
  48.108 +        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  48.109 +        LIBS="$LIBS $SDL_LIBS"
  48.110  dnl
  48.111  dnl Now check if the installed SDL is sufficiently new. (Also sanity
  48.112 -dnl checks the results of sdl-config to some extent
  48.113 +dnl checks the results of sdl2-config to some extent
  48.114  dnl
  48.115        rm -f conf.sdltest
  48.116        AC_TRY_RUN([
  48.117 @@ -110,32 +127,36 @@
  48.118      }
  48.119    else
  48.120      {
  48.121 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  48.122 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
  48.123 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  48.124 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
  48.125        printf("*** best to upgrade to the required version.\n");
  48.126 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
  48.127 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
  48.128 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
  48.129 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
  48.130        printf("*** config.cache before re-running configure\n");
  48.131        return 1;
  48.132      }
  48.133  }
  48.134  
  48.135  ],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
  48.136 -       CFLAGS="$ac_save_CFLAGS"
  48.137 -       CXXFLAGS="$ac_save_CXXFLAGS"
  48.138 -       LIBS="$ac_save_LIBS"
  48.139 -     fi
  48.140 +        CFLAGS="$ac_save_CFLAGS"
  48.141 +        CXXFLAGS="$ac_save_CXXFLAGS"
  48.142 +        LIBS="$ac_save_LIBS"
  48.143 +      fi
  48.144 +    fi
  48.145 +    if test "x$no_sdl" = x ; then
  48.146 +      AC_MSG_RESULT(yes)
  48.147 +    else
  48.148 +      AC_MSG_RESULT(no)
  48.149 +    fi
  48.150    fi
  48.151    if test "x$no_sdl" = x ; then
  48.152 -     AC_MSG_RESULT(yes)
  48.153 -     ifelse([$2], , :, [$2])     
  48.154 +     ifelse([$2], , :, [$2])
  48.155    else
  48.156 -     AC_MSG_RESULT(no)
  48.157       if test "$SDL_CONFIG" = "no" ; then
  48.158 -       echo "*** The sdl-config script installed by SDL could not be found"
  48.159 +       echo "*** The sdl2-config script installed by SDL could not be found"
  48.160         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
  48.161         echo "*** your path, or set the SDL_CONFIG environment variable to the"
  48.162 -       echo "*** full path to sdl-config."
  48.163 +       echo "*** full path to sdl2-config."
  48.164       else
  48.165         if test -f conf.sdltest ; then
  48.166          :
  48.167 @@ -165,7 +186,7 @@
  48.168          [ echo "*** The test program failed to compile or link. See the file config.log for the"
  48.169            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
  48.170            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
  48.171 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
  48.172 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ])
  48.173            CFLAGS="$ac_save_CFLAGS"
  48.174            CXXFLAGS="$ac_save_CXXFLAGS"
  48.175            LIBS="$ac_save_LIBS"
  48.176 @@ -179,3 +200,160 @@
  48.177    AC_SUBST(SDL_LIBS)
  48.178    rm -f conf.sdltest
  48.179  ])
  48.180 +# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
  48.181 +# serial 1 (pkg-config-0.24)
  48.182 +# 
  48.183 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
  48.184 +#
  48.185 +# This program is free software; you can redistribute it and/or modify
  48.186 +# it under the terms of the GNU General Public License as published by
  48.187 +# the Free Software Foundation; either version 2 of the License, or
  48.188 +# (at your option) any later version.
  48.189 +#
  48.190 +# This program is distributed in the hope that it will be useful, but
  48.191 +# WITHOUT ANY WARRANTY; without even the implied warranty of
  48.192 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  48.193 +# General Public License for more details.
  48.194 +#
  48.195 +# You should have received a copy of the GNU General Public License
  48.196 +# along with this program; if not, write to the Free Software
  48.197 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  48.198 +#
  48.199 +# As a special exception to the GNU General Public License, if you
  48.200 +# distribute this file as part of a program that contains a
  48.201 +# configuration script generated by Autoconf, you may include it under
  48.202 +# the same distribution terms that you use for the rest of that program.
  48.203 +
  48.204 +# PKG_PROG_PKG_CONFIG([MIN-VERSION])
  48.205 +# ----------------------------------
  48.206 +AC_DEFUN([PKG_PROG_PKG_CONFIG],
  48.207 +[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
  48.208 +m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
  48.209 +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
  48.210 +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
  48.211 +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
  48.212 +
  48.213 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
  48.214 +	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
  48.215 +fi
  48.216 +if test -n "$PKG_CONFIG"; then
  48.217 +	_pkg_min_version=m4_default([$1], [0.9.0])
  48.218 +	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
  48.219 +	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
  48.220 +		AC_MSG_RESULT([yes])
  48.221 +	else
  48.222 +		AC_MSG_RESULT([no])
  48.223 +		PKG_CONFIG=""
  48.224 +	fi
  48.225 +fi[]dnl
  48.226 +])# PKG_PROG_PKG_CONFIG
  48.227 +
  48.228 +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
  48.229 +#
  48.230 +# Check to see whether a particular set of modules exists.  Similar
  48.231 +# to PKG_CHECK_MODULES(), but does not set variables or print errors.
  48.232 +#
  48.233 +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
  48.234 +# only at the first occurence in configure.ac, so if the first place
  48.235 +# it's called might be skipped (such as if it is within an "if", you
  48.236 +# have to call PKG_CHECK_EXISTS manually
  48.237 +# --------------------------------------------------------------
  48.238 +AC_DEFUN([PKG_CHECK_EXISTS],
  48.239 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
  48.240 +if test -n "$PKG_CONFIG" && \
  48.241 +    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
  48.242 +  m4_default([$2], [:])
  48.243 +m4_ifvaln([$3], [else
  48.244 +  $3])dnl
  48.245 +fi])
  48.246 +
  48.247 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
  48.248 +# ---------------------------------------------
  48.249 +m4_define([_PKG_CONFIG],
  48.250 +[if test -n "$$1"; then
  48.251 +    pkg_cv_[]$1="$$1"
  48.252 + elif test -n "$PKG_CONFIG"; then
  48.253 +    PKG_CHECK_EXISTS([$3],
  48.254 +                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
  48.255 +		     [pkg_failed=yes])
  48.256 + else
  48.257 +    pkg_failed=untried
  48.258 +fi[]dnl
  48.259 +])# _PKG_CONFIG
  48.260 +
  48.261 +# _PKG_SHORT_ERRORS_SUPPORTED
  48.262 +# -----------------------------
  48.263 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
  48.264 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
  48.265 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  48.266 +        _pkg_short_errors_supported=yes
  48.267 +else
  48.268 +        _pkg_short_errors_supported=no
  48.269 +fi[]dnl
  48.270 +])# _PKG_SHORT_ERRORS_SUPPORTED
  48.271 +
  48.272 +
  48.273 +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
  48.274 +# [ACTION-IF-NOT-FOUND])
  48.275 +#
  48.276 +#
  48.277 +# Note that if there is a possibility the first call to
  48.278 +# PKG_CHECK_MODULES might not happen, you should be sure to include an
  48.279 +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
  48.280 +#
  48.281 +#
  48.282 +# --------------------------------------------------------------
  48.283 +AC_DEFUN([PKG_CHECK_MODULES],
  48.284 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
  48.285 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
  48.286 +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
  48.287 +
  48.288 +pkg_failed=no
  48.289 +AC_MSG_CHECKING([for $1])
  48.290 +
  48.291 +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
  48.292 +_PKG_CONFIG([$1][_LIBS], [libs], [$2])
  48.293 +
  48.294 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
  48.295 +and $1[]_LIBS to avoid the need to call pkg-config.
  48.296 +See the pkg-config man page for more details.])
  48.297 +
  48.298 +if test $pkg_failed = yes; then
  48.299 +   	AC_MSG_RESULT([no])
  48.300 +        _PKG_SHORT_ERRORS_SUPPORTED
  48.301 +        if test $_pkg_short_errors_supported = yes; then
  48.302 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
  48.303 +        else 
  48.304 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
  48.305 +        fi
  48.306 +	# Put the nasty error message in config.log where it belongs
  48.307 +	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
  48.308 +
  48.309 +	m4_default([$4], [AC_MSG_ERROR(
  48.310 +[Package requirements ($2) were not met:
  48.311 +
  48.312 +$$1_PKG_ERRORS
  48.313 +
  48.314 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
  48.315 +installed software in a non-standard prefix.
  48.316 +
  48.317 +_PKG_TEXT])dnl
  48.318 +        ])
  48.319 +elif test $pkg_failed = untried; then
  48.320 +     	AC_MSG_RESULT([no])
  48.321 +	m4_default([$4], [AC_MSG_FAILURE(
  48.322 +[The pkg-config script could not be found or is too old.  Make sure it
  48.323 +is in your PATH or set the PKG_CONFIG environment variable to the full
  48.324 +path to pkg-config.
  48.325 +
  48.326 +_PKG_TEXT
  48.327 +
  48.328 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
  48.329 +        ])
  48.330 +else
  48.331 +	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
  48.332 +	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
  48.333 +        AC_MSG_RESULT([yes])
  48.334 +	$3
  48.335 +fi[]dnl
  48.336 +])# PKG_CHECK_MODULES
    49.1 --- a/test/configure	Sun Jan 22 01:29:26 2012 -0500
    49.2 +++ b/test/configure	Sun Jan 22 17:21:00 2012 -0500
    49.3 @@ -632,9 +632,12 @@
    49.4  OSMESA_CONFIG
    49.5  EXE
    49.6  MATHLIB
    49.7 -SDL_CONFIG
    49.8 +PKG_CONFIG
    49.9 +PKG_CONFIG_PATH
   49.10 +PKG_CONFIG_LIBDIR
   49.11  SDL_CFLAGS
   49.12  SDL_LIBS
   49.13 +SDL_CONFIG
   49.14  XMKMF
   49.15  CPP
   49.16  GLLIB
   49.17 @@ -650,6 +653,11 @@
   49.18  LDFLAGS
   49.19  LIBS
   49.20  CPPFLAGS
   49.21 +PKG_CONFIG
   49.22 +PKG_CONFIG_PATH
   49.23 +PKG_CONFIG_LIBDIR
   49.24 +SDL_CFLAGS
   49.25 +SDL_LIBS
   49.26  XMKMF
   49.27  CPP'
   49.28  
   49.29 @@ -1245,6 +1253,13 @@
   49.30    LIBS        libraries to pass to the linker, e.g. -l<library>
   49.31    CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
   49.32                you have headers in a nonstandard directory <include dir>
   49.33 +  PKG_CONFIG  path to pkg-config utility
   49.34 +  PKG_CONFIG_PATH
   49.35 +              directories to add to pkg-config's search path
   49.36 +  PKG_CONFIG_LIBDIR
   49.37 +              path overriding pkg-config's built-in search path
   49.38 +  SDL_CFLAGS  C compiler flags for SDL, overriding pkg-config
   49.39 +  SDL_LIBS    linker flags for SDL, overriding pkg-config
   49.40    XMKMF       Path to xmkmf, Makefile generator for X Window System
   49.41    CPP         C preprocessor
   49.42  
   49.43 @@ -2906,7 +2921,130 @@
   49.44  
   49.45  
   49.46  
   49.47 -SDL_VERSION=1.3.0
   49.48 +SDL_VERSION=2.0.0
   49.49 +
   49.50 +
   49.51 +
   49.52 +
   49.53 +
   49.54 +
   49.55 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
   49.56 +	if test -n "$ac_tool_prefix"; then
   49.57 +  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
   49.58 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
   49.59 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
   49.60 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
   49.61 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   49.62 +  echo $ECHO_N "(cached) $ECHO_C" >&6
   49.63 +else
   49.64 +  case $PKG_CONFIG in
   49.65 +  [\\/]* | ?:[\\/]*)
   49.66 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   49.67 +  ;;
   49.68 +  *)
   49.69 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   49.70 +for as_dir in $PATH
   49.71 +do
   49.72 +  IFS=$as_save_IFS
   49.73 +  test -z "$as_dir" && as_dir=.
   49.74 +  for ac_exec_ext in '' $ac_executable_extensions; do
   49.75 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   49.76 +    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   49.77 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
   49.78 +    break 2
   49.79 +  fi
   49.80 +done
   49.81 +done
   49.82 +IFS=$as_save_IFS
   49.83 +
   49.84 +  ;;
   49.85 +esac
   49.86 +fi
   49.87 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
   49.88 +if test -n "$PKG_CONFIG"; then
   49.89 +  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
   49.90 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
   49.91 +else
   49.92 +  { echo "$as_me:$LINENO: result: no" >&5
   49.93 +echo "${ECHO_T}no" >&6; }
   49.94 +fi
   49.95 +
   49.96 +
   49.97 +fi
   49.98 +if test -z "$ac_cv_path_PKG_CONFIG"; then
   49.99 +  ac_pt_PKG_CONFIG=$PKG_CONFIG
  49.100 +  # Extract the first word of "pkg-config", so it can be a program name with args.
  49.101 +set dummy pkg-config; ac_word=$2
  49.102 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  49.103 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  49.104 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
  49.105 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  49.106 +else
  49.107 +  case $ac_pt_PKG_CONFIG in
  49.108 +  [\\/]* | ?:[\\/]*)
  49.109 +  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
  49.110 +  ;;
  49.111 +  *)
  49.112 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  49.113 +for as_dir in $PATH
  49.114 +do
  49.115 +  IFS=$as_save_IFS
  49.116 +  test -z "$as_dir" && as_dir=.
  49.117 +  for ac_exec_ext in '' $ac_executable_extensions; do
  49.118 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  49.119 +    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  49.120 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  49.121 +    break 2
  49.122 +  fi
  49.123 +done
  49.124 +done
  49.125 +IFS=$as_save_IFS
  49.126 +
  49.127 +  ;;
  49.128 +esac
  49.129 +fi
  49.130 +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  49.131 +if test -n "$ac_pt_PKG_CONFIG"; then
  49.132 +  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
  49.133 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
  49.134 +else
  49.135 +  { echo "$as_me:$LINENO: result: no" >&5
  49.136 +echo "${ECHO_T}no" >&6; }
  49.137 +fi
  49.138 +
  49.139 +  if test "x$ac_pt_PKG_CONFIG" = x; then
  49.140 +    PKG_CONFIG=""
  49.141 +  else
  49.142 +    case $cross_compiling:$ac_tool_warned in
  49.143 +yes:)
  49.144 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  49.145 +whose name does not start with the host triplet.  If you think this
  49.146 +configuration is useful to you, please write to autoconf@gnu.org." >&5
  49.147 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  49.148 +whose name does not start with the host triplet.  If you think this
  49.149 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  49.150 +ac_tool_warned=yes ;;
  49.151 +esac
  49.152 +    PKG_CONFIG=$ac_pt_PKG_CONFIG
  49.153 +  fi
  49.154 +else
  49.155 +  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
  49.156 +fi
  49.157 +
  49.158 +fi
  49.159 +if test -n "$PKG_CONFIG"; then
  49.160 +	_pkg_min_version=0.9.0
  49.161 +	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
  49.162 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
  49.163 +	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
  49.164 +		{ echo "$as_me:$LINENO: result: yes" >&5
  49.165 +echo "${ECHO_T}yes" >&6; }
  49.166 +	else
  49.167 +		{ echo "$as_me:$LINENO: result: no" >&5
  49.168 +echo "${ECHO_T}no" >&6; }
  49.169 +		PKG_CONFIG=""
  49.170 +	fi
  49.171 +fi
  49.172  
  49.173  # Check whether --with-sdl-prefix was given.
  49.174  if test "${with_sdl_prefix+set}" = set; then
  49.175 @@ -2931,24 +3069,104 @@
  49.176  fi
  49.177  
  49.178  
  49.179 -  if test x$sdl_exec_prefix != x ; then
  49.180 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
  49.181 -    if test x${SDL_CONFIG+set} != xset ; then
  49.182 -       SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
  49.183 +  min_sdl_version=$SDL_VERSION
  49.184 +
  49.185 +  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
  49.186 +
  49.187 +pkg_failed=no
  49.188 +{ echo "$as_me:$LINENO: checking for SDL" >&5
  49.189 +echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
  49.190 +
  49.191 +if test -n "$SDL_CFLAGS"; then
  49.192 +    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
  49.193 + elif test -n "$PKG_CONFIG"; then
  49.194 +    if test -n "$PKG_CONFIG" && \
  49.195 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
  49.196 +  ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
  49.197 +  ac_status=$?
  49.198 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  49.199 +  (exit $ac_status); }; then
  49.200 +  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $min_sdl_version" 2>/dev/null`
  49.201 +else
  49.202 +  pkg_failed=yes
  49.203 +fi
  49.204 + else
  49.205 +    pkg_failed=untried
  49.206 +fi
  49.207 +if test -n "$SDL_LIBS"; then
  49.208 +    pkg_cv_SDL_LIBS="$SDL_LIBS"
  49.209 + elif test -n "$PKG_CONFIG"; then
  49.210 +    if test -n "$PKG_CONFIG" && \
  49.211 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
  49.212 +  ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
  49.213 +  ac_status=$?
  49.214 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  49.215 +  (exit $ac_status); }; then
  49.216 +  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $min_sdl_version" 2>/dev/null`
  49.217 +else
  49.218 +  pkg_failed=yes
  49.219 +fi
  49.220 + else
  49.221 +    pkg_failed=untried
  49.222 +fi
  49.223 +
  49.224 +
  49.225 +
  49.226 +if test $pkg_failed = yes; then
  49.227 +   	{ echo "$as_me:$LINENO: result: no" >&5
  49.228 +echo "${ECHO_T}no" >&6; }
  49.229 +
  49.230 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  49.231 +        _pkg_short_errors_supported=yes
  49.232 +else
  49.233 +        _pkg_short_errors_supported=no
  49.234 +fi
  49.235 +        if test $_pkg_short_errors_supported = yes; then
  49.236 +	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl2 >= $min_sdl_version" 2>&1`
  49.237 +        else
  49.238 +	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl2 >= $min_sdl_version" 2>&1`
  49.239 +        fi
  49.240 +	# Put the nasty error message in config.log where it belongs
  49.241 +	echo "$SDL_PKG_ERRORS" >&5
  49.242 +
  49.243 +	sdl_pc=no
  49.244 +elif test $pkg_failed = untried; then
  49.245 +     	{ echo "$as_me:$LINENO: result: no" >&5
  49.246 +echo "${ECHO_T}no" >&6; }
  49.247 +	sdl_pc=no
  49.248 +else
  49.249 +	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
  49.250 +	SDL_LIBS=$pkg_cv_SDL_LIBS
  49.251 +        { echo "$as_me:$LINENO: result: yes" >&5
  49.252 +echo "${ECHO_T}yes" >&6; }
  49.253 +	sdl_pc=yes
  49.254 +fi
  49.255 +  else
  49.256 +    sdl_pc=no
  49.257 +    if test x$sdl_exec_prefix != x ; then
  49.258 +      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
  49.259 +      if test x${SDL_CONFIG+set} != xset ; then
  49.260 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
  49.261 +      fi
  49.262 +    fi
  49.263 +    if test x$sdl_prefix != x ; then
  49.264 +      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
  49.265 +      if test x${SDL_CONFIG+set} != xset ; then
  49.266 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
  49.267 +      fi
  49.268      fi
  49.269    fi
  49.270 -  if test x$sdl_prefix != x ; then
  49.271 -    sdl_args="$sdl_args --prefix=$sdl_prefix"
  49.272 -    if test x${SDL_CONFIG+set} != xset ; then
  49.273 -       SDL_CONFIG=$sdl_prefix/bin/sdl-config
  49.274 +
  49.275 +  if test "x$sdl_pc" = xyes ; then
  49.276 +    no_sdl=""
  49.277 +    SDL_CONFIG="pkg-config sdl2"
  49.278 +  else
  49.279 +    as_save_PATH="$PATH"
  49.280 +    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
  49.281 +      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
  49.282      fi
  49.283 -  fi
  49.284 -
  49.285 -  if test "x$prefix" != xNONE; then
  49.286 -    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
  49.287 -  fi
  49.288 -  # Extract the first word of "sdl-config", so it can be a program name with args.
  49.289 -set dummy sdl-config; ac_word=$2
  49.290 +    # Extract the first word of "sdl2-config", so it can be a program name with args.
  49.291 +set dummy sdl2-config; ac_word=$2
  49.292  { echo "$as_me:$LINENO: checking for $ac_word" >&5
  49.293  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  49.294  if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
  49.295 @@ -2988,29 +3206,30 @@
  49.296  fi
  49.297  
  49.298  
  49.299 -  min_sdl_version=$SDL_VERSION
  49.300 -  { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
  49.301 +    PATH="$as_save_PATH"
  49.302 +    { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
  49.303  echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
  49.304 -  no_sdl=""
  49.305 -  if test "$SDL_CONFIG" = "no" ; then
  49.306 -    no_sdl=yes
  49.307 -  else
  49.308 -    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
  49.309 -    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
  49.310 -
  49.311 -    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
  49.312 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
  49.313 -    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
  49.314 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
  49.315 -    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
  49.316 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
  49.317 -    if test "x$enable_sdltest" = "xyes" ; then
  49.318 -      ac_save_CFLAGS="$CFLAGS"
  49.319 -      ac_save_CXXFLAGS="$CXXFLAGS"
  49.320 -      ac_save_LIBS="$LIBS"
  49.321 -      CFLAGS="$CFLAGS $SDL_CFLAGS"
  49.322 -      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  49.323 -      LIBS="$LIBS $SDL_LIBS"
  49.324 +    no_sdl=""
  49.325 +
  49.326 +    if test "$SDL_CONFIG" = "no" ; then
  49.327 +      no_sdl=yes
  49.328 +    else
  49.329 +      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
  49.330 +      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
  49.331 +
  49.332 +      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
  49.333 +             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
  49.334 +      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
  49.335 +             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
  49.336 +      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
  49.337 +             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
  49.338 +      if test "x$enable_sdltest" = "xyes" ; then
  49.339 +        ac_save_CFLAGS="$CFLAGS"
  49.340 +        ac_save_CXXFLAGS="$CXXFLAGS"
  49.341 +        ac_save_LIBS="$LIBS"
  49.342 +        CFLAGS="$CFLAGS $SDL_CFLAGS"
  49.343 +        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  49.344 +        LIBS="$LIBS $SDL_LIBS"
  49.345        rm -f conf.sdltest
  49.346        if test "$cross_compiling" = yes; then
  49.347    echo $ac_n "cross compiling; assumed OK... $ac_c"
  49.348 @@ -3068,11 +3287,11 @@
  49.349      }
  49.350    else
  49.351      {
  49.352 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  49.353 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
  49.354 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  49.355 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
  49.356        printf("*** best to upgrade to the required version.\n");
  49.357 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
  49.358 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
  49.359 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
  49.360 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
  49.361        printf("*** config.cache before re-running configure\n");
  49.362        return 1;
  49.363      }
  49.364 @@ -3113,23 +3332,27 @@
  49.365  fi
  49.366  
  49.367  
  49.368 -       CFLAGS="$ac_save_CFLAGS"
  49.369 -       CXXFLAGS="$ac_save_CXXFLAGS"
  49.370 -       LIBS="$ac_save_LIBS"
  49.371 -     fi
  49.372 +        CFLAGS="$ac_save_CFLAGS"
  49.373 +        CXXFLAGS="$ac_save_CXXFLAGS"
  49.374 +        LIBS="$ac_save_LIBS"
  49.375 +      fi
  49.376 +    fi
  49.377 +    if test "x$no_sdl" = x ; then
  49.378 +      { echo "$as_me:$LINENO: result: yes" >&5
  49.379 +echo "${ECHO_T}yes" >&6; }
  49.380 +    else
  49.381 +      { echo "$as_me:$LINENO: result: no" >&5
  49.382 +echo "${ECHO_T}no" >&6; }
  49.383 +    fi
  49.384    fi
  49.385    if test "x$no_sdl" = x ; then
  49.386 -     { echo "$as_me:$LINENO: result: yes" >&5
  49.387 -echo "${ECHO_T}yes" >&6; }
  49.388       :
  49.389    else
  49.390 -     { echo "$as_me:$LINENO: result: no" >&5
  49.391 -echo "${ECHO_T}no" >&6; }
  49.392       if test "$SDL_CONFIG" = "no" ; then
  49.393 -       echo "*** The sdl-config script installed by SDL could not be found"
  49.394 +       echo "*** The sdl2-config script installed by SDL could not be found"
  49.395         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
  49.396         echo "*** your path, or set the SDL_CONFIG environment variable to the"
  49.397 -       echo "*** full path to sdl-config."
  49.398 +       echo "*** full path to sdl2-config."
  49.399       else
  49.400         if test -f conf.sdltest ; then
  49.401          :
  49.402 @@ -3195,7 +3418,7 @@
  49.403  	 echo "*** The test program failed to compile or link. See the file config.log for the"
  49.404            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
  49.405            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
  49.406 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
  49.407 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG"
  49.408  fi
  49.409  
  49.410  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  49.411 @@ -4567,9 +4790,12 @@
  49.412  OSMESA_CONFIG!$OSMESA_CONFIG$ac_delim
  49.413  EXE!$EXE$ac_delim
  49.414  MATHLIB!$MATHLIB$ac_delim
  49.415 -SDL_CONFIG!$SDL_CONFIG$ac_delim
  49.416 +PKG_CONFIG!$PKG_CONFIG$ac_delim
  49.417 +PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
  49.418 +PKG_CONFIG_LIBDIR!$PKG_CONFIG_LIBDIR$ac_delim
  49.419  SDL_CFLAGS!$SDL_CFLAGS$ac_delim
  49.420  SDL_LIBS!$SDL_LIBS$ac_delim
  49.421 +SDL_CONFIG!$SDL_CONFIG$ac_delim
  49.422  XMKMF!$XMKMF$ac_delim
  49.423  CPP!$CPP$ac_delim
  49.424  GLLIB!$GLLIB$ac_delim
  49.425 @@ -4578,7 +4804,7 @@
  49.426  LTLIBOBJS!$LTLIBOBJS$ac_delim
  49.427  _ACEOF
  49.428  
  49.429 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
  49.430 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
  49.431      break
  49.432    elif $ac_last_try; then
  49.433      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
    50.1 --- a/test/configure.in	Sun Jan 22 01:29:26 2012 -0500
    50.2 +++ b/test/configure.in	Sun Jan 22 17:21:00 2012 -0500
    50.3 @@ -65,7 +65,7 @@
    50.4  AC_SUBST(MATHLIB)
    50.5  
    50.6  dnl Check for SDL
    50.7 -SDL_VERSION=1.3.0
    50.8 +SDL_VERSION=2.0.0
    50.9  AM_PATH_SDL($SDL_VERSION,
   50.10              :,
   50.11  	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])