Update SDL to 1.2.8
This commit is contained in:
Bradley Bell
parent
1636d139eb
commit
8484414588
|
|
@ -1,3 +1,9 @@
|
|||
2005-03-17 Bradley Bell <btb@icculus.org>
|
||||
|
||||
* 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 <btb@icculus.org>
|
||||
|
||||
* main/bm.c, main/bm.h: use hardcoded value instead of
|
||||
|
|
|
|||
18
README
18
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\
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue