From 8484414588a8053cb5ff856d6f63f0ac81a92f39 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 18 Mar 2005 03:13:08 +0000 Subject: [PATCH] Update SDL to 1.2.8 --- ChangeLog | 6 ++++++ README | 18 ++++++++---------- VisualC/d2x/d2x.dsp | 8 ++++---- VisualC/d2xgl/d2xgl.dsp | 8 ++++---- VisualC/libmve/libmve.dsp | 4 ++-- VisualC/mveplayer/mveplayer.dsp | 8 ++++---- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 079919be..4b5f04e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-03-17 Bradley Bell + + * README, VisualC/d2x/d2x.dsp, VisualC/d2xgl/d2xgl.dsp, + VisualC/libmve/libmve.dsp, VisualC/mveplayer/mveplayer.dsp: + Update SDL to 1.2.8 + 2005-03-16 Bradley Bell * main/bm.c, main/bm.h: use hardcoded value instead of diff --git a/README b/README index d2ae6a19..f1321414 100644 --- a/README +++ b/README @@ -61,16 +61,14 @@ Required tools: * PhysicsFS * NASM 0.98 (OPTIONAL but RECOMMENDED) -Note that SDL.dll needs to be in your executable PATH, since that is -where windows looks for dlls. -I recommend copying or moving it to /usr/local/bin: -cp /usr/local/lib/SDL.dll /usr/local/bin +Download the SDL 1.2 SDK for MinGW, unpack and install it from the +MSYS shell with "make native". You will need to manually copy the +file bin/i386-mingw32msvc-sdl-config to /usr/bin/sdl-config, and edit +it, setting the "prefix" variable to "/usr". -If you need to run autogen.sh (e.g. to rebuild the configure scripts, -or to build from cvs) sdl.m4 will have to be somewhere where aclocal -can find it. -You can fix this by setting the ACLOCAL_FLAGS variable like this: -export ACLOCAL_FLAGS=/usr/local/share/aclocal +If you are compiling from CVS, you will also need to have msysDTK +installed. This is required to run autogen.sh and also includes the +cvs client itself, among other useful tools. Now you can configure d2x as normal. i.e. ./configure @@ -98,7 +96,7 @@ This can be whereever you like, but if your directory structure looks like this, then you won't have to mess with the project settings: sdl\ -sdl\SDL-1.2.7\ +sdl\SDL-1.2.8\ physfs physfs\physfs-1.0.0\ descent\d2x\ diff --git a/VisualC/d2x/d2x.dsp b/VisualC/d2x/d2x.dsp index d3a36821..88aa93ba 100644 --- a/VisualC/d2x/d2x.dsp +++ b/VisualC/d2x/d2x.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\physfs\physfs-1.0.0" /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\physfs\physfs-1.0.0" /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -1185,11 +1185,11 @@ SOURCE=..\..\main\weapon.h # End Group # Begin Source File -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" +SOURCE="..\..\..\..\sdl\SDL-1.2.8\lib\SDLmain.lib" # End Source File # Begin Source File -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDL.lib" +SOURCE="..\..\..\..\sdl\SDL-1.2.8\lib\SDL.lib" # End Source File # Begin Source File diff --git a/VisualC/d2xgl/d2xgl.dsp b/VisualC/d2xgl/d2xgl.dsp index cfb73750..aaca7ecc 100644 --- a/VisualC/d2xgl/d2xgl.dsp +++ b/VisualC/d2xgl/d2xgl.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\physfs\physfs-1.0.0" /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\physfs\physfs-1.0.0" /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -1197,11 +1197,11 @@ SOURCE=..\..\main\weapon.h # End Group # Begin Source File -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" +SOURCE="..\..\..\..\sdl\SDL-1.2.8\lib\SDLmain.lib" # End Source File # Begin Source File -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDL.lib" +SOURCE="..\..\..\..\sdl\SDL-1.2.8\lib\SDL.lib" # End Source File # Begin Source File diff --git a/VisualC/libmve/libmve.dsp b/VisualC/libmve/libmve.dsp index 0fbe638b..4cf6d7c5 100644 --- a/VisualC/libmve/libmve.dsp +++ b/VisualC/libmve/libmve.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/VisualC/mveplayer/mveplayer.dsp b/VisualC/mveplayer/mveplayer.dsp index 6b343243..f0c431f7 100644 --- a/VisualC/mveplayer/mveplayer.dsp +++ b/VisualC/mveplayer/mveplayer.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.8\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -120,11 +120,11 @@ SOURCE=..\..\include\libmve.h # End Group # Begin Source File -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDL.lib" +SOURCE="..\..\..\..\sdl\SDL-1.2.8\lib\SDL.lib" # End Source File # Begin Source File -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" +SOURCE="..\..\..\..\sdl\SDL-1.2.8\lib\SDLmain.lib" # End Source File # End Target # End Project -- 2.39.2