Menu
▾
▴
[Dawnofinfinity-commits] SF.net SVN: dawnofinfinity: [26] doi-ioquake3/ioquake3
|
From: <mrv...@us...> - 2007-06-02 08:57:21
|
Revision: 26
http://svn.sourceforge.net/dawnofinfinity/?rev=26&view=rev
Author: mrvacbob
Date: 2007-06-02 01:57:18 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
downgrade ioquake3, patch openarena in
Modified Paths:
--------------
doi-ioquake3/ioquake3/Makefile
doi-ioquake3/ioquake3/NOTTODO
doi-ioquake3/ioquake3/README
doi-ioquake3/ioquake3/TODO
doi-ioquake3/ioquake3/code/SDL12/include/SDL.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_active.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_audio.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_byteorder.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_cdrom.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_copying.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_cpuinfo.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_endian.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_error.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_events.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_getenv.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_joystick.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_keyboard.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_keysym.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_loadso.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_main.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_mouse.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_mutex.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_opengl.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_quit.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_rwops.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_syswm.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_thread.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_timer.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_types.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_version.h
doi-ioquake3/ioquake3/code/SDL12/include/SDL_video.h
doi-ioquake3/ioquake3/code/SDL12/include/begin_code.h
doi-ioquake3/ioquake3/code/SDL12/include/close_code.h
doi-ioquake3/ioquake3/code/botlib/be_ai_chat.c
doi-ioquake3/ioquake3/code/botlib/l_precomp.c
doi-ioquake3/ioquake3/code/cgame/cg_main.c
doi-ioquake3/ioquake3/code/client/cl_cgame.c
doi-ioquake3/ioquake3/code/client/cl_curl.c
doi-ioquake3/ioquake3/code/client/cl_keys.c
doi-ioquake3/ioquake3/code/client/cl_main.c
doi-ioquake3/ioquake3/code/client/cl_parse.c
doi-ioquake3/ioquake3/code/client/cl_ui.c
doi-ioquake3/ioquake3/code/client/client.h
doi-ioquake3/ioquake3/code/client/keycodes.h
doi-ioquake3/ioquake3/code/client/keys.h
doi-ioquake3/ioquake3/code/client/qal.c
doi-ioquake3/ioquake3/code/client/snd_dma.c
doi-ioquake3/ioquake3/code/client/snd_openal.c
doi-ioquake3/ioquake3/code/game/bg_lib.h
doi-ioquake3/ioquake3/code/game/g_bot.c
doi-ioquake3/ioquake3/code/game/g_session.c
doi-ioquake3/ioquake3/code/libs/macosx/libSDL-1.2.0.dylib
doi-ioquake3/ioquake3/code/q3_ui/ui_mods.c
doi-ioquake3/ioquake3/code/q3_ui/ui_teamorders.c
doi-ioquake3/ioquake3/code/qcommon/common.c
doi-ioquake3/ioquake3/code/qcommon/cvar.c
doi-ioquake3/ioquake3/code/qcommon/files.c
doi-ioquake3/ioquake3/code/qcommon/md5.c
doi-ioquake3/ioquake3/code/qcommon/net_chan.c
doi-ioquake3/ioquake3/code/qcommon/q_platform.h
doi-ioquake3/ioquake3/code/qcommon/q_shared.c
doi-ioquake3/ioquake3/code/qcommon/q_shared.h
doi-ioquake3/ioquake3/code/qcommon/qcommon.h
doi-ioquake3/ioquake3/code/qcommon/vm.c
doi-ioquake3/ioquake3/code/qcommon/vm_interpreted.c
doi-ioquake3/ioquake3/code/qcommon/vm_x86_64.c
doi-ioquake3/ioquake3/code/renderer/tr_init.c
doi-ioquake3/ioquake3/code/renderer/tr_shader.c
doi-ioquake3/ioquake3/code/server/sv_ccmds.c
doi-ioquake3/ioquake3/code/server/sv_client.c
doi-ioquake3/ioquake3/code/server/sv_game.c
doi-ioquake3/ioquake3/code/server/sv_init.c
doi-ioquake3/ioquake3/code/server/sv_main.c
doi-ioquake3/ioquake3/code/ui/ui_main.c
doi-ioquake3/ioquake3/code/unix/MacSupport/ioquake3.icns
doi-ioquake3/ioquake3/code/unix/linux_glimp.c
doi-ioquake3/ioquake3/code/unix/sdl_glimp.c
doi-ioquake3/ioquake3/code/unix/sdl_snd.c
doi-ioquake3/ioquake3/code/unix/setup/Makefile
doi-ioquake3/ioquake3/code/unix/setup/Solaris_pkg.sh
doi-ioquake3/ioquake3/code/unix/setup/pkg/ioquake3/pkginfo.template
doi-ioquake3/ioquake3/code/unix/setup/pkg/ioquake3d/pkginfo.template
doi-ioquake3/ioquake3/code/unix/setup/setup.xml
doi-ioquake3/ioquake3/code/unix/unix_main.c
doi-ioquake3/ioquake3/code/unix/unix_shared.c
doi-ioquake3/ioquake3/code/win32/win_gamma.c
doi-ioquake3/ioquake3/code/win32/win_input.c
doi-ioquake3/ioquake3/code/win32/win_shared.c
doi-ioquake3/ioquake3/code/win32/win_wndproc.c
doi-ioquake3/ioquake3/cross-make-mingw.sh
doi-ioquake3/ioquake3/make-macosx-ub.sh
Modified: doi-ioquake3/ioquake3/Makefile
===================================================================
--- doi-ioquake3/ioquake3/Makefile 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/Makefile 2007-06-02 08:57:18 UTC (rev 26)
@@ -51,18 +51,6 @@
ARCH=$(COMPILE_ARCH)
endif
-ifndef CC
- CC=gcc
-endif
-
-ifeq ($(PLATFORM),sunos)
- # GNU make on SunOS defines CC as 'cc'. 'grep -q' is not an option on SunOS.
- CC=gcc
- CC_IS_GCC=1
-else
- CC_IS_GCC=$(shell $(CC) --version | grep -q "(GCC)" && echo 1)
-endif
-
ifeq ($(ARCH),powerpc)
ARCH=ppc
endif
@@ -185,6 +173,8 @@
ifeq ($(PLATFORM),linux)
+ CC=gcc
+
ifeq ($(ARCH),alpha)
ARCH=axp
else
@@ -302,6 +292,7 @@
#############################################################################
ifeq ($(PLATFORM),darwin)
+ CC=gcc
VM_PPC=vm_ppc_new
HAVE_VM_COMPILED=true
BASE_CFLAGS=
@@ -437,9 +428,8 @@
ifeq ($(PLATFORM),mingw32)
-ifndef WINDRES
-WINDRES=windres
-endif
+ CC=gcc
+ WINDRES=windres
ARCH=x86
@@ -537,11 +527,13 @@
endif
ifeq ($(ARCH),axp)
+ CC=gcc
BASE_CFLAGS += -DNO_VM_COMPILED
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
-fomit-frame-pointer -fexpensive-optimizations
else
ifeq ($(ARCH),i386)
+ CC=gcc
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
-march=pentium -fomit-frame-pointer -pipe -ffast-math \
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
@@ -591,6 +583,7 @@
ARCH=i386
endif
+ CC=gcc
LDFLAGS=-lm
SHLIBEXT=so
SHLIBCFLAGS=-fPIC
@@ -617,6 +610,7 @@
ARCH=mips #default to MIPS
+ CC=cc
BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 -mips3 \
-nostdinc -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED
RELEASE_CFLAGS=$(BASE_CFLAGS) -O3
@@ -637,6 +631,7 @@
ifeq ($(PLATFORM),sunos)
+ CC=gcc
INSTALL=ginstall
MKDIR=gmkdir
COPYDIR="/usr/local/share/games/quake3"
@@ -670,22 +665,15 @@
-falign-jumps=2 -falign-functions=2 -fstrength-reduce \
-mtune=ultrasparc -mv8plus -mno-faster-structs \
-funroll-loops
+ BASE_CFLAGS += -DNO_VM_COMPILED
else
ifeq ($(ARCH),i386)
- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
- -funroll-loops -falign-loops=2 -falign-jumps=2 \
- -falign-functions=2 -fstrength-reduce
- HAVE_VM_COMPILED=true
- BASE_CFLAGS += -m32
- LDFLAGS+=-m32
- GL_CFLAGS+= -I/usr/X11/include/NVIDIA
+ OPTIMIZE = -O3 -march=i586 -ffast-math \
+ -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+ -funroll-loops -fstrength-reduce
endif
endif
- ifneq ($(HAVE_VM_COMPILED),true)
- BASE_CFLAGS += -DNO_VM_COMPILED
- endif
-
DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
@@ -705,11 +693,18 @@
CLIENT_LDFLAGS=-L/usr/openwin/$(LIB) -L/usr/X11/lib -lGLU -lX11 -lXext
endif
+ ifeq ($(ARCH),i386)
+ # Solarix x86 make ...
+ BASE_CFLAGS += -m32
+ LDFLAGS+=-m32
+ endif
+
else # ifeq sunos
#############################################################################
# SETUP AND BUILD -- GENERIC
#############################################################################
+ CC=cc
BASE_CFLAGS=-DNO_VM_COMPILED
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3
@@ -775,7 +770,7 @@
endif
ifeq ($(GENERATE_DEPENDENCIES),1)
- ifeq ($(CC_IS_GCC),1)
+ ifeq ($(CC),gcc)
DEPEND_CFLAGS=-MMD
endif
endif
@@ -1863,10 +1858,10 @@
$(MAKE) VERSION=$(VERSION) -C $(LOKISETUPDIR)
dist:
- rm -rf ioquake3-$(SVN_VERSION)
- svn export . ioquake3-$(SVN_VERSION)
- tar --owner=root --group=root --force-local -cjf ioquake3-$(SVN_VERSION).tar.bz2 ioquake3-$(SVN_VERSION)
- rm -rf ioquake3-$(SVN_VERSION)
+ rm -rf quake3-$(SVN_VERSION)
+ svn export . quake3-$(SVN_VERSION)
+ tar --owner=root --group=root --force-local -cjf quake3-$(SVN_VERSION).tar.bz2 quake3-$(SVN_VERSION)
+ rm -rf quake3-$(SVN_VERSION)
#############################################################################
# DEPENDENCIES
Modified: doi-ioquake3/ioquake3/NOTTODO
===================================================================
--- doi-ioquake3/ioquake3/NOTTODO 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/NOTTODO 2007-06-02 08:57:18 UTC (rev 26)
@@ -18,15 +18,4 @@
Removing the SDL/OpenAL header files from SVN. Having them in SVN makes it easier
for non-Linux platforms to compile the game. This isn't changing.
-MP3 support. It is already done, see: http://ioquake3.org/?page=patches
-
-All development should take place on the trunk. This includes bug
-fixes, new features and experimental stuff.
-
-Release branches should not receive any commits that aren't also made
-to the trunk. Normally you /shouldn't/ commit to release branches as
-such commits are periodically merged from the trunk. These merges are
-harder to perform if there are sporadic commits made in the interim.
-
-Under NO CIRCUMSTANCES ever commit to a tag. A tag is a static
-snapshot which is intended to be unchanging.
+MP3 support. It is already done, see: http://icculus.org/quake3/?page=patches
Modified: doi-ioquake3/ioquake3/README
===================================================================
--- doi-ioquake3/ioquake3/README 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/README 2007-06-02 08:57:18 UTC (rev 26)
@@ -23,7 +23,6 @@
* Much improved QVM tools
* Support for various esoteric operating systems (see
http://ioquake3.org/?page=status)
- * cl_guid support
* HTTP/FTP download redirection (using cURL)
* Multiuser support on Windows systems (user specific game data
is stored in "%APPDATA%\Quake3")
@@ -75,12 +74,9 @@
It is also possible to cross compile for Windows under *nix using MinGW. A
script is available to build a cross compilation environment from
http://www.libsdl.org/extras/win32/cross/build-cross.sh. The gcc/binutils
-version numbers that the script downloads may need to be altered.
-Alternatively, your distribution may have mingw32 packages available. On
-debian/Ubuntu, these are mingw32, mingw32-runtime and mingw32-binutils. Cross
-compiling is simply a case of using './cross-make-mingw.sh' in place of 'make',
-though you may find you need to change the value of the variables in this
-script to match your environment.
+version numbers that the script downloads may need to be altered. After you
+have successfully run this script cross compiling is simply a case of using
+'./cross-make-mingw.sh' in place of 'make'.
If the make based build system is being used (i.e. *nix or MinGW), the
following variables may be set, either on the command line or in
@@ -128,6 +124,8 @@
source
s_alGraceDistance - after having passed MaxDistance, length
until sounds are completely inaudible.
+ s_alMaxSpeakerDistance - ET_SPEAKERS beyond this distance are
+ culled
s_alDriver - which OpenAL library to use
s_alDevice - which OpenAL device to use
s_alAvailableDevices - list of available OpenAL devices
@@ -151,7 +149,6 @@
cl_platformSensitivity - read only, indicates the mouse input
scaling
r_ext_texture_filter_anisotropic - anisotropic texture filtering
- cl_guidServerUniq - makes cl_guid unique for each server
cl_cURLLib - filename of cURL library to load
sv_dlURL - the base of the HTTP or FTP site that
holds custom pk3 files for your server
@@ -207,110 +204,70 @@
compiler. See http://www.quakesrc.org/forums/viewtopic.php?t=5665 (if it
still exists when you read this) for more details.
-cl_guid Support
- cl_guid is a cvar which is part of the client's USERINFO string. Its value
- is a 32 character string made up of [a-f] and [0-9] characters. This
- value is pseudo-unique for every player. Id's Quake 3 Arena client also
- sets cl_guid, but only if Punkbuster is enabled on the client.
-
- If cl_guidServerUniq is non-zero (the default), then this value is also
- pseudo-unique for each server a client connects to (based on IP:PORT of
- the server).
-
- The purpose of cl_guid is to add an identifier for each player on
- a server. This value can be reset by the client at any time so it's not
- useful for blocking access. However, it can have at least two uses in
- your mod's game code:
- 1) improve logging to allow statistical tools to index players by more
- than just name
- 2) granting some weak admin rights to players without requiring passwords
-
Using HTTP/FTP Download Support (Server)
- You can enable redirected downloads on your server even if it's not
- an ioquake3 server. You simply need to use the 'sets' command to put
- the sv_dlURL cvar into your SERVERINFO string and ensure sv_allowDownloads
- is set to 1
+ You can enable redirected downloads on your server even if it's not
+ an ioquake3 server. You simply need to use the 'sets' command to put
+ the sv_dlURL cvar into your SERVERINFO string and ensure sv_allowDownloads
+ is set to 1
- sv_dlURL is the base of the URL that contains your custom .pk3 files
- the client will append both fs_game and the filename to the end of
- this value. For example, if you have sv_dlURL set to
- "http://ioquake3.org", fs_game is "baseq3", and the client is
- missing "test.pk3", it will attempt to download from the URL
- "http://ioquake3.org/baseq3/test.pk3"
+ sv_dlURL is the base of the URL that contains your custom .pk3 files
+ the client will append both fs_game and the filename to the end of
+ this value. For example, if you have sv_dlURL set to
+ "http://ioquake3.org", fs_game is "baseq3", and the client is
+ missing "test.pk3", it will attempt to download from the URL
+ "http://ioquake3.org/baseq3/test.pk3"
- sv_allowDownload's value is now a bitmask made up of the following
- flags:
- 1 - ENABLE
- 2 - do not use HTTP/FTP downloads
- 4 - do not use UDP downloads
- 8 - do not ask the client to disconnect when using HTTP/FTP
+ sv_allowDownload's value is now a bitmask made up of the following
+ flags:
+ 1 - ENABLE
+ 2 - do not use HTTP/FTP downloads
+ 4 - do not use UDP downloads
+ 8 - do not ask the client to disconnect when using HTTP/FTP
- Server operators who are concerned about potential "leeching" from their
- HTTP servers from other ioquake3 servers can make use of the HTTP_REFERER
- that ioquake3 sets which is "ioQ3://{SERVER_IP}:{SERVER_PORT}". For,
- example, Apache's mod_rewrite can restrict access based on HTTP_REFERER.
+ Server operators who are concerned about potential "leeching" from their
+ HTTP servers from other ioquake3 servers can make use of the HTTP_REFERER
+ that ioquake3 sets which is "ioQ3://{SERVER_IP}:{SERVER_PORT}". For,
+ example, Apache's mod_rewrite can restrict access based on HTTP_REFERER.
Using HTTP/FTP Download Support (Client)
- Simply setting cl_allowDownload to 1 will enable HTTP/FTP downloads
- assuming ioquake3 was compiled with USE_CURL=1 (the default).
- like sv_allowDownload, cl_allowDownload also uses a bitmask value
- supporting the following flags:
- 1 - ENABLE
- 2 - do not use HTTP/FTP downloads
- 4 - do not use UDP downloads
+ Simply setting cl_allowDownload to 1 will enable HTTP/FTP downloads
+ assuming ioquake3 was compiled with USE_CURL=1 (the default).
+ like sv_allowDownload, cl_allowDownload also uses a bitmask value
+ supporting the following flags:
+ 1 - ENABLE
+ 2 - do not use HTTP/FTP downloads
+ 4 - do not use UDP downloads
- When ioquake3 is built with USE_CURL_DLOPEN=1 (default on some platforms),
- it will use the value of the cvar cl_cURLLib as the filename of the cURL
- library to dynamically load.
+ When ioquake3 is built with USE_CURL_DLOPEN=1 (default on some platforms),
+ it will use the value of the cvar cl_cURLLib as the filename of the cURL
+ library to dynamically load.
Multiuser Support on Windows systems
- On Windows, all user specific files such as autogenerated configuration,
- demos, videos, screenshots, and autodownloaded pk3s are now saved in a
- directory specific to the user who is running ioquake3.
+ On Windows, all user specific files such as autogenerated configuration,
+ demos, videos, screenshots, and autodownloaded pk3s are now saved in a
+ directory specific to the user who is running ioquake3.
- On NT-based such as Windows XP, this is usually a directory named:
- "C:\Documents and Settings\%USERNAME%\Application Data\Quake3\"
+ On NT-based such as Windows XP, this is usually a directory named:
+ "C:\Documents and Settings\%USERNAME%\Application Data\Quake3\"
- Windows 95, Windows 98, and Windows ME will use a directory like:
- "C:\Windows\Application Data\Quake3"
- in single-user mode, or:
- "C:\Windows\Profiles\%USERNAME%\Application Data\Quake3"
- if multiple logins have been enabled.
+ Windows 95, Windows 98, and Windows ME will use a directory like:
+ "C:\Windows\Application Data\Quake3"
+ in single-user mode, or:
+ "C:\Windows\Profiles\%USERNAME%\Application Data\Quake3"
+ if multiple logins have been enabled.
- In order to access this directory more easily, the installer may create a
- Shortcut which has its target set to:
- "%APPDATA%\Quake3\"
- This Shortcut would work for all users on the system regardless of the
- locale settings. Unfortunately, this environment variable is only
- present on Windows NT based systems.
-
- You can revert to the old single-user behaviour by setting the fs_homepath
- cvar to the directory where ioquake3 is installed. For example:
- ioquake3.exe +set fs_homepath "c:\ioquake3"
- Note that this cvar MUST be set as a command line parameter.
+ In order to access this directory more easily, the installer may create a
+ Shortcut which has its target set to:
+ "%APPDATA%\Quake3\"
+ This Shortcut would work for all users on the system regardless of the
+ locale settings. Unfortunately, this environment variable is only
+ present on Windows NT based systems.
+
+ You can revert to the old single-user behaviour by setting the fs_homepath
+ cvar to the directory where ioquake3 is installed. For example:
+ ioquake3.exe +set fs_homepath "c:\ioquake3"
+ Note that this cvar MUST be set as a command line parameter.
-SDL Keyboard Differences
- ioquake3 clients built againt SDL (e.g. Linux and Mac OS X) have different
- keyboard behaviour than the original Quake3 clients.
-
- * "Caps Lock" and "Num Lock" can not be used as normal binds since they
- do not send a KEYUP event until the key is pressed again.
-
- * SDL > 1.2.9 does not support disabling "Dead Key" recognition.
- In order to send "Dead Key" characters (e.g. ~, ', `, and ^), you
- must key a Space (or sometimes the same character again) after the
- character to send it on many international keyboard layouts.
-
- * The SDL client supports many more keys than the original Quake3 client.
- For example the keys: "Windows", "SysReq", "ScrollLock", and "Break".
- For non-US keyboards, all of the so called "World" keys are now
- supported as well as F13, F14, F15, and the country-specific
- mode/meta keys.
-
- SDL's "Dead Key" behaviour makes the hard-coded toggleConsole binds ~ and `
- annoying to use on many non-US keyboards. In response, an additional
- toggleConsole bind has been added on the key combination Shift-Esc.
-
------------------------------------------------------------- Contributing -----
Please send all patches to bugzilla (https://bugzilla.icculus.org), or join the
@@ -383,3 +340,4 @@
Stuart Dalton <ba...@gm...>
Vincent S. Cojot <vincent at cojot dot name>
optical <al...@ri...>
+
Modified: doi-ioquake3/ioquake3/TODO
===================================================================
--- doi-ioquake3/ioquake3/TODO 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/TODO 2007-06-02 08:57:18 UTC (rev 26)
@@ -23,8 +23,6 @@
* Replace windows DirectX backend with SDL
* Graphical "ioquake3" watermark in videos, optional, on by default
* Gamma stuff while recording videos.
-* Application for OS X at least to launch mods with appropriate hunkmegs, etc.
-For 2.0:
+For 1.99:
* Four player split-screen
-* Multi-platform application to launch and download mods.
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,44 +1,47 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL.h,v 1.8 2004/01/04 16:49:07 slouken Exp $";
+#endif
+
/* Main include header for the SDL library */
#ifndef _SDL_H
#define _SDL_H
#include "SDL_main.h"
-#include "SDL_stdinc.h"
+#include "SDL_types.h"
+#include "SDL_getenv.h"
+#include "SDL_error.h"
+#include "SDL_rwops.h"
+#include "SDL_timer.h"
#include "SDL_audio.h"
#include "SDL_cdrom.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
+#include "SDL_joystick.h"
#include "SDL_events.h"
-#include "SDL_loadso.h"
-#include "SDL_mutex.h"
-#include "SDL_rwops.h"
-#include "SDL_thread.h"
-#include "SDL_timer.h"
#include "SDL_video.h"
+#include "SDL_byteorder.h"
#include "SDL_version.h"
#include "begin_code.h"
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_active.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_active.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_active.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,33 +1,35 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_active.h,v 1.6 2004/01/04 16:49:07 slouken Exp $";
+#endif
+
/* Include file for SDL application focus event handling */
#ifndef _SDL_active_h
#define _SDL_active_h
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_audio.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_audio.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_audio.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,36 +1,42 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_audio.h,v 1.9 2004/08/20 18:57:01 slouken Exp $";
+#endif
+
/* Access to the raw audio mixing buffer for the SDL library */
#ifndef _SDL_audio_h
#define _SDL_audio_h
-#include "SDL_stdinc.h"
+#include <stdio.h>
+
+#include "SDL_main.h"
+#include "SDL_types.h"
#include "SDL_error.h"
-#include "SDL_endian.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
#include "SDL_rwops.h"
+#include "SDL_byteorder.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_byteorder.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_byteorder.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_byteorder.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,24 +1,68 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
-/* DEPRECATED */
-#include "SDL_endian.h"
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_byteorder.h,v 1.10 2005/09/08 06:49:20 icculus Exp $";
+#endif
+
+/* Macros for determining the byte-order of this platform */
+
+#ifndef _SDL_byteorder_h
+#define _SDL_byteorder_h
+
+/* The two types of endianness */
+#define SDL_LIL_ENDIAN 1234
+#define SDL_BIG_ENDIAN 4321
+
+#ifdef __linux__
+# include <endian.h>
+# if BYTE_ORDER == LITTLE_ENDIAN
+# define SDL_BYTEORDER SDL_LIL_ENDIAN
+# else
+# define SDL_BYTEORDER SDL_BIG_ENDIAN
+# endif
+
+#else
+
+/* Pardon the mess, I'm trying to determine the endianness of this host.
+ I'm doing it by preprocessor defines rather than some sort of configure
+ script so that application code can use this too. The "right" way would
+ be to dynamically generate this file on install, but that's a lot of work.
+ */
+#if (defined(__i386__) || defined(__i386)) || \
+ defined(__ia64__) || defined(WIN32) || \
+ (defined(__alpha__) || defined(__alpha)) || \
+ (defined(__arm__) || defined(__thumb__)) || \
+ (defined(__sh__) || defined(__sh64__)) || \
+ (defined(__mips__) && defined(__MIPSEL__)) || \
+ defined(__SYMBIAN32__) || \
+ defined(__x86_64__) || \
+ defined(__LITTLE_ENDIAN__)
+#define SDL_BYTEORDER SDL_LIL_ENDIAN
+#else
+#define SDL_BYTEORDER SDL_BIG_ENDIAN
+#endif
+
+#endif /* __linux__ */
+
+#endif /* _SDL_byteorder_h */
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_cdrom.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_cdrom.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_cdrom.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,32 +1,36 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_cdrom.h,v 1.8 2005/04/17 10:16:30 icculus Exp $";
+#endif
+
/* This is the CD-audio control API for Simple DirectMedia Layer */
#ifndef _SDL_cdrom_h
#define _SDL_cdrom_h
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include "SDL_types.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_copying.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_copying.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_copying.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,22 +1,27 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_copying.h,v 1.5 2004/01/04 16:49:07 slouken Exp $";
+#endif
+
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_cpuinfo.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_cpuinfo.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_cpuinfo.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,33 +1,36 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_cpuinfo.h,v 1.5 2004/01/24 05:47:18 slouken Exp $";
+#endif
+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* CPU feature detection for SDL */
#ifndef _SDL_cpuinfo_h
#define _SDL_cpuinfo_h
-#include "SDL_stdinc.h"
-
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
@@ -36,35 +39,35 @@
/* This function returns true if the CPU has the RDTSC instruction
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC();
/* This function returns true if the CPU has MMX features
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX();
/* This function returns true if the CPU has MMX Ext. features
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt();
/* This function returns true if the CPU has 3DNow features
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow();
/* This function returns true if the CPU has 3DNow! Ext. features
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt();
/* This function returns true if the CPU has SSE features
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE();
/* This function returns true if the CPU has SSE2 features
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2();
/* This function returns true if the CPU has AltiVec features
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec();
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_endian.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_endian.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_endian.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,48 +1,52 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_endian.h,v 1.15 2005/03/30 12:38:03 pmandin Exp $";
+#endif
+
/* Functions for reading and writing endian-specific values */
#ifndef _SDL_endian_h
#define _SDL_endian_h
-#include "SDL_stdinc.h"
+/* These functions read and write data of the specified endianness,
+ dynamically translating to the host machine endianness.
-/* The two types of endianness */
-#define SDL_LIL_ENDIAN 1234
-#define SDL_BIG_ENDIAN 4321
+ e.g.: If you want to read a 16 bit value on big-endian machine from
+ an open file containing little endian values, you would use:
+ value = SDL_ReadLE16(rp);
+ Note that the read/write functions use SDL_RWops pointers
+ instead of FILE pointers. This allows you to read and write
+ endian values from large chunks of memory as well as files
+ and other data sources.
+*/
-#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */
-#if defined(__hppa__) || \
- defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
- (defined(__MIPS__) && defined(__MISPEB__)) || \
- defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
- defined(__sparc__)
-#define SDL_BYTEORDER SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER SDL_LIL_ENDIAN
-#endif
-#endif /* !SDL_BYTEORDER */
+#include <stdio.h>
+#include "SDL_types.h"
+#include "SDL_rwops.h"
+#include "SDL_byteorder.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
@@ -55,8 +59,7 @@
static for compilers that do not support inline functions, this
header should only be included in files that actually use them.
*/
-#if defined(__GNUC__) && defined(__i386__) && \
- !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
+#if defined(__GNUC__) && defined(__i386__)
static __inline__ Uint16 SDL_Swap16(Uint16 x)
{
__asm__("xchgb %b0,%h0" : "=q" (x) : "0" (x));
@@ -183,6 +186,23 @@
#define SDL_SwapBE64(X) (X)
#endif
+/* Read an item of the specified endianness and return in native format */
+extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops *src);
+extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops *src);
+extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops *src);
+extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops *src);
+extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops *src);
+extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops *src);
+
+/* Write an item of native format to the specified endianness */
+extern DECLSPEC int SDLCALL SDL_WriteLE16(SDL_RWops *dst, Uint16 value);
+extern DECLSPEC int SDLCALL SDL_WriteBE16(SDL_RWops *dst, Uint16 value);
+extern DECLSPEC int SDLCALL SDL_WriteLE32(SDL_RWops *dst, Uint32 value);
+extern DECLSPEC int SDLCALL SDL_WriteBE32(SDL_RWops *dst, Uint32 value);
+extern DECLSPEC int SDLCALL SDL_WriteLE64(SDL_RWops *dst, Uint64 value);
+extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value);
+
+
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_error.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_error.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_error.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,32 +1,35 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_error.h,v 1.8 2004/11/15 23:30:07 slouken Exp $";
+#endif
+
/* Simple error message routines for SDL */
#ifndef _SDL_error_h
#define _SDL_error_h
-#include "SDL_stdinc.h"
-
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
@@ -40,13 +43,11 @@
/* Private error message function - used internally */
#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported() SDL_Error(SDL_UNSUPPORTED)
typedef enum {
SDL_ENOMEM,
SDL_EFREAD,
SDL_EFWRITE,
SDL_EFSEEK,
- SDL_UNSUPPORTED,
SDL_LASTERROR
} SDL_errorcode;
extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_events.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_events.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_events.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,32 +1,36 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_events.h,v 1.11 2004/08/20 18:57:01 slouken Exp $";
+#endif
+
/* Include file for SDL event handling */
#ifndef _SDL_events_h
#define _SDL_events_h
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include "SDL_types.h"
#include "SDL_active.h"
#include "SDL_keyboard.h"
#include "SDL_mouse.h"
@@ -39,13 +43,8 @@
extern "C" {
#endif
-/* General keyboard/mouse state definitions */
-#define SDL_RELEASED 0
-#define SDL_PRESSED 1
-
/* Event enumerations */
-typedef enum {
- SDL_NOEVENT = 0, /* Unused (do not remove) */
+enum { SDL_NOEVENT = 0, /* Unused (do not remove) */
SDL_ACTIVEEVENT, /* Application loses/gains visibility */
SDL_KEYDOWN, /* Keys pressed */
SDL_KEYUP, /* Keys released */
@@ -75,16 +74,14 @@
It is the number of bits in the event mask datatype -- Uint32
*/
SDL_NUMEVENTS = 32
-} SDL_EventType;
+};
/* Predefined event masks */
#define SDL_EVENTMASK(X) (1<<(X))
-typedef enum {
+enum {
SDL_ACTIVEEVENTMASK = SDL_EVENTMASK(SDL_ACTIVEEVENT),
SDL_KEYDOWNMASK = SDL_EVENTMASK(SDL_KEYDOWN),
SDL_KEYUPMASK = SDL_EVENTMASK(SDL_KEYUP),
- SDL_KEYEVENTMASK = SDL_EVENTMASK(SDL_KEYDOWN)|
- SDL_EVENTMASK(SDL_KEYUP),
SDL_MOUSEMOTIONMASK = SDL_EVENTMASK(SDL_MOUSEMOTION),
SDL_MOUSEBUTTONDOWNMASK = SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
SDL_MOUSEBUTTONUPMASK = SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
@@ -105,7 +102,7 @@
SDL_VIDEOEXPOSEMASK = SDL_EVENTMASK(SDL_VIDEOEXPOSE),
SDL_QUITMASK = SDL_EVENTMASK(SDL_QUIT),
SDL_SYSWMEVENTMASK = SDL_EVENTMASK(SDL_SYSWMEVENT)
-} SDL_EventMask ;
+};
#define SDL_ALLEVENTS 0xFFFFFFFF
/* Application visibility event structure */
@@ -217,7 +214,7 @@
} SDL_SysWMEvent;
/* General event structure */
-typedef union SDL_Event {
+typedef union {
Uint8 type;
SDL_ActiveEvent active;
SDL_KeyboardEvent key;
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_getenv.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_getenv.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_getenv.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,24 +1,30 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
- 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.1 of the License, or (at your option) any later version.
+/* Not all environments have a working getenv()/putenv() */
- 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.
+#if defined(macintosh) || defined(_WIN32_WCE)
+#define NEED_SDL_GETENV
+#endif
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#ifdef NEED_SDL_GETENV
- Sam Lantinga
- sl...@li...
-*/
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
-/* DEPRECATED */
-#include "SDL_stdinc.h"
+/* Put a variable of the form "name=value" into the environment */
+extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
+#define putenv(X) SDL_putenv(X)
+
+/* Retrieve a variable named "name" from the environment */
+extern DECLSPEC char * SDLCALL SDL_getenv(const char *name);
+#define getenv(X) SDL_getenv(X)
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* NEED_GETENV */
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_joystick.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_joystick.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_joystick.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,32 +1,36 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_joystick.h,v 1.7 2004/07/18 19:05:06 slouken Exp $";
+#endif
+
/* Include file for SDL joystick event handling */
#ifndef _SDL_joystick_h
#define _SDL_joystick_h
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include "SDL_types.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_keyboard.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_keyboard.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_keyboard.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,32 +1,36 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_keyboard.h,v 1.7 2004/07/18 22:57:40 slouken Exp $";
+#endif
+
/* Include file for SDL keyboard event handling */
#ifndef _SDL_keyboard_h
#define _SDL_keyboard_h
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include "SDL_types.h"
#include "SDL_keysym.h"
#include "begin_code.h"
@@ -84,7 +88,6 @@
* If 'delay' is set to 0, keyboard repeat is disabled.
*/
extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval);
-extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval);
/*
* Get a snapshot of the current state of the keyboard.
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_keysym.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_keysym.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_keysym.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,25 +1,30 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_keysym.h,v 1.6 2004/01/04 16:49:07 slouken Exp $";
+#endif
+
#ifndef _SDL_keysym_h
#define _SDL_keysym_h
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_loadso.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_loadso.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_loadso.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,25 +1,30 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ version 2 of the License, or (at your option) any later version.
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.
+ Library General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Library 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
Sam Lantinga
sl...@li...
*/
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id: SDL_loadso.h,v 1.5 2004/01/04 16:49:07 slouken Exp $";
+#endif
+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* System dependent library loading routines */
@@ -41,9 +46,6 @@
#ifndef _SDL_loadso_h
#define _SDL_loadso_h
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Modified: doi-ioquake3/ioquake3/code/SDL12/include/SDL_main.h
===================================================================
--- doi-ioquake3/ioquake3/code/SDL12/include/SDL_main.h 2007-06-02 08:20:20 UTC (rev 25)
+++ doi-ioquake3/ioquake3/code/SDL12/include/SDL_main.h 2007-06-02 08:57:18 UTC (rev 26)
@@ -1,35 +1,38 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
+ Copyright (C) 1997-2004 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it...
[truncated message content] |
