From: havoc Date: Sun, 13 May 2018 05:06:07 +0000 (+0000) Subject: Removed per-platform clients (wgl/glx/agl) - now only SDL2 client X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=1cdf5be504866ab14cd3a3cf50f69668409edc5d Removed per-platform clients (wgl/glx/agl) - now only SDL2 client exists. Removed dedicated server from VS2017 projects - it's not really needed. Removed cd_sdl.c since SDL1.2 support is not maintained, and the SDL2 code path in it is equivalent to cd_null.c as SDL2 does not support controlling cd audio playback - also removed cd_null.c and the corresponding code in cd_shared.c, which now only uses faketrack mode. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12422 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/BSDmakefile b/BSDmakefile index d13013b5..b6cebea7 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -16,11 +16,11 @@ CMD_CP=$(CMD_UNIXCP) CMD_MKDIR=$(CMD_UNIXMKDIR) # default targets -TARGETS_DEBUG=sv-debug cl-debug sdl-debug -TARGETS_PROFILE=sv-profile cl-profile sdl-profile -TARGETS_RELEASE=sv-release cl-release sdl-release -TARGETS_RELEASE_PROFILE=sv-release-profile cl-release-profile sdl-release-profile -TARGETS_NEXUIZ=sv-nexuiz cl-nexuiz sdl-nexuiz +TARGETS_DEBUG=sv-debug sdl-debug +TARGETS_PROFILE=sv-profile sdl-profile +TARGETS_RELEASE=sv-release sdl-release +TARGETS_RELEASE_PROFILE=sv-release-profile sdl-release-profile +TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz # Link options DP_LINK_ZLIB?=shared @@ -30,15 +30,6 @@ DP_LINK_CRYPTO?=dlopen DP_LINK_CRYPTO_RIJNDAEL?=dlopen ###### Optional features ##### -DP_CDDA?=enabled -.if $(DP_CDDA) == "enabled" - OBJ_SDLCD=$(OBJ_CD_COMMON) cd_sdl.o - OBJ_BSDCD=$(OBJ_CD_COMMON) cd_bsd.o -.else - OBJ_SDLCD=$(OBJ_CD_COMMON) $(OBJ_NOCD) - OBJ_BSDCD=$(OBJ_CD_COMMON) $(OBJ_NOCD) -.endif - DP_VIDEO_CAPTURE?=enabled .if $(DP_VIDEO_CAPTURE) == "enabled" CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE @@ -60,13 +51,10 @@ DEFAULT_SNDAPI=OSS .else DEFAULT_SNDAPI=BSD .endif -OBJ_CD=$(OBJ_BSDCD) -OBJ_CL=$(OBJ_GLX) OBJ_ICON= OBJ_ICON_NEXUIZ= -LDFLAGS_CL=$(LDFLAGS_BSDCL) LDFLAGS_SV=$(LDFLAGS_BSDSV) LDFLAGS_SDL=$(LDFLAGS_BSDSDL) @@ -74,10 +62,8 @@ SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11) -EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV) EXE_SDL=$(EXE_UNIXSDL) -EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) @@ -129,31 +115,6 @@ CFLAGS_CRYPTO_RIJNDAEL= .endif -##### Sound configuration ##### - -.ifndef DP_SOUND_API -DP_SOUND_API=$(DEFAULT_SNDAPI) -.endif - -# NULL: no sound -.if $(DP_SOUND_API) == "NULL" -OBJ_SOUND=$(OBJ_SND_NULL) -LIB_SOUND=$(LIB_SND_NULL) -.endif - -# OSS: Open Sound System -.if $(DP_SOUND_API) == "OSS" -OBJ_SOUND=$(OBJ_SND_OSS) -LIB_SOUND=$(LIB_SND_OSS) -.endif - -# BSD: BSD / Sun audio API -.if $(DP_SOUND_API) == "BSD" -OBJ_SOUND=$(OBJ_SND_BSD) -LIB_SOUND=$(LIB_SND_BSD) -.endif - - ##### Extra CFLAGS ##### CFLAGS_MAKEDEP=-MD @@ -165,7 +126,6 @@ CFLAGS_FS= CFLAGS_PRELOAD= .ifdef DP_PRELOAD_DEPENDENCIES -LDFLAGS_CL+=$(LDFLAGS_UNIXCL_PRELOAD) LDFLAGS_SV+=$(LDFLAGS_UNIXSV_PRELOAD) LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD) CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD) diff --git a/DPiOS.xcodeproj/project.pbxproj b/DPiOS.xcodeproj/project.pbxproj index a0488e90..ee18bd87 100755 --- a/DPiOS.xcodeproj/project.pbxproj +++ b/DPiOS.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; 74063A3E1751ADDB0015D12C /* mod_skeletal_animatevertices_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 74063A3C1751ADDA0015D12C /* mod_skeletal_animatevertices_sse.c */; }; - 74063A401751B0250015D12C /* cd_null.c in Sources */ = {isa = PBXBuildFile; fileRef = 74063A3F1751B0250015D12C /* cd_null.c */; }; 74063A421751B0AF0015D12C /* clvm_cmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 74063A411751B0AF0015D12C /* clvm_cmds.c */; }; 74063A491751B9B60015D12C /* libSDL2-ios-armv7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74063A471751B9B60015D12C /* libSDL2-ios-armv7.a */; }; 74063A4A1751B9B60015D12C /* libSDL2-ios-simulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74063A481751B9B60015D12C /* libSDL2-ios-simulator.a */; }; @@ -23,7 +22,6 @@ 7463B77C12F9CE6B00983F6A /* cd_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 7463B6C812F9CE6B00983F6A /* cd_shared.c */; }; 7463B77D12F9CE6B00983F6A /* cl_collision.c in Sources */ = {isa = PBXBuildFile; fileRef = 7463B6CA12F9CE6B00983F6A /* cl_collision.c */; }; 7463B77E12F9CE6B00983F6A /* cl_demo.c in Sources */ = {isa = PBXBuildFile; fileRef = 7463B6CC12F9CE6B00983F6A /* cl_demo.c */; }; - 7463B77F12F9CE6B00983F6A /* cl_dyntexture.c in Sources */ = {isa = PBXBuildFile; fileRef = 7463B6CD12F9CE6B00983F6A /* cl_dyntexture.c */; }; 7463B78112F9CE6B00983F6A /* cl_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 7463B6D112F9CE6B00983F6A /* cl_input.c */; }; 7463B78212F9CE6B00983F6A /* cl_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 7463B6D212F9CE6B00983F6A /* cl_main.c */; }; 7463B78312F9CE6B00983F6A /* cl_parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 7463B6D312F9CE6B00983F6A /* cl_parse.c */; }; @@ -123,7 +121,6 @@ 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 74063A3C1751ADDA0015D12C /* mod_skeletal_animatevertices_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mod_skeletal_animatevertices_sse.c; sourceTree = ""; }; 74063A3D1751ADDA0015D12C /* mod_skeletal_animatevertices_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mod_skeletal_animatevertices_sse.h; sourceTree = ""; }; - 74063A3F1751B0250015D12C /* cd_null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cd_null.c; sourceTree = ""; }; 74063A411751B0AF0015D12C /* clvm_cmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = clvm_cmds.c; sourceTree = ""; }; 74063A471751B9B60015D12C /* libSDL2-ios-armv7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libSDL2-ios-armv7.a"; path = "lib/libSDL2-ios-armv7.a"; sourceTree = ""; }; 74063A481751B9B60015D12C /* libSDL2-ios-simulator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libSDL2-ios-simulator.a"; path = "lib/libSDL2-ios-simulator.a"; sourceTree = ""; }; @@ -140,8 +137,6 @@ 7463B6CA12F9CE6B00983F6A /* cl_collision.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cl_collision.c; sourceTree = ""; }; 7463B6CB12F9CE6B00983F6A /* cl_collision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cl_collision.h; sourceTree = ""; }; 7463B6CC12F9CE6B00983F6A /* cl_demo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cl_demo.c; sourceTree = ""; }; - 7463B6CD12F9CE6B00983F6A /* cl_dyntexture.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cl_dyntexture.c; sourceTree = ""; }; - 7463B6CE12F9CE6B00983F6A /* cl_dyntexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cl_dyntexture.h; sourceTree = ""; }; 7463B6D112F9CE6B00983F6A /* cl_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cl_input.c; sourceTree = ""; }; 7463B6D212F9CE6B00983F6A /* cl_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cl_main.c; sourceTree = ""; }; 7463B6D312F9CE6B00983F6A /* cl_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cl_parse.c; sourceTree = ""; }; @@ -359,7 +354,6 @@ isa = PBXGroup; children = ( 74063A411751B0AF0015D12C /* clvm_cmds.c */, - 74063A3F1751B0250015D12C /* cd_null.c */, 7463B6C012F9CE6B00983F6A /* bih.c */, 7463B6C112F9CE6B00983F6A /* bih.h */, 7463B6C212F9CE6B00983F6A /* bspfile.h */, @@ -373,8 +367,6 @@ 7463B6CA12F9CE6B00983F6A /* cl_collision.c */, 7463B6CB12F9CE6B00983F6A /* cl_collision.h */, 7463B6CC12F9CE6B00983F6A /* cl_demo.c */, - 7463B6CD12F9CE6B00983F6A /* cl_dyntexture.c */, - 7463B6CE12F9CE6B00983F6A /* cl_dyntexture.h */, 7463B6D112F9CE6B00983F6A /* cl_input.c */, 7463B6D212F9CE6B00983F6A /* cl_main.c */, 7463B6D312F9CE6B00983F6A /* cl_parse.c */, @@ -649,7 +641,6 @@ 7463B77C12F9CE6B00983F6A /* cd_shared.c in Sources */, 7463B77D12F9CE6B00983F6A /* cl_collision.c in Sources */, 7463B77E12F9CE6B00983F6A /* cl_demo.c in Sources */, - 7463B77F12F9CE6B00983F6A /* cl_dyntexture.c in Sources */, 7463B78112F9CE6B00983F6A /* cl_input.c in Sources */, 7463B78212F9CE6B00983F6A /* cl_main.c in Sources */, 7463B78312F9CE6B00983F6A /* cl_parse.c in Sources */, @@ -736,7 +727,6 @@ 7463B7F012F9D17D00983F6A /* (null) in Sources */, 7487D481130102AA00AEE909 /* thread_sdl.c in Sources */, 74063A3E1751ADDB0015D12C /* mod_skeletal_animatevertices_sse.c in Sources */, - 74063A401751B0250015D12C /* cd_null.c in Sources */, 74063A421751B0AF0015D12C /* clvm_cmds.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/cd_bsd.c b/cd_bsd.c deleted file mode 100644 index 7b3a855a..00000000 --- a/cd_bsd.c +++ /dev/null @@ -1,283 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#include "quakedef.h" - -#include -#include -#include - -#include -#include -#include -#include -#include -#ifndef __FreeBSD__ -# include -#endif - -#include "cdaudio.h" - - -#ifndef __FreeBSD__ -# define DEFAULT_CD_DEVICE _PATH_DEV "cd0" -#else -# define DEFAULT_CD_DEVICE "/dev/acd0c" -#endif - -static int cdfile = -1; -static char cd_dev[64] = DEFAULT_CD_DEVICE; - - -void CDAudio_SysEject (void) -{ - if (cdfile == -1) - return; - - ioctl(cdfile, CDIOCALLOW); - if (ioctl(cdfile, CDIOCEJECT) == -1) - Con_Print("ioctl CDIOCEJECT failed\n"); -} - - -void CDAudio_SysCloseDoor (void) -{ - if (cdfile == -1) - return; - - ioctl(cdfile, CDIOCALLOW); - if (ioctl(cdfile, CDIOCCLOSE) == -1) - Con_Print("ioctl CDIOCCLOSE failed\n"); -} - -int CDAudio_SysGetAudioDiskInfo (void) -{ - struct ioc_toc_header tochdr; - - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDIOREADTOCHEADER, &tochdr) == -1) - { - Con_Print("ioctl CDIOREADTOCHEADER failed\n"); - return -1; - } - - if (tochdr.starting_track < 1) - { - Con_Print("CDAudio: no music tracks\n"); - return -1; - } - - return tochdr.ending_track; -} - - -float CDAudio_SysGetVolume (void) -{ - struct ioc_vol vol; - - if (cdfile == -1) - return -1.0f; - - if (ioctl (cdfile, CDIOCGETVOL, &vol) == -1) - { - Con_Print("ioctl CDIOCGETVOL failed\n"); - return -1.0f; - } - - return (vol.vol[0] + vol.vol[1]) / 2.0f / 255.0f; -} - - -void CDAudio_SysSetVolume (float volume) -{ - struct ioc_vol vol; - - if (cdfile == -1) - return; - - vol.vol[0] = vol.vol[1] = volume * 255; - vol.vol[2] = vol.vol[3] = 0; - - if (ioctl (cdfile, CDIOCSETVOL, &vol) == -1) - Con_Printf ("ioctl CDIOCSETVOL failed\n"); -} - - -int CDAudio_SysPlay (int track) -{ - struct ioc_read_toc_entry rte; - struct cd_toc_entry entry; - struct ioc_play_track ti; - - if (cdfile == -1) - return -1; - - // don't try to play a non-audio track - rte.address_format = CD_MSF_FORMAT; - rte.starting_track = track; - rte.data_len = sizeof(entry); - rte.data = &entry; - if (ioctl(cdfile, CDIOREADTOCENTRYS, &rte) == -1) - { - Con_Print("ioctl CDIOREADTOCENTRYS failed\n"); - return -1; - } - if (entry.control & 4) // if it's a data track - { - Con_Printf("CDAudio: track %i is not audio\n", track); - return -1; - } - - if (cdPlaying) - CDAudio_Stop(); - - ti.start_track = track; - ti.end_track = track; - ti.start_index = 1; - ti.end_index = 99; - - if (ioctl(cdfile, CDIOCPLAYTRACKS, &ti) == -1) - { - Con_Print("ioctl CDIOCPLAYTRACKS failed\n"); - return -1; - } - - if (ioctl(cdfile, CDIOCRESUME) == -1) - { - Con_Print("ioctl CDIOCRESUME failed\n"); - return -1; - } - - return 0; -} - - -int CDAudio_SysStop (void) -{ - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDIOCSTOP) == -1) - { - Con_Printf("ioctl CDIOCSTOP failed (%d)\n", errno); - return -1; - } - ioctl(cdfile, CDIOCALLOW); - - return 0; -} - -int CDAudio_SysPause (void) -{ - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDIOCPAUSE) == -1) - { - Con_Print("ioctl CDIOCPAUSE failed\n"); - return -1; - } - - return 0; -} - - -int CDAudio_SysResume (void) -{ - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDIOCRESUME) == -1) - Con_Print("ioctl CDIOCRESUME failed\n"); - - return 0; -} - -int CDAudio_SysUpdate (void) -{ - static time_t lastchk = 0; - struct ioc_read_subchannel subchnl; - struct cd_sub_channel_info data; - - if (cdPlaying && lastchk < time(NULL)) - { - lastchk = time(NULL) + 2; //two seconds between chks - - bzero(&subchnl, sizeof(subchnl)); - subchnl.data = &data; - subchnl.data_len = sizeof(data); - subchnl.address_format = CD_MSF_FORMAT; - subchnl.data_format = CD_CURRENT_POSITION; - - if (ioctl(cdfile, CDIOCREADSUBCHANNEL, &subchnl) == -1) - { - Con_Print("ioctl CDIOCREADSUBCHANNEL failed\n"); - cdPlaying = false; - return -1; - } - if (data.header.audio_status != CD_AS_PLAY_IN_PROGRESS && - data.header.audio_status != CD_AS_PLAY_PAUSED) - { - cdPlaying = false; - if (cdPlayLooping) - CDAudio_Play(cdPlayTrack, true); - } - else - cdPlayTrack = data.what.position.track_number; - } - - return 0; -} - -void CDAudio_SysInit (void) -{ - int i; - -// COMMANDLINEOPTION: BSD Sound: -cddev chooses which CD drive to use - if ((i = COM_CheckParm("-cddev")) != 0 && i < com_argc - 1) - strlcpy(cd_dev, com_argv[i + 1], sizeof(cd_dev)); -} - -int CDAudio_SysStartup (void) -{ -#ifndef __FreeBSD__ - char buff [80]; - - if ((cdfile = opendisk(cd_dev, O_RDONLY, buff, sizeof(buff), 0)) == -1) -#else - if ((cdfile = open(cd_dev, O_RDONLY)) < 0) -#endif - { - Con_Printf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n", - cd_dev, errno); - cdfile = -1; - return -1; - } - - return 0; -} - -void CDAudio_SysShutdown (void) -{ - close(cdfile); - cdfile = -1; -} diff --git a/cd_linux.c b/cd_linux.c deleted file mode 100644 index bc07b849..00000000 --- a/cd_linux.c +++ /dev/null @@ -1,256 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All -// rights reserved. - -// suggested by Zero_Dogg to fix a compile problem on Mandriva Linux -#include "quakedef.h" - -#include -#include - -#include -#include -#include -#include - -#include "cdaudio.h" - - -static int cdfile = -1; -static char cd_dev[64] = "/dev/cdrom"; - - -void CDAudio_SysEject (void) -{ - if (cdfile == -1) - return; - - if (ioctl(cdfile, CDROMEJECT) == -1) - Con_Print("ioctl CDROMEJECT failed\n"); -} - - -void CDAudio_SysCloseDoor (void) -{ - if (cdfile == -1) - return; - - if (ioctl(cdfile, CDROMCLOSETRAY) == -1) - Con_Print("ioctl CDROMCLOSETRAY failed\n"); -} - -int CDAudio_SysGetAudioDiskInfo (void) -{ - struct cdrom_tochdr tochdr; - - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1) - { - Con_Print("ioctl CDROMREADTOCHDR failed\n"); - return -1; - } - - if (tochdr.cdth_trk0 < 1) - { - Con_Print("CDAudio: no music tracks\n"); - return -1; - } - - return tochdr.cdth_trk1; -} - - -float CDAudio_SysGetVolume (void) -{ - struct cdrom_volctrl vol; - - if (cdfile == -1) - return -1.0f; - - if (ioctl (cdfile, CDROMVOLREAD, &vol) == -1) - { - Con_Print("ioctl CDROMVOLREAD failed\n"); - return -1.0f; - } - - return (vol.channel0 + vol.channel1) / 2.0f / 255.0f; -} - - -void CDAudio_SysSetVolume (float volume) -{ - struct cdrom_volctrl vol; - - if (cdfile == -1) - return; - - vol.channel0 = vol.channel1 = (__u8)(volume * 255); - vol.channel2 = vol.channel3 = 0; - - if (ioctl (cdfile, CDROMVOLCTRL, &vol) == -1) - Con_Print("ioctl CDROMVOLCTRL failed\n"); -} - - -int CDAudio_SysPlay (int track) -{ - struct cdrom_tocentry entry; - struct cdrom_ti ti; - - if (cdfile == -1) - return -1; - - // don't try to play a non-audio track - entry.cdte_track = track; - entry.cdte_format = CDROM_MSF; - if (ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1) - { - Con_Print("ioctl CDROMREADTOCENTRY failed\n"); - return -1; - } - if (entry.cdte_ctrl == CDROM_DATA_TRACK) - { - Con_Printf("CDAudio: track %i is not audio\n", track); - return -1; - } - - if (cdPlaying) - CDAudio_Stop(); - - ti.cdti_trk0 = track; - ti.cdti_trk1 = track; - ti.cdti_ind0 = 1; - ti.cdti_ind1 = 99; - - if (ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1) - { - Con_Print("ioctl CDROMPLAYTRKIND failed\n"); - return -1; - } - - if (ioctl(cdfile, CDROMRESUME) == -1) - { - Con_Print("ioctl CDROMRESUME failed\n"); - return -1; - } - - return 0; -} - - -int CDAudio_SysStop (void) -{ - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDROMSTOP) == -1) - { - Con_Printf("ioctl CDROMSTOP failed (%d)\n", errno); - return -1; - } - - return 0; -} - -int CDAudio_SysPause (void) -{ - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDROMPAUSE) == -1) - { - Con_Print("ioctl CDROMPAUSE failed\n"); - return -1; - } - - return 0; -} - - -int CDAudio_SysResume (void) -{ - if (cdfile == -1) - return -1; - - if (ioctl(cdfile, CDROMRESUME) == -1) - Con_Print("ioctl CDROMRESUME failed\n"); - - return 0; -} - -int CDAudio_SysUpdate (void) -{ - struct cdrom_subchnl subchnl; - static time_t lastchk = 0; - - if (cdPlaying && lastchk < time(NULL) && cdfile != -1) - { - lastchk = time(NULL) + 2; //two seconds between chks - subchnl.cdsc_format = CDROM_MSF; - if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1) - { - Con_Print("ioctl CDROMSUBCHNL failed\n"); - cdPlaying = false; - return -1; - } - if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY && - subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED) - { - cdPlaying = false; - if (cdPlayLooping) - CDAudio_Play(cdPlayTrack, true); - } - else - cdPlayTrack = subchnl.cdsc_trk; - } - - return 0; -} - -void CDAudio_SysInit (void) -{ - int i; - -// COMMANDLINEOPTION: Linux Sound: -cddev chooses which CD drive to use - if ((i = COM_CheckParm("-cddev")) != 0 && i < com_argc - 1) - strlcpy(cd_dev, com_argv[i + 1], sizeof(cd_dev)); -} - -int CDAudio_SysStartup (void) -{ - if ((cdfile = open(cd_dev, O_RDONLY | O_NONBLOCK)) == -1) - { - Con_Printf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n", - cd_dev, errno); - cdfile = -1; - return -1; - } - - return 0; -} - -void CDAudio_SysShutdown (void) -{ - close(cdfile); - cdfile = -1; -} diff --git a/cd_null.c b/cd_null.c deleted file mode 100644 index 2ac9141f..00000000 --- a/cd_null.c +++ /dev/null @@ -1,91 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#include "quakedef.h" -#include "cdaudio.h" - - -void CDAudio_SysEject (void) -{ -} - - -void CDAudio_SysCloseDoor (void) -{ -} - - -int CDAudio_SysGetAudioDiskInfo (void) -{ - return -1; -} - - -float CDAudio_SysGetVolume (void) -{ - return -1.0f; -} - - -void CDAudio_SysSetVolume (float fvolume) -{ -} - - -int CDAudio_SysPlay (int track) -{ - return -1; -} - - -int CDAudio_SysStop (void) -{ - return -1; -} - - -int CDAudio_SysPause (void) -{ - return -1; -} - -int CDAudio_SysResume (void) -{ - return -1; -} - -int CDAudio_SysUpdate (void) -{ - return -1; -} - - -void CDAudio_SysInit (void) -{ -} - -int CDAudio_SysStartup (void) -{ - return -1; -} - -void CDAudio_SysShutdown (void) -{ -} diff --git a/cd_sdl.c b/cd_sdl.c deleted file mode 100644 index 410dd390..00000000 --- a/cd_sdl.c +++ /dev/null @@ -1,283 +0,0 @@ -/* -Copyright (C) 2004 Andreas Kirsch (used cd_null.c as template) -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#include "quakedef.h" -#include "cdaudio.h" - -#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2 -// SDL 1.2 has CD audio - -#include -#include - -// If one of the functions fails, it returns -1, if not 0 - -// SDL supports multiple cd devices - so we are going to support this, too. -static void CDAudio_SDL_CDDrive_f( void ); - -// we only support playing one CD at a time -static SDL_CD *cd; - -static int ValidateDrive( void ) -{ - if( cd && SDL_CDStatus( cd ) > 0 ) - return cdValid = true; - - return cdValid = false; -} - -void CDAudio_SysEject (void) -{ - SDL_CDEject( cd ); -} - - -void CDAudio_SysCloseDoor (void) -{ - //NO SDL FUNCTION -} - -int CDAudio_SysGetAudioDiskInfo (void) -{ - if( ValidateDrive() ) // everything > 0 is ok, 0 is trayempty and -1 is error - return cd->numtracks; - return -1; -} - -float CDAudio_SysGetVolume (void) -{ - return -1.0f; -} - -void CDAudio_SysSetVolume (float volume) -{ - //NO SDL FUNCTION -} - -int CDAudio_SysPlay (int track) -{ - return SDL_CDPlayTracks(cd, track-1, 0, 1, 0); -} - -int CDAudio_SysStop (void) -{ - return SDL_CDStop( cd ); -} - -int CDAudio_SysPause (void) -{ - return SDL_CDPause( cd ); -} - -int CDAudio_SysResume (void) -{ - return SDL_CDResume( cd ); -} - -int CDAudio_SysUpdate (void) -{ - static time_t lastchk = 0; - - if (cdPlaying && lastchk < time(NULL)) - { - lastchk = time(NULL) + 2; //two seconds between chks - if( !cd || cd->status <= 0 ) { - cdValid = false; - return -1; - } - if (SDL_CDStatus( cd ) == CD_STOPPED) - { - if( cdPlayLooping ) - CDAudio_SysPlay( cdPlayTrack ); - else - cdPlaying = false; - } - } - return 0; -} - -void CDAudio_SysInit (void) -{ - if( SDL_InitSubSystem( SDL_INIT_CDROM ) == -1 ) - Con_Print( "Failed to init the CDROM SDL subsystem!\n" ); - - Cmd_AddCommand( "cddrive", CDAudio_SDL_CDDrive_f, "select an SDL-detected CD drive by number" ); -} - -static int IsAudioCD( void ) -{ - int i; - for( i = 0 ; i < cd->numtracks ; i++ ) - if( cd->track[ i ].type == SDL_AUDIO_TRACK ) - return true; - return false; -} - -int CDAudio_SysStartup (void) -{ - int i; - int numdrives; - - numdrives = SDL_CDNumDrives(); - if( numdrives == -1 ) // was the CDROM system initialized correctly? - return -1; - - Con_Printf( "Found %i cdrom drives.\n", numdrives ); - - for( i = 0 ; i < numdrives ; i++, cd = NULL ) { - cd = SDL_CDOpen( i ); - if( !cd ) { - Con_Printf( "CD drive %i is invalid.\n", i ); - continue; - } - - if( CD_INDRIVE( SDL_CDStatus( cd ) ) ) - if( IsAudioCD() ) - break; - else - Con_Printf( "The CD in drive %i is not an audio cd.\n", i ); - else - Con_Printf( "No CD in drive %i.\n", i ); - - SDL_CDClose( cd ); - } - - if( i == numdrives && !cd ) - return -1; - - return 0; -} - -void CDAudio_SysShutdown (void) -{ - if( cd ) - SDL_CDClose( cd ); -} - -void CDAudio_SDL_CDDrive_f( void ) -{ - int i; - int numdrives = SDL_CDNumDrives(); - - if( Cmd_Argc() != 2 ) { - Con_Print( "cddrive \n" ); - return; - } - - i = atoi( Cmd_Argv( 1 ) ); - if( i >= numdrives ) { - Con_Printf("Only %i drives!\n", numdrives ); - return; - } - - if( cd ) - SDL_CDClose( cd ); - - cd = SDL_CDOpen( i ); - if( !cd ) { - Con_Printf( "Couldn't open drive %i.\n", i ); - return; - } - - if( !CD_INDRIVE( SDL_CDStatus( cd ) ) ) - Con_Printf( "No cd in drive %i.\n", i ); - else if( !IsAudioCD() ) - Con_Printf( "The CD in drive %i is not an audio CD.\n", i ); - - ValidateDrive(); -} - - - - - -#else -// SDL 1.3 does not have CD audio - -void CDAudio_SysEject (void) -{ -} - - -void CDAudio_SysCloseDoor (void) -{ -} - - -int CDAudio_SysGetAudioDiskInfo (void) -{ - return -1; -} - - -float CDAudio_SysGetVolume (void) -{ - return -1.0f; -} - - -void CDAudio_SysSetVolume (float fvolume) -{ -} - - -int CDAudio_SysPlay (int track) -{ - return -1; -} - - -int CDAudio_SysStop (void) -{ - return -1; -} - - -int CDAudio_SysPause (void) -{ - return -1; -} - -int CDAudio_SysResume (void) -{ - return -1; -} - -int CDAudio_SysUpdate (void) -{ - return -1; -} - - -void CDAudio_SysInit (void) -{ -} - -int CDAudio_SysStartup (void) -{ - return -1; -} - -void CDAudio_SysShutdown (void) -{ -} -#endif - diff --git a/cd_shared.c b/cd_shared.c index 43b4a7f4..eb78eaf1 100644 --- a/cd_shared.c +++ b/cd_shared.c @@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // used by menu to ghost CD audio slider cvar_t cdaudioinitialized = {CVAR_READONLY,"cdaudioinitialized","0","indicates if CD Audio system is active"}; -cvar_t cdaudio = {CVAR_SAVE,"cdaudio","1","CD playing mode (0 = never access CD drive, 1 = play CD tracks if no replacement available, 2 = play fake tracks if no CD track available, 3 = play only real CD tracks, 4 = play real CD tracks even instead of named fake tracks)"}; #define MAX_PLAYLISTS 10 int music_playlist_active = -1; @@ -94,13 +93,9 @@ typedef char filename_t[MAX_QPATH]; #ifdef MAXTRACKS static filename_t remap[MAXTRACKS]; #endif -static unsigned char maxTrack; static int faketrack = -1; -static float saved_vol = 1.0f; - // exported variables -qboolean cdValid = false; qboolean cdPlaying = false; qboolean cdPlayLooping = false; unsigned char cdPlayTrack; @@ -109,80 +104,16 @@ cl_cdstate_t cd; static void CDAudio_Eject (void) { - if (!enabled) - return; - - if(cdaudio.integer == 0) - return; - - CDAudio_SysEject(); } static void CDAudio_CloseDoor (void) { - if (!enabled) - return; - - if(cdaudio.integer == 0) - return; - - CDAudio_SysCloseDoor(); } static int CDAudio_GetAudioDiskInfo (void) { - int ret; - - cdValid = false; - - if(cdaudio.integer == 0) - return -1; - - ret = CDAudio_SysGetAudioDiskInfo(); - if (ret < 1) - return -1; - - cdValid = true; - maxTrack = ret; - - return 0; -} - -static qboolean CDAudio_Play_real (int track, qboolean looping, qboolean complain) -{ - if(track < 1) - { - if(complain) - Con_Print("Could not load BGM track.\n"); - return false; - } - - if (!cdValid) - { - CDAudio_GetAudioDiskInfo(); - if (!cdValid) - { - if(complain) - Con_DPrint ("No CD in player.\n"); - return false; - } - } - - if (track > maxTrack) - { - if(complain) - Con_DPrintf("CDAudio: Bad track number %u.\n", track); - return false; - } - - if (CDAudio_SysPlay(track) == -1) - return false; - - if(cdaudio.integer != 3) - Con_DPrintf ("CD track %u playing...\n", track); - - return true; + return -1; } void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryreal, float startposition) @@ -198,41 +129,16 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryr if(tryreal && strspn(trackname, "0123456789") == strlen(trackname)) { - track = (unsigned char) atoi(trackname); + track = (unsigned int) atoi(trackname); #ifdef MAXTRACKS - if(track > 0 && track < MAXTRACKS) - if(*remap[track]) - { - if(strspn(remap[track], "0123456789") == strlen(remap[track])) - { - trackname = remap[track]; - } - else - { - // ignore remappings to fake tracks if we're going to play a real track - switch(cdaudio.integer) - { - case 0: // we never access CD - case 1: // we have a replacement - trackname = remap[track]; - break; - case 2: // we only use fake track replacement if CD track is invalid - CDAudio_GetAudioDiskInfo(); - if(!cdValid || track > maxTrack) - trackname = remap[track]; - break; - case 3: // we always play from CD - ignore this remapping then - case 4: // we randomize anyway - break; - } - } - } + if(track > 0 && track < MAXTRACKS && *remap[track]) + trackname = remap[track]; #endif } if(tryreal && strspn(trackname, "0123456789") == strlen(trackname)) { - track = (unsigned char) atoi(trackname); + track = (unsigned int) atoi(trackname); if (track < 1) { Con_DPrintf("CDAudio: Bad track number %u.\n", track); @@ -247,40 +153,6 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryr return; CDAudio_Stop (); - if(track >= 1) - { - if(cdaudio.integer == 3) // only play real CD tracks at all - { - if(CDAudio_Play_real(track, looping, true)) - goto success; - return; - } - - if(cdaudio.integer == 2) // prefer real CD track over fake - { - if(CDAudio_Play_real(track, looping, false)) - goto success; - } - } - - if(cdaudio.integer == 4) // only play real CD tracks, EVEN instead of fake tracks! - { - if(CDAudio_Play_real(track, looping, false)) - goto success; - - if(cdValid && maxTrack > 0) - { - track = 1 + (rand() % maxTrack); - if(CDAudio_Play_real(track, looping, true)) - goto success; - } - else - { - Con_DPrint ("No CD in player.\n"); - } - return; - } - // Try playing a fake track (sound file) first if(track >= 1) { @@ -313,31 +185,21 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryr if (faketrack != -1) { if(track >= 1) - { - if(cdaudio.integer != 0) // we don't need these messages if only fake tracks can be played anyway - Con_DPrintf ("Fake CD track %u playing...\n", track); - } + Con_DPrintf ("BGM track %u playing...\n", track); else Con_DPrintf ("BGM track %s playing...\n", trackname); } } - // If we can't play a fake CD track, try the real one if (faketrack == -1) { - if(cdaudio.integer == 0 || track < 1) - { - Con_Print("Could not load BGM track.\n"); - return; - } + if(track >= 1) + Con_DPrintf ("Could not load BGM track %u.\n", track); else - { - if(!CDAudio_Play_real(track, looping, true)) - return; - } + Con_DPrintf ("Could not load BGM track %s.\n", trackname); + return; } -success: cdPlayLooping = looping; cdPlayTrack = track; cdPlaying = true; @@ -377,14 +239,6 @@ void CDAudio_Stop (void) S_StopChannel (faketrack, true, true); faketrack = -1; } - else if (cdPlaying && (CDAudio_SysStop() == -1)) - return; - else if(wasPlaying) - { - CDAudio_Resume(); // needed by SDL - can't stop while paused there (causing pause/stop to fail after play, pause, stop, play otherwise) - if (cdPlaying && (CDAudio_SysStop() == -1)) - return; - } wasPlaying = false; cdPlaying = false; @@ -392,14 +246,10 @@ void CDAudio_Stop (void) void CDAudio_Pause (void) { - if (!enabled || !cdPlaying) - return; - - if (faketrack != -1) - S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, true); - else if (CDAudio_SysPause() == -1) + if (!enabled || !cdPlaying || faketrack == -1) return; + S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, true); wasPlaying = cdPlaying; cdPlaying = false; } @@ -407,13 +257,10 @@ void CDAudio_Pause (void) void CDAudio_Resume (void) { - if (!enabled || cdPlaying || !wasPlaying) + if (!enabled || cdPlaying || !wasPlaying || faketrack == -1) return; - if (faketrack != -1) - S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, false); - else if (CDAudio_SysResume() == -1) - return; + S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, false); cdPlaying = true; } @@ -530,17 +377,12 @@ static void CD_f (void) if (faketrack == -1) CDAudio_Stop(); CDAudio_Eject(); - cdValid = false; return; } if (strcasecmp(command, "info") == 0) { CDAudio_GetAudioDiskInfo (); - if (cdValid) - Con_Printf("%u tracks on CD.\n", maxTrack); - else - Con_Print ("No CD in player.\n"); if (cdPlaying) Con_Printf("Currently %s track %u\n", cdPlayLooping ? "looping" : "playing", cdPlayTrack); else if (wasPlaying) @@ -557,7 +399,7 @@ static void CD_f (void) Con_Printf("cd off - stops and disables CD audio system\n"); Con_Printf("cd reset - resets CD audio system (clears track remapping and re-reads disc information)\n"); Con_Printf("cd rescan - rescans disks in drives (to use another disc)\n"); - Con_Printf("cd remap [remap2] [remap3] [...] - chooses (possibly emulated) CD tracks to play when a map asks for a particular track, this has many uses\n"); + Con_Printf("cd remap [remap2] [remap3] [...] - chooses emulated CD tracks to play when a map asks for a particular track, this has many uses\n"); Con_Printf("cd close - closes CD tray\n"); Con_Printf("cd eject - stops playing music and opens CD tray to allow you to change disc\n"); Con_Printf("cd play - plays selected track in remapping table\n"); @@ -585,8 +427,6 @@ static void CDAudio_SetVolume (float newvol) if (faketrack != -1) S_SetChannelVolume (faketrack, newvol); - else - CDAudio_SysSetVolume (newvol * mastervolume.value); } cdvolume = newvol; @@ -699,9 +539,6 @@ void CDAudio_Update (void) CDAudio_StartPlaylist(true); lastplaylist = music_playlist_index.integer; } - - if (faketrack == -1 && cdaudio.integer != 0 && bgmvolume.value != 0) - CDAudio_SysUpdate(); } int CDAudio_Init (void) @@ -715,14 +552,11 @@ int CDAudio_Init (void) if (COM_CheckParm("-nocdaudio")) return -1; - CDAudio_SysInit(); - #ifdef MAXTRACKS for (i = 0; i < MAXTRACKS; i++) *remap[i] = 0; #endif - Cvar_RegisterVariable(&cdaudio); Cvar_RegisterVariable(&cdaudioinitialized); Cvar_SetValueQuick(&cdaudioinitialized, true); enabled = true; @@ -746,23 +580,6 @@ int CDAudio_Startup (void) if (COM_CheckParm("-nocdaudio")) return -1; - CDAudio_SysStartup (); - - if (CDAudio_GetAudioDiskInfo()) - { - Con_Print("CDAudio_Init: No CD in player.\n"); - cdValid = false; - } - - saved_vol = CDAudio_SysGetVolume (); - if (saved_vol < 0.0f) - { - Con_Print ("Can't get initial CD volume\n"); - saved_vol = 1.0f; - } - else - Con_Printf ("Initial CD volume: %g\n", saved_vol); - initialized = true; Con_Print("CD Audio Initialized\n"); @@ -775,9 +592,6 @@ void CDAudio_Shutdown (void) if (!initialized) return; - CDAudio_SysSetVolume (saved_vol); - CDAudio_Stop(); - CDAudio_SysShutdown(); initialized = false; } diff --git a/cd_win.c b/cd_win.c deleted file mode 100644 index ec94e560..00000000 --- a/cd_win.c +++ /dev/null @@ -1,268 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All -// rights reserved. - -#include "quakedef.h" -#include -#include - -#include "cdaudio.h" - -#if defined(_MSC_VER) && (_MSC_VER < 1300) -typedef DWORD DWORD_PTR; -#endif - -extern HWND mainwindow; - -UINT wDeviceID; - -void CDAudio_SysEject(void) -{ - DWORD dwReturn; - - if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, (DWORD_PTR)NULL))) - Con_Printf("MCI_SET_DOOR_OPEN failed (%x)\n", (unsigned)dwReturn); -} - - -void CDAudio_SysCloseDoor(void) -{ - DWORD dwReturn; - - if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD_PTR)NULL))) - Con_Printf("MCI_SET_DOOR_CLOSED failed (%x)\n", (unsigned)dwReturn); -} - -int CDAudio_SysGetAudioDiskInfo(void) -{ - DWORD dwReturn; - MCI_STATUS_PARMS mciStatusParms; - - mciStatusParms.dwItem = MCI_STATUS_READY; - dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms); - if (dwReturn) - { - Con_Print("CDAudio_SysGetAudioDiskInfo: drive ready test - get status failed\n"); - return -1; - } - if (!mciStatusParms.dwReturn) - { - Con_Print("CDAudio_SysGetAudioDiskInfo: drive not ready\n"); - return -1; - } - - mciStatusParms.dwItem = MCI_STATUS_NUMBER_OF_TRACKS; - dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms); - if (dwReturn) - { - Con_Print("CDAudio_SysGetAudioDiskInfo: get tracks - status failed\n"); - return -1; - } - if (mciStatusParms.dwReturn < 1) - { - Con_Print("CDAudio_SysGetAudioDiskInfo: no music tracks\n"); - return -1; - } - - return mciStatusParms.dwReturn; -} - - -float CDAudio_SysGetVolume (void) -{ - // IMPLEMENTME - return -1.0f; -} - - -void CDAudio_SysSetVolume (float fvolume) -{ - // IMPLEMENTME -} - - -int CDAudio_SysPlay (int track) -{ - DWORD dwReturn; - MCI_PLAY_PARMS mciPlayParms; - MCI_STATUS_PARMS mciStatusParms; - - // don't try to play a non-audio track - mciStatusParms.dwItem = MCI_CDA_STATUS_TYPE_TRACK; - mciStatusParms.dwTrack = track; - dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms); - if (dwReturn) - { - Con_Printf("CDAudio_SysPlay: MCI_STATUS failed (%x)\n", (unsigned)dwReturn); - return -1; - } - if (mciStatusParms.dwReturn != MCI_CDA_TRACK_AUDIO) - { - Con_Printf("CDAudio_SysPlay: track %i is not audio\n", track); - return -1; - } - - if (cdPlaying) - CDAudio_Stop(); - - // get the length of the track to be played - mciStatusParms.dwItem = MCI_STATUS_LENGTH; - mciStatusParms.dwTrack = track; - dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms); - if (dwReturn) - { - Con_Printf("CDAudio_SysPlay: MCI_STATUS failed (%x)\n", (unsigned)dwReturn); - return -1; - } - - mciPlayParms.dwFrom = MCI_MAKE_TMSF(track, 0, 0, 0); - mciPlayParms.dwTo = (mciStatusParms.dwReturn << 8) | track; - mciPlayParms.dwCallback = (DWORD_PTR)mainwindow; - dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)(LPVOID) &mciPlayParms); - if (dwReturn) - { - Con_Printf("CDAudio_SysPlay: MCI_PLAY failed (%x)\n", (unsigned)dwReturn); - return -1; - } - - return 0; -} - - -int CDAudio_SysStop (void) -{ - DWORD dwReturn; - - if ((dwReturn = mciSendCommand(wDeviceID, MCI_STOP, 0, (DWORD_PTR)NULL))) - { - Con_Printf("MCI_STOP failed (%x)\n", (unsigned)dwReturn); - return -1; - } - return 0; -} - -int CDAudio_SysPause (void) -{ - DWORD dwReturn; - MCI_GENERIC_PARMS mciGenericParms; - - mciGenericParms.dwCallback = (DWORD_PTR)mainwindow; - if ((dwReturn = mciSendCommand(wDeviceID, MCI_PAUSE, 0, (DWORD_PTR)(LPVOID) &mciGenericParms))) - { - Con_Printf("MCI_PAUSE failed (%x)\n", (unsigned)dwReturn); - return -1; - } - return 0; -} - - -int CDAudio_SysResume (void) -{ - DWORD dwReturn; - MCI_PLAY_PARMS mciPlayParms; - - mciPlayParms.dwFrom = MCI_MAKE_TMSF(cdPlayTrack, 0, 0, 0); - mciPlayParms.dwTo = MCI_MAKE_TMSF(cdPlayTrack + 1, 0, 0, 0); - mciPlayParms.dwCallback = (DWORD_PTR)mainwindow; - dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, (DWORD_PTR)(LPVOID) &mciPlayParms); - if (dwReturn) - { - Con_Printf("CDAudio_SysResume: MCI_PLAY failed (%x)\n", (unsigned)dwReturn); - return -1; - } - return 0; -} - -LONG CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (lParam != (LPARAM)wDeviceID) - return 1; - - switch (wParam) - { - case MCI_NOTIFY_SUCCESSFUL: - if (cdPlaying) - { - cdPlaying = false; - if (cdPlayLooping) - CDAudio_Play(cdPlayTrack, true); - } - break; - - case MCI_NOTIFY_ABORTED: - case MCI_NOTIFY_SUPERSEDED: - break; - - case MCI_NOTIFY_FAILURE: - Con_Print("MCI_NOTIFY_FAILURE\n"); - CDAudio_Stop (); - cdValid = false; - break; - - default: - Con_Printf("Unexpected MM_MCINOTIFY type (%i)\n", (int)wParam); - return 1; - } - - return 0; -} - - -int CDAudio_SysUpdate (void) -{ - return 0; -} - -void CDAudio_SysInit (void) -{ -} - -int CDAudio_SysStartup (void) -{ - DWORD dwReturn; - MCI_OPEN_PARMS mciOpenParms; - MCI_SET_PARMS mciSetParms; - - mciOpenParms.lpstrDeviceType = "cdaudio"; - if ((dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, (DWORD_PTR) (LPVOID) &mciOpenParms))) - { - Con_Printf("CDAudio_SysStartup: MCI_OPEN failed (%x)\n", (unsigned)dwReturn); - return -1; - } - wDeviceID = mciOpenParms.wDeviceID; - - // Set the time format to track/minute/second/frame (TMSF). - mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF; - if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD_PTR)(LPVOID) &mciSetParms))) - { - Con_Printf("CDAudio_SysStartup: MCI_SET_TIME_FORMAT failed (%x)\n", (unsigned)dwReturn); - mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD_PTR)NULL); - return -1; - } - - return 0; -} - -void CDAudio_SysShutdown (void) -{ - if (mciSendCommand(wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)NULL)) - Con_Print("CDAudio_SysShutdown: MCI_CLOSE failed\n"); -} diff --git a/cdaudio.h b/cdaudio.h index 5eac430a..3fed67fa 100644 --- a/cdaudio.h +++ b/cdaudio.h @@ -49,18 +49,3 @@ void CDAudio_Shutdown(void); void CDAudio_Update(void); float CDAudio_GetPosition(void); void CDAudio_StartPlaylist(qboolean resume); - -// Prototypes of the system dependent functions -void CDAudio_SysEject (void); -void CDAudio_SysCloseDoor (void); -int CDAudio_SysGetAudioDiskInfo (void); -float CDAudio_SysGetVolume (void); -void CDAudio_SysSetVolume (float volume); -int CDAudio_SysPlay (int track); -int CDAudio_SysStop (void); -int CDAudio_SysPause (void); -int CDAudio_SysResume (void); -int CDAudio_SysUpdate (void); -void CDAudio_SysInit (void); -int CDAudio_SysStartup (void); -void CDAudio_SysShutdown (void); diff --git a/darkplaces-dedicated-vs2010.vcxproj b/darkplaces-dedicated-vs2010.vcxproj deleted file mode 100644 index 8a231197..00000000 --- a/darkplaces-dedicated-vs2010.vcxproj +++ /dev/null @@ -1,287 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {389AE334-D907-4069-90B3-F0551B3EFDE9} - darkplacesdedicated - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - $(ProjectName) - $(ProjectName) - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX86 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - - - true - Console - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-dedicated-vs2012.vcxproj b/darkplaces-dedicated-vs2012.vcxproj deleted file mode 100644 index a0225637..00000000 --- a/darkplaces-dedicated-vs2012.vcxproj +++ /dev/null @@ -1,378 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {389AE334-D907-4069-90B3-F0551B3EFDE9} - darkplacesdedicated - Win32Proj - darkplaces-dedicated-vs2012 - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-dedicated-vs2013.vcxproj b/darkplaces-dedicated-vs2013.vcxproj deleted file mode 100644 index a1749d31..00000000 --- a/darkplaces-dedicated-vs2013.vcxproj +++ /dev/null @@ -1,387 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {389AE334-D907-4069-90B3-F0551B3EFDE9} - darkplacesdedicated - Win32Proj - darkplaces-dedicated-vs2013 - - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-dedicated-vs2015.vcxproj b/darkplaces-dedicated-vs2015.vcxproj deleted file mode 100644 index b55e6505..00000000 --- a/darkplaces-dedicated-vs2015.vcxproj +++ /dev/null @@ -1,389 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {389AE334-D907-4069-90B3-F0551B3EFDE9} - darkplacesdedicated - Win32Proj - darkplaces-dedicated-vs2015 - - - - Application - v140 - MultiByte - true - - - Application - v140 - MultiByte - - - Application - v140 - MultiByte - true - - - Application - v140 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX86 - true - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX86 - true - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-dedicated-vs2017.vcxproj b/darkplaces-dedicated-vs2017.vcxproj deleted file mode 100644 index 92138a36..00000000 --- a/darkplaces-dedicated-vs2017.vcxproj +++ /dev/null @@ -1,385 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {389AE334-D907-4069-90B3-F0551B3EFDE9} - darkplacesdedicated - Win32Proj - darkplaces-dedicated-vs2017 - - - - Application - v141 - MultiByte - true - - - Application - v141 - MultiByte - - - Application - v141 - MultiByte - true - - - Application - v141 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX86 - true - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX86 - true - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Console - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-dedicated.dev b/darkplaces-dedicated.dev deleted file mode 100644 index 35bdc6f1..00000000 --- a/darkplaces-dedicated.dev +++ /dev/null @@ -1,1699 +0,0 @@ -[Project] -FileName=darkplaces-dedicated.dev -Name=DarkPlaces -UnitCount=165 -Type=1 -Ver=1 -ObjFiles= -Includes= -Libs= -PrivateResource=darkplaces-dedicated_private.rc -ResourceIncludes= -MakeIncludes= -Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES_@@_ -CppCompiler= -Linker=-lwinmm -lws2_32_@@_ -IsCpp=0 -Icon=darkplaces.ico -ExeOutput= -ObjectOutput= -OverrideOutput=1 -OverrideOutputName=darkplaces-dedicated.exe -HostApplication= -Folders="Header Files","Source Files" -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=1 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=0000000000000000000100 - -[Unit1] -FileName=dpvsimpledecode.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=cdaudio.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=cl_collision.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit4] -FileName=cl_screen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit5] -FileName=cl_video.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit6] -FileName=client.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit7] -FileName=clprogdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit8] -FileName=cmd.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit9] -FileName=collision.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit10] -FileName=common.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit11] -FileName=console.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit12] -FileName=curves.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit13] -FileName=cvar.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit16] -FileName=fs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit17] -FileName=gl_backend.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit18] -FileName=polygon.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit19] -FileName=glquake.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit20] -FileName=image.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit21] -FileName=input.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit22] -FileName=jpeg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit23] -FileName=keys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit24] -FileName=lhnet.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit25] -FileName=mathlib.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit26] -FileName=matrixlib.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit27] -FileName=menu.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit28] -FileName=meshqueue.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit29] -FileName=model_alias.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit30] -FileName=model_brush.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit31] -FileName=model_shared.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit32] -FileName=model_sprite.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit33] -FileName=model_zymotic.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit34] -FileName=modelgen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit35] -FileName=mprogdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit36] -FileName=netconn.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit37] -FileName=palette.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit38] -FileName=portals.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit39] -FileName=pr_comp.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit40] -FileName=progdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit41] -FileName=progs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit42] -FileName=progsvm.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit43] -FileName=protocol.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit44] -FileName=prvm_execprogram.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit45] -FileName=qtypes.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit46] -FileName=quakedef.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit47] -FileName=r_lerpanim.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit48] -FileName=r_modules.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit49] -FileName=r_shadow.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit50] -FileName=r_textures.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit51] -FileName=render.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit52] -FileName=resource.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit53] -FileName=sbar.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit54] -FileName=screen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit55] -FileName=server.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit56] -FileName=sound.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit57] -FileName=spritegn.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit58] -FileName=sys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit59] -FileName=vid.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit60] -FileName=wad.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit62] -FileName=zone.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit63] -FileName=zone.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit64] -FileName=cd_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit65] -FileName=cd_null.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit66] -FileName=cl_collision.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit67] -FileName=cl_demo.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit68] -FileName=cl_input.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit69] -FileName=cl_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit70] -FileName=cl_parse.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit71] -FileName=cl_particles.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit72] -FileName=cl_screen.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit73] -FileName=cl_video.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit74] -FileName=cmd.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit75] -FileName=collision.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit76] -FileName=common.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit77] -FileName=console.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit78] -FileName=polygon.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit79] -FileName=curves.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit80] -FileName=cvar.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit81] -FileName=dpvsimpledecode.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit82] -FileName=filematch.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit83] -FileName=fractalnoise.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit84] -FileName=fs.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit85] -FileName=gl_backend.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit86] -FileName=gl_draw.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit87] -FileName=gl_rmain.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit88] -FileName=gl_rsurf.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit89] -FileName=gl_textures.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit91] -FileName=host_cmd.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit92] -FileName=image.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit93] -FileName=jpeg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit94] -FileName=keys.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit95] -FileName=lhnet.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit96] -FileName=mathlib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit97] -FileName=matrixlib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit98] -FileName=menu.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit99] -FileName=meshqueue.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit100] -FileName=model_alias.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit101] -FileName=model_brush.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit102] -FileName=model_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit103] -FileName=model_sprite.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit104] -FileName=netconn.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit105] -FileName=palette.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit106] -FileName=portals.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit107] -FileName=protocol.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit108] -FileName=prvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit109] -FileName=prvm_edict.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit110] -FileName=prvm_exec.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit111] -FileName=builddate.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit113] -FileName=r_lerpanim.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit114] -FileName=r_lightning.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit115] -FileName=r_modules.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit116] -FileName=r_shadow.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit118] -FileName=r_sprites.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit119] -FileName=sbar.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit120] -FileName=snd_null.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit121] -FileName=sv_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit122] -FileName=sv_move.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit123] -FileName=sv_phys.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit124] -FileName=sv_user.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit125] -FileName=sys_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit126] -FileName=sys_linux.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit127] -FileName=vid_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit128] -FileName=vid_null.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit133] -FileName=image_png.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit134] -FileName=lhfont.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit135] -FileName=mdfour.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit136] -FileName=model_dpmodel.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit137] -FileName=model_psk.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit139] -FileName=csprogs.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit140] -FileName=mdfour.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit141] -FileName=image_png.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit143] -FileName=wad.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit145] -FileName=cl_dyntexture.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit148] -FileName=cl_gecko.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit149] -FileName=clvm_cmds.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit150] -FileName=libcurl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit151] -FileName=libcurl.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit152] -FileName=sv_demo.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit153] -FileName=sv_demo.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit154] -FileName=svbsp.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit155] -FileName=svbsp.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit156] -FileName=timing.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit157] -FileName=hmac.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit112] -FileName=r_explosion.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[VersionInfo] -Major=1 -Minor=0 -Release=0 -Build=0 -LanguageID=1033 -CharsetID=1252 -CompanyName=Forest Hale Digital Services -FileVersion=1.0 -FileDescription=DarkPlaces Game Engine -InternalName=darkplaces.exe -LegalCopyright=id Software, Forest Hale, and contributors -LegalTrademarks= -OriginalFilename=darkplaces.exe -ProductName=DarkPlaces -ProductVersion=1.0 -AutoIncBuildNr=0 - -[Unit90] -FileName=host.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit138] -FileName=clvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit14] -FileName=bspfile.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit15] -FileName=draw.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit61] -FileName=world.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit117] -FileName=r_sky.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit158] -FileName=hmac.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit159] -FileName=cap_avi.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit160] -FileName=cap_avi.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit161] -FileName=cap_ogg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit162] -FileName=cap_ogg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit163] -FileName=utf8lib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit164] -FileName=ft2.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit165] -FileName=bih.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit129] -FileName=svvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit130] -FileName=mvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit131] -FileName=prvm_cmds.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit132] -FileName=csprogs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit144] -FileName=world.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit146] -FileName=cl_dyntexture.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit147] -FileName=cl_gecko.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit142] -FileName=view.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - diff --git a/darkplaces-dedicated.dsp b/darkplaces-dedicated.dsp deleted file mode 100644 index 09e5d6a6..00000000 --- a/darkplaces-dedicated.dsp +++ /dev/null @@ -1,741 +0,0 @@ -# Microsoft Developer Studio Project File - Name="darkplaces-dedicated" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=darkplaces-dedicated - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "darkplaces-dedicated.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "darkplaces-dedicated.mak" CFG="darkplaces-dedicated - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "darkplaces-dedicated - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "darkplaces-dedicated - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "darkplaces-dedicated - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release-Dedicated" -# PROP Intermediate_Dir "Release-Dedicated" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Op /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 ws2_32.lib winmm.lib user32.lib gdi32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /machine:I386 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "darkplaces-dedicated - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug-Dedicated" -# PROP Intermediate_Dir "Debug-Dedicated" -# 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" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib winmm.lib user32.lib gdi32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /debug /machine:I386 /out:"Debug-Dedicated/darkplaces-dedicated-debug.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "darkplaces-dedicated - Win32 Release" -# Name "darkplaces-dedicated - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\builddate.c -# End Source File -# Begin Source File - -SOURCE=.\cd_null.c -# End Source File -# Begin Source File - -SOURCE=.\cd_shared.c -# End Source File -# Begin Source File - -SOURCE=.\cl_collision.c -# End Source File -# Begin Source File - -SOURCE=.\cl_demo.c -# End Source File -# Begin Source File - -SOURCE=.\cl_dyntexture.h -# End Source File -# Begin Source File - -SOURCE=.\cl_gecko.h -# End Source File -# Begin Source File - -SOURCE=.\cl_input.c -# End Source File -# Begin Source File - -SOURCE=.\cl_main.c -# End Source File -# Begin Source File - -SOURCE=.\cl_parse.c -# End Source File -# Begin Source File - -SOURCE=.\cl_particles.c -# End Source File -# Begin Source File - -SOURCE=.\cl_screen.c -# End Source File -# Begin Source File - -SOURCE=.\cl_video.c -# End Source File -# Begin Source File - -SOURCE=.\clvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\cmd.c -# End Source File -# Begin Source File - -SOURCE=.\collision.c -# End Source File -# Begin Source File - -SOURCE=.\common.c -# End Source File -# Begin Source File - -SOURCE=.\console.c -# End Source File -# Begin Source File - -SOURCE=.\csprogs.c -# End Source File -# Begin Source File - -SOURCE=.\curves.c -# End Source File -# Begin Source File - -SOURCE=.\cvar.c -# End Source File -# Begin Source File - -SOURCE=.\darkplaces.rc -# End Source File -# Begin Source File - -SOURCE=.\dpvsimpledecode.c -# End Source File -# Begin Source File - -SOURCE=.\filematch.c -# End Source File -# Begin Source File - -SOURCE=.\fractalnoise.c -# End Source File -# Begin Source File - -SOURCE=.\fs.c -# End Source File -# Begin Source File - -SOURCE=.\gl_backend.c -# End Source File -# Begin Source File - -SOURCE=.\gl_draw.c -# End Source File -# Begin Source File - -SOURCE=.\gl_rmain.c -# End Source File -# Begin Source File - -SOURCE=.\gl_rsurf.c -# End Source File -# Begin Source File - -SOURCE=.\gl_textures.c -# End Source File -# Begin Source File - -SOURCE=.\host.c -# End Source File -# Begin Source File - -SOURCE=.\host_cmd.c -# End Source File -# Begin Source File - -SOURCE=.\image.c -# End Source File -# Begin Source File - -SOURCE=.\image_png.c -# End Source File -# Begin Source File - -SOURCE=.\jpeg.c -# End Source File -# Begin Source File - -SOURCE=.\keys.c -# End Source File -# Begin Source File - -SOURCE=.\lhnet.c -# End Source File -# Begin Source File - -SOURCE=.\libcurl.c -# End Source File -# Begin Source File - -SOURCE=.\mathlib.c -# End Source File -# Begin Source File - -SOURCE=.\matrixlib.c -# End Source File -# Begin Source File - -SOURCE=.\mdfour.c -# End Source File -# Begin Source File - -SOURCE=.\menu.c -# End Source File -# Begin Source File - -SOURCE=.\meshqueue.c -# End Source File -# Begin Source File - -SOURCE=.\model_alias.c -# End Source File -# Begin Source File - -SOURCE=.\model_brush.c -# End Source File -# Begin Source File - -SOURCE=.\model_shared.c -# End Source File -# Begin Source File - -SOURCE=.\model_sprite.c -# End Source File -# Begin Source File - -SOURCE=.\mvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\netconn.c -# End Source File -# Begin Source File - -SOURCE=.\palette.c -# End Source File -# Begin Source File - -SOURCE=.\polygon.c -# End Source File -# Begin Source File - -SOURCE=.\portals.c -# End Source File -# Begin Source File - -SOURCE=.\protocol.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_edict.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_exec.c -# End Source File -# Begin Source File - -SOURCE=.\r_explosion.c -# End Source File -# Begin Source File - -SOURCE=.\r_lerpanim.c -# End Source File -# Begin Source File - -SOURCE=.\r_lightning.c -# End Source File -# Begin Source File - -SOURCE=.\r_modules.c -# End Source File -# Begin Source File - -SOURCE=.\r_shadow.c -# End Source File -# Begin Source File - -SOURCE=.\r_sky.c -# End Source File -# Begin Source File - -SOURCE=.\r_sprites.c -# End Source File -# Begin Source File - -SOURCE=.\sbar.c -# End Source File -# Begin Source File - -SOURCE=.\snd_null.c -# End Source File -# Begin Source File - -SOURCE=.\sv_demo.c -# End Source File -# Begin Source File - -SOURCE=.\sv_main.c -# End Source File -# Begin Source File - -SOURCE=.\sv_move.c -# End Source File -# Begin Source File - -SOURCE=.\sv_phys.c -# End Source File -# Begin Source File - -SOURCE=.\sv_user.c -# End Source File -# Begin Source File - -SOURCE=.\svbsp.c -# End Source File -# Begin Source File - -SOURCE=.\svvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\sys_linux.c -# End Source File -# Begin Source File - -SOURCE=.\sys_shared.c -# End Source File -# Begin Source File - -SOURCE=.\vid_null.c -# End Source File -# Begin Source File - -SOURCE=.\vid_shared.c -# End Source File -# Begin Source File - -SOURCE=.\view.c -# End Source File -# Begin Source File - -SOURCE=.\wad.c -# End Source File -# Begin Source File - -SOURCE=.\world.c -# End Source File -# Begin Source File - -SOURCE=.\zone.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\bspfile.h -# End Source File -# Begin Source File - -SOURCE=.\cdaudio.h -# End Source File -# Begin Source File - -SOURCE=.\cl_collision.h -# End Source File -# Begin Source File - -SOURCE=.\cl_dyntexture.h -# End Source File -# Begin Source File - -SOURCE=.\cl_gecko.h -# End Source File -# Begin Source File - -SOURCE=.\cl_screen.h -# End Source File -# Begin Source File - -SOURCE=.\cl_video.h -# End Source File -# Begin Source File - -SOURCE=.\client.h -# End Source File -# Begin Source File - -SOURCE=.\clprogdefs.h -# End Source File -# Begin Source File - -SOURCE=.\cmd.h -# End Source File -# Begin Source File - -SOURCE=.\collision.h -# End Source File -# Begin Source File - -SOURCE=.\common.h -# End Source File -# Begin Source File - -SOURCE=.\console.h -# End Source File -# Begin Source File - -SOURCE=.\csprogs.h -# End Source File -# Begin Source File - -SOURCE=.\curves.h -# End Source File -# Begin Source File - -SOURCE=.\cvar.h -# End Source File -# Begin Source File - -SOURCE=.\dpvsimpledecode.h -# End Source File -# Begin Source File - -SOURCE=.\draw.h -# End Source File -# Begin Source File - -SOURCE=.\fs.h -# End Source File -# Begin Source File - -SOURCE=.\gl_backend.h -# End Source File -# Begin Source File - -SOURCE=.\glquake.h -# End Source File -# Begin Source File - -SOURCE=.\image.h -# End Source File -# Begin Source File - -SOURCE=.\image_png.h -# End Source File -# Begin Source File - -SOURCE=.\input.h -# End Source File -# Begin Source File - -SOURCE=.\jpeg.h -# End Source File -# Begin Source File - -SOURCE=.\keys.h -# End Source File -# Begin Source File - -SOURCE=.\lhfont.h -# End Source File -# Begin Source File - -SOURCE=.\lhnet.h -# End Source File -# Begin Source File - -SOURCE=.\libcurl.h -# End Source File -# Begin Source File - -SOURCE=.\mathlib.h -# End Source File -# Begin Source File - -SOURCE=.\matrixlib.h -# End Source File -# Begin Source File - -SOURCE=.\mdfour.h -# End Source File -# Begin Source File - -SOURCE=.\menu.h -# End Source File -# Begin Source File - -SOURCE=.\meshqueue.h -# End Source File -# Begin Source File - -SOURCE=.\model_alias.h -# End Source File -# Begin Source File - -SOURCE=.\model_brush.h -# End Source File -# Begin Source File - -SOURCE=.\model_dpmodel.h -# End Source File -# Begin Source File - -SOURCE=.\model_psk.h -# End Source File -# Begin Source File - -SOURCE=.\model_shared.h -# End Source File -# Begin Source File - -SOURCE=.\model_sprite.h -# End Source File -# Begin Source File - -SOURCE=.\model_zymotic.h -# End Source File -# Begin Source File - -SOURCE=.\modelgen.h -# End Source File -# Begin Source File - -SOURCE=.\mprogdefs.h -# End Source File -# Begin Source File - -SOURCE=.\netconn.h -# End Source File -# Begin Source File - -SOURCE=.\palette.h -# End Source File -# Begin Source File - -SOURCE=.\polygon.h -# End Source File -# Begin Source File - -SOURCE=.\portals.h -# End Source File -# Begin Source File - -SOURCE=.\pr_comp.h -# End Source File -# Begin Source File - -SOURCE=.\pr_execprogram.h -# End Source File -# Begin Source File - -SOURCE=.\progdefs.h -# End Source File -# Begin Source File - -SOURCE=.\progs.h -# End Source File -# Begin Source File - -SOURCE=.\progsvm.h -# End Source File -# Begin Source File - -SOURCE=.\protocol.h -# End Source File -# Begin Source File - -SOURCE=.\prvm_cmds.h -# End Source File -# Begin Source File - -SOURCE=.\prvm_execprogram.h -# End Source File -# Begin Source File - -SOURCE=.\qtypes.h -# End Source File -# Begin Source File - -SOURCE=.\quakedef.h -# End Source File -# Begin Source File - -SOURCE=.\r_lerpanim.h -# End Source File -# Begin Source File - -SOURCE=.\r_modules.h -# End Source File -# Begin Source File - -SOURCE=.\r_shadow.h -# End Source File -# Begin Source File - -SOURCE=.\r_textures.h -# End Source File -# Begin Source File - -SOURCE=.\render.h -# End Source File -# Begin Source File - -SOURCE=.\sbar.h -# End Source File -# Begin Source File - -SOURCE=.\screen.h -# End Source File -# Begin Source File - -SOURCE=.\server.h -# End Source File -# Begin Source File - -SOURCE=.\snd_main.h -# End Source File -# Begin Source File - -SOURCE=.\sound.h -# End Source File -# Begin Source File - -SOURCE=.\spritegn.h -# End Source File -# Begin Source File - -SOURCE=.\sv_demo.h -# End Source File -# Begin Source File - -SOURCE=.\svbsp.h -# End Source File -# Begin Source File - -SOURCE=.\sys.h -# End Source File -# Begin Source File - -SOURCE=.\vid.h -# End Source File -# Begin Source File - -SOURCE=.\wad.h -# End Source File -# Begin Source File - -SOURCE=.\world.h -# End Source File -# Begin Source File - -SOURCE=.\zone.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\darkplaces.ico -# End Source File -# Begin Source File - -SOURCE=.\darkplaces.rc -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# End Target -# End Project diff --git a/darkplaces-dedicated.vcproj b/darkplaces-dedicated.vcproj deleted file mode 100755 index 312fb6fd..00000000 --- a/darkplaces-dedicated.vcproj +++ /dev/null @@ -1,1087 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/darkplaces-sdl-vs2010.vcxproj b/darkplaces-sdl-vs2010.vcxproj deleted file mode 100644 index 37c091fb..00000000 --- a/darkplaces-sdl-vs2010.vcxproj +++ /dev/null @@ -1,295 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51} - darkplacessdl - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - $(ProjectName) - $(ProjectName) - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-sdl-vs2012.vcxproj b/darkplaces-sdl-vs2012.vcxproj deleted file mode 100644 index cc82bdb9..00000000 --- a/darkplaces-sdl-vs2012.vcxproj +++ /dev/null @@ -1,386 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51} - darkplacessdl - Win32Proj - darkplaces-sdl-vs2012 - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-sdl-vs2013.vcxproj b/darkplaces-sdl-vs2013.vcxproj deleted file mode 100644 index bca82ce4..00000000 --- a/darkplaces-sdl-vs2013.vcxproj +++ /dev/null @@ -1,395 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51} - darkplacessdl - Win32Proj - darkplaces-sdl-vs2013 - - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev deleted file mode 100755 index 4ead20d9..00000000 --- a/darkplaces-sdl.dev +++ /dev/null @@ -1,1979 +0,0 @@ -[Project] -FileName=darkplaces-sdl.dev -Name=DarkPlaces -UnitCount=183 -Type=0 -Ver=1 -ObjFiles= -Includes=C:\Dev-Cpp\SDL\include;C:\Dev-Cpp\SDL\include\SDL -Libs=C:\Dev-Cpp\SDL\lib -PrivateResource=darkplaces_private.rc -ResourceIncludes= -MakeIncludes= -Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_GNU_SOURCE=1 -Dmain=SDL_main -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES_@@__@@_ -CppCompiler= -Linker=-lwinmm -lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL -mwindows_@@__@@_ -IsCpp=0 -Icon= -ExeOutput= -ObjectOutput= -OverrideOutput=1 -OverrideOutputName=darkplaces-sdl.exe -HostApplication= -Folders="Header Files","Source Files" -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=1 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=0000000001100000000100 - -[Unit1] -FileName=dpvsimpledecode.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=cdaudio.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=cl_collision.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit4] -FileName=cl_screen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit5] -FileName=cl_video.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit6] -FileName=client.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit7] -FileName=clprogdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit8] -FileName=cmd.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit9] -FileName=collision.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit10] -FileName=common.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit11] -FileName=conproc.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit12] -FileName=console.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit13] -FileName=snd_main.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit14] -FileName=curves.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit15] -FileName=cvar.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit16] -FileName=bspfile.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit17] -FileName=draw.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit18] -FileName=fs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit19] -FileName=gl_backend.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit20] -FileName=polygon.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit21] -FileName=glquake.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit22] -FileName=image.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit23] -FileName=input.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit24] -FileName=jpeg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit25] -FileName=keys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit26] -FileName=lhnet.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit27] -FileName=mathlib.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit28] -FileName=matrixlib.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit29] -FileName=menu.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit30] -FileName=meshqueue.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit31] -FileName=model_alias.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit32] -FileName=model_brush.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit33] -FileName=model_shared.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit34] -FileName=model_sprite.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit35] -FileName=model_zymotic.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit36] -FileName=modelgen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit37] -FileName=mprogdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit38] -FileName=netconn.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit39] -FileName=palette.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit40] -FileName=portals.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit41] -FileName=pr_comp.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit42] -FileName=progdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit43] -FileName=progs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit44] -FileName=progsvm.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit45] -FileName=protocol.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit46] -FileName=prvm_execprogram.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit47] -FileName=qtypes.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit48] -FileName=quakedef.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit49] -FileName=r_lerpanim.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit50] -FileName=r_modules.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit51] -FileName=r_shadow.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit52] -FileName=r_textures.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit53] -FileName=render.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit54] -FileName=resource.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit55] -FileName=sbar.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit56] -FileName=screen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit57] -FileName=server.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit58] -FileName=snd_ogg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit59] -FileName=snd_wav.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit60] -FileName=sound.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit61] -FileName=spritegn.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit62] -FileName=sys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit63] -FileName=vid.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit64] -FileName=wad.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit65] -FileName=world.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit66] -FileName=zone.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit67] -FileName=zone.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit68] -FileName=cd_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit70] -FileName=cl_demo.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit71] -FileName=cl_input.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit72] -FileName=cl_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit73] -FileName=cl_parse.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit74] -FileName=cl_particles.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit75] -FileName=cl_screen.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit76] -FileName=cl_video.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit77] -FileName=cmd.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit78] -FileName=collision.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit79] -FileName=common.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit80] -FileName=conproc.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit81] -FileName=console.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit82] -FileName=polygon.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit83] -FileName=curves.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit84] -FileName=cvar.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit85] -FileName=dpvsimpledecode.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit86] -FileName=filematch.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit87] -FileName=fractalnoise.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit88] -FileName=fs.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit89] -FileName=gl_backend.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit90] -FileName=gl_draw.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit91] -FileName=gl_rmain.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit92] -FileName=gl_rsurf.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit93] -FileName=gl_textures.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit94] -FileName=host.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit95] -FileName=host_cmd.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit96] -FileName=image.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit97] -FileName=jpeg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit98] -FileName=keys.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit99] -FileName=lhnet.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit100] -FileName=mathlib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit101] -FileName=matrixlib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit102] -FileName=menu.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit103] -FileName=meshqueue.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit104] -FileName=model_alias.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit105] -FileName=model_brush.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit106] -FileName=model_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit107] -FileName=model_sprite.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit108] -FileName=netconn.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit109] -FileName=palette.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit110] -FileName=portals.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit111] -FileName=protocol.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit112] -FileName=prvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit113] -FileName=prvm_edict.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit114] -FileName=prvm_exec.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit115] -FileName=builddate.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit116] -FileName=r_explosion.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit118] -FileName=r_lightning.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit119] -FileName=r_modules.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit120] -FileName=r_shadow.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit121] -FileName=r_sky.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit123] -FileName=sbar.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit124] -FileName=snd_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit125] -FileName=snd_mem.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit126] -FileName=snd_mix.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit127] -FileName=snd_ogg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit128] -FileName=snd_wav.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit130] -FileName=sv_move.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit131] -FileName=sv_phys.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit132] -FileName=sv_user.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit133] -FileName=sys_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit136] -FileName=wad.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit137] -FileName=world.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit138] -FileName=svvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit139] -FileName=mvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit140] -FileName=prvm_cmds.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit141] -FileName=csprogs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit142] -FileName=image_png.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit143] -FileName=lhfont.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit145] -FileName=model_dpmodel.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit146] -FileName=model_psk.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit147] -FileName=csprogs.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit148] -FileName=image_png.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit149] -FileName=mdfour.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit150] -FileName=libcurl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit151] -FileName=libcurl.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit152] -FileName=clvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit153] -FileName=svbsp.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit154] -FileName=svbsp.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit155] -FileName=sv_demo.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit156] -FileName=sv_demo.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit157] -FileName=snd_modplug.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit117] -FileName=r_lerpanim.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[VersionInfo] -Major=1 -Minor=0 -Release=0 -Build=0 -LanguageID=1033 -CharsetID=1252 -CompanyName=Forest Hale Digital Services -FileVersion=1.0 -FileDescription=DarkPlaces Game Engine -InternalName=darkplaces.exe -LegalCopyright=id Software, Forest Hale, and contributors -LegalTrademarks= -OriginalFilename=darkplaces.exe -ProductName=DarkPlaces -ProductVersion=1.0 -AutoIncBuildNr=0 - -[Unit122] -FileName=r_sprites.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit144] -FileName=mdfour.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit158] -FileName=snd_modplug.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit159] -FileName=cl_gecko.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit160] -FileName=cl_gecko.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit161] -FileName=cl_dyntexture.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit162] -FileName=cl_dyntexture.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit163] -FileName=sys_sdl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit164] -FileName=vid_sdl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit165] -FileName=cd_sdl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit166] -FileName=snd_sdl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit69] -FileName=cl_collision.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit129] -FileName=sv_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit134] -FileName=vid_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit135] -FileName=view.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit167] -FileName=cap_ogg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit168] -FileName=cap_ogg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit169] -FileName=cap_avi.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit170] -FileName=cap_avi.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit175] -FileName=hmac.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit179] -FileName=ft2_fontdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit181] -FileName=utf8lib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit182] -FileName=bih.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit185] -FileName=timing.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit186] -FileName=vid_agl_mackeys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit187] -FileName=vid_wgl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit188] -FileName=clvm_cmds.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit189] -FileName=darkplaces_private.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit190] -FileName=SDLMain.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit191] -FileName=snd_3dras.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit192] -FileName=snd_3dras_typedefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit193] -FileName=timing.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit194] -FileName=vid_agl_mackeys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit174] -FileName=hmac.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit178] -FileName=ft2.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit180] -FileName=ft2.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit177] -FileName=ft2_defs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit172] -FileName=SDLMain.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit173] -FileName=timing.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit171] -FileName=clvm_cmds.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit176] -FileName=utf8lib.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit183] -FileName=bih.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - diff --git a/darkplaces-sdl.dsp b/darkplaces-sdl.dsp deleted file mode 100644 index 11fac692..00000000 --- a/darkplaces-sdl.dsp +++ /dev/null @@ -1,769 +0,0 @@ -# Microsoft Developer Studio Project File - Name="darkplaces-sdl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=darkplaces-sdl - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "darkplaces-sdl.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "darkplaces-sdl.mak" CFG="darkplaces-sdl - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "darkplaces-sdl - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "darkplaces-sdl - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "darkplaces-sdl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release-SDL" -# PROP Intermediate_Dir "Release-SDL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Op /I "SDL/include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /machine:I386 /libpath:"SDL/lib" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "darkplaces-sdl - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug-SDL" -# PROP Intermediate_Dir "Debug-SDL" -# 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" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "SDL/include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"Debug-SDL/darkplaces-sdl-debug.exe" /pdbtype:sept /libpath:"SDL/lib" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "darkplaces-sdl - Win32 Release" -# Name "darkplaces-sdl - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\builddate.c -# End Source File -# Begin Source File - -SOURCE=.\cd_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\cd_shared.c -# End Source File -# Begin Source File - -SOURCE=.\cl_collision.c -# End Source File -# Begin Source File - -SOURCE=.\cl_demo.c -# End Source File -# Begin Source File - -SOURCE=.\cl_dyntexture.c -# End Source File -# Begin Source File - -SOURCE=.\cl_gecko.c -# End Source File -# Begin Source File - -SOURCE=.\cl_input.c -# End Source File -# Begin Source File - -SOURCE=.\cl_main.c -# End Source File -# Begin Source File - -SOURCE=.\cl_parse.c -# End Source File -# Begin Source File - -SOURCE=.\cl_particles.c -# End Source File -# Begin Source File - -SOURCE=.\cl_screen.c -# End Source File -# Begin Source File - -SOURCE=.\cl_video.c -# End Source File -# Begin Source File - -SOURCE=.\clvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\cmd.c -# End Source File -# Begin Source File - -SOURCE=.\collision.c -# End Source File -# Begin Source File - -SOURCE=.\common.c -# End Source File -# Begin Source File - -SOURCE=.\console.c -# End Source File -# Begin Source File - -SOURCE=.\csprogs.c -# End Source File -# Begin Source File - -SOURCE=.\curves.c -# End Source File -# Begin Source File - -SOURCE=.\cvar.c -# End Source File -# Begin Source File - -SOURCE=.\dpvsimpledecode.c -# End Source File -# Begin Source File - -SOURCE=.\filematch.c -# End Source File -# Begin Source File - -SOURCE=.\fractalnoise.c -# End Source File -# Begin Source File - -SOURCE=.\fs.c -# End Source File -# Begin Source File - -SOURCE=.\gl_backend.c -# End Source File -# Begin Source File - -SOURCE=.\gl_draw.c -# End Source File -# Begin Source File - -SOURCE=.\gl_rmain.c -# End Source File -# Begin Source File - -SOURCE=.\gl_rsurf.c -# End Source File -# Begin Source File - -SOURCE=.\gl_textures.c -# End Source File -# Begin Source File - -SOURCE=.\host.c -# End Source File -# Begin Source File - -SOURCE=.\host_cmd.c -# End Source File -# Begin Source File - -SOURCE=.\image.c -# End Source File -# Begin Source File - -SOURCE=.\image_png.c -# End Source File -# Begin Source File - -SOURCE=.\jpeg.c -# End Source File -# Begin Source File - -SOURCE=.\keys.c -# End Source File -# Begin Source File - -SOURCE=.\lhnet.c -# End Source File -# Begin Source File - -SOURCE=.\libcurl.c -# End Source File -# Begin Source File - -SOURCE=.\mathlib.c -# End Source File -# Begin Source File - -SOURCE=.\matrixlib.c -# End Source File -# Begin Source File - -SOURCE=.\mdfour.c -# End Source File -# Begin Source File - -SOURCE=.\menu.c -# End Source File -# Begin Source File - -SOURCE=.\meshqueue.c -# End Source File -# Begin Source File - -SOURCE=.\model_alias.c -# End Source File -# Begin Source File - -SOURCE=.\model_brush.c -# End Source File -# Begin Source File - -SOURCE=.\model_shared.c -# End Source File -# Begin Source File - -SOURCE=.\model_sprite.c -# End Source File -# Begin Source File - -SOURCE=.\mvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\netconn.c -# End Source File -# Begin Source File - -SOURCE=.\palette.c -# End Source File -# Begin Source File - -SOURCE=.\polygon.c -# End Source File -# Begin Source File - -SOURCE=.\portals.c -# End Source File -# Begin Source File - -SOURCE=.\protocol.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_edict.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_exec.c -# End Source File -# Begin Source File - -SOURCE=.\r_explosion.c -# End Source File -# Begin Source File - -SOURCE=.\r_lerpanim.c -# End Source File -# Begin Source File - -SOURCE=.\r_lightning.c -# End Source File -# Begin Source File - -SOURCE=.\r_modules.c -# End Source File -# Begin Source File - -SOURCE=.\r_shadow.c -# End Source File -# Begin Source File - -SOURCE=.\r_sky.c -# End Source File -# Begin Source File - -SOURCE=.\r_sprites.c -# End Source File -# Begin Source File - -SOURCE=.\sbar.c -# End Source File -# Begin Source File - -SOURCE=.\snd_main.c -# End Source File -# Begin Source File - -SOURCE=.\snd_mem.c -# End Source File -# Begin Source File - -SOURCE=.\snd_mix.c -# End Source File -# Begin Source File - -SOURCE=.\snd_ogg.c -# End Source File -# Begin Source File - -SOURCE=.\snd_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\snd_wav.c -# End Source File -# Begin Source File - -SOURCE=.\sv_demo.c -# End Source File -# Begin Source File - -SOURCE=.\sv_main.c -# End Source File -# Begin Source File - -SOURCE=.\sv_move.c -# End Source File -# Begin Source File - -SOURCE=.\sv_phys.c -# End Source File -# Begin Source File - -SOURCE=.\sv_user.c -# End Source File -# Begin Source File - -SOURCE=.\svbsp.c -# End Source File -# Begin Source File - -SOURCE=.\svvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\sys_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\sys_shared.c -# End Source File -# Begin Source File - -SOURCE=.\vid_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\vid_shared.c -# End Source File -# Begin Source File - -SOURCE=.\view.c -# End Source File -# Begin Source File - -SOURCE=.\wad.c -# End Source File -# Begin Source File - -SOURCE=.\world.c -# End Source File -# Begin Source File - -SOURCE=.\zone.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\bspfile.h -# End Source File -# Begin Source File - -SOURCE=.\cdaudio.h -# End Source File -# Begin Source File - -SOURCE=.\cl_collision.h -# End Source File -# Begin Source File - -SOURCE=.\cl_dyntexture.h -# End Source File -# Begin Source File - -SOURCE=.\cl_gecko.h -# End Source File -# Begin Source File - -SOURCE=.\cl_screen.h -# End Source File -# Begin Source File - -SOURCE=.\cl_video.h -# End Source File -# Begin Source File - -SOURCE=.\client.h -# End Source File -# Begin Source File - -SOURCE=.\clprogdefs.h -# End Source File -# Begin Source File - -SOURCE=.\cmd.h -# End Source File -# Begin Source File - -SOURCE=.\collision.h -# End Source File -# Begin Source File - -SOURCE=.\common.h -# End Source File -# Begin Source File - -SOURCE=.\conproc.h -# End Source File -# Begin Source File - -SOURCE=.\console.h -# End Source File -# Begin Source File - -SOURCE=.\csprogs.h -# End Source File -# Begin Source File - -SOURCE=.\curves.h -# End Source File -# Begin Source File - -SOURCE=.\cvar.h -# End Source File -# Begin Source File - -SOURCE=.\dpvsimpledecode.h -# End Source File -# Begin Source File - -SOURCE=.\draw.h -# End Source File -# Begin Source File - -SOURCE=.\fs.h -# End Source File -# Begin Source File - -SOURCE=.\gl_backend.h -# End Source File -# Begin Source File - -SOURCE=.\glquake.h -# End Source File -# Begin Source File - -SOURCE=.\image.h -# End Source File -# Begin Source File - -SOURCE=.\image_png.h -# End Source File -# Begin Source File - -SOURCE=.\input.h -# End Source File -# Begin Source File - -SOURCE=.\jpeg.h -# End Source File -# Begin Source File - -SOURCE=.\keys.h -# End Source File -# Begin Source File - -SOURCE=.\lhfont.h -# End Source File -# Begin Source File - -SOURCE=.\lhnet.h -# End Source File -# Begin Source File - -SOURCE=.\libcurl.h -# End Source File -# Begin Source File - -SOURCE=.\mathlib.h -# End Source File -# Begin Source File - -SOURCE=.\matrixlib.h -# End Source File -# Begin Source File - -SOURCE=.\mdfour.h -# End Source File -# Begin Source File - -SOURCE=.\menu.h -# End Source File -# Begin Source File - -SOURCE=.\meshqueue.h -# End Source File -# Begin Source File - -SOURCE=.\model_alias.h -# End Source File -# Begin Source File - -SOURCE=.\model_brush.h -# End Source File -# Begin Source File - -SOURCE=.\model_dpmodel.h -# End Source File -# Begin Source File - -SOURCE=.\model_psk.h -# End Source File -# Begin Source File - -SOURCE=.\model_shared.h -# End Source File -# Begin Source File - -SOURCE=.\model_sprite.h -# End Source File -# Begin Source File - -SOURCE=.\model_zymotic.h -# End Source File -# Begin Source File - -SOURCE=.\modelgen.h -# End Source File -# Begin Source File - -SOURCE=.\mprogdefs.h -# End Source File -# Begin Source File - -SOURCE=.\netconn.h -# End Source File -# Begin Source File - -SOURCE=.\palette.h -# End Source File -# Begin Source File - -SOURCE=.\polygon.h -# End Source File -# Begin Source File - -SOURCE=.\portals.h -# End Source File -# Begin Source File - -SOURCE=.\pr_comp.h -# End Source File -# Begin Source File - -SOURCE=.\pr_execprogram.h -# End Source File -# Begin Source File - -SOURCE=.\progdefs.h -# End Source File -# Begin Source File - -SOURCE=.\progs.h -# End Source File -# Begin Source File - -SOURCE=.\progsvm.h -# End Source File -# Begin Source File - -SOURCE=.\protocol.h -# End Source File -# Begin Source File - -SOURCE=.\prvm_cmds.h -# End Source File -# Begin Source File - -SOURCE=.\prvm_execprogram.h -# End Source File -# Begin Source File - -SOURCE=.\qtypes.h -# End Source File -# Begin Source File - -SOURCE=.\quakedef.h -# End Source File -# Begin Source File - -SOURCE=.\r_lerpanim.h -# End Source File -# Begin Source File - -SOURCE=.\r_modules.h -# End Source File -# Begin Source File - -SOURCE=.\r_shadow.h -# End Source File -# Begin Source File - -SOURCE=.\r_textures.h -# End Source File -# Begin Source File - -SOURCE=.\render.h -# End Source File -# Begin Source File - -SOURCE=.\sbar.h -# End Source File -# Begin Source File - -SOURCE=.\screen.h -# End Source File -# Begin Source File - -SOURCE=.\server.h -# End Source File -# Begin Source File - -SOURCE=.\snd_main.h -# End Source File -# Begin Source File - -SOURCE=.\snd_ogg.h -# End Source File -# Begin Source File - -SOURCE=.\snd_wav.h -# End Source File -# Begin Source File - -SOURCE=.\sound.h -# End Source File -# Begin Source File - -SOURCE=.\spritegn.h -# End Source File -# Begin Source File - -SOURCE=.\sv_demo.h -# End Source File -# Begin Source File - -SOURCE=.\svbsp.h -# End Source File -# Begin Source File - -SOURCE=.\sys.h -# End Source File -# Begin Source File - -SOURCE=.\vid.h -# End Source File -# Begin Source File - -SOURCE=.\wad.h -# End Source File -# Begin Source File - -SOURCE=.\world.h -# End Source File -# Begin Source File - -SOURCE=.\zone.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\darkplaces.ico -# End Source File -# Begin Source File - -SOURCE=.\darkplaces.rc -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# End Target -# End Project diff --git a/darkplaces-sdl.vcproj b/darkplaces-sdl.vcproj deleted file mode 100755 index 4914baed..00000000 --- a/darkplaces-sdl.vcproj +++ /dev/null @@ -1,1113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/darkplaces-sdl2-vs2010.vcxproj b/darkplaces-sdl2-vs2010.vcxproj deleted file mode 100644 index 80385391..00000000 --- a/darkplaces-sdl2-vs2010.vcxproj +++ /dev/null @@ -1,295 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51} - darkplacessdl2 - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - $(ProjectName) - $(ProjectName) - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-sdl2-vs2012.vcxproj b/darkplaces-sdl2-vs2012.vcxproj deleted file mode 100644 index 71a8185d..00000000 --- a/darkplaces-sdl2-vs2012.vcxproj +++ /dev/null @@ -1,386 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51} - darkplacessdl2 - Win32Proj - darkplaces-sdl2-vs2012 - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-sdl2-vs2013.vcxproj b/darkplaces-sdl2-vs2013.vcxproj deleted file mode 100644 index 27201e1a..00000000 --- a/darkplaces-sdl2-vs2013.vcxproj +++ /dev/null @@ -1,395 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2} - darkplacessdl2 - Win32Proj - darkplaces-sdl2-vs2013 - - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-sdl2-vs2015.vcxproj b/darkplaces-sdl2-vs2015.vcxproj deleted file mode 100644 index 616f6826..00000000 --- a/darkplaces-sdl2-vs2015.vcxproj +++ /dev/null @@ -1,401 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2} - darkplacessdl2 - Win32Proj - darkplaces-sdl2-vs2015 - - - - Application - v140 - MultiByte - true - - - Application - v140 - MultiByte - - - Application - v140 - MultiByte - true - - - Application - v140 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - Windows - MachineX64 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level4 - ProgramDatabase - 4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-sdl2-vs2017.vcxproj b/darkplaces-sdl2-vs2017.vcxproj index ae0df8d9..6dbb795d 100644 --- a/darkplaces-sdl2-vs2017.vcxproj +++ b/darkplaces-sdl2-vs2017.vcxproj @@ -197,7 +197,6 @@ - @@ -394,4 +393,4 @@ - \ No newline at end of file + diff --git a/darkplaces-vs2010.sln b/darkplaces-vs2010.sln deleted file mode 100644 index b97ef0fd..00000000 --- a/darkplaces-vs2010.sln +++ /dev/null @@ -1,48 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2010", "darkplaces-wgl-vs2010.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2010", "darkplaces-sdl-vs2010.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2010", "darkplaces-dedicated-vs2010.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2010", "darkplaces-sdl2-vs2010.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/darkplaces-vs2012.sln b/darkplaces-vs2012.sln deleted file mode 100644 index 8d4aa6bc..00000000 --- a/darkplaces-vs2012.sln +++ /dev/null @@ -1,48 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2012", "darkplaces-wgl-vs2012.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2012", "darkplaces-sdl-vs2012.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2012", "darkplaces-dedicated-vs2012.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2012", "darkplaces-sdl2-vs2012.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/darkplaces-vs2013.sln b/darkplaces-vs2013.sln deleted file mode 100644 index 5e8dfc58..00000000 --- a/darkplaces-vs2013.sln +++ /dev/null @@ -1,58 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2013", "darkplaces-wgl-vs2013.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2013", "darkplaces-sdl-vs2013.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2013", "darkplaces-dedicated-vs2013.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2013", "darkplaces-sdl2-vs2013.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.ActiveCfg = Debug|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.Build.0 = Debug|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.ActiveCfg = Debug|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.Build.0 = Debug|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.ActiveCfg = Release|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.Build.0 = Release|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.ActiveCfg = Release|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/darkplaces-vs2015.sln b/darkplaces-vs2015.sln deleted file mode 100644 index d2fe2e09..00000000 --- a/darkplaces-vs2015.sln +++ /dev/null @@ -1,48 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2015", "darkplaces-wgl-vs2015.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2015", "darkplaces-dedicated-vs2015.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2015", "darkplaces-sdl2-vs2015.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.ActiveCfg = Debug|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.Build.0 = Debug|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.ActiveCfg = Debug|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.Build.0 = Debug|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.ActiveCfg = Release|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.Build.0 = Release|Win32 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.ActiveCfg = Release|x64 - {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/darkplaces-vs2017.sln b/darkplaces-vs2017.sln index fa38d3e4..a3e27483 100644 --- a/darkplaces-vs2017.sln +++ b/darkplaces-vs2017.sln @@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2017", "darkplaces-wgl-vs2017.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2017", "darkplaces-dedicated-vs2017.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2017", "darkplaces-sdl2-vs2017.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}" EndProject Global diff --git a/darkplaces-wgl-vs2010.vcxproj b/darkplaces-wgl-vs2010.vcxproj deleted file mode 100644 index 2daad8b0..00000000 --- a/darkplaces-wgl-vs2010.vcxproj +++ /dev/null @@ -1,296 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28} - darkplaceswgl - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - $(ProjectName) - $(ProjectName) - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX86 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-wgl-vs2012.vcxproj b/darkplaces-wgl-vs2012.vcxproj deleted file mode 100644 index 3bc87381..00000000 --- a/darkplaces-wgl-vs2012.vcxproj +++ /dev/null @@ -1,388 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28} - darkplaceswgl - Win32Proj - darkplaces-wgl-vs2012 - - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - Application - v110 - MultiByte - true - - - Application - v110 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-wgl-vs2013.vcxproj b/darkplaces-wgl-vs2013.vcxproj deleted file mode 100644 index fdd1954e..00000000 --- a/darkplaces-wgl-vs2013.vcxproj +++ /dev/null @@ -1,397 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28} - darkplaceswgl - Win32Proj - darkplaces-wgl-vs2013 - - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - Application - v120 - MultiByte - true - - - Application - v120 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX86 - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-wgl-vs2015.vcxproj b/darkplaces-wgl-vs2015.vcxproj deleted file mode 100644 index 38403466..00000000 --- a/darkplaces-wgl-vs2015.vcxproj +++ /dev/null @@ -1,399 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28} - darkplaceswgl - Win32Proj - darkplaces-wgl-vs2015 - - - - Application - v140 - MultiByte - true - - - Application - v140 - MultiByte - - - Application - v140 - MultiByte - true - - - Application - v140 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX86 - true - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - true - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-wgl-vs2017.vcxproj b/darkplaces-wgl-vs2017.vcxproj deleted file mode 100644 index dd15685b..00000000 --- a/darkplaces-wgl-vs2017.vcxproj +++ /dev/null @@ -1,395 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28} - darkplaceswgl - Win32Proj - darkplaces-wgl-vs2017 - - - - Application - v141 - MultiByte - true - - - Application - v141 - MultiByte - - - Application - v141 - MultiByte - true - - - Application - v141 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.50727.1 - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - true - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - $(SolutionDir)\ - $(Configuration)-$(ProjectName)-$(Platform)\ - false - - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX86 - true - - - - - X64 - - - Disabled - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - MachineX64 - - - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX86 - true - - - - - X64 - - - MaxSpeed - true - CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - Level3 - ProgramDatabase - CompileAsCpp - 4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings) - true - /wd"4201" %(AdditionalOptions) - - - $(OutDir)$(TargetName)$(TargetExt) - true - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - /wd"4800" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/darkplaces-wgl.vcproj b/darkplaces-wgl.vcproj deleted file mode 100644 index 21d6ff3e..00000000 --- a/darkplaces-wgl.vcproj +++ /dev/null @@ -1,1119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/darkplaces.cbp b/darkplaces.cbp deleted file mode 100644 index 82bc978b..00000000 --- a/darkplaces.cbp +++ /dev/null @@ -1,464 +0,0 @@ - - - - - - diff --git a/darkplaces.dev b/darkplaces.dev deleted file mode 100644 index 0b68b7ce..00000000 --- a/darkplaces.dev +++ /dev/null @@ -1,1799 +0,0 @@ -[Project] -FileName=darkplaces.dev -Name=DarkPlaces -UnitCount=175 -Type=0 -Ver=1 -ObjFiles= -Includes= -Libs= -PrivateResource=darkplaces_private.rc -ResourceIncludes= -MakeIncludes= -Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES_@@_ -CppCompiler= -Linker=-lwinmm -lws2_32 -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 -Wl,--large-address-aware_@@_ -IsCpp=0 -Icon=darkplaces.ico -ExeOutput= -ObjectOutput= -OverrideOutput=1 -OverrideOutputName=darkplaces.exe -HostApplication= -Folders="Header Files","Source Files" -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=1 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=0000000000000000000100 - -[Unit1] -FileName=dpvsimpledecode.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=cdaudio.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=cl_collision.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit4] -FileName=cl_screen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit5] -FileName=cl_video.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit6] -FileName=client.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit7] -FileName=clprogdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit8] -FileName=cmd.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit9] -FileName=collision.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit10] -FileName=common.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit11] -FileName=conproc.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit12] -FileName=console.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit13] -FileName=snd_main.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit14] -FileName=curves.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit15] -FileName=cvar.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit16] -FileName=bspfile.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit17] -FileName=draw.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit18] -FileName=fs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit19] -FileName=gl_backend.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit20] -FileName=polygon.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit21] -FileName=glquake.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit22] -FileName=image.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit23] -FileName=input.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit24] -FileName=jpeg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit25] -FileName=keys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit26] -FileName=lhnet.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit27] -FileName=mathlib.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit28] -FileName=matrixlib.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit29] -FileName=menu.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit30] -FileName=meshqueue.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit31] -FileName=model_alias.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit32] -FileName=model_brush.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit33] -FileName=model_shared.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit34] -FileName=model_sprite.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit35] -FileName=model_zymotic.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit36] -FileName=modelgen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit37] -FileName=mprogdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit38] -FileName=netconn.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit39] -FileName=palette.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit40] -FileName=portals.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit41] -FileName=pr_comp.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit42] -FileName=progdefs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit43] -FileName=progs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit44] -FileName=progsvm.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit45] -FileName=protocol.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit46] -FileName=prvm_execprogram.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit47] -FileName=qtypes.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit48] -FileName=quakedef.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit49] -FileName=r_lerpanim.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit50] -FileName=r_modules.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit51] -FileName=r_shadow.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit52] -FileName=r_textures.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit53] -FileName=render.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit54] -FileName=resource.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit55] -FileName=sbar.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit56] -FileName=screen.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit57] -FileName=server.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit58] -FileName=snd_ogg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit59] -FileName=snd_wav.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit60] -FileName=sound.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit61] -FileName=spritegn.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit62] -FileName=sys.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit63] -FileName=vid.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit64] -FileName=wad.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit65] -FileName=world.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit66] -FileName=zone.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit67] -FileName=zone.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit68] -FileName=cd_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit69] -FileName=cd_win.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit70] -FileName=cl_collision.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit71] -FileName=cl_demo.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit72] -FileName=cl_input.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit73] -FileName=cl_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit74] -FileName=cl_parse.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit75] -FileName=cl_particles.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit76] -FileName=cl_screen.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit77] -FileName=cl_video.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit78] -FileName=cmd.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit79] -FileName=collision.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit80] -FileName=common.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit81] -FileName=conproc.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit82] -FileName=console.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit83] -FileName=polygon.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit84] -FileName=curves.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit85] -FileName=cvar.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit86] -FileName=dpvsimpledecode.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit87] -FileName=filematch.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit88] -FileName=fractalnoise.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit89] -FileName=fs.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit90] -FileName=gl_backend.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit91] -FileName=gl_draw.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit92] -FileName=gl_rmain.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit93] -FileName=gl_rsurf.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit94] -FileName=gl_textures.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit95] -FileName=host.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit96] -FileName=host_cmd.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit97] -FileName=image.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit98] -FileName=jpeg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit99] -FileName=keys.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit100] -FileName=lhnet.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit101] -FileName=mathlib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit102] -FileName=matrixlib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit103] -FileName=menu.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit104] -FileName=meshqueue.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit105] -FileName=model_alias.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit106] -FileName=model_brush.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit107] -FileName=model_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit108] -FileName=model_sprite.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit109] -FileName=netconn.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit110] -FileName=palette.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit111] -FileName=portals.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit112] -FileName=protocol.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit113] -FileName=prvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit114] -FileName=prvm_edict.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit115] -FileName=prvm_exec.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit116] -FileName=builddate.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit118] -FileName=r_lerpanim.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit119] -FileName=r_lightning.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit120] -FileName=r_modules.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit121] -FileName=r_shadow.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit123] -FileName=r_sprites.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit124] -FileName=sbar.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit125] -FileName=snd_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit126] -FileName=snd_mem.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit127] -FileName=snd_mix.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit128] -FileName=snd_ogg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit129] -FileName=snd_wav.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit130] -FileName=snd_win.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit131] -FileName=sv_main.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit132] -FileName=sv_move.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit133] -FileName=sv_phys.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit134] -FileName=sv_user.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit135] -FileName=sys_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit136] -FileName=sys_win.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit137] -FileName=vid_shared.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit138] -FileName=vid_wgl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit139] -FileName=view.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit140] -FileName=wad.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit141] -FileName=world.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit142] -FileName=svvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit143] -FileName=mvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit145] -FileName=csprogs.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit146] -FileName=image_png.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit147] -FileName=lhfont.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit148] -FileName=mdfour.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit149] -FileName=model_dpmodel.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit150] -FileName=model_psk.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit151] -FileName=csprogs.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit152] -FileName=image_png.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit153] -FileName=mdfour.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit154] -FileName=libcurl.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit155] -FileName=libcurl.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit156] -FileName=clvm_cmds.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit157] -FileName=svbsp.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit117] -FileName=r_explosion.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[VersionInfo] -Major=1 -Minor=0 -Release=0 -Build=0 -LanguageID=1033 -CharsetID=1252 -CompanyName=Forest Hale Digital Services -FileVersion=1.0 -FileDescription=DarkPlaces Game Engine -InternalName=darkplaces.exe -LegalCopyright=id Software, Forest Hale, and contributors -LegalTrademarks= -OriginalFilename=darkplaces.exe -ProductName=DarkPlaces -ProductVersion=1.0 -AutoIncBuildNr=0 - -[Unit122] -FileName=r_sky.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit144] -FileName=prvm_cmds.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit158] -FileName=svbsp.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit159] -FileName=sv_demo.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit160] -FileName=sv_demo.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit161] -FileName=snd_modplug.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit162] -FileName=snd_modplug.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit163] -FileName=cl_gecko.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit164] -FileName=cl_gecko.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit165] -FileName=cl_dyntexture.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit166] -FileName=cl_dyntexture.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit167] -FileName=hmac.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit168] -FileName=hmac.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit169] -FileName=cap_avi.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit170] -FileName=cap_avi.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit171] -FileName=cap_ogg.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit172] -FileName=cap_ogg.h -CompileCpp=0 -Folder=Header Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit173] -FileName=utf8lib.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit174] -FileName=ft2.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit175] -FileName=bih.c -CompileCpp=0 -Folder=Source Files -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - diff --git a/darkplaces.dsp b/darkplaces.dsp deleted file mode 100644 index 5cf31799..00000000 --- a/darkplaces.dsp +++ /dev/null @@ -1,773 +0,0 @@ -# Microsoft Developer Studio Project File - Name="darkplaces" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=darkplaces - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "darkplaces.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "darkplaces.mak" CFG="darkplaces - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "darkplaces - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "darkplaces - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "darkplaces - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Op /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 ws2_32.lib winmm.lib user32.lib gdi32.lib comctl32.lib /nologo /subsystem:windows /LARGEADDRESSAWARE /machine:I386 -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "darkplaces - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# 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" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_FILE_OFFSET_BITS=64" /D "__KERNEL_STRICT_NAMES" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib winmm.lib user32.lib gdi32.lib comctl32.lib /nologo /subsystem:windows /LARGEADDRESSAWARE /debug /machine:I386 /out:"Debug/darkplaces-debug.exe" /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "darkplaces - Win32 Release" -# Name "darkplaces - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\builddate.c -# End Source File -# Begin Source File - -SOURCE=.\cd_shared.c -# End Source File -# Begin Source File - -SOURCE=.\cd_win.c -# End Source File -# Begin Source File - -SOURCE=.\cl_collision.c -# End Source File -# Begin Source File - -SOURCE=.\cl_demo.c -# End Source File -# Begin Source File - -SOURCE=.\cl_dyntexture.c -# End Source File -# Begin Source File - -SOURCE=.\cl_gecko.c -# End Source File -# Begin Source File - -SOURCE=.\cl_input.c -# End Source File -# Begin Source File - -SOURCE=.\cl_main.c -# End Source File -# Begin Source File - -SOURCE=.\cl_parse.c -# End Source File -# Begin Source File - -SOURCE=.\cl_particles.c -# End Source File -# Begin Source File - -SOURCE=.\cl_screen.c -# End Source File -# Begin Source File - -SOURCE=.\cl_video.c -# End Source File -# Begin Source File - -SOURCE=.\clvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\cmd.c -# End Source File -# Begin Source File - -SOURCE=.\collision.c -# End Source File -# Begin Source File - -SOURCE=.\common.c -# End Source File -# Begin Source File - -SOURCE=.\conproc.c -# End Source File -# Begin Source File - -SOURCE=.\console.c -# End Source File -# Begin Source File - -SOURCE=.\csprogs.c -# End Source File -# Begin Source File - -SOURCE=.\curves.c -# End Source File -# Begin Source File - -SOURCE=.\cvar.c -# End Source File -# Begin Source File - -SOURCE=.\dpvsimpledecode.c -# End Source File -# Begin Source File - -SOURCE=.\filematch.c -# End Source File -# Begin Source File - -SOURCE=.\fractalnoise.c -# End Source File -# Begin Source File - -SOURCE=.\fs.c -# End Source File -# Begin Source File - -SOURCE=.\gl_backend.c -# End Source File -# Begin Source File - -SOURCE=.\gl_draw.c -# End Source File -# Begin Source File - -SOURCE=.\gl_rmain.c -# End Source File -# Begin Source File - -SOURCE=.\gl_rsurf.c -# End Source File -# Begin Source File - -SOURCE=.\gl_textures.c -# End Source File -# Begin Source File - -SOURCE=.\host.c -# End Source File -# Begin Source File - -SOURCE=.\host_cmd.c -# End Source File -# Begin Source File - -SOURCE=.\image.c -# End Source File -# Begin Source File - -SOURCE=.\image_png.c -# End Source File -# Begin Source File - -SOURCE=.\jpeg.c -# End Source File -# Begin Source File - -SOURCE=.\keys.c -# End Source File -# Begin Source File - -SOURCE=.\lhnet.c -# End Source File -# Begin Source File - -SOURCE=.\libcurl.c -# End Source File -# Begin Source File - -SOURCE=.\mathlib.c -# End Source File -# Begin Source File - -SOURCE=.\matrixlib.c -# End Source File -# Begin Source File - -SOURCE=.\mdfour.c -# End Source File -# Begin Source File - -SOURCE=.\menu.c -# End Source File -# Begin Source File - -SOURCE=.\meshqueue.c -# End Source File -# Begin Source File - -SOURCE=.\model_alias.c -# End Source File -# Begin Source File - -SOURCE=.\model_brush.c -# End Source File -# Begin Source File - -SOURCE=.\model_shared.c -# End Source File -# Begin Source File - -SOURCE=.\model_sprite.c -# End Source File -# Begin Source File - -SOURCE=.\mvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\netconn.c -# End Source File -# Begin Source File - -SOURCE=.\palette.c -# End Source File -# Begin Source File - -SOURCE=.\polygon.c -# End Source File -# Begin Source File - -SOURCE=.\portals.c -# End Source File -# Begin Source File - -SOURCE=.\protocol.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_edict.c -# End Source File -# Begin Source File - -SOURCE=.\prvm_exec.c -# End Source File -# Begin Source File - -SOURCE=.\r_explosion.c -# End Source File -# Begin Source File - -SOURCE=.\r_lerpanim.c -# End Source File -# Begin Source File - -SOURCE=.\r_lightning.c -# End Source File -# Begin Source File - -SOURCE=.\r_modules.c -# End Source File -# Begin Source File - -SOURCE=.\r_shadow.c -# End Source File -# Begin Source File - -SOURCE=.\r_sky.c -# End Source File -# Begin Source File - -SOURCE=.\r_sprites.c -# End Source File -# Begin Source File - -SOURCE=.\sbar.c -# End Source File -# Begin Source File - -SOURCE=.\snd_main.c -# End Source File -# Begin Source File - -SOURCE=.\snd_mem.c -# End Source File -# Begin Source File - -SOURCE=.\snd_mix.c -# End Source File -# Begin Source File - -SOURCE=.\snd_ogg.c -# End Source File -# Begin Source File - -SOURCE=.\snd_wav.c -# End Source File -# Begin Source File - -SOURCE=.\snd_win.c -# End Source File -# Begin Source File - -SOURCE=.\sv_demo.c -# End Source File -# Begin Source File - -SOURCE=.\sv_main.c -# End Source File -# Begin Source File - -SOURCE=.\sv_move.c -# End Source File -# Begin Source File - -SOURCE=.\sv_phys.c -# End Source File -# Begin Source File - -SOURCE=.\sv_user.c -# End Source File -# Begin Source File - -SOURCE=.\svbsp.c -# End Source File -# Begin Source File - -SOURCE=.\svvm_cmds.c -# End Source File -# Begin Source File - -SOURCE=.\sys_shared.c -# End Source File -# Begin Source File - -SOURCE=.\sys_win.c -# End Source File -# Begin Source File - -SOURCE=.\vid_shared.c -# End Source File -# Begin Source File - -SOURCE=.\vid_wgl.c -# End Source File -# Begin Source File - -SOURCE=.\view.c -# End Source File -# Begin Source File - -SOURCE=.\wad.c -# End Source File -# Begin Source File - -SOURCE=.\world.c -# End Source File -# Begin Source File - -SOURCE=.\zone.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\bspfile.h -# End Source File -# Begin Source File - -SOURCE=.\cdaudio.h -# End Source File -# Begin Source File - -SOURCE=.\cl_collision.h -# End Source File -# Begin Source File - -SOURCE=.\cl_dyntexture.h -# End Source File -# Begin Source File - -SOURCE=.\cl_gecko.h -# End Source File -# Begin Source File - -SOURCE=.\cl_screen.h -# End Source File -# Begin Source File - -SOURCE=.\cl_video.h -# End Source File -# Begin Source File - -SOURCE=.\client.h -# End Source File -# Begin Source File - -SOURCE=.\clprogdefs.h -# End Source File -# Begin Source File - -SOURCE=.\cmd.h -# End Source File -# Begin Source File - -SOURCE=.\collision.h -# End Source File -# Begin Source File - -SOURCE=.\common.h -# End Source File -# Begin Source File - -SOURCE=.\conproc.h -# End Source File -# Begin Source File - -SOURCE=.\console.h -# End Source File -# Begin Source File - -SOURCE=.\csprogs.h -# End Source File -# Begin Source File - -SOURCE=.\curves.h -# End Source File -# Begin Source File - -SOURCE=.\cvar.h -# End Source File -# Begin Source File - -SOURCE=.\dpvsimpledecode.h -# End Source File -# Begin Source File - -SOURCE=.\draw.h -# End Source File -# Begin Source File - -SOURCE=.\fs.h -# End Source File -# Begin Source File - -SOURCE=.\gl_backend.h -# End Source File -# Begin Source File - -SOURCE=.\glquake.h -# End Source File -# Begin Source File - -SOURCE=.\image.h -# End Source File -# Begin Source File - -SOURCE=.\image_png.h -# End Source File -# Begin Source File - -SOURCE=.\input.h -# End Source File -# Begin Source File - -SOURCE=.\jpeg.h -# End Source File -# Begin Source File - -SOURCE=.\keys.h -# End Source File -# Begin Source File - -SOURCE=.\lhfont.h -# End Source File -# Begin Source File - -SOURCE=.\lhnet.h -# End Source File -# Begin Source File - -SOURCE=.\libcurl.h -# End Source File -# Begin Source File - -SOURCE=.\mathlib.h -# End Source File -# Begin Source File - -SOURCE=.\matrixlib.h -# End Source File -# Begin Source File - -SOURCE=.\mdfour.h -# End Source File -# Begin Source File - -SOURCE=.\menu.h -# End Source File -# Begin Source File - -SOURCE=.\meshqueue.h -# End Source File -# Begin Source File - -SOURCE=.\model_alias.h -# End Source File -# Begin Source File - -SOURCE=.\model_brush.h -# End Source File -# Begin Source File - -SOURCE=.\model_dpmodel.h -# End Source File -# Begin Source File - -SOURCE=.\model_psk.h -# End Source File -# Begin Source File - -SOURCE=.\model_shared.h -# End Source File -# Begin Source File - -SOURCE=.\model_sprite.h -# End Source File -# Begin Source File - -SOURCE=.\model_zymotic.h -# End Source File -# Begin Source File - -SOURCE=.\modelgen.h -# End Source File -# Begin Source File - -SOURCE=.\mprogdefs.h -# End Source File -# Begin Source File - -SOURCE=.\netconn.h -# End Source File -# Begin Source File - -SOURCE=.\palette.h -# End Source File -# Begin Source File - -SOURCE=.\polygon.h -# End Source File -# Begin Source File - -SOURCE=.\portals.h -# End Source File -# Begin Source File - -SOURCE=.\pr_comp.h -# End Source File -# Begin Source File - -SOURCE=.\pr_execprogram.h -# End Source File -# Begin Source File - -SOURCE=.\progdefs.h -# End Source File -# Begin Source File - -SOURCE=.\progs.h -# End Source File -# Begin Source File - -SOURCE=.\progsvm.h -# End Source File -# Begin Source File - -SOURCE=.\protocol.h -# End Source File -# Begin Source File - -SOURCE=.\prvm_cmds.h -# End Source File -# Begin Source File - -SOURCE=.\prvm_execprogram.h -# End Source File -# Begin Source File - -SOURCE=.\qtypes.h -# End Source File -# Begin Source File - -SOURCE=.\quakedef.h -# End Source File -# Begin Source File - -SOURCE=.\r_lerpanim.h -# End Source File -# Begin Source File - -SOURCE=.\r_modules.h -# End Source File -# Begin Source File - -SOURCE=.\r_shadow.h -# End Source File -# Begin Source File - -SOURCE=.\r_textures.h -# End Source File -# Begin Source File - -SOURCE=.\render.h -# End Source File -# Begin Source File - -SOURCE=.\sbar.h -# End Source File -# Begin Source File - -SOURCE=.\screen.h -# End Source File -# Begin Source File - -SOURCE=.\server.h -# End Source File -# Begin Source File - -SOURCE=.\snd_main.h -# End Source File -# Begin Source File - -SOURCE=.\snd_ogg.h -# End Source File -# Begin Source File - -SOURCE=.\snd_wav.h -# End Source File -# Begin Source File - -SOURCE=.\sound.h -# End Source File -# Begin Source File - -SOURCE=.\spritegn.h -# End Source File -# Begin Source File - -SOURCE=.\sv_demo.h -# End Source File -# Begin Source File - -SOURCE=.\svbsp.h -# End Source File -# Begin Source File - -SOURCE=.\sys.h -# End Source File -# Begin Source File - -SOURCE=.\vid.h -# End Source File -# Begin Source File - -SOURCE=.\wad.h -# End Source File -# Begin Source File - -SOURCE=.\world.h -# End Source File -# Begin Source File - -SOURCE=.\zone.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\darkplaces.ico -# End Source File -# Begin Source File - -SOURCE=.\darkplaces.rc -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# End Target -# End Project diff --git a/darkplaces.dsw b/darkplaces.dsw deleted file mode 100644 index 4289b243..00000000 --- a/darkplaces.dsw +++ /dev/null @@ -1,53 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "darkplaces"=".\darkplaces.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "dedicated"=".\darkplaces-dedicated.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "sdl"=".\darkplaces-sdl.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/darkplaces.sln b/darkplaces.sln deleted file mode 100755 index 716aa52d..00000000 --- a/darkplaces.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl.vcproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl.vcproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated.vcproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|x64 - {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|x64 - {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|x64 - {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/makefile b/makefile index 59504d11..70b297dc 100644 --- a/makefile +++ b/makefile @@ -75,19 +75,6 @@ TARGETS_RELEASE_PROFILE=sv-release-profile cl-release-profile sdl-release-profil TARGETS_NEXUIZ=sv-nexuiz cl-nexuiz sdl-nexuiz ###### Optional features ##### -DP_CDDA?=enabled -ifeq ($(DP_CDDA), enabled) - OBJ_SDLCD=$(OBJ_CD_COMMON) cd_sdl.o - OBJ_LINUXCD=$(OBJ_CD_COMMON) cd_linux.o - OBJ_BSDCD=$(OBJ_CD_COMMON) cd_bsd.o - OBJ_WINCD=$(OBJ_CD_COMMON) cd_win.o -else - OBJ_SDLCD=$(OBJ_CD_COMMON) $(OBJ_NOCD) - OBJ_LINUXCD=$(OBJ_CD_COMMON) $(OBJ_NOCD) - OBJ_BSDCD=$(OBJ_CD_COMMON) $(OBJ_NOCD) - OBJ_WINCD=$(OBJ_CD_COMMON) $(OBJ_NOCD) -endif - DP_VIDEO_CAPTURE?=enabled ifeq ($(DP_VIDEO_CAPTURE), enabled) CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE @@ -99,14 +86,9 @@ endif # Linux configuration ifeq ($(DP_MAKE_TARGET), linux) - DEFAULT_SNDAPI=ALSA - OBJ_CD=$(OBJ_LINUXCD) - - OBJ_CL=$(OBJ_GLX) OBJ_ICON= OBJ_ICON_NEXUIZ= - LDFLAGS_CL=$(LDFLAGS_LINUXCL) LDFLAGS_SV=$(LDFLAGS_LINUXSV) LDFLAGS_SDL=$(LDFLAGS_LINUXSDL) @@ -114,10 +96,8 @@ ifeq ($(DP_MAKE_TARGET), linux) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11) - EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV) EXE_SDL=$(EXE_UNIXSDL) - EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) @@ -130,14 +110,9 @@ endif # Mac OS X configuration ifeq ($(DP_MAKE_TARGET), macosx) - DEFAULT_SNDAPI=COREAUDIO - OBJ_CD=$(OBJ_MACOSXCD) - - OBJ_CL=$(OBJ_AGL) OBJ_ICON= OBJ_ICON_NEXUIZ= - LDFLAGS_CL=$(LDFLAGS_MACOSXCL) LDFLAGS_SV=$(LDFLAGS_MACOSXSV) LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL) @@ -145,10 +120,8 @@ ifeq ($(DP_MAKE_TARGET), macosx) SDLCONFIG_LIBS=$(SDLCONFIG_MACOSXLIBS) SDLCONFIG_STATICLIBS=$(SDLCONFIG_MACOSXSTATICLIBS) - EXE_CL=$(EXE_MACOSXCL) EXE_SV=$(EXE_UNIXSV) EXE_SDL=$(EXE_UNIXSDL) - EXE_CLNEXUIZ=$(EXE_MACOSXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) @@ -173,16 +146,11 @@ endif # SunOS configuration (Solaris) ifeq ($(DP_MAKE_TARGET), sunos) - DEFAULT_SNDAPI=BSD - OBJ_CD=$(OBJ_SUNOSCD) - - OBJ_CL=$(OBJ_GLX) OBJ_ICON= OBJ_ICON_NEXUIZ= CFLAGS_EXTRA=$(CFLAGS_SUNOS) - LDFLAGS_CL=$(LDFLAGS_SUNOSCL) LDFLAGS_SV=$(LDFLAGS_SUNOSSV) LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL) @@ -190,10 +158,8 @@ ifeq ($(DP_MAKE_TARGET), sunos) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11) - EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV) EXE_SDL=$(EXE_UNIXSDL) - EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) @@ -206,18 +172,10 @@ endif # BSD configuration ifeq ($(DP_MAKE_TARGET), bsd) -ifeq ($(DP_ARCH),FreeBSD) - DEFAULT_SNDAPI=OSS -else - DEFAULT_SNDAPI=BSD -endif - OBJ_CD=$(OBJ_BSDCD) - OBJ_CL=$(OBJ_GLX) OBJ_ICON= OBJ_ICON_NEXUIZ= - LDFLAGS_CL=$(LDFLAGS_BSDCL) LDFLAGS_SV=$(LDFLAGS_BSDSV) LDFLAGS_SDL=$(LDFLAGS_BSDSDL) @@ -225,10 +183,8 @@ endif SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11) SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11) - EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV) EXE_SDL=$(EXE_UNIXSDL) - EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) @@ -257,26 +213,15 @@ ifeq ($(WIN64RELEASE), 1) # WINDRES=$(TARGET)-windres endif -ifeq ($(D3D), 1) - CFLAGS_D3D=-DSUPPORTD3D -DSUPPORTDIRECTX - CFLAGS_WARNINGS=-Wall - LDFLAGS_D3D=-ld3d9 -else - CFLAGS_D3D= - CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes - LDFLAGS_D3D= -endif +CFLAGS_D3D= +CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes +LDFLAGS_D3D= ifeq ($(DP_MAKE_TARGET), mingw) - DEFAULT_SNDAPI=WIN - OBJ_CD=$(OBJ_WINCD) - - OBJ_CL=$(OBJ_WGL) OBJ_ICON=darkplaces.o OBJ_ICON_NEXUIZ=nexuiz.o - LDFLAGS_CL=$(LDFLAGS_WINCL) LDFLAGS_SV=$(LDFLAGS_WINSV) LDFLAGS_SDL=$(LDFLAGS_WINSDL) @@ -284,10 +229,8 @@ ifeq ($(DP_MAKE_TARGET), mingw) SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) - EXE_CL=$(EXE_WINCL) EXE_SV=$(EXE_WINSV) EXE_SDL=$(EXE_WINSDL) - EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ) @@ -348,53 +291,6 @@ ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen) CFLAGS_CRYPTO_RIJNDAEL= endif -##### Sound configuration ##### - -ifndef DP_SOUND_API - DP_SOUND_API=$(DEFAULT_SNDAPI) -endif - -# NULL: no sound -ifeq ($(DP_SOUND_API), NULL) - OBJ_SOUND=$(OBJ_SND_NULL) - LIB_SOUND=$(LIB_SND_NULL) -endif - -# OSS: Open Sound System -ifeq ($(DP_SOUND_API), OSS) - OBJ_SOUND=$(OBJ_SND_OSS) - LIB_SOUND=$(LIB_SND_OSS) -endif - -# ALSA: Advanced Linux Sound Architecture -ifeq ($(DP_SOUND_API), ALSA) - OBJ_SOUND=$(OBJ_SND_ALSA) - LIB_SOUND=$(LIB_SND_ALSA) -endif - -# COREAUDIO: Core Audio -ifeq ($(DP_SOUND_API), COREAUDIO) - OBJ_SOUND=$(OBJ_SND_COREAUDIO) - LIB_SOUND=$(LIB_SND_COREAUDIO) -endif - -# BSD: BSD / Sun audio API -ifeq ($(DP_SOUND_API), BSD) - OBJ_SOUND=$(OBJ_SND_BSD) - LIB_SOUND=$(LIB_SND_BSD) -endif - -# WIN: DirectX and Win32 WAVE output -ifeq ($(DP_SOUND_API), WIN) - OBJ_SOUND=$(OBJ_SND_WIN) - LIB_SOUND=$(LIB_SND_WIN) -endif - -ifeq ($(DP_SOUND_API),3DRAS) - OBJ_SOUND=$(OBJ_SND_3DRAS) - LIB_SOUND=$(LIB_SND_3DRAS) -endif - ##### Extra CFLAGS ##### CFLAGS_MAKEDEP?=-MMD diff --git a/makefile.inc b/makefile.inc index 32797e0c..326e3a4a 100644 --- a/makefile.inc +++ b/makefile.inc @@ -38,7 +38,7 @@ SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framew STRIP?=strip -###### Sound and audio CD ##### +###### Sound ##### OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o @@ -70,10 +70,6 @@ LIB_SND_WIN= OBJ_SND_3DRAS=snd_3dras.o LIB_SND_3DRAS= -# CD objects -OBJ_CD_COMMON=cd_shared.o -OBJ_NOCD=cd_null.o - ###### Common objects and flags ##### @@ -81,6 +77,7 @@ OBJ_NOCD=cd_null.o OBJ_COMMON= \ bih.o \ crypto.o \ + cd_shared.o \ cl_collision.o \ cl_demo.o \ cl_input.o \ @@ -165,12 +162,12 @@ OBJ_MENU= \ # being linked, because it should be recompiled every time an executable is # built to give the executable a proper date string OBJ_SV= builddate.c sys_linux.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON) -OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMMON) snd_sdl.o $(OBJ_SDLCD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) +OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMMON) snd_sdl.o $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) # Compilation CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../ -CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE) +CFLAGS_CLIENT=-DCONFIG_MENU $(CFLAGS_VIDEO_CAPTURE) CFLAGS_SERVER= CFLAGS_DEBUG=-ggdb CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs @@ -205,20 +202,14 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } ##### UNIX specific variables ##### -OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) - LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) -LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) -EXE_UNIXCL=darkplaces-glx EXE_UNIXSV=darkplaces-dedicated EXE_UNIXSDL=darkplaces-sdl -EXE_UNIXCLNEXUIZ=nexuiz-glx EXE_UNIXSVNEXUIZ=nexuiz-dedicated EXE_UNIXSDLNEXUIZ=nexuiz-sdl @@ -230,36 +221,22 @@ CMD_UNIXMKDIR=mkdir -p ##### Linux specific variables ##### # Link -LDFLAGS_LINUXCL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXCL) LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXSDL) ##### Mac OS X specific variables ##### -# No CD support available -OBJ_MACOSXCD=$(OBJ_NOCD) - # Link -LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit -framework Carbon $(LIB_SOUND) LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m -OBJ_AGL= builddate.c sys_linux.o vid_agl.o thread_null.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) - -EXE_MACOSXCL=darkplaces-agl -EXE_MACOSXCLNEXUIZ=nexuiz-agl - ##### SunOS specific variables ##### -# No CD support available -OBJ_SUNOSCD=$(OBJ_NOCD) - CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS # Link -LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl -R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm $(LIB_SOUND) LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL) @@ -267,7 +244,6 @@ LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl -lsocket -lnsl $(LDFLAGS_UNIXSD ##### BSD specific variables ##### # Link -LDFLAGS_BSDCL=$(LDFLAGS_UNIXCOMMON) -lutil $(LDFLAGS_UNIXCL) LDFLAGS_BSDSV=$(LDFLAGS_UNIXCOMMON) LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) @@ -276,17 +252,12 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) WINDRES ?= windres -OBJ_WGL= builddate.c sys_win.o vid_wgl.o thread_null.o $(OBJ_MENU) $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) - # Link # see LDFLAGS_WINCOMMON in makefile -LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mwindows -lwinmm -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 -lws2_32 $(LDFLAGS_D3D) $(LIB_Z) $(LIB_JPEG) LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mconsole -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG) LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(SDLCONFIG_LIBS) -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG) -EXE_WINCL=darkplaces.exe EXE_WINSV=darkplaces-dedicated.exe EXE_WINSDL=darkplaces-sdl.exe -EXE_WINCLNEXUIZ=nexuiz.exe EXE_WINSVNEXUIZ=nexuiz-dedicated.exe EXE_WINSDLNEXUIZ=nexuiz-sdl.exe @@ -296,7 +267,6 @@ VPATH := ../../../ .PHONY : clean clean-profile help \ debug profile release \ - cl-debug cl-profile cl-release \ sv-debug sv-profile sv-release \ sdl-debug sdl-profile sdl-release @@ -317,11 +287,6 @@ help: @echo " previously compiled" @echo "* $(MAKE) nexuiz : make client and server binaries with nexuiz icon" @echo " (release versions)" - @echo "* $(MAKE) cl-debug : make client (debug version)" - @echo "* $(MAKE) cl-profile : make client (profile version)" - @echo "* $(MAKE) cl-release-profile : make client (release profile version)" - @echo "* $(MAKE) cl-release : make client (release version)" - @echo "* $(MAKE) cl-nexuiz : make client with nexuiz icon (release version)" @echo "* $(MAKE) sv-debug : make dedicated server (debug version)" @echo "* $(MAKE) sv-profile : make dedicated server (profile version)" @echo "* $(MAKE) sv-release-profile : make dedicated server (release profile version)" @@ -350,79 +315,54 @@ release-profile : nexuiz : $(MAKE) $(TARGETS_NEXUIZ) -cl-debug : - $(MAKE) bin-debug \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1 - -cl-profile : - $(MAKE) bin-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1 - -cl-release : - $(MAKE) bin-release \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1 - -cl-release-profile : - $(MAKE) bin-release-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE='$(EXE_CL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1 - -cl-nexuiz : - $(MAKE) bin-release \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - EXE='$(EXE_CLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_CL)' LEVEL=1 - sv-debug : $(MAKE) bin-debug \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1 sv-profile : $(MAKE) bin-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1 sv-release : $(MAKE) bin-release \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1 sv-release-profile : $(MAKE) bin-release-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SV)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1 sv-nexuiz : $(MAKE) bin-release \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SVNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_SERVER)' LDFLAGS_COMMON='$(LDFLAGS_SV)' LEVEL=1 sdl-debug : $(MAKE) bin-debug \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 sdl-profile : $(MAKE) bin-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 sdl-release : $(MAKE) bin-release \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 sdl-release-profile : $(MAKE) bin-release-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SDL)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 sdl-nexuiz : $(MAKE) bin-release \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ EXE='$(EXE_SDLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' CFLAGS_SDL='$(SDLCONFIG_CFLAGS)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 bin-debug : @@ -431,7 +371,7 @@ bin-debug : @echo '========== $(EXE) (debug) ==========' $(MAKE) prepare BUILD_DIR=build-obj/debug/$(EXE) $(MAKE) -C build-obj/debug/$(EXE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)'\ LDFLAGS='$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)' LEVEL=2 @@ -441,7 +381,7 @@ bin-profile : @echo '========== $(EXE) (profile) ==========' $(MAKE) prepare BUILD_DIR=build-obj/profile/$(EXE) $(MAKE) -C build-obj/profile/$(EXE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)'\ LDFLAGS='$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)' LEVEL=2 @@ -451,7 +391,7 @@ bin-release : @echo '========== $(EXE) (release) ==========' $(MAKE) prepare BUILD_DIR=build-obj/release/$(EXE) $(MAKE) -C build-obj/release/$(EXE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)'\ LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2 $(STRIP) $(EXE) @@ -462,7 +402,7 @@ bin-release-profile : @echo '========== $(EXE) (release) ==========' $(MAKE) prepare BUILD_DIR=build-obj/release-profile/$(EXE) $(MAKE) -C build-obj/release-profile/$(EXE) $(EXE) \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ CFLAGS='$(CFLAGS_COMMON) $(CFLAGS_FEATURES) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE_PROFILE) $(OPTIM_RELEASE)'\ LDFLAGS='$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)' LEVEL=2 $(STRIP) $(EXE) @@ -509,10 +449,6 @@ nexuiz.o: %.o : %.rc $(CHECKLEVEL2) $(DO_CC) -$(EXE_CL): $(OBJ_CL) $(OBJ_ICON) - $(CHECKLEVEL2) - $(DO_LD) - $(EXE_SV): $(OBJ_SV) $(OBJ_ICON) $(CHECKLEVEL2) $(DO_LD) @@ -521,10 +457,6 @@ $(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON) $(CHECKLEVEL2) $(DO_LD) -$(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ) - $(CHECKLEVEL2) - $(DO_LD) - $(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ) $(CHECKLEVEL2) $(DO_LD) @@ -534,10 +466,8 @@ $(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ) $(DO_LD) clean: - -$(CMD_RM) $(EXE_CL) -$(CMD_RM) $(EXE_SV) -$(CMD_RM) $(EXE_SDL) - -$(CMD_RM) $(EXE_CLNEXUIZ) -$(CMD_RM) $(EXE_SVNEXUIZ) -$(CMD_RM) $(EXE_SDLNEXUIZ) -$(CMD_RM) *.o diff --git a/snd_3dras.c b/snd_3dras.c deleted file mode 100644 index 0619796a..00000000 --- a/snd_3dras.c +++ /dev/null @@ -1,1042 +0,0 @@ -// BSD - -#include "quakedef.h" -#include "snd_3dras_typedefs.h" -#include "snd_3dras.h" - -cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"}; -cvar_t mastervolume = {CVAR_SAVE, "mastervolume", "1", "master volume"}; -cvar_t volume = {CVAR_SAVE, "volume", "0.7", "volume of sound effects"}; -cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"}; -cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"}; -cvar_t snd_mutewhenidle = {CVAR_SAVE, "snd_mutewhenidle", "1", "whether to disable sound output when game window is inactive"}; -static cvar_t snd_precache = {0, "snd_precache", "1", "loads sounds before they are used"}; - -static dllhandle_t ras_dll = NULL; -// This values is used as a multiple version support check AND to check if the lib has been loaded with success (its 0 if it failed) -int ras_version; - -static mempool_t *snd_mempool; -static sfx_t sfx_list ={//This is a header, never contains only useful data, only the first next (makes the code less complex, later) - NULL, //next - "", //name[MAX_QPATH]; - NULL, //sounddata - 0, //locks - 0 //flags - //0, //loopstart, - //0 //total_length -}; -static unsigned int channel_id_count=0; -static channel_t channel_list={ - NULL, //next - NULL, //soundevent - 0, //entnum - 0, //entchannel - 0 //id -}; -static entnum_t entnum_list={ - NULL,// *next; - 0, // entnum; - {0.0,0.0,0.0}, //lastloc - NULL,// *soundsource;// This is also used to indicate a unused slot (when it's pointing to 0) -}; - -int updatecount=0; -int soundblocked=0; -int openframe; -void* soundworld; -void* listener; -float listener_location [3]; - -//1 qu = 0.0381 meter aka 38.1 mm -//2^17 qu's is the max map size in DP -//3DRAS uses atleast 32 bit to store it's locations. -//So the smallest possible step is 0.0381*2^17/2^(32) -// =~ 1.16 nm so let's pick 2 to be safe -static float DP_Ras_UnitSize=(float)2/1000/1000; //2 nm -static float DP_Ras_VolumeScale=0.075; -//static float QU_Size = 0.0381; //meter -//static float DP_QU_Ras_Scale=QU_Size/DP_Ras_UnitSize; -static float DP_QU_Ras_Scale=19050; -static void* (*ras_delete )(void*); -static int (*ras_getversion )(); -static void* (*ras_soundworld_new )(SampleRate, WaveLength); -static void (*ras_soundworld_destroy )(void*); -static void (*ras_soundworld_endframe )(void*); -static int (*ras_soundworld_beginframe )(void*); -static void (*ras_soundworld_setmainlistener )(void*,void*); -static void (*ras_soundworld_setscale )(void*,const Scale); -static void* (*ras_fileinputwhole_new )(unsigned char*, Index); -static void* (*ras_audiodecoderwav_new )(void*, int); -static void* (*ras_audiodecoderogg_new )(void*); -static void* (*ras_sounddataoneshot_new )(void*,WaveLength,Amount); -static void* (*ras_sounddataloop_new )(void*,WaveLength,Amount); -static void* (*ras_listener_new )(void*,Location*,Scalar*); -static void* (*ras_listener_setlocation )(void*,Location*); -static void* (*ras_listener_setrotation )(void*,Scalar *,Scalar*,Scalar*); -static void* (*ras_soundsource_new )(void*,SoundVolume,Location*); -static int (*ras_soundsource_ended )(void*); -static void (*ras_soundsource_setlocation )(void*,Location*); -static void* (*ras_soundevent_new )(void*,void*,void*,SoundPower,Ratio); -static void (*ras_soundevent_setsoundpower )(void*,SoundPower); -static int (*ras_soundevent_ended )(void*); -static int (*ras_setcoordinatesystem )(Location*,Location*,Location*); -static int (*ras_testrotation )(Scalar *,Scalar *,Scalar *); - -// #define RAS_PRINT //Comment out for to not print extra crap. - -static dllfunction_t ras_funcs[] = -{ - {"Delete" ,(void**) &ras_delete }, - {"SetCoordinateSystem" ,(void**) &ras_setcoordinatesystem }, - {"TestRotation" ,(void**) &ras_testrotation }, - {"GetVersion" ,(void**) &ras_getversion }, - {"SoundWorld_New" ,(void**) &ras_soundworld_new }, - {"SoundWorld_Destroy" ,(void**) &ras_soundworld_destroy }, - {"SoundWorld_EndFrame" ,(void**) &ras_soundworld_endframe }, - {"SoundWorld_BeginFrame" ,(void**) &ras_soundworld_beginframe }, - {"FileInputWhile_New" ,(void**) &ras_fileinputwhole_new }, - {"AudioDecoderFileWav_New" ,(void**) &ras_audiodecoderwav_new }, - {"AudioDecoderFileOgg_New" ,(void**) &ras_audiodecoderogg_new }, - {"SoundDataAudioDecoderOneShot_New" ,(void**) &ras_sounddataoneshot_new }, - //{"SoundDataAudioDecoderFileLoop_New" ,(void**) &ras_sounddataloop_new }, - {"SoundWorld_SetMainListener" ,(void**) &ras_soundworld_setmainlistener }, - {"SoundWorld_SetScale" ,(void**) &ras_soundworld_setscale }, - {"ListenerPlayer_New" ,(void**) &ras_listener_new }, - {"ListenerPlayer_SetLocation" ,(void**) &ras_listener_setlocation }, - {"ListenerPlayer_SetRotation_InVectors" ,(void**) &ras_listener_setrotation }, - {"SoundSource_Ended" ,(void**) &ras_soundsource_ended }, - {"SoundSourcePoint_New" ,(void**) &ras_soundsource_new }, - {"SoundSourcePoint_SetLocation" ,(void**) &ras_soundsource_setlocation }, - {"SoundEvent_New" ,(void**) &ras_soundevent_new }, - {"SoundEvent_Ended" ,(void**) &ras_soundevent_ended }, - {"SoundEvent_SetSoundPower" ,(void**) &ras_soundevent_setsoundpower }, - { NULL , NULL } -}; -static const char* ras_dllname [] = -{ -#if defined(WIN32) - "3dras32.dll", -#elif defined(MACOSX) - "3dras.dylib", -#else - "3dras.so", -#endif - NULL -}; - -// --- entnum_t List functions ---- -void entnum_new(entnum_t** prev, entnum_t** new){ //Adds a new item to the start of the list and sets the pointers. - (*new)=Mem_Alloc(snd_mempool,sizeof(entnum_t)); - if(&new){ - (*new)->next=entnum_list.next; - entnum_list.next=(*new); - (*prev)=&entnum_list; - }else{ - Con_Printf("Could not allocate memory for a new entnum_t"); - } -} -void entnum_begin(entnum_t** prev, entnum_t** now){ //Goes to the beginning of the list and sets the pointers. - (*prev)=&entnum_list; - (*now )=entnum_list.next; -} -void entnum_next(entnum_t** prev, entnum_t** now){ //Goes to the next element - (*prev)=(*now); - (*now )=(*now)->next; -} -void entnum_delete_and_next(entnum_t** prev, entnum_t** now){ //Deletes the element and goes to the next element - entnum_t* next; - next=(*now)->next; - if((*now)->rasptr) ras_delete((*now)->rasptr); - Mem_Free(*now); - (*now)=next; - (*prev)->next=(*now); -} -// --- End Of entnum_t List functions ---- - -// --- channel_t List functions ---- -void channel_new(channel_t** prev, channel_t** new){ //Adds a new item to the start of the list and sets the pointers. - (*new)=Mem_Alloc(snd_mempool,sizeof(channel_t)); - if(&new){ - (*new)->next=channel_list.next; - channel_list.next=(*new); - (*prev)=&channel_list; - }else{ - Con_Printf("Could not allocate memory for a new channel_t"); - } -} -void channel_begin(channel_t** prev, channel_t** now){ //Goes to the beginning of the list and sets the pointers. - (*prev)=&channel_list; - (*now )=channel_list.next; -} -void channel_next(channel_t** prev, channel_t** now){ //Goes to the next element - (*prev)=(*now ); - (*now )=(*now)->next; -} -void channel_delete_and_next(channel_t** prev, channel_t** now){ //Deletes the element and goes to the next element - channel_t* next; - next=(*now)->next; - if((*now)->rasptr) ras_delete((*now)->rasptr); - Mem_Free(*now); - (*now)=next; - (*prev)->next=(*now); -} -// --- End Of channel_t List functions ---- - -// --- sfx_t List functions ---- -void sfx_new(sfx_t** prev, sfx_t** new){ //Adds a new item to the start of the list and sets the pointers. - (*new)=Mem_Alloc(snd_mempool,sizeof(sfx_t)); - if(&new){ - (*new)->next=sfx_list.next; - sfx_list.next=(*new); - (*prev)=&sfx_list; - }else{ - Con_Printf("Could not allocate memory for a new sfx_t"); - } -} -void sfx_begin(sfx_t** prev, sfx_t** now){ //Goes to the beginning of the list and sets the pointers. - (*prev)=&sfx_list; - (*now )=sfx_list.next; -} -void sfx_next(sfx_t** prev, sfx_t** now){ //Goes to the next element - (*prev)=(*now ); - (*now )=(*now)->next; -} -void sfx_delete_and_next(sfx_t** prev, sfx_t** now){ //Deletes the element and goes to the next element - sfx_t* next; - next=(*now)->next; - if((*now)->rasptr) ras_delete((*now)->rasptr); - Mem_Free(*now); - (*now)=next; - (*prev)->next=(*now); -} -// --- End Of sfx_t List functions ---- - -void channel_new_smart(channel_t** prev, channel_t** now){ - channel_new(prev,now); - ++channel_id_count; - (*now)->id=channel_id_count; -} -void Free_Unlocked_Sfx(void){ - sfx_t *prev, *now; - sfx_begin(&prev,&now); - while(now){ - if( - !(now->flags & SFXFLAG_SERVERSOUND) && - now->locks<=0 - ){ - sfx_delete_and_next(&prev,&now); - }else{ - sfx_next(&prev,&now); - } - } -} -void DP_To_Ras_Location(const float in[3],Location out[3]){ - out[0]=(Location)(in[0]*DP_QU_Ras_Scale ); - out[1]=(Location)(in[1]*DP_QU_Ras_Scale ); - out[2]=(Location)(in[2]*DP_QU_Ras_Scale ); -} -void S_Restart_f(void){ - S_Shutdown(); - S_Startup(); -} -static void S_Play_Common (float fvol, float attenuation){ - int i; - char name [MAX_QPATH]; - sfx_t *sfx; - if(ras_version>0 && ras_dll){ - #ifdef RAS_PRINT - Con_Printf("Called S_Play_Common\n"); - Con_Printf("Does this need to be location in depend channel ?\n"); - #endif - - i = 1; - while (i < Cmd_Argc ()) - { - // Get the name, and appends ".wav" as an extension if there's none - strlcpy (name, Cmd_Argv (i), sizeof (name)); - if (!strrchr (name, '.')) - strlcat (name, ".wav", sizeof (name)); - i++; - - // If we need to get the volume from the command line - if (fvol == -1.0f) - { - fvol = atof (Cmd_Argv (i)); - i++; - } - - sfx = S_PrecacheSound (name, true, true); - if (sfx) - S_StartSound (-1, 0, sfx, listener_location, fvol, attenuation); - } - } -} -static void S_Play_f(void){ - S_Play_Common (1.0f, 1.0f); -} -static void S_Play2_f(void){ - S_Play_Common (1.0f, 0.0f); -} -static void S_PlayVol_f(void){ - S_Play_Common (-1.0f, 0.0f); -} -static void S_SoundList_f(void){ - channel_t *prev_c, *now_c; - sfx_t *prev_s, *now_s; - entnum_t *prev_e, *now_e; - int count_c,count_s,count_e; - - if(ras_version>0 && ras_dll){ - - Con_Printf("Sfx (SoundDatas) :\n" - "------------------\n" - "Locks\tflags\tpointer\tName\n"); - count_s=0; - sfx_begin(&prev_s,&now_s); - while(now_s){ - ++count_s; - Con_Printf("%i\t%i\t%i\t%s\n", - now_s->locks, now_s->flags, now_s->rasptr!=NULL, now_s->name - ); - sfx_next(&prev_s,&now_s); - } - - Con_Printf("Entnum (SoundSources) :\n" - "-----------------------\n" - "Ent\tpointer\n"); - count_e=0; - entnum_begin(&prev_e,&now_e); - while(now_e){ - ++count_e; - Con_Printf("%i\t%i\n", - now_e->entnum, now_e->rasptr!=NULL - ); - entnum_next(&prev_e,&now_e); - } - - Con_Printf("Channels (SoundEvents) :\n" - "------------------------\n" - "Ent\tChannel\tID\tpointer\n"); - count_c=0; - channel_begin(&prev_c,&now_c); - while(now_c){ - ++count_c; - Con_Printf("%i\t%i\t%i\t%i\n", - now_c->entnum, now_c->entchannel, now_c->id, now_c->rasptr!=NULL - ); - channel_next(&prev_c,&now_c); - } - - Con_Printf( - "Count:\n" - "------\n" - "Channels: %i\n" - "Sfx's: %i\n" - "Entities: %i\n", - count_c,count_s,count_e - ); - } -} -void Free_All_sfx(){ - sfx_t *prev, *now; - sfx_begin(&prev,&now); - while(now) sfx_delete_and_next(&prev,&now); -} -void Free_All_channel(){ - channel_t *prev, *now; - channel_begin(&prev,&now); - while(now) channel_delete_and_next(&prev,&now); -} -void Free_All_entnum(){ - entnum_t *prev, *now; - entnum_begin(&prev,&now); - while(now) entnum_delete_and_next(&prev,&now); -} -void S_Init (void){ - Location up[3],right[3],front[3]; - ras_version=0; - snd_mempool = Mem_AllocPool("sound", 0, NULL); - if(ras_dll) Con_Printf( "3D RAS already loaded ... (this indicates a bug)\n"); - if (Sys_LoadLibrary (ras_dllname, &ras_dll, ras_funcs)) - { - Con_Printf ("Loading 3D RAS succeeded\n"); - Con_Printf ("Checking the lib version\n"); - ras_version=ras_getversion(); - if (ras_version>0){ - - Con_Printf ("Version %i found\n",ras_version); - Cvar_RegisterVariable(&volume); - Cvar_RegisterVariable(&bgmvolume); - Cvar_RegisterVariable(&mastervolume); - Cvar_RegisterVariable(&snd_staticvolume); - Cvar_RegisterVariable(&snd_precache); - - Cmd_AddCommand("play", S_Play_f, "play a sound at your current location (not heard by anyone else)"); - Cmd_AddCommand("snd_play", S_Play_f, "play a sound at your current location (not heard by anyone else)"); - Cmd_AddCommand("play2", S_Play2_f, "play a sound globally throughout the level (not heard by anyone else)"); - Cmd_AddCommand("snd_play2", S_Play2_f, "play a sound globally throughout the level (not heard by anyone else)"); - Cmd_AddCommand("playvol", S_PlayVol_f, "play a sound at the specified volume level at your current location (not heard by anyone else)"); - Cmd_AddCommand("snd_playvol", S_PlayVol_f, "play a sound at the specified volume level at your current location (not heard by anyone else)"); - Cmd_AddCommand("stopsound", S_StopAllSounds, "silence"); - Cmd_AddCommand("soundlist", S_SoundList_f, "list loaded sounds"); - Cmd_AddCommand("snd_stopsound", S_StopAllSounds, "silence"); - Cmd_AddCommand("snd_soundlist", S_SoundList_f, "list loaded sounds"); - Cmd_AddCommand("snd_restart", S_Restart_f, "restart sound system"); - Cmd_AddCommand("snd_shutdown", S_Shutdown, "shutdown the sound system keeping the dll loaded"); - Cmd_AddCommand("snd_startup", S_Startup, "start the sound system"); - Cmd_AddCommand("snd_unloadallsounds", S_UnloadAllSounds_f, "unload all sound files"); - - //Set the coordinate system inside the lib equal to the one inside dp: - up[0]= 0 , up[1]= 0 , up[2]=1; - right[0]= 0 ,right[1]=-1 , right[2]=0; - front[0]= 1 ,front[1]= 0 , front[2]=0; - if(ras_setcoordinatesystem(right,up,front)==0){ - Con_Printf("Failed to set the Coordinate System\n"); - ras_version=0; - } - }else{ - Con_Printf ("Failed to get the lib version\n"); - Sys_UnloadLibrary (&ras_dll); - ras_dll=0; - } - }else{ - ras_dll=0; - Con_Printf ("Loading 3D RAS failed\n"); - Sys_UnloadLibrary (&ras_dll); - } -} -void S_Terminate (void){ - if(ras_dll){ - S_Shutdown(); - Free_All_sfx(); // <= The only valid place to free the sfx. - Sys_UnloadLibrary(&ras_dll); - ras_dll=0; - ras_version=0; - } -} - -void S_Startup (void){ - Location loc[3]={0, 0, 0}; - Scalar rot[4]={1.0, 0, 0, 0}; - if(ras_version>0 && ras_dll){ - channel_id_count=1; - soundworld= ras_soundworld_new(48000,0.1); - if(soundworld==0){ - Con_Printf("Failed to start a SoundWorld\n"); - }else{ - Con_Printf("Succeeded in starting a new SoundWorld\n"); - listener=ras_listener_new(soundworld,loc,rot); - ras_soundworld_setmainlistener(soundworld,listener); - openframe = ras_soundworld_beginframe(soundworld); - ras_soundworld_setscale(soundworld,DP_Ras_UnitSize); - } - } -} -void S_Shutdown (void){ - if(ras_version>0 && ras_dll && soundworld){ - if(openframe) ras_soundworld_endframe(soundworld); - - //Order doesn't really matter because the lib takes care of the references - //Free_All_sfx(); <= DO NOT FREE SFX ... they just keep sending in the old sfx causing havoc. - Free_All_channel(); - Free_All_entnum(); - - ras_soundworld_destroy(soundworld); - soundworld=ras_delete(soundworld); - if(soundworld){ - Con_Printf("Failed to stop the SoundWorld\n"); - }else{ - Con_Printf("Succeeded in stopping the SoundWorld\n"); - } - } -} -void S_UnloadAllSounds_f(void){ - if(ras_version>0 && ras_dll){ - Free_All_sfx(); - } -} - -void S_Update(const matrix4x4_t *listener_matrix){ - float forward [3]; - float left [3]; - float up [3]; - float float3 [3]; - Location location3 [3]; - entnum_t *prev_e, *now_e; - channel_t *prev_c, *now_c; - if(ras_version>0 && ras_dll && soundworld){ - Matrix4x4_ToVectors(listener_matrix,forward,left,up,listener_location); //Add the new player location. - if(openframe){ - VectorNegate(left,left); - DP_To_Ras_Location(listener_location,location3); - ras_listener_setlocation(listener,location3); - ras_listener_setrotation(listener,left,up,forward); - /* - Con_Printf( - "DP: Left={%f|%f|%f} Up={%f|%f|%f} Front={%f|%f|%f}\n", - left[0], left[1], left[2], - up[0], up[1], up[2], - forward[0],forward[1],forward[2] - ); - ras_testrotation(left,up,forward); - Con_Printf( - "RAS: Left={%f|%f|%f} Up={%f|%f|%f} Front={%f|%f|%f}\n", - left[0], left[1], left[2], - up[0], up[1], up[2], - forward[0],forward[1],forward[2] - ); - */ - if(updatecount>100){ - updatecount=0; - #ifdef RAS_PRINT - Con_Printf("S_Update: Add a callback to SCR_CaptureVideo_SoundFrame.\n"); - Con_Printf("S_Update: Add Slomo.\n"); - Con_Printf("S_Update: Add BlockedSoundCheck.\n"); - Con_Printf("S_Update: Add Slomo(as a cvar) and pauze.\n"); - #endif - }else{ - ++updatecount; - } - //(15:20:31) div0: (at the moment, you can extend it to multichannel) - //(15:20:40) div0: see S_CaptureAVISound() - if(cl.entities){ //if there is a list of ents - //Update all entities there position into the sound sources. - entnum_begin(&prev_e,&now_e); - while(now_e){ - if(!now_e->rasptr){ - Con_Printf("S_Update: Found an entnum_t without a valid RAS-ptr... This indicates a bug.\n"); - entnum_delete_and_next(&prev_e,&now_e); - }else{ //Look for unused ent and drop them. - if(now_e->entnum!=-1){ //Talking about an ent ? Or a static sound source ? - if(ras_soundsource_ended(now_e->rasptr)){ - VectorCopy(cl.entities[now_e->entnum].state_current.origin,float3); - VectorCopy(now_e->lastloc,float3); - DP_To_Ras_Location(float3,location3); - ras_soundsource_setlocation(now_e->rasptr,location3); - entnum_next(&prev_e,&now_e); - }else{ - entnum_delete_and_next(&prev_e,&now_e); - } - }else{ - if(ras_soundsource_ended(now_e->rasptr)){ - entnum_delete_and_next(&prev_e,&now_e); - }else{ - entnum_next(&prev_e,&now_e); - } - } - } - } - }else{ - Free_All_entnum(); - } - channel_begin(&prev_c,&now_c); - while(now_c){ - if(!now_c->rasptr){ - Con_Printf("S_Update: Found an channel_t without a valid RAS-ptr... This indicates a bug.\n"); - channel_delete_and_next(&prev_c,&now_c); - }else{ //Look for stopped sound channels and free them - if(ras_soundevent_ended(now_c->rasptr)){ - channel_delete_and_next(&prev_c,&now_c); - }else{ - channel_next(&prev_c,&now_c); - } - } - } - ras_soundworld_endframe (soundworld); - } - openframe =ras_soundworld_beginframe(soundworld); - } -} -void S_ExtraUpdate (void){ - // This lib is unable to use any extra updates. - //if(ras_version>0 && ras_dll){ - //} -} -sfx_t* S_FindName (const char *name){ - sfx_t *prev,*now; - if(ras_version>0 && ras_dll){ - #ifdef RAS_PRINT - Con_Printf("Called S_FindName %s\n",name); - #endif - - if (strlen (name) >= sizeof (now->name)) - { - Con_Printf ("S_FindName: sound name too long (%s)\n", name); - return NULL; - } - - sfx_begin(&prev,&now); - // Seek in list - while (now){ - if(strcmp (now->name, name)==0) return now; - sfx_next(&prev,&now); - } - - // None found in the list, - // Add a sfx_t struct for this sound - sfx_new(&prev,&now); - now->locks=0; - now->flags=0; - now->rasptr=0; - //sfx->looptstart=0; - //sfx->total_length=0; - strlcpy (now->name, name, sizeof (now->name)); - return now; - } - return NULL; -} -int S_LoadSound(sfx_t *sfx, int complain){ - // TODO add SCR_PushLoadingScreen, SCR_PopLoadingScreen calls to this - fs_offset_t filesize; - char namebuffer[MAX_QPATH +16 ]; - char filename [MAX_QPATH +16+4]; - char fileext [4]; - size_t len; - unsigned char *data=NULL; - void* file_ptr=NULL; - void* decoder_ptr=NULL; - if(ras_version>0 && ras_dll){ - - fileext[3]=0; //Terminator - // See if already loaded - if (sfx->rasptr) return true; - - // LordHavoc: if the sound filename does not begin with sound/, try adding it - if (!data && strncasecmp(sfx->name, "sound/", 6)) - { - len = dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", sfx->name); - if (len < 0){ // name too long - Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", sfx->name); - return false; - } - if(!data){ - data = FS_LoadFile(namebuffer, snd_mempool, false, &filesize); - if(data) memcpy(fileext,namebuffer+len-3,3); //Copy the extention - } - if(!data){ //Stick .wav to the end and try again - memcpy(filename,namebuffer,len); - memcpy(filename+len-4,".wav",5); - data = FS_LoadFile(filename, snd_mempool, false, &filesize); - if(data) memcpy(fileext,"wav",3); - } - if(!data){ //Stick .ogg to the end and try again - memcpy(filename,namebuffer,len); - memcpy(filename+len-4,".ogg",5); - data = FS_LoadFile(filename, snd_mempool, false, &filesize); - if(data) memcpy(fileext,"ogg",3); - } - } - if(!data){ - // LordHavoc: then try without the added sound/ as wav and ogg - len = dpsnprintf (namebuffer, sizeof(namebuffer), "%s", sfx->name); - if (len < 0){ // name too long - Con_DPrintf("S_LoadSound: name \"%s\" is too long\n", sfx->name); - return false; - } - if(!data){ - data = FS_LoadFile(namebuffer, snd_mempool, false, &filesize); - if(data) memcpy(fileext,namebuffer+len-3,3); //Copy the file extention - } - if(!data){ //Stick .wav to the end - memcpy(filename,namebuffer,len); - memcpy(filename+len-4,".wav",5); - data = FS_LoadFile(filename, snd_mempool, false, &filesize); - if(data) memcpy(fileext,"wav",3); - } - if(!data){ //Stick .ogg to the end - memcpy(filename,namebuffer,len); - memcpy(filename+len-4,".ogg",5); - data = FS_LoadFile(filename, snd_mempool, false, &filesize); - if(data) memcpy(fileext,"ogg",3); - } - } - if (!data){ - if(complain) Con_Printf("Failed attempt load file '%s'\n",namebuffer); - }else{ //if the file loaded: pass to RAS 3D - file_ptr=ras_fileinputwhole_new(data,filesize); - // There we transfered to file to RAS 3D - // So lets free up data shall we ? - FS_Close(data); - - if(!file_ptr){ - Con_Printf("Failed to upload file to audio lib\n"); - }else{ - if(0==strncasecmp(fileext,"wav",3)){ - decoder_ptr=ras_audiodecoderwav_new(file_ptr,true); //(true)use seek mode: some quake files are broken. - } - if(0==strncasecmp(fileext,"ogg",3)){ - decoder_ptr=ras_audiodecoderogg_new(file_ptr); - } - if(!decoder_ptr){ - Con_Printf("File succeeded to load, but no decoder available for '%s'\n",fileext); - }else{ - #ifdef RAS_PRINT - Con_Printf("ToDo: Add a cvar to configure the cache size and number of cache blocks.\n"); - Con_Printf("ToDo: Add support for looping sounds.\n"); - #endif - sfx->rasptr=ras_sounddataoneshot_new(decoder_ptr,0.05,8); - } - file_ptr=ras_delete(file_ptr); - } - return !(sfx->rasptr); - } - return false; - } - return false; -} -sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean serversound){ - sfx_t *sfx; - if(ras_version>0 && ras_dll){ - #ifdef RAS_PRINT - Con_Printf("Called S_PrecacheSound %s, %i, %i\n",name,complain,serversound); - #endif - if (name == NULL || name[0] == 0) - return NULL; - sfx = S_FindName (name); - if (sfx == NULL) return NULL; - if (lock) ++(sfx->locks); - if (snd_precache.integer) S_LoadSound(sfx, complain); - return sfx; - } - return NULL; -} -void S_ClearUsed (void){ - sfx_t *prev_s, *now_s; - unsigned int i; - - if(ras_version>0 && ras_dll){ - Con_Printf("Called S_ClearUsed\n"); - for(i=0;iflags & SFXFLAG_SERVERSOUND) now_s->flags &= ~SFXFLAG_SERVERSOUND; - sfx_next(&prev_s,&now_s); - } - } - } -} -void S_PurgeUnused(void){ - Free_Unlocked_Sfx(); -} -qboolean S_IsSoundPrecached (const sfx_t *sfx){ - if(ras_version>0 && ras_dll){ - return !sfx->rasptr; - } - return 0; -} - -void S_KillChannel (channel_t *now){ //Silences a SoundEvent - if(now->rasptr){ - ras_soundevent_setsoundpower(now->rasptr,0); - ras_delete(now->rasptr); - now->rasptr=0; - }else{ - Con_Printf("S_KillChannel: Warning pointer was 0 ... this indicates a bug.\n"); - } -} - -int S_StartSound_OnEnt (int entnum, int entchannel, sfx_t *sfx, float fvol, float attenuation){ - entnum_t *prev_e, *now_e; - channel_t *prev_c, *now_c; - Location tmp_location[3]; - - //If there is a game world - if(!cl.entities){ - Con_Printf("S_StartSound_OnEnt: no entity list exists\n"); - return -1; - } - - // Look for the correct ent_t - entnum_begin(&prev_e,&now_e); - while(now_e){ - if(now_e->entnum==entnum) break; - entnum_next(&prev_e,&now_e); - } - //We found no ent ... lets make one... - if(!now_e){ - entnum_new(&prev_e,&now_e); - if(!now_e){ - Con_Printf("S_StartSound_OnEnt: could not make new entnum_t\n"); - return -1; - } - VectorCopy(cl.entities[entnum].state_current.origin, now_e->lastloc); - DP_To_Ras_Location(now_e->lastloc,tmp_location); - now_e->rasptr=ras_soundsource_new(soundworld,1.0,tmp_location); - if(!now_e->rasptr){ - Con_Printf("S_StartSound_OnEnt: could not create a new sound source\n"); - return -1; - } - } - - //Ok now lets look for the channel. - channel_begin(&prev_c,&now_c); - while(now_c){ - if( - now_c->entnum==entnum && - now_c->entchannel==entchannel - ) break; - channel_next(&prev_c,&now_c); - } - - if(now_c){ //O dear the channel excists .... - S_KillChannel(now_c); - }else{ //We found no channel .... So we need to make a new one ... - channel_new_smart(&prev_c,&now_c); - if(!now_c){ - Con_Printf("S_StartSound_OnEnt: could not make new channel_t\n"); - channel_delete_and_next(&prev_c,&now_c); - return -1; - } - now_c->entnum =entnum; - now_c->entchannel=entchannel; - } - - //Lets start the sound on the acquired sound source and channel - now_c->rasptr=ras_soundevent_new( - soundworld,now_e->rasptr,sfx->rasptr,fvol*DP_Ras_VolumeScale,1.0 - ); - if(!now_c->rasptr){ //Whoops, failed, lets delete this channel then. - channel_delete_and_next(&prev_c,&now_c); - Con_Printf("S_StartSound_OnEnt: could not make a new soundevent.\n"); - return -1; - } - return now_c->id; -} -int S_StartSound_OnLocation (sfx_t *sfx, vec3_t origin, float fvol, float attenuation){ - entnum_t *prev_e, *now_e; - channel_t *prev_c, *now_c; - Location tmp_location[3]; - DP_To_Ras_Location(origin,tmp_location); - - entnum_new (&prev_e,&now_e); - VectorCopy(now_e->lastloc,origin); - now_e->entnum=-1; - now_e->rasptr=ras_soundsource_new(soundworld,1.0,tmp_location); - if(!now_e->rasptr){ - Con_Printf("S_StartSound_OnLocation: Could not make a new soundsource.\n"); - entnum_delete_and_next(&prev_e,&now_e); - return -1; - } - channel_new_smart(&prev_c,&now_c); - now_c->entnum=-1; - now_c->entchannel=-1; - now_c->rasptr =ras_soundevent_new(soundworld,now_e->rasptr,sfx->rasptr,fvol*DP_Ras_VolumeScale,1.0); - if(!now_c->rasptr){ - entnum_delete_and_next(&prev_e,&now_e); - channel_delete_and_next(&prev_c,&now_c); - Con_Printf("S_StartSound_OnLocation: Could not make a new soundevent.\n"); - return -1; - } - return now_c->id; -} - - -// Qantourisc on the wicked-quake-sound-system: -// -------------------------------------------- -// entnum can be Zero or lower => This means "use the origin" so it's not tracked. -// entnum -1 is a "world" containing more then 1 soundsource. -// If channel != 0 try to overwrite the requested channel. Otherwise play it on some random channel. -// If channel == -1 overwrite the first track of the ent. -// If a channel replacement is requested, only allow overwriting if it's owned by the same channel. -// If no channel can be replaced, pick a new one. -// Also when you overwrite a channel, that one has to stop dead. -// This function returns the channel it was played on (so it can be stopped later) -// This starts CD-music: S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0); -// The channel you return then, can later be requested to be stopped. - -int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation){ - sfx_t *prev_s,*now_s; - int sfx_ok; - if(ras_version>0 && ras_dll && soundworld){ - #ifdef RAS_PRINT - Con_Printf("Called S_StartSound %i, %i, %f, %f\n",entnum,entchannel,fvol,attenuation); - #endif - if(sfx==NULL){ // They pass this to me ... but WHY ? it makes no sense ! - #ifdef RAS_PRINT - Con_Printf("S_StartSound: forgot to mention a sfx!\n"); - #endif - return -1; - } - - sfx_ok=0; - sfx_begin(&prev_s,&now_s); - while(now_s){ - if(now_s==sfx){ - sfx_ok=1; - break; - } - sfx_next(&prev_s,&now_s); - } - if(!sfx_ok){ - Con_Printf("S_StartSound: passed illegal sfx_t!\n"); - return -1; - } - if (!S_LoadSound(sfx,true)) return -1; - - - if(entnum!=-1){ //If we are talking about an ent - return S_StartSound_OnEnt(entnum,entchannel,sfx,fvol,attenuation); - }else{ - return S_StartSound_OnLocation( sfx,origin,fvol,attenuation); - } - } - Con_Printf("S_StartSound: engine not stated\n"); - return -1; -} -qboolean S_LocalSound (const char *s){ - sfx_t *sfx; - int ch_ind; - if(ras_version>0 && ras_dll){ - #ifdef RAS_PRINT - Con_Printf("Called S_LocalSound %s\n",s); - #endif - - sfx = S_PrecacheSound (s, true, true); - if (!sfx) - { - Con_Printf("S_LocalSound: can't precache %s\n", s); - return false; - } - - // Local sounds must not be freed - sfx->flags |= SFXFLAG_PERMANENTLOCK; - #ifdef RAS_PRINT - Con_Printf("S_LocalSound: this is still a small hack\n"); - #endif - ch_ind = S_StartSound (cl.viewentity, 0, sfx, listener_location, 1, 0); - if (ch_ind < 0) - return false; - - //channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND; - return true; - } - return 0; -} -void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation){ - //Static sounds should not be looped - if(ras_version>0 && ras_dll){ - #ifdef RAS_PRINT - Con_Printf("Called S_StaticSound\n"); - Con_Printf("Waiting on Qantourisc to add Static sounds in his lib.\n"); - #endif - //Static sounds are sounds that are not pauzed, and or played locally. - } -} -void S_StopSound (int entnum, int entchannel){ - channel_t *prev, *now; - if(ras_version>0 && ras_dll){ - //Con_Printf("Called S_StopSound %i, %i\n",entnum,entchannel); - channel_begin(&prev,&now); - while(now){ - if(now->entnum==entnum && now->entchannel==entchannel) break; - channel_next(&prev,&now); - } - if(now){ //If we found our to delete sound. - S_KillChannel(now); - channel_delete_and_next(&prev,&now); - }else{ - Con_Printf("S_StopSound: Could not find the requested entnum-entchannel sound\n"); - } - } -} -void S_StopAllSounds (void){ - channel_t *prev, *now; - if(ras_version>0 && ras_dll){ - //Con_Printf("Called S_StopAllSounds\n"); - channel_begin(&prev,&now); - while(now){ - S_KillChannel(now); - channel_next(&prev,&now); - } - } -} -void S_PauseGameSounds (qboolean toggle){ - if(ras_version>0 && ras_dll){ - Con_Printf("Called S_PauseGameSounds %i\n",toggle); - //Localsounds should not be pauzed - } -} -void S_StopChannel (unsigned int channel_ind){ - channel_t *prev,*now; - if(ras_version>0 && ras_dll){ - channel_begin(&prev,&now); - while(now){ - if(now->id==channel_ind){ - S_KillChannel(now); - channel_delete_and_next(&prev,&now); - }else{ - channel_next(&prev,&now); - } - } - } -} -qboolean S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qboolean value){ - if(ras_version>0 && ras_dll){ - Con_Printf("Called S_SetChannelFlag %u, %u, %i\n",ch_ind, flag, value); - } - return 0; -} -void S_SetChannelVolume (unsigned int ch_ind, float fvol){ - channel_t *prev,*now; - if(ras_version>0 && ras_dll){ - Con_Printf("Called S_SetChannelVolume %u, %f\n",ch_ind, fvol); - channel_begin(&prev,&now); - while(now){ - if(now->id==ch_ind){ - if(now->rasptr){ - ras_soundevent_setsoundpower(now->rasptr,fvol*DP_Ras_VolumeScale); - }else{ - Con_Printf("S_StopChannel: Warning pointer was 0 ... this indicates a bug.\n"); - } - } - channel_next(&prev,&now); - } - } -} - -float S_GetChannelPosition (unsigned int ch_ind) -{ - // FIXME unsupported - return -1; -} - -void S_BlockSound (void){ - soundblocked++; -} -void S_UnblockSound (void){ - soundblocked--; - if(soundblocked<0){ - Con_Printf("S_UnblockSound: Requested more S_UnblockSound then S_BlockSound.\n"); - } -} - -int S_GetSoundRate (void){ - Con_Printf("Inside 3DRAS, the soundrate of the end-user is NONE of the dev's concern.\n"); - Con_Printf("So let's assume 44100.\n"); - return 44100; -} - -int S_GetSoundChannels (void){ - Con_Printf("Inside 3DRAS, the soundrate of the end-user is NONE of the dev's concern.\n"); - Con_Printf("So let's assume 2.\n"); - return 2; -} - -/* -==================== -SndSys_SendKeyEvents - -Send keyboard events originating from the sound system (e.g. MIDI) -==================== -*/ -void SndSys_SendKeyEvents(void) -{ - // not supported -} diff --git a/snd_3dras.h b/snd_3dras.h deleted file mode 100644 index b735a6dd..00000000 --- a/snd_3dras.h +++ /dev/null @@ -1,49 +0,0 @@ -//BSD - -#ifndef SND_3DRAS_H -#define SND_3DRAS_H - -#include "sound.h" - -#define DEFAULT_SOUND_PACKET_VOLUME 255 -#define DEFAULT_SOUND_PACKET_ATTENUATION 1.0 - -#define CHANNELFLAG_NONE 0 -#define CHANNELFLAG_FORCELOOP (1 << 0) // force looping even if the sound is not looped -#define CHANNELFLAG_LOCALSOUND (1 << 1) // INTERNAL USE. Not settable by S_SetChannelFlag -#define CHANNELFLAG_PAUSED (1 << 2) -#define CHANNELFLAG_FULLVOLUME (1 << 3) // isn't affected by the general volume - -#define SFXFLAG_NONE 0 -//#define SFXFLAG_FILEMISSING (1 << 0) // wasn't able to load the associated sound file -#define SFXFLAG_SERVERSOUND (1 << 1) // the sfx is part of the server precache list -//#define SFXFLAG_STREAMED (1 << 2) // informative only. You shouldn't need to know that -#define SFXFLAG_PERMANENTLOCK (1 << 3) // can never be freed (ex: used by the client code) - -typedef struct channel_s{ - struct channel_s* next; - void* rasptr;//Sound Event // This is also used to indicate a unused slot (when it's pointing to 0) - int entnum;// to allow overriding a specific sound - int entchannel; - unsigned int id; -} channel_t; - -typedef struct entnum_s{ - struct entnum_s *next; - int entnum; - vec3_t lastloc; //Since DP has no way of tracking the deletion, we will use this instead (great jumps indicate teleport or new ent - void *rasptr;//Sound Source // This is also used to indicate a unused slot (when it's pointing to 0) -} entnum_t; - -struct sfx_s{ - struct sfx_s *next; - char name[MAX_QPATH]; - void* rasptr; //Sound Data// The sound data allocated in the lib - - int locks; - unsigned int flags; // cf SFXFLAG_* defines - //unsigned int loopstart; // in sample frames. equals total_length if not looped - //unsigned int total_length; // in sample frames -}; - -#endif diff --git a/snd_3dras_typedefs.h b/snd_3dras_typedefs.h deleted file mode 100644 index a56ef9ec..00000000 --- a/snd_3dras_typedefs.h +++ /dev/null @@ -1,57 +0,0 @@ -// This file defines a few "basis measurement" types that extern program will need. -#ifndef Typedefs_h -#define Typedefs_h -#include - ///To address a location in a file. -typedef unsigned int FilePosition; - ///This will express an Amount of something. -typedef uint64_t Amount; - /// Index expresses an address in a certain array of data. -typedef uint64_t Index; - /// A signed index, to access things that can be access before 0 -typedef int64_t SignedIndex; - ///The depth at witch we are tracing. -typedef unsigned int TraceDepth; - ///The type of a Location (as in a messurement ... from 0) -typedef int64_t Location; - ///The type of a Location on a texture -typedef float TextureLocation; - ///The type of a Distance -typedef float Distance; - ///The type of a Scalar type for use in: Normal3D, Dot product, Direction3D, ... -typedef float Scalar; - ///Howmuch of something ? -typedef float Ratio; - ///The type of a an EulerAngle for use in: EulerAngle2D, EulerAngle3D, ... -typedef float EulerAngle; - ///The type that detemens the size of 1 Location. Expressed in meters/Location. -typedef float Scale; - ///The frequency of something. -typedef float Frequency; - ///The wavelength of a frequency -typedef Distance WaveLength; - /// Howmany samples we take per secod -typedef float SampleRate; - /// The type in witch we will express a SoundSample. -typedef float Sample; - /// The type that express the speed of sound (meter/second). -typedef float SoundSpeed; - /// The type that that express 1 Time. As in a small step. Note in the feature this will be a class. To make it ring. -typedef unsigned int Time; -typedef float Duration; -//typedef StrongType Time; // Example of a strong typecheck - /// The amplitude of the SoundPower. This for export to an AudioOutputDevice. -typedef float SoundVolume; - /// How mutch power per square meter is received per meter (Watt/Meter^2) -typedef float SoundIntensity; - /// An expression of the power of sound source (Watt) -typedef float SoundPower; // W, The power of the sound source - -typedef float LightIntensity; -typedef float LightPower; -typedef float Brightness; -typedef float Gamma; -typedef float Color; -typedef float RefractionIndex; -typedef unsigned int Resolution; -#endif diff --git a/snd_alsa.c b/snd_alsa.c deleted file mode 100644 index 3f4292c8..00000000 --- a/snd_alsa.c +++ /dev/null @@ -1,524 +0,0 @@ -/* - Copyright (C) 2006 Mathieu Olivier - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - -*/ - -// ALSA module, used by Linux - -#include "quakedef.h" - -#include - -#include "snd_main.h" - - -#define NB_PERIODS 4 - -static snd_pcm_t* pcm_handle = NULL; -static snd_pcm_sframes_t expected_delay = 0; -static unsigned int alsasoundtime; - -static snd_seq_t* seq_handle = NULL; - -/* -==================== -SndSys_Init - -Create "snd_renderbuffer" with the proper sound format if the call is successful -May return a suggested format if the requested format isn't available -==================== -*/ -qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) -{ - const char* pcm_name, *seq_name; - int i, err, seq_client, seq_port; - snd_pcm_hw_params_t* hw_params = NULL; - snd_pcm_format_t snd_pcm_format; - snd_pcm_uframes_t buffer_size; - - Con_Print ("SndSys_Init: using the ALSA module\n"); - - seq_name = NULL; -// COMMANDLINEOPTION: Linux ALSA Sound: -sndseqin : selects which sequencer port to use for input, by default no sequencer port is used (MIDI note events from that port get mapped to MIDINOTE keys that can be bound) - i = COM_CheckParm ("-sndseqin"); // TODO turn this into a cvar, maybe - if (i != 0 && i < com_argc - 1) - seq_name = com_argv[i + 1]; - if(seq_name) - { - seq_client = atoi(seq_name); - seq_port = 0; - if(strchr(seq_name, ':')) - seq_port = atoi(strchr(seq_name, ':') + 1); - Con_Printf ("SndSys_Init: seq input port has been set to \"%d:%d\". Enabling sequencer input...\n", seq_client, seq_port); - err = snd_seq_open (&seq_handle, "default", SND_SEQ_OPEN_INPUT, 0); - if (err < 0) - { - Con_Print ("SndSys_Init: can't open seq device\n"); - goto seqdone; - } - err = snd_seq_set_client_name(seq_handle, gamename); - if (err < 0) - { - Con_Print ("SndSys_Init: can't set name of seq device\n"); - goto seqerror; - } - err = snd_seq_create_simple_port(seq_handle, gamename, SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION); - if(err < 0) - { - Con_Print ("SndSys_Init: can't create seq port\n"); - goto seqerror; - } - err = snd_seq_connect_from(seq_handle, 0, seq_client, seq_port); - if(err < 0) - { - Con_Printf ("SndSys_Init: can't connect to seq port \"%d:%d\"\n", seq_client, seq_port); - goto seqerror; - } - err = snd_seq_nonblock(seq_handle, 1); - if(err < 0) - { - Con_Print ("SndSys_Init: can't make seq nonblocking\n"); - goto seqerror; - } - - goto seqdone; - -seqerror: - snd_seq_close(seq_handle); - seq_handle = NULL; - } - -seqdone: - // Check the requested sound format - if (requested->width < 1 || requested->width > 2) - { - Con_Printf ("SndSys_Init: invalid sound width (%hu)\n", - requested->width); - - if (suggested != NULL) - { - memcpy (suggested, requested, sizeof (*suggested)); - - if (requested->width < 1) - suggested->width = 1; - else - suggested->width = 2; - - Con_Printf ("SndSys_Init: suggesting sound width = %hu\n", - suggested->width); - } - - return false; - } - - if (pcm_handle != NULL) - { - Con_Print ("SndSys_Init: WARNING: Init called before Shutdown!\n"); - SndSys_Shutdown (); - } - - // Determine the name of the PCM handle we'll use - switch (requested->channels) - { - case 4: - pcm_name = "surround40"; - break; - case 6: - pcm_name = "surround51"; - break; - case 8: - pcm_name = "surround71"; - break; - default: - pcm_name = "default"; - break; - } -// COMMANDLINEOPTION: Linux ALSA Sound: -sndpcm selects which pcm device to use, default is "default" - i = COM_CheckParm ("-sndpcm"); - if (i != 0 && i < com_argc - 1) - pcm_name = com_argv[i + 1]; - - // Open the audio device - Con_Printf ("SndSys_Init: PCM device is \"%s\"\n", pcm_name); - err = snd_pcm_open (&pcm_handle, pcm_name, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't open audio device \"%s\" (%s)\n", - pcm_name, snd_strerror (err)); - return false; - } - - // Allocate the hardware parameters - err = snd_pcm_hw_params_malloc (&hw_params); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't allocate hardware parameters (%s)\n", - snd_strerror (err)); - goto init_error; - } - err = snd_pcm_hw_params_any (pcm_handle, hw_params); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't initialize hardware parameters (%s)\n", - snd_strerror (err)); - goto init_error; - } - - // Set the access type - err = snd_pcm_hw_params_set_access (pcm_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't set access type (%s)\n", - snd_strerror (err)); - goto init_error; - } - - // Set the sound width - if (requested->width == 1) - snd_pcm_format = SND_PCM_FORMAT_U8; - else - snd_pcm_format = SND_PCM_FORMAT_S16; - err = snd_pcm_hw_params_set_format (pcm_handle, hw_params, snd_pcm_format); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't set sound width to %hu (%s)\n", - requested->width, snd_strerror (err)); - goto init_error; - } - - // Set the sound channels - err = snd_pcm_hw_params_set_channels (pcm_handle, hw_params, requested->channels); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't set sound channels to %hu (%s)\n", - requested->channels, snd_strerror (err)); - goto init_error; - } - - // Set the sound speed - err = snd_pcm_hw_params_set_rate (pcm_handle, hw_params, requested->speed, 0); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't set sound speed to %u (%s)\n", - requested->speed, snd_strerror (err)); - goto init_error; - } - - // pick a buffer size that is a power of 2 (by masking off low bits) - buffer_size = i = (int)(requested->speed * 0.15f); - while (buffer_size & (buffer_size-1)) - buffer_size &= (buffer_size-1); - // then check if it is the nearest power of 2 and bump it up if not - if (i - buffer_size >= buffer_size >> 1) - buffer_size *= 2; - - err = snd_pcm_hw_params_set_buffer_size_near (pcm_handle, hw_params, &buffer_size); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't set sound buffer size to %lu (%s)\n", - buffer_size, snd_strerror (err)); - goto init_error; - } - - // pick a period size near the buffer_size we got from ALSA - snd_pcm_hw_params_get_buffer_size (hw_params, &buffer_size); - buffer_size /= NB_PERIODS; - err = snd_pcm_hw_params_set_period_size_near(pcm_handle, hw_params, &buffer_size, 0); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't set sound period size to %lu (%s)\n", - buffer_size, snd_strerror (err)); - goto init_error; - } - - err = snd_pcm_hw_params (pcm_handle, hw_params); - if (err < 0) - { - Con_Printf ("SndSys_Init: can't set hardware parameters (%s)\n", - snd_strerror (err)); - goto init_error; - } - - snd_pcm_hw_params_free (hw_params); - - snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL); - expected_delay = 0; - alsasoundtime = 0; - if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO) - Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_ALSA); - - return true; - - -// It's not very clean, but it avoids a lot of duplicated code. -init_error: - - if (hw_params != NULL) - snd_pcm_hw_params_free (hw_params); - - snd_pcm_close(pcm_handle); - pcm_handle = NULL; - - return false; -} - - -/* -==================== -SndSys_Shutdown - -Stop the sound card, delete "snd_renderbuffer" and free its other resources -==================== -*/ -void SndSys_Shutdown (void) -{ - if (seq_handle != NULL) - { - snd_seq_close(seq_handle); - seq_handle = NULL; - } - - if (pcm_handle != NULL) - { - snd_pcm_close(pcm_handle); - pcm_handle = NULL; - } - - if (snd_renderbuffer != NULL) - { - Mem_Free(snd_renderbuffer->ring); - Mem_Free(snd_renderbuffer); - snd_renderbuffer = NULL; - } -} - - -/* -==================== -SndSys_Recover - -Try to recover from errors -==================== -*/ -static qboolean SndSys_Recover (int err_num) -{ - int err; - - // We can only do something on underrun ("broken pipe") errors - if (err_num != -EPIPE) - return false; - - err = snd_pcm_prepare (pcm_handle); - if (err < 0) - { - Con_Printf ("SndSys_Recover: unable to recover (%s)\n", - snd_strerror (err)); - - // TOCHECK: should we stop the playback ? - - return false; - } - - return true; -} - - -/* -==================== -SndSys_Write -==================== -*/ -static snd_pcm_sframes_t SndSys_Write (const unsigned char* buffer, unsigned int nbframes) -{ - snd_pcm_sframes_t written; - - written = snd_pcm_writei (pcm_handle, buffer, nbframes); - if (written < 0) - { - if (developer_insane.integer && vid_activewindow) - Con_DPrintf ("SndSys_Write: audio write returned %ld (%s)!\n", - written, snd_strerror (written)); - - if (SndSys_Recover (written)) - { - written = snd_pcm_writei (pcm_handle, buffer, nbframes); - if (written < 0) - Con_DPrintf ("SndSys_Write: audio write failed again (error %ld: %s)!\n", - written, snd_strerror (written)); - } - } - if (written > 0) - { - snd_renderbuffer->startframe += written; - expected_delay += written; - } - - return written; -} - - -/* -==================== -SndSys_Submit - -Submit the contents of "snd_renderbuffer" to the sound card -==================== -*/ -void SndSys_Submit (void) -{ - unsigned int startoffset, factor; - snd_pcm_uframes_t limit, nbframes; - snd_pcm_sframes_t written; - - if (pcm_handle == NULL || - snd_renderbuffer->startframe == snd_renderbuffer->endframe) - return; - - startoffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes; - factor = snd_renderbuffer->format.width * snd_renderbuffer->format.channels; - limit = snd_renderbuffer->maxframes - startoffset; - nbframes = snd_renderbuffer->endframe - snd_renderbuffer->startframe; - - if (nbframes > limit) - { - written = SndSys_Write (&snd_renderbuffer->ring[startoffset * factor], limit); - if (written < 0 || (snd_pcm_uframes_t)written != limit) - return; - - nbframes -= limit; - startoffset = 0; - } - - written = SndSys_Write (&snd_renderbuffer->ring[startoffset * factor], nbframes); - if (written < 0) - return; -} - - -/* -==================== -SndSys_GetSoundTime - -Returns the number of sample frames consumed since the sound started -==================== -*/ -unsigned int SndSys_GetSoundTime (void) -{ - snd_pcm_sframes_t delay, timediff; - int err; - - if (pcm_handle == NULL) - return 0; - - err = snd_pcm_delay (pcm_handle, &delay); - if (err < 0) - { - if (developer_insane.integer && vid_activewindow) - Con_DPrintf ("SndSys_GetSoundTime: can't get playback delay (%s)\n", - snd_strerror (err)); - - if (! SndSys_Recover (err)) - return 0; - - err = snd_pcm_delay (pcm_handle, &delay); - if (err < 0) - { - Con_DPrintf ("SndSys_GetSoundTime: can't get playback delay, again (%s)\n", - snd_strerror (err)); - return 0; - } - } - - if (expected_delay < delay) - { - Con_DPrintf ("SndSys_GetSoundTime: expected_delay(%ld) < delay(%ld)\n", - expected_delay, delay); - timediff = 0; - } - else - timediff = expected_delay - delay; - expected_delay = delay; - - alsasoundtime += (unsigned int)timediff; - - return alsasoundtime; -} - - -/* -==================== -SndSys_LockRenderBuffer - -Get the exclusive lock on "snd_renderbuffer" -==================== -*/ -qboolean SndSys_LockRenderBuffer (void) -{ - // Nothing to do - return true; -} - - -/* -==================== -SndSys_UnlockRenderBuffer - -Release the exclusive lock on "snd_renderbuffer" -==================== -*/ -void SndSys_UnlockRenderBuffer (void) -{ - // Nothing to do -} - -/* -==================== -SndSys_SendKeyEvents - -Send keyboard events originating from the sound system (e.g. MIDI) -==================== -*/ -void SndSys_SendKeyEvents(void) -{ - snd_seq_event_t *event; - if(!seq_handle) - return; - for(;;) - { - if(snd_seq_event_input(seq_handle, &event) <= 0) - break; - if(event) - { - switch(event->type) - { - case SND_SEQ_EVENT_NOTEON: - if(event->data.note.velocity) - { - Key_Event(K_MIDINOTE0 + event->data.note.note, 0, true); - break; - } - case SND_SEQ_EVENT_NOTEOFF: - Key_Event(K_MIDINOTE0 + event->data.note.note, 0, false); - break; - } - } - } -} diff --git a/snd_bsd.c b/snd_bsd.c deleted file mode 100644 index 0e927f1e..00000000 --- a/snd_bsd.c +++ /dev/null @@ -1,243 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -#include "quakedef.h" - -#include -#include -#ifndef SUNOS -# include -#endif -#include - -#include -#ifndef SUNOS -# include -#endif -#include - -#include "snd_main.h" - - -static int audio_fd = -1; - - -/* -==================== -SndSys_Init - -Create "snd_renderbuffer" with the proper sound format if the call is successful -May return a suggested format if the requested format isn't available -==================== -*/ -qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) -{ - unsigned int i; - const char *snddev; - audio_info_t info; - - // Open the audio device -#ifdef _PATH_SOUND - snddev = _PATH_SOUND; -#elif defined(SUNOS) - snddev = "/dev/audio"; -#else - snddev = "/dev/sound"; -#endif - audio_fd = open (snddev, O_WRONLY | O_NDELAY | O_NONBLOCK); - if (audio_fd < 0) - { - Con_Printf("Can't open the sound device (%s)\n", snddev); - return false; - } - - AUDIO_INITINFO (&info); -#ifdef AUMODE_PLAY // NetBSD / OpenBSD - info.mode = AUMODE_PLAY; -#endif - info.play.sample_rate = requested->speed; - info.play.channels = requested->channels; - info.play.precision = requested->width * 8; - if (requested->width == 1) -#ifdef SUNOS - info.play.encoding = AUDIO_ENCODING_LINEAR8; -#else - info.play.encoding = AUDIO_ENCODING_ULINEAR; -#endif - else -#ifdef SUNOS - info.play.encoding = AUDIO_ENCODING_LINEAR; -#else - if (mem_bigendian) - info.play.encoding = AUDIO_ENCODING_SLINEAR_BE; - else - info.play.encoding = AUDIO_ENCODING_SLINEAR_LE; -#endif - - if (ioctl (audio_fd, AUDIO_SETINFO, &info) != 0) - { - Con_Printf("Can't set up the sound device (%s)\n", snddev); - return false; - } - - // TODO: check the parameters with AUDIO_GETINFO - // TODO: check AUDIO_ENCODINGFLAG_EMULATED with AUDIO_GETENC - - snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL); - return true; -} - - -/* -==================== -SndSys_Shutdown - -Stop the sound card, delete "snd_renderbuffer" and free its other resources -==================== -*/ -void SndSys_Shutdown (void) -{ - if (audio_fd >= 0) - { - close(audio_fd); - audio_fd = -1; - } - - if (snd_renderbuffer != NULL) - { - Mem_Free(snd_renderbuffer->ring); - Mem_Free(snd_renderbuffer); - snd_renderbuffer = NULL; - } -} - - -/* -==================== -SndSys_Submit - -Submit the contents of "snd_renderbuffer" to the sound card -==================== -*/ -void SndSys_Submit (void) -{ - unsigned int startoffset, factor, limit, nbframes; - int written; - - if (audio_fd < 0 || - snd_renderbuffer->startframe == snd_renderbuffer->endframe) - return; - - startoffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes; - factor = snd_renderbuffer->format.width * snd_renderbuffer->format.channels; - limit = snd_renderbuffer->maxframes - startoffset; - nbframes = snd_renderbuffer->endframe - snd_renderbuffer->startframe; - if (nbframes > limit) - { - written = write (audio_fd, &snd_renderbuffer->ring[startoffset * factor], limit * factor); - if (written < 0) - { - Con_Printf("SndSys_Submit: audio write returned %d!\n", written); - return; - } - - if (written % factor != 0) - Sys_Error("SndSys_Submit: nb of bytes written (%d) isn't aligned to a frame sample!\n", written); - - snd_renderbuffer->startframe += written / factor; - - if ((unsigned int)written < limit * factor) - { - Con_Printf("SndSys_Submit: audio can't keep up! (%u < %u)\n", written, limit * factor); - return; - } - - nbframes -= limit; - startoffset = 0; - } - - written = write (audio_fd, &snd_renderbuffer->ring[startoffset * factor], nbframes * factor); - if (written < 0) - { - Con_Printf("SndSys_Submit: audio write returned %d!\n", written); - return; - } - snd_renderbuffer->startframe += written / factor; -} - - -/* -==================== -SndSys_GetSoundTime - -Returns the number of sample frames consumed since the sound started -==================== -*/ -unsigned int SndSys_GetSoundTime (void) -{ - audio_info_t info; - - if (ioctl (audio_fd, AUDIO_GETINFO, &info) < 0) - { - Con_Print("Error: can't get audio info\n"); - SndSys_Shutdown (); - return 0; - } - - return info.play.samples; -} - - -/* -==================== -SndSys_LockRenderBuffer - -Get the exclusive lock on "snd_renderbuffer" -==================== -*/ -qboolean SndSys_LockRenderBuffer (void) -{ - // Nothing to do - return true; -} - - -/* -==================== -SndSys_UnlockRenderBuffer - -Release the exclusive lock on "snd_renderbuffer" -==================== -*/ -void SndSys_UnlockRenderBuffer (void) -{ - // Nothing to do -} - -/* -==================== -SndSys_SendKeyEvents - -Send keyboard events originating from the sound system (e.g. MIDI) -==================== -*/ -void SndSys_SendKeyEvents(void) -{ - // not supported -} diff --git a/snd_coreaudio.c b/snd_coreaudio.c deleted file mode 100644 index ce8fff5b..00000000 --- a/snd_coreaudio.c +++ /dev/null @@ -1,399 +0,0 @@ -/* -=========================================================================== -Copyright (C) 1999-2005 Id Software, Inc. - -This file is part of Quake III Arena source code. - -Quake III Arena source code is free software; you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the License, -or (at your option) any later version. - -Quake III Arena source code 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Foobar; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -=========================================================================== -*/ - -#include "quakedef.h" - -#include -#include - -#include - -#include "snd_main.h" - - -#define CHUNK_SIZE 1024 - -static unsigned int submissionChunk = 0; // in sample frames -static unsigned int coreaudiotime = 0; // based on the number of chunks submitted so far -static qboolean s_isRunning = false; -static pthread_mutex_t coreaudio_mutex; -static AudioDeviceID outputDeviceID = kAudioDeviceUnknown; -static short *mixbuffer = NULL; - - -/* -==================== -audioDeviceIOProc -==================== -*/ -static OSStatus audioDeviceIOProc(AudioDeviceID inDevice, - const AudioTimeStamp *inNow, - const AudioBufferList *inInputData, - const AudioTimeStamp *inInputTime, - AudioBufferList *outOutputData, - const AudioTimeStamp *inOutputTime, - void *inClientData) -{ - float *outBuffer; - unsigned int frameCount, factor, sampleIndex; - float scale = 1.0f / SHRT_MAX; - - outBuffer = (float*)outOutputData->mBuffers[0].mData; - factor = snd_renderbuffer->format.channels * snd_renderbuffer->format.width; - frameCount = 0; - if (snd_blocked) - scale = 0; - - // Lock the snd_renderbuffer - if (SndSys_LockRenderBuffer()) - { - unsigned int maxFrames, sampleCount; - unsigned int startOffset, endOffset; - const short *samples; - - if (snd_usethreadedmixing) - { - S_MixToBuffer(mixbuffer, submissionChunk); - sampleCount = submissionChunk * snd_renderbuffer->format.channels; - for (sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++) - outBuffer[sampleIndex] = mixbuffer[sampleIndex] * scale; - // unlock the mutex now - SndSys_UnlockRenderBuffer(); - return 0; - } - - // Transfert up to a chunk of sample frames from snd_renderbuffer to outBuffer - maxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe; - if (maxFrames >= submissionChunk) - frameCount = submissionChunk; - else - frameCount = maxFrames; - - // Convert the samples from shorts to floats. Scale the floats to be [-1..1]. - startOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes; - endOffset = (snd_renderbuffer->startframe + frameCount) % snd_renderbuffer->maxframes; - if (startOffset > endOffset) // if the buffer wraps - { - sampleCount = (snd_renderbuffer->maxframes - startOffset) * snd_renderbuffer->format.channels; - samples = (const short*)(&snd_renderbuffer->ring[startOffset * factor]); - for (sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++) - outBuffer[sampleIndex] = samples[sampleIndex] * scale; - - outBuffer = &outBuffer[sampleCount]; - sampleCount = frameCount * snd_renderbuffer->format.channels - sampleCount; - samples = (const short*)(&snd_renderbuffer->ring[0]); - for (sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++) - outBuffer[sampleIndex] = samples[sampleIndex] * scale; - } - else - { - sampleCount = frameCount * snd_renderbuffer->format.channels; - samples = (const short*)(&snd_renderbuffer->ring[startOffset * factor]); - for (sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++) - outBuffer[sampleIndex] = samples[sampleIndex] * scale; - } - - snd_renderbuffer->startframe += frameCount; - - // unlock the mutex now - SndSys_UnlockRenderBuffer(); - } - - // If there was not enough samples, complete with silence samples - if (frameCount < submissionChunk) - { - unsigned int missingFrames; - - missingFrames = submissionChunk - frameCount; - if (developer_insane.integer && vid_activewindow) - Con_DPrintf("audioDeviceIOProc: %u sample frames missing\n", missingFrames); - memset(&outBuffer[frameCount * snd_renderbuffer->format.channels], 0, missingFrames * sizeof(outBuffer[0])); - } - - coreaudiotime += submissionChunk; - return 0; -} - - -/* -==================== -SndSys_Init - -Create "snd_renderbuffer" with the proper sound format if the call is successful -May return a suggested format if the requested format isn't available -==================== -*/ -qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) -{ - OSStatus status; - UInt32 propertySize, bufferByteCount; - AudioStreamBasicDescription streamDesc; - - if (s_isRunning) - return true; - - Con_Printf("Initializing CoreAudio...\n"); - snd_threaded = false; - - if(requested->width != 2) - { - // we can only do 16bit per sample for now - if(suggested != NULL) - { - memcpy (suggested, requested, sizeof (*suggested)); - suggested->width = 2; - } - return false; - } - - // Get the output device - propertySize = sizeof(outputDeviceID); - status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propertySize, &outputDeviceID); - if (status) - { - Con_Printf("CoreAudio: AudioDeviceGetProperty() returned %d when getting kAudioHardwarePropertyDefaultOutputDevice\n", (int)status); - return false; - } - if (outputDeviceID == kAudioDeviceUnknown) - { - Con_Printf("CoreAudio: outputDeviceID is kAudioDeviceUnknown\n"); - return false; - } - - // Configure the output device - propertySize = sizeof(bufferByteCount); - bufferByteCount = CHUNK_SIZE * sizeof(float) * requested->channels; - status = AudioDeviceSetProperty(outputDeviceID, NULL, 0, false, kAudioDevicePropertyBufferSize, propertySize, &bufferByteCount); - if (status) - { - Con_Printf("CoreAudio: AudioDeviceSetProperty() returned %d when setting kAudioDevicePropertyBufferSize to %d\n", (int)status, CHUNK_SIZE); - return false; - } - - propertySize = sizeof(bufferByteCount); - status = AudioDeviceGetProperty(outputDeviceID, 0, false, kAudioDevicePropertyBufferSize, &propertySize, &bufferByteCount); - if (status) - { - Con_Printf("CoreAudio: AudioDeviceGetProperty() returned %d when setting kAudioDevicePropertyBufferSize\n", (int)status); - return false; - } - - submissionChunk = bufferByteCount / sizeof(float); - if (submissionChunk % requested->channels != 0) - { - Con_Print("CoreAudio: chunk size is NOT a multiple of the number of channels\n"); - return false; - } - submissionChunk /= requested->channels; - Con_Printf(" Chunk size = %d sample frames\n", submissionChunk); - - // Print out the device status - propertySize = sizeof(streamDesc); - status = AudioDeviceGetProperty(outputDeviceID, 0, false, kAudioDevicePropertyStreamFormat, &propertySize, &streamDesc); - if (status) - { - Con_Printf("CoreAudio: AudioDeviceGetProperty() returned %d when getting kAudioDevicePropertyStreamFormat\n", (int)status); - return false; - } - - Con_Print (" Hardware format:\n"); - Con_Printf(" %5d mSampleRate\n", (unsigned int)streamDesc.mSampleRate); - Con_Printf(" %c%c%c%c mFormatID\n", - (char)(streamDesc.mFormatID >> 24), - (char)(streamDesc.mFormatID >> 16), - (char)(streamDesc.mFormatID >> 8), - (char)(streamDesc.mFormatID >> 0)); - Con_Printf(" %5u mBytesPerPacket\n", (unsigned int)streamDesc.mBytesPerPacket); - Con_Printf(" %5u mFramesPerPacket\n", (unsigned int)streamDesc.mFramesPerPacket); - Con_Printf(" %5u mBytesPerFrame\n", (unsigned int)streamDesc.mBytesPerFrame); - Con_Printf(" %5u mChannelsPerFrame\n", (unsigned int)streamDesc.mChannelsPerFrame); - Con_Printf(" %5u mBitsPerChannel\n", (unsigned int)streamDesc.mBitsPerChannel); - - // Suggest proper settings if they differ - if (requested->channels != streamDesc.mChannelsPerFrame || requested->speed != streamDesc.mSampleRate) - { - if (suggested != NULL) - { - memcpy (suggested, requested, sizeof (*suggested)); - suggested->channels = streamDesc.mChannelsPerFrame; - suggested->speed = streamDesc.mSampleRate; - } - return false; - } - - if(streamDesc.mFormatID == kAudioFormatLinearPCM) - { - // Add the callback function - status = AudioDeviceAddIOProc(outputDeviceID, audioDeviceIOProc, NULL); - if (!status) - { - // We haven't sent any sample frames yet - coreaudiotime = 0; - if (pthread_mutex_init(&coreaudio_mutex, NULL) == 0) - { - if ((snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL))) - { - if ((mixbuffer = Mem_Alloc(snd_mempool, CHUNK_SIZE * sizeof(*mixbuffer) * requested->channels))) - { - // Start sound running - status = AudioDeviceStart(outputDeviceID, audioDeviceIOProc); - if (!status) - { - s_isRunning = true; - snd_threaded = true; - Con_Print(" Initialization successful\n"); - return true; - } - else - Con_Printf("CoreAudio: AudioDeviceStart() returned %d\n", (int)status); - Mem_Free(mixbuffer); - mixbuffer = NULL; - } - else - Con_Print("CoreAudio: can't allocate memory for mixbuffer\n"); - Mem_Free(snd_renderbuffer->ring); - Mem_Free(snd_renderbuffer); - snd_renderbuffer = NULL; - } - else - Con_Print("CoreAudio: can't allocate memory for ringbuffer\n"); - pthread_mutex_destroy(&coreaudio_mutex); - } - else - Con_Print("CoreAudio: can't create pthread mutex\n"); - AudioDeviceRemoveIOProc(outputDeviceID, audioDeviceIOProc); - } - else - Con_Printf("CoreAudio: AudioDeviceAddIOProc() returned %d\n", (int)status); - } - else - Con_Print("CoreAudio: Default audio device doesn't support linear PCM!\n"); - return false; -} - - -/* -==================== -SndSys_Shutdown - -Stop the sound card, delete "snd_renderbuffer" and free its other resources -==================== -*/ -void SndSys_Shutdown(void) -{ - OSStatus status; - - if (!s_isRunning) - return; - - status = AudioDeviceStop(outputDeviceID, audioDeviceIOProc); - if (status) - { - Con_Printf("AudioDeviceStop: returned %d\n", (int)status); - return; - } - s_isRunning = false; - - pthread_mutex_destroy(&coreaudio_mutex); - - status = AudioDeviceRemoveIOProc(outputDeviceID, audioDeviceIOProc); - if (status) - { - Con_Printf("AudioDeviceRemoveIOProc: returned %d\n", (int)status); - return; - } - - if (snd_renderbuffer != NULL) - { - Mem_Free(snd_renderbuffer->ring); - Mem_Free(snd_renderbuffer); - snd_renderbuffer = NULL; - } - - if (mixbuffer != NULL) - Mem_Free(mixbuffer); - mixbuffer = NULL; -} - - -/* -==================== -SndSys_Submit - -Submit the contents of "snd_renderbuffer" to the sound card -==================== -*/ -void SndSys_Submit (void) -{ - // Nothing to do here (this sound module is callback-based) -} - - -/* -==================== -SndSys_GetSoundTime - -Returns the number of sample frames consumed since the sound started -==================== -*/ -unsigned int SndSys_GetSoundTime (void) -{ - return coreaudiotime; -} - - -/* -==================== -SndSys_LockRenderBuffer - -Get the exclusive lock on "snd_renderbuffer" -==================== -*/ -qboolean SndSys_LockRenderBuffer (void) -{ - return (pthread_mutex_lock(&coreaudio_mutex) == 0); -} - - -/* -==================== -SndSys_UnlockRenderBuffer - -Release the exclusive lock on "snd_renderbuffer" -==================== -*/ -void SndSys_UnlockRenderBuffer (void) -{ - pthread_mutex_unlock(&coreaudio_mutex); -} - -/* -==================== -SndSys_SendKeyEvents - -Send keyboard events originating from the sound system (e.g. MIDI) -==================== -*/ -void SndSys_SendKeyEvents(void) -{ - // not supported -} diff --git a/snd_win.c b/snd_win.c deleted file mode 100644 index 08012248..00000000 --- a/snd_win.c +++ /dev/null @@ -1,897 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef SUPPORTDIRECTX -#ifndef DIRECTSOUND_VERSION -# define DIRECTSOUND_VERSION 0x0500 /* Version 5.0 */ -#endif -#endif -#include -#include -#ifdef SUPPORTDIRECTX -#include -#endif - -#include "qtypes.h" -#include "quakedef.h" -#include "snd_main.h" - -// ============================================================================== - -#ifndef _WAVEFORMATEXTENSIBLE_ -#define _WAVEFORMATEXTENSIBLE_ -typedef struct -{ - WAVEFORMATEX Format; - union - { - WORD wValidBitsPerSample; // bits of precision - WORD wSamplesPerBlock; // valid if wBitsPerSample==0 - WORD wReserved; // If neither applies, set to zero - } Samples; - DWORD dwChannelMask; // which channels are present in stream - GUID SubFormat; -} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; -#endif - -#if !defined(WAVE_FORMAT_EXTENSIBLE) -# define WAVE_FORMAT_EXTENSIBLE 0xFFFE -#endif - -// Some speaker positions -#ifndef SPEAKER_FRONT_LEFT -# define SPEAKER_FRONT_LEFT 0x1 -# define SPEAKER_FRONT_RIGHT 0x2 -# define SPEAKER_FRONT_CENTER 0x4 -# define SPEAKER_LOW_FREQUENCY 0x8 -# define SPEAKER_BACK_LEFT 0x10 -# define SPEAKER_BACK_RIGHT 0x20 -# define SPEAKER_FRONT_LEFT_OF_CENTER 0x40 -# define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80 -// ... we never use the other values -#endif - -// KSDATAFORMAT_SUBTYPE_PCM = GUID "00000001-0000-0010-8000-00aa00389b71" -static const GUID MY_KSDATAFORMAT_SUBTYPE_PCM = -{ - 0x00000001, - 0x0000, - 0x0010, - { - 0x80, 0x00, - 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 - } -}; - - -// ============================================================================== - -extern HWND mainwindow; -static cvar_t snd_wav_partitionsize = {CVAR_SAVE, "snd_wav_partitionsize", "1024", "controls sound delay in samples, values too low will cause crackling, too high will cause delayed sounds"}; -static qboolean sndsys_registeredcvars = false; - -#ifdef SUPPORTDIRECTX -HRESULT (WINAPI *pDirectSoundCreate)(GUID FAR *lpGUID, LPDIRECTSOUND FAR *lplpDS, IUnknown FAR *pUnkOuter); -#endif - -// Wave output: queue of this many sound buffers to play, reused cyclically -#define WAV_BUFFERS 16 -#define WAV_MASK (WAV_BUFFERS - 1) -static unsigned int wav_buffer_size; - -// DirectSound output: 64KB in 1 buffer -//#define SECONDARY_BUFFER_SIZE(fmt_ptr) ((fmt_ptr)->width * (fmt_ptr)->channels * (fmt_ptr)->speed / 2) -// LordHavoc: changed this to be a multiple of 32768 -#define SECONDARY_BUFFER_SIZE(fmt_ptr) ((fmt_ptr)->channels * 32768) - -typedef enum sndinitstat_e {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat; - -#ifdef SUPPORTDIRECTX -static qboolean dsound_init; -static unsigned int dsound_time; -static qboolean primary_format_set; -#endif - -static qboolean wav_init; - -static int snd_sent, snd_completed; - -static int prev_painted; -static unsigned int paintpot; - - - -/* - * Global variables. Must be visible to window-procedure function - * so it can unlock and free the data block after it has been played. - */ - -HANDLE hData; -HPSTR lpData, lpData2; - -HGLOBAL hWaveHdr; -LPWAVEHDR lpWaveHdr; - -HWAVEOUT hWaveOut; - -WAVEOUTCAPS wavecaps; - -DWORD gSndBufSize; - -DWORD dwStartTime; - -#ifdef SUPPORTDIRECTX -LPDIRECTSOUND pDS; -LPDIRECTSOUNDBUFFER pDSBuf, pDSPBuf; - -HINSTANCE hInstDS; -#endif - -qboolean SNDDMA_InitWav (void); -#ifdef SUPPORTDIRECTX -sndinitstat SNDDMA_InitDirect (void); -#endif - - -/* -================== -SndSys_BuildWaveFormat -================== -*/ -static qboolean SndSys_BuildWaveFormat (const snd_format_t* requested, WAVEFORMATEXTENSIBLE* fmt_ptr) -{ - WAVEFORMATEX* pfmtex; - - memset (fmt_ptr, 0, sizeof(*fmt_ptr)); - - pfmtex = &fmt_ptr->Format; - pfmtex->nChannels = requested->channels; - pfmtex->wBitsPerSample = requested->width * 8; - pfmtex->nSamplesPerSec = requested->speed; - pfmtex->nBlockAlign = pfmtex->nChannels * pfmtex->wBitsPerSample / 8; - pfmtex->nAvgBytesPerSec = pfmtex->nSamplesPerSec * pfmtex->nBlockAlign; - - // LordHavoc: disabled this WAVE_FORMAT_EXTENSIBLE support because it does not seem to be working -#if 0 - if (requested->channels <= 2) - { -#endif - pfmtex->wFormatTag = WAVE_FORMAT_PCM; - pfmtex->cbSize = 0; -#if 0 - } - else - { - pfmtex->wFormatTag = WAVE_FORMAT_EXTENSIBLE; - pfmtex->cbSize = sizeof(*fmt_ptr) - sizeof(fmt_ptr->Format); - fmt_ptr->Samples.wValidBitsPerSample = fmt_ptr->Format.wBitsPerSample; - fmt_ptr->SubFormat = MY_KSDATAFORMAT_SUBTYPE_PCM; - - // Build the channel mask - fmt_ptr->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; - switch (requested->channels) - { - case 8: - fmt_ptr->dwChannelMask |= SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER; - // no break - case 6: - fmt_ptr->dwChannelMask |= SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY; - // no break - case 4: - fmt_ptr->dwChannelMask |= SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; - break; - - default: - Con_Printf("SndSys_BuildWaveFormat: invalid number of channels (%hu)\n", requested->channels); - return false; - } - } -#endif - - return true; -} - - -#ifdef SUPPORTDIRECTX -/* -================== -SndSys_InitDirectSound - -DirectSound 5 support -================== -*/ -static sndinitstat SndSys_InitDirectSound (const snd_format_t* requested) -{ - DSBUFFERDESC dsbuf; - DSBCAPS dsbcaps; - DWORD dwSize; - DSCAPS dscaps; - WAVEFORMATEXTENSIBLE format, pformat; - HRESULT hresult; - int reps; - - if (! SndSys_BuildWaveFormat(requested, &format)) - return SIS_FAILURE; - - if (!hInstDS) - { - hInstDS = LoadLibrary("dsound.dll"); - - if (hInstDS == NULL) - { - Con_Print("Couldn't load dsound.dll\n"); - return SIS_FAILURE; - } - - pDirectSoundCreate = (HRESULT (__stdcall *)(GUID *, LPDIRECTSOUND *,IUnknown *))GetProcAddress(hInstDS,"DirectSoundCreate"); - - if (!pDirectSoundCreate) - { - Con_Print("Couldn't get DS proc addr\n"); - return SIS_FAILURE; - } - } - - while ((hresult = pDirectSoundCreate(NULL, &pDS, NULL)) != DS_OK) - { - if (hresult != DSERR_ALLOCATED) - { - Con_Print("DirectSound create failed\n"); - return SIS_FAILURE; - } - - if (MessageBox (NULL, - "The sound hardware is in use by another app.\n\n" - "Select Retry to try to start sound again or Cancel to run Quake with no sound.", - "Sound not available", - MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY) - { - Con_Print("DirectSoundCreate failure\n hardware already in use\n"); - return SIS_NOTAVAIL; - } - } - - dscaps.dwSize = sizeof(dscaps); - - if (DS_OK != IDirectSound_GetCaps (pDS, &dscaps)) - { - Con_Print("Couldn't get DS caps\n"); - } - - if (dscaps.dwFlags & DSCAPS_EMULDRIVER) - { - Con_Print("No DirectSound driver installed\n"); - SndSys_Shutdown (); - return SIS_FAILURE; - } - - if (DS_OK != IDirectSound_SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE)) - { - Con_Print("Set coop level failed\n"); - SndSys_Shutdown (); - return SIS_FAILURE; - } - - // get access to the primary buffer, if possible, so we can set the - // sound hardware format - memset (&dsbuf, 0, sizeof(dsbuf)); - dsbuf.dwSize = sizeof(DSBUFFERDESC); - dsbuf.dwFlags = DSBCAPS_PRIMARYBUFFER; - dsbuf.dwBufferBytes = 0; - dsbuf.lpwfxFormat = NULL; - - memset(&dsbcaps, 0, sizeof(dsbcaps)); - dsbcaps.dwSize = sizeof(dsbcaps); - primary_format_set = false; - -// COMMANDLINEOPTION: Windows DirectSound: -snoforceformat uses the format that DirectSound returns, rather than forcing it - if (!COM_CheckParm ("-snoforceformat")) - { - if (DS_OK == IDirectSound_CreateSoundBuffer(pDS, &dsbuf, &pDSPBuf, NULL)) - { - pformat = format; - - if (DS_OK != IDirectSoundBuffer_SetFormat (pDSPBuf, (WAVEFORMATEX*)&pformat)) - { - Con_Print("Set primary sound buffer format: no\n"); - } - else - { - Con_Print("Set primary sound buffer format: yes\n"); - - primary_format_set = true; - } - } - } - -// COMMANDLINEOPTION: Windows DirectSound: -primarysound locks the sound hardware for exclusive use - if (!primary_format_set || !COM_CheckParm ("-primarysound")) - { - HRESULT result; - - // create the secondary buffer we'll actually work with - memset (&dsbuf, 0, sizeof(dsbuf)); - dsbuf.dwSize = sizeof(DSBUFFERDESC); - dsbuf.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_LOCSOFTWARE; - dsbuf.dwBufferBytes = SECONDARY_BUFFER_SIZE(requested); - dsbuf.lpwfxFormat = (WAVEFORMATEX*)&format; - - memset(&dsbcaps, 0, sizeof(dsbcaps)); - dsbcaps.dwSize = sizeof(dsbcaps); - - result = IDirectSound_CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL); - if (result != DS_OK || - requested->channels != format.Format.nChannels || - requested->width != format.Format.wBitsPerSample / 8 || - requested->speed != format.Format.nSamplesPerSec) - { - Con_Printf("DS:CreateSoundBuffer Failed (%d): channels=%u, width=%u, speed=%u\n", - (int)result, (unsigned)format.Format.nChannels, (unsigned)format.Format.wBitsPerSample / 8, (unsigned)format.Format.nSamplesPerSec); - SndSys_Shutdown (); - return SIS_FAILURE; - } - - if (DS_OK != IDirectSoundBuffer_GetCaps (pDSBuf, &dsbcaps)) - { - Con_Print("DS:GetCaps failed\n"); - SndSys_Shutdown (); - return SIS_FAILURE; - } - - Con_Print("Using secondary sound buffer\n"); - } - else - { - if (DS_OK != IDirectSound_SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY)) - { - Con_Print("Set coop level failed\n"); - SndSys_Shutdown (); - return SIS_FAILURE; - } - - if (DS_OK != IDirectSoundBuffer_GetCaps (pDSPBuf, &dsbcaps)) - { - Con_Print("DS:GetCaps failed\n"); - return SIS_FAILURE; - } - - pDSBuf = pDSPBuf; - Con_Print("Using primary sound buffer\n"); - } - - // Make sure mixer is active - IDirectSoundBuffer_Play(pDSBuf, 0, 0, DSBPLAY_LOOPING); - - Con_Printf(" %d channel(s)\n" - " %d bits/sample\n" - " %d samples/sec\n", - requested->channels, requested->width * 8, requested->speed); - - gSndBufSize = dsbcaps.dwBufferBytes; - - // initialize the buffer - reps = 0; - - while ((hresult = IDirectSoundBuffer_Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&lpData, &dwSize, NULL, NULL, 0)) != DS_OK) - { - if (hresult != DSERR_BUFFERLOST) - { - Con_Print("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n"); - SndSys_Shutdown (); - return SIS_FAILURE; - } - - if (++reps > 10000) - { - Con_Print("SNDDMA_InitDirect: DS: couldn't restore buffer\n"); - SndSys_Shutdown (); - return SIS_FAILURE; - } - - } - - memset(lpData, 0, dwSize); - IDirectSoundBuffer_Unlock(pDSBuf, lpData, dwSize, NULL, 0); - - IDirectSoundBuffer_Stop(pDSBuf); - IDirectSoundBuffer_Play(pDSBuf, 0, 0, DSBPLAY_LOOPING); - - dwStartTime = 0; - dsound_time = 0; - snd_renderbuffer = Snd_CreateRingBuffer(requested, gSndBufSize / (requested->width * requested->channels), lpData); - - dsound_init = true; - - return SIS_SUCCESS; -} -#endif - - -/* -================== -SndSys_InitMmsystem - -Crappy windows multimedia base -================== -*/ -static qboolean SndSys_InitMmsystem (const snd_format_t* requested) -{ - WAVEFORMATEXTENSIBLE format; - int i; - HRESULT hr; - - if (! SndSys_BuildWaveFormat(requested, &format)) - return false; - - // Open a waveform device for output using window callback - while ((hr = waveOutOpen((LPHWAVEOUT)&hWaveOut, WAVE_MAPPER, (WAVEFORMATEX*)&format, - 0, 0L, CALLBACK_NULL)) != MMSYSERR_NOERROR) - { - if (hr != MMSYSERR_ALLOCATED) - { - Con_Print("waveOutOpen failed\n"); - return false; - } - - if (MessageBox (NULL, - "The sound hardware is in use by another app.\n\n" - "Select Retry to try to start sound again or Cancel to run Quake with no sound.", - "Sound not available", - MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY) - { - Con_Print("waveOutOpen failure;\n hardware already in use\n"); - return false; - } - } - - wav_buffer_size = bound(128, snd_wav_partitionsize.integer, 8192) * requested->channels * requested->width; - - /* - * Allocate and lock memory for the waveform data. The memory - * for waveform data must be globally allocated with - * GMEM_MOVEABLE and GMEM_SHARE flags. - */ - gSndBufSize = WAV_BUFFERS * wav_buffer_size; - hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize); - if (!hData) - { - Con_Print("Sound: Out of memory.\n"); - SndSys_Shutdown (); - return false; - } - lpData = (HPSTR)GlobalLock(hData); - if (!lpData) - { - Con_Print("Sound: Failed to lock.\n"); - SndSys_Shutdown (); - return false; - } - memset (lpData, 0, gSndBufSize); - - /* - * Allocate and lock memory for the header. This memory must - * also be globally allocated with GMEM_MOVEABLE and - * GMEM_SHARE flags. - */ - hWaveHdr = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, (DWORD) sizeof(WAVEHDR) * WAV_BUFFERS); - - if (hWaveHdr == NULL) - { - Con_Print("Sound: Failed to Alloc header.\n"); - SndSys_Shutdown (); - return false; - } - - lpWaveHdr = (LPWAVEHDR) GlobalLock(hWaveHdr); - - if (lpWaveHdr == NULL) - { - Con_Print("Sound: Failed to lock header.\n"); - SndSys_Shutdown (); - return false; - } - - memset (lpWaveHdr, 0, sizeof(WAVEHDR) * WAV_BUFFERS); - - // After allocation, set up and prepare headers - for (i=0 ; iwidth * requested->channels), lpData); - - prev_painted = 0; - paintpot = 0; - - snd_sent = 0; - snd_completed = 0; - - wav_init = true; - - return true; -} - - -/* -==================== -SndSys_Init - -Create "snd_renderbuffer" with the proper sound format if the call is successful -May return a suggested format if the requested format isn't available -==================== -*/ -qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) -{ -#ifdef SUPPORTDIRECTX - qboolean wavonly; -#endif - sndinitstat stat; - - if (!sndsys_registeredcvars) - { - sndsys_registeredcvars = true; - Cvar_RegisterVariable(&snd_wav_partitionsize); - } - - Con_Print ("SndSys_Init: using the Win32 module\n"); - -#ifdef SUPPORTDIRECTX -// COMMANDLINEOPTION: Windows Sound: -wavonly uses wave sound instead of DirectSound - wavonly = (COM_CheckParm ("-wavonly") != 0); - dsound_init = false; -#endif - wav_init = false; - - stat = SIS_FAILURE; // assume DirectSound won't initialize - -#ifdef SUPPORTDIRECTX - // Init DirectSound - if (!wavonly) - { - stat = SndSys_InitDirectSound (requested); - - if (stat == SIS_SUCCESS) - Con_Print("DirectSound initialized\n"); - else - Con_Print("DirectSound failed to init\n"); - } -#endif - - // if DirectSound didn't succeed in initializing, try to initialize - // waveOut sound, unless DirectSound failed because the hardware is - // already allocated (in which case the user has already chosen not - // to have sound) -#ifdef SUPPORTDIRECTX - if (!dsound_init && (stat != SIS_NOTAVAIL)) -#endif - { - if (SndSys_InitMmsystem (requested)) - Con_Print("Wave sound (MMSYSTEM) initialized\n"); - else - Con_Print("Wave sound failed to init\n"); - } - -#ifdef SUPPORTDIRECTX - return (dsound_init || wav_init); -#else - return wav_init; -#endif -} - - -/* -==================== -SndSys_Shutdown - -Stop the sound card, delete "snd_renderbuffer" and free its other resources -==================== -*/ -void SndSys_Shutdown (void) -{ -#ifdef SUPPORTDIRECTX - if (pDSBuf) - { - IDirectSoundBuffer_Stop(pDSBuf); - IDirectSoundBuffer_Release(pDSBuf); - } - - // only release primary buffer if it's not also the mixing buffer we just released - if (pDSPBuf && (pDSBuf != pDSPBuf)) - { - IDirectSoundBuffer_Release(pDSPBuf); - } - - if (pDS) - { - IDirectSound_SetCooperativeLevel (pDS, mainwindow, DSSCL_NORMAL); - IDirectSound_Release(pDS); - } -#endif - - if (hWaveOut) - { - waveOutReset (hWaveOut); - - if (lpWaveHdr) - { - unsigned int i; - - for (i=0 ; i< WAV_BUFFERS ; i++) - waveOutUnprepareHeader (hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)); - } - - waveOutClose (hWaveOut); - - if (hWaveHdr) - { - GlobalUnlock(hWaveHdr); - GlobalFree(hWaveHdr); - } - - if (hData) - { - GlobalUnlock(hData); - GlobalFree(hData); - } - } - - if (snd_renderbuffer != NULL) - { - Mem_Free(snd_renderbuffer); - snd_renderbuffer = NULL; - } - -#ifdef SUPPORTDIRECTX - pDS = NULL; - pDSBuf = NULL; - pDSPBuf = NULL; - dsound_init = false; -#endif - hWaveOut = 0; - hData = 0; - hWaveHdr = 0; - lpData = NULL; - lpWaveHdr = NULL; - wav_init = false; -} - - -/* -==================== -SndSys_Submit - -Submit the contents of "snd_renderbuffer" to the sound card -==================== -*/ -void SndSys_Submit (void) -{ - LPWAVEHDR h; - int wResult; - - // DirectSound doesn't need this - if (!wav_init) - return; - - paintpot += (snd_renderbuffer->endframe - prev_painted) * snd_renderbuffer->format.channels * snd_renderbuffer->format.width; - if (paintpot > WAV_BUFFERS * wav_buffer_size) - paintpot = WAV_BUFFERS * wav_buffer_size; - prev_painted = snd_renderbuffer->endframe; - - // submit new sound blocks - while (paintpot > wav_buffer_size) - { - h = lpWaveHdr + (snd_sent & WAV_MASK); - - /* - * Now the data block can be sent to the output device. The - * waveOutWrite function returns immediately and waveform - * data is sent to the output device in the background. - */ - wResult = waveOutWrite(hWaveOut, h, sizeof(WAVEHDR)); - if (wResult == MMSYSERR_NOERROR) - snd_sent++; - else if (wResult == WAVERR_STILLPLAYING) - { - if(developer_insane.integer) - Con_DPrint("waveOutWrite failed (too much sound data)\n"); - //h->dwFlags |= WHDR_DONE; - //snd_sent++; - } - else - { - Con_Printf("waveOutWrite failed, error code %d\n", (int) wResult); - SndSys_Shutdown (); - return; - } - - paintpot -= wav_buffer_size; - } - -} - - -/* -==================== -SndSys_GetSoundTime - -Returns the number of sample frames consumed since the sound started -==================== -*/ -unsigned int SndSys_GetSoundTime (void) -{ - unsigned int factor; - - factor = snd_renderbuffer->format.width * snd_renderbuffer->format.channels; - -#ifdef SUPPORTDIRECTX - if (dsound_init) - { - DWORD dwTime; - unsigned int diff; - - IDirectSoundBuffer_GetCurrentPosition(pDSBuf, &dwTime, NULL); - diff = (unsigned int)(dwTime - dwStartTime) % (unsigned int)gSndBufSize; - dwStartTime = dwTime; - - dsound_time += diff / factor; - return dsound_time; - } -#endif - - if (wav_init) - { - // Find which sound blocks have completed - for (;;) - { - if (snd_completed == snd_sent) - { - // Con_DPrint("Sound overrun\n"); - break; - } - - if (!(lpWaveHdr[snd_completed & WAV_MASK].dwFlags & WHDR_DONE)) - break; - - snd_completed++; // this buffer has been played - } - - return (snd_completed * wav_buffer_size) / factor; - - /* - * S_PaintAndSubmit: WARNING: newsoundtime (soundtime (275 < 134217707) - * apparently this sound time wraps quite early? - { - MMRESULT res; - MMTIME mmtime; - - mmtime.wType = TIME_SAMPLES; - res = waveOutGetPosition(hWaveOut, &mmtime, sizeof(mmtime)); - if(res == MMSYSERR_NOERROR) - return mmtime.u.sample; - } - */ - } - - return 0; -} - - -#ifdef SUPPORTDIRECTX -static DWORD dsound_dwSize; -static DWORD dsound_dwSize2; -static DWORD *dsound_pbuf; -static DWORD *dsound_pbuf2; -#endif - -/* -==================== -SndSys_LockRenderBuffer - -Get the exclusive lock on "snd_renderbuffer" -==================== -*/ -qboolean SndSys_LockRenderBuffer (void) -{ -#ifdef SUPPORTDIRECTX - int reps; - HRESULT hresult; - DWORD dwStatus; - - if (pDSBuf) - { - // if the buffer was lost or stopped, restore it and/or restart it - if (IDirectSoundBuffer_GetStatus (pDSBuf, &dwStatus) != DS_OK) - Con_Print("Couldn't get sound buffer status\n"); - - if (dwStatus & DSBSTATUS_BUFFERLOST) - { - Con_Print("DSound buffer is lost!!\n"); - IDirectSoundBuffer_Restore (pDSBuf); - } - - if (!(dwStatus & DSBSTATUS_PLAYING)) - IDirectSoundBuffer_Play(pDSBuf, 0, 0, DSBPLAY_LOOPING); - - reps = 0; - - while ((hresult = IDirectSoundBuffer_Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&dsound_pbuf, &dsound_dwSize, (LPVOID*)&dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK) - { - if (hresult != DSERR_BUFFERLOST) - { - Con_Print("S_LockBuffer: DS: Lock Sound Buffer Failed\n"); - S_Shutdown (); - S_Startup (); - return false; - } - - if (++reps > 10000) - { - Con_Print("S_LockBuffer: DS: couldn't restore buffer\n"); - S_Shutdown (); - S_Startup (); - return false; - } - } - - if ((void*)dsound_pbuf != snd_renderbuffer->ring) - Sys_Error("SndSys_LockRenderBuffer: the ring address has changed!!!\n"); - return true; - } -#endif - - return wav_init; -} - - -/* -==================== -SndSys_UnlockRenderBuffer - -Release the exclusive lock on "snd_renderbuffer" -==================== -*/ -void SndSys_UnlockRenderBuffer (void) -{ -#ifdef SUPPORTDIRECTX - if (pDSBuf) - IDirectSoundBuffer_Unlock(pDSBuf, dsound_pbuf, dsound_dwSize, dsound_pbuf2, dsound_dwSize2); -#endif -} - -/* -==================== -SndSys_SendKeyEvents - -Send keyboard events originating from the sound system (e.g. MIDI) -==================== -*/ -void SndSys_SendKeyEvents(void) -{ - // not supported -} diff --git a/todo b/todo index 1c7b3d55..28e8cb6c 100644 --- a/todo +++ b/todo @@ -61,9 +61,6 @@ 0 bug darkplaces server: X-Men mod has flying enemies that tend to go through the floor, sometimes preventing a level from being completed. x1m1 has two alcoves that open to reveal Storm and Archangel but often Storm disappears through the ground of hear alcove and then the level can't be completed. A similar problem with Storm apears in x1m3 in an alcove. (ewwfq yahoo com) 0 bug darkplaces server: savegames do not contain parms for multiple players, restoring a savegame leaves parms for other players as they were at the time of loading the savegame, clearly wrong (daemon) 0 bug darkplaces server: savegames do not save precaches, which means that automatic precaching frequently results in invalid modelindex values when reloading the savegame, and this bug also exists in many quake mods that randomly choose multiple variants of a monster, each with separate precaches, resulting in a different precache order when reloading the savegame -0 bug darkplaces wgl client: during video mode setup, sometimes another application's window becomes permanently top most, not darkplaces' fullscreen window, why? (tZork) -0 bug darkplaces windows sound: freezing on exit sometimes when freeing sound buffer during sound shutdown (Black) -0 bug darkplaces windows sound: surround sound fails in windows client, falls back to stereo (greenmarine) 0 bug dpmaster: if server does not reply to queries in a reasonable period of time it should be removed from the list, this is necessary for the server to be removed when it shuts down and sends out two heartbeats to let the master know that it is shutting down, and isn't there to reply to queries (jitspoe, div0) 0 bug dpmaster: if server does not reply within 5 seconds to a query it should be removed (jitspoe, div0) 0 bug dpmod: LinkDoors seems to ignore .origin on door entities when comparing if they overlap @@ -213,7 +210,6 @@ 0 feature darkplaces sound: the new sound engine should have a cvar for random variations of pitch on sounds like in doom (RenegadeC) 0 feature darkplaces website: add download link for deluxemaps_id1.pk3 0 feature darkplaces website: add q1source.zip to downloads page and suggest that mingw/Dev-C++ users may need the dx headers from it (cpuforbrain) -0 feature darkplaces windows: include P3, P4, Xeon, AthlonXP, and Athlon64-32bit optimized windows dedicated server binaries for windows server admins to use, http://www.alientrap.org/forum/viewtopic.php?t=522 (PoWaZ) 0 feature darkplaces: .vis files - like .lit but replacement vis data, note this also requires .leaf files (knghtbrd) 0 feature darkplaces: add DP_GFX_EFFECTINFO extension to indicate that effectinfo.txt is supported, and thoroughly document its syntax (Morphed) 0 feature darkplaces: add a progress bar to the loading screen, this would be updated by the model/sound loading process @@ -278,7 +274,6 @@ 1 bug darkplaces linux client: when clicked in a file manager it does not find the data directories as the working directory is not set, do a proper search for valid data directories in multiple paths, such as working directory, executable path, etc (Randy) 1 bug darkplaces loader: check for out of bounds lump data ranges in maps (FrikaC) 1 bug darkplaces loader: check for truncated sound files (FrikaC) -1 bug darkplaces makefile: add icon to windows sdl builds (RenegadeC) 1 bug darkplaces nexuiz: can't open console when in nexuiz menu (stahl) 1 bug darkplaces protocol: GAME_NEXUIZ: view sometimes stuck on its side while playing (update: this is not related to cl.viewangles, it's something else): http://www.digitalfunk.org/brewdles/Nexuiz/nexuiz000001.jpg (Brewdles) 1 bug darkplaces prvm: add back the leak checking http://cvs.icculus.org/cvs/twilight/darkplaces/prvm_cmds.c?r1=1.67&r2=1.68 (Black) @@ -331,7 +326,6 @@ 1 feature darkplaces server: add contents reporting to qc somehow when traceline does model tracing and hits the model, this could also fix q3bsp sky collisions? 1 feature darkplaces server: add gettimestamp builtin (returns a string) for logging purposes 1 feature darkplaces server: add md3 mesh name reporting to qc somehow when traceline does model tracing and hits the model -1 feature darkplaces video: add r_displayrefresh cvar for windows video refresh settings (Willis, Judas Judas, Michael Miller, Vondur) 1 feature dpmod: add a Treasure Hunt mode (inspired by preview of Will Rock) - a team wins when they hold all the artifacts 1 feature dpmod: add func_crate (NotoriousRay) 1 feature dpmod: dm 7 monster spawns should occasionally be a crowd of Diablo2 style powered up monsters (Rick) @@ -711,7 +705,6 @@ d bug darkplaces sound: sound is sometimes coming from the wrong side apparently d bug darkplaces sound: spatialization bug occurs in The Ascension of Vigil, making all player and monster sounds far to the right (RenegadeC) d bug darkplaces sound: svc_staticsound messages are being received before sounds are precached, causing no ambient sounds to work (esteel) d bug darkplaces video: generate 1024 color gamma ramps for glx on Quadro, right now hardware gamma is being disabled on these cards because they use 1024 color ramps, not 256 (div0) -d bug darkplaces wgl client: hardware gamma is being retried every frame for unknown reasons, this is SEVERELY impacting framerates on win2k/xp (Jago) d bug darkplaces windows general: include libcurl dll from Nexuiz 2.0 in future releases (Baker) d bug dpmod: air control doesn't seem to be working (Kedhrin) d bug dpmod: fix sv_user.qc noclip movement when looking straight up/down (Electro) diff --git a/vid_agl.c b/vid_agl.c deleted file mode 100644 index ae4e871b..00000000 --- a/vid_agl.c +++ /dev/null @@ -1,1130 +0,0 @@ -/* - vid_agl.c - - Mac OS X OpenGL and input module, using Carbon and AGL - - Copyright (C) 2005-2006 Mathieu Olivier - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - - -#include -#include -#include -#include -#include -#include -#include -#include -#include "quakedef.h" -#include "vid_agl_mackeys.h" // this is SDL/src/video/maccommon/SDL_mackeys.h - -#ifndef kCGLCEMPEngine -#define kCGLCEMPEngine 313 -#endif - -// Tell startup code that we have a client -int cl_available = true; - -qboolean vid_supportrefreshrate = true; - -// AGL prototypes -AGLPixelFormat (*qaglChoosePixelFormat) (const AGLDevice *gdevs, GLint ndev, const GLint *attribList); -AGLContext (*qaglCreateContext) (AGLPixelFormat pix, AGLContext share); -GLboolean (*qaglDestroyContext) (AGLContext ctx); -void (*qaglDestroyPixelFormat) (AGLPixelFormat pix); -const GLubyte* (*qaglErrorString) (GLenum code); -GLenum (*qaglGetError) (void); -GLboolean (*qaglSetCurrentContext) (AGLContext ctx); -GLboolean (*qaglSetDrawable) (AGLContext ctx, AGLDrawable draw); -GLboolean (*qaglSetFullScreen) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device); -GLboolean (*qaglSetInteger) (AGLContext ctx, GLenum pname, const GLint *params); -void (*qaglSwapBuffers) (AGLContext ctx); -CGLError (*qCGLEnable) (CGLContextObj ctx, CGLContextEnable pname); -CGLError (*qCGLDisable) (CGLContextObj ctx, CGLContextEnable pname); -CGLContextObj (*qCGLGetCurrentContext) (void); - -static qboolean multithreadedgl; -static qboolean mouse_avail = true; -static qboolean vid_usingmouse = false; -static qboolean vid_usinghidecursor = false; -static qboolean vid_usingnoaccel = false; - -static qboolean vid_isfullscreen = false; -static qboolean vid_usingvsync = false; - -static qboolean sound_active = true; - -static cvar_t apple_multithreadedgl = {CVAR_SAVE, "apple_multithreadedgl", "1", "makes use of a second thread for the OpenGL driver (if possible) rather than using the engine thread (note: this is done automatically on most other operating systems)"}; -static cvar_t apple_mouse_noaccel = {CVAR_SAVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"}; - -static AGLContext context; -static WindowRef window; - -static double originalMouseSpeed = -1.0; - -io_connect_t IN_GetIOHandle(void) -{ - io_connect_t iohandle = MACH_PORT_NULL; - kern_return_t status; - io_service_t iohidsystem = MACH_PORT_NULL; - mach_port_t masterport; - - status = IOMasterPort(MACH_PORT_NULL, &masterport); - if(status != KERN_SUCCESS) - return 0; - - iohidsystem = IORegistryEntryFromPath(masterport, kIOServicePlane ":/IOResources/IOHIDSystem"); - if(!iohidsystem) - return 0; - - status = IOServiceOpen(iohidsystem, mach_task_self(), kIOHIDParamConnectType, &iohandle); - IOObjectRelease(iohidsystem); - - return iohandle; -} - -void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) -{ - if (!mouse_avail || !window) - relative = hidecursor = false; - - if (relative) - { - if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer)) - VID_SetMouse(false, false, false); // ungrab first! - if (!vid_usingmouse) - { - Rect winBounds; - CGPoint winCenter; - - SelectWindow(window); - - // Put the mouse cursor at the center of the window - GetWindowBounds (window, kWindowContentRgn, &winBounds); - winCenter.x = (winBounds.left + winBounds.right) / 2; - winCenter.y = (winBounds.top + winBounds.bottom) / 2; - CGWarpMouseCursorPosition(winCenter); - - // Lock the mouse pointer at its current position - CGAssociateMouseAndMouseCursorPosition(false); - - // Save the status of mouse acceleration - originalMouseSpeed = -1.0; // in case of error - if(apple_mouse_noaccel.integer) - { - io_connect_t mouseDev = IN_GetIOHandle(); - if(mouseDev != 0) - { - if(IOHIDGetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), &originalMouseSpeed) == kIOReturnSuccess) - { - Con_DPrintf("previous mouse acceleration: %f\n", originalMouseSpeed); - if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), -1.0) != kIOReturnSuccess) - { - Con_Print("Could not disable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n"); - Cvar_SetValueQuick(&apple_mouse_noaccel, 0); - } - } - else - { - Con_Print("Could not disable mouse acceleration (failed at IOHIDGetAccelerationWithKey).\n"); - Cvar_SetValueQuick(&apple_mouse_noaccel, 0); - } - IOServiceClose(mouseDev); - } - else - { - Con_Print("Could not disable mouse acceleration (failed at IO_GetIOHandle).\n"); - Cvar_SetValueQuick(&apple_mouse_noaccel, 0); - } - } - - vid_usingmouse = true; - vid_usingnoaccel = !!apple_mouse_noaccel.integer; - } - } - else - { - if (vid_usingmouse) - { - if(originalMouseSpeed != -1.0) - { - io_connect_t mouseDev = IN_GetIOHandle(); - if(mouseDev != 0) - { - Con_DPrintf("restoring mouse acceleration to: %f\n", originalMouseSpeed); - if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), originalMouseSpeed) != kIOReturnSuccess) - Con_Print("Could not re-enable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n"); - IOServiceClose(mouseDev); - } - else - Con_Print("Could not re-enable mouse acceleration (failed at IO_GetIOHandle).\n"); - } - - CGAssociateMouseAndMouseCursorPosition(true); - - vid_usingmouse = false; - } - } - - if (vid_usinghidecursor != hidecursor) - { - vid_usinghidecursor = hidecursor; - if (hidecursor) - CGDisplayHideCursor(CGMainDisplayID()); - else - CGDisplayShowCursor(CGMainDisplayID()); - } -} - -void VID_Finish (void) -{ - qboolean vid_usevsync; - - // handle changes of the vsync option - vid_usevsync = (vid_vsync.integer && !cls.timedemo); - if (vid_usingvsync != vid_usevsync) - { - GLint sync = (vid_usevsync ? 1 : 0); - - if (qaglSetInteger(context, AGL_SWAP_INTERVAL, &sync) == GL_TRUE) - { - vid_usingvsync = vid_usevsync; - Con_DPrintf("Vsync %s\n", vid_usevsync ? "activated" : "deactivated"); - } - else - Con_Printf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate"); - } - - if (!vid_hidden) - { - if (r_speeds.integer == 2 || gl_finish.integer) - GL_Finish(); - qaglSwapBuffers(context); - } - VID_UpdateGamma(); - - if (apple_multithreadedgl.integer) - { - if (!multithreadedgl) - { - if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable) - { - CGLContextObj ctx = qCGLGetCurrentContext(); - CGLError e = qCGLEnable(ctx, kCGLCEMPEngine); - if(e == kCGLNoError) - multithreadedgl = true; - else - { - Con_Printf("WARNING: can't enable multithreaded GL, error %d\n", (int) e); - Cvar_SetValueQuick(&apple_multithreadedgl, 0); - } - } - else - { - Con_Printf("WARNING: can't enable multithreaded GL, CGL functions not present\n"); - Cvar_SetValueQuick(&apple_multithreadedgl, 0); - } - } - } - else - { - if (multithreadedgl) - { - if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable) - { - CGLContextObj ctx = qCGLGetCurrentContext(); - qCGLDisable(ctx, kCGLCEMPEngine); - multithreadedgl = false; - } - } - } -} - -void signal_handler(int sig) -{ - Sys_PrintfToTerminal("Received signal %d, exiting...\n", sig); - Sys_Quit(1); -} - -void InitSig(void) -{ - signal(SIGHUP, signal_handler); - signal(SIGINT, signal_handler); - signal(SIGQUIT, signal_handler); - signal(SIGILL, signal_handler); - signal(SIGTRAP, signal_handler); - signal(SIGIOT, signal_handler); - signal(SIGBUS, signal_handler); - signal(SIGFPE, signal_handler); - signal(SIGSEGV, signal_handler); - signal(SIGTERM, signal_handler); -} - -void VID_Init(void) -{ - InitSig(); // trap evil signals - Cvar_RegisterVariable(&apple_multithreadedgl); - Cvar_RegisterVariable(&apple_mouse_noaccel); -// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) - if (COM_CheckParm ("-nomouse")) - mouse_avail = false; -} - -static void *prjobj = NULL; -static void *cglobj = NULL; - -static void GL_CloseLibrary(void) -{ - if (cglobj) - dlclose(cglobj); - cglobj = NULL; - if (prjobj) - dlclose(prjobj); - prjobj = NULL; - gl_driver[0] = 0; - gl_extensions = ""; - gl_platform = ""; - gl_platformextensions = ""; -} - -static int GL_OpenLibrary(void) -{ - const char *name = "/System/Library/Frameworks/AGL.framework/AGL"; - const char *name2 = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; - - Con_Printf("Loading OpenGL driver %s\n", name); - GL_CloseLibrary(); - if (!(prjobj = dlopen(name, RTLD_LAZY))) - { - Con_Printf("Unable to open symbol list for %s\n", name); - return false; - } - strlcpy(gl_driver, name, sizeof(gl_driver)); - - Con_Printf("Loading OpenGL driver %s\n", name2); - if (!(cglobj = dlopen(name2, RTLD_LAZY))) - Con_Printf("Unable to open symbol list for %s; multithreaded GL disabled\n", name); - - return true; -} - -void *GL_GetProcAddress(const char *name) -{ - return dlsym(prjobj, name); -} - -static void *CGL_GetProcAddress(const char *name) -{ - if(!cglobj) - return NULL; - return dlsym(cglobj, name); -} - -void VID_Shutdown(void) -{ - if (context == NULL && window == NULL) - return; - - VID_EnableJoystick(false); - VID_SetMouse(false, false, false); - - if (context != NULL) - { - qaglDestroyContext(context); - context = NULL; - } - - if (vid_isfullscreen) - CGReleaseAllDisplays(); - - if (window != NULL) - { - DisposeWindow(window); - window = NULL; - } - - vid_hidden = true; - vid_isfullscreen = false; - - GL_CloseLibrary(); -} - -// Since the event handler can be called at any time, we store the events for later processing -static qboolean AsyncEvent_Quitting = false; -static qboolean AsyncEvent_Collapsed = false; -static OSStatus MainWindowEventHandler (EventHandlerCallRef nextHandler, EventRef event, void *userData) -{ - OSStatus err = noErr; - - switch (GetEventKind (event)) - { - case kEventWindowClosed: - AsyncEvent_Quitting = true; - break; - - // Docked (start) - case kEventWindowCollapsing: - AsyncEvent_Collapsed = true; - break; - - // Undocked / restored (end) - case kEventWindowExpanded: - AsyncEvent_Collapsed = false; - break; - - default: - err = eventNotHandledErr; - break; - } - - return err; -} - -static void VID_AppFocusChanged(qboolean windowIsActive) -{ - if (vid_activewindow != windowIsActive) - vid_activewindow = windowIsActive; - - if (windowIsActive || !snd_mutewhenidle.integer) - { - if (!sound_active) - { - S_UnblockSound (); - sound_active = true; - } - } - else - { - if (sound_active) - { - S_BlockSound (); - sound_active = false; - } - } -} - -static void VID_ProcessPendingAsyncEvents (void) -{ - // Collapsed / expanded - if (AsyncEvent_Collapsed != vid_hidden) - { - vid_hidden = !vid_hidden; - VID_AppFocusChanged(!vid_hidden); - } - - // Closed - if (AsyncEvent_Quitting) - Sys_Quit(0); -} - -static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer, int samples) -{ - *attrib++ = AGL_RGBA; - *attrib++ = AGL_RED_SIZE;*attrib++ = stencil ? 8 : 5; - *attrib++ = AGL_GREEN_SIZE;*attrib++ = stencil ? 8 : 5; - *attrib++ = AGL_BLUE_SIZE;*attrib++ = stencil ? 8 : 5; - *attrib++ = AGL_DOUBLEBUFFER; - *attrib++ = AGL_DEPTH_SIZE;*attrib++ = stencil ? 24 : 16; - - // if stencil is enabled, ask for alpha too - if (stencil) - { - *attrib++ = AGL_STENCIL_SIZE;*attrib++ = 8; - *attrib++ = AGL_ALPHA_SIZE;*attrib++ = 8; - } - if (fullscreen) - *attrib++ = AGL_FULLSCREEN; - if (stereobuffer) - *attrib++ = AGL_STEREO; -#ifdef AGL_SAMPLE_BUFFERS_ARB -#ifdef AGL_SAMPLES_ARB - if (samples > 1) - { - *attrib++ = AGL_SAMPLE_BUFFERS_ARB; - *attrib++ = 1; - *attrib++ = AGL_SAMPLES_ARB; - *attrib++ = samples; - } -#endif -#endif - - *attrib++ = AGL_NONE; -} - -qboolean VID_InitMode(viddef_mode_t *mode) -{ - const EventTypeSpec winEvents[] = - { - { kEventClassWindow, kEventWindowClosed }, - { kEventClassWindow, kEventWindowCollapsing }, - { kEventClassWindow, kEventWindowExpanded }, - }; - OSStatus carbonError; - Rect windowBounds; - CFStringRef windowTitle; - AGLPixelFormat pixelFormat; - GLint attributes [32]; - GLenum error; - - if (!GL_OpenLibrary()) - { - Con_Printf("Unable to load GL driver\n"); - return false; - } - - if ((qaglChoosePixelFormat = (AGLPixelFormat (*) (const AGLDevice *gdevs, GLint ndev, const GLint *attribList))GL_GetProcAddress("aglChoosePixelFormat")) == NULL - || (qaglCreateContext = (AGLContext (*) (AGLPixelFormat pix, AGLContext share))GL_GetProcAddress("aglCreateContext")) == NULL - || (qaglDestroyContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglDestroyContext")) == NULL - || (qaglDestroyPixelFormat = (void (*) (AGLPixelFormat pix))GL_GetProcAddress("aglDestroyPixelFormat")) == NULL - || (qaglErrorString = (const GLubyte* (*) (GLenum code))GL_GetProcAddress("aglErrorString")) == NULL - || (qaglGetError = (GLenum (*) (void))GL_GetProcAddress("aglGetError")) == NULL - || (qaglSetCurrentContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglSetCurrentContext")) == NULL - || (qaglSetDrawable = (GLboolean (*) (AGLContext ctx, AGLDrawable draw))GL_GetProcAddress("aglSetDrawable")) == NULL - || (qaglSetFullScreen = (GLboolean (*) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device))GL_GetProcAddress("aglSetFullScreen")) == NULL - || (qaglSetInteger = (GLboolean (*) (AGLContext ctx, GLenum pname, const GLint *params))GL_GetProcAddress("aglSetInteger")) == NULL - || (qaglSwapBuffers = (void (*) (AGLContext ctx))GL_GetProcAddress("aglSwapBuffers")) == NULL - ) - { - Con_Printf("AGL functions not found\n"); - ReleaseWindow(window); - return false; - } - - qCGLEnable = (CGLError (*) (CGLContextObj ctx, CGLContextEnable pname)) CGL_GetProcAddress("CGLEnable"); - qCGLDisable = (CGLError (*) (CGLContextObj ctx, CGLContextEnable pname)) CGL_GetProcAddress("CGLDisable"); - qCGLGetCurrentContext = (CGLContextObj (*) (void)) CGL_GetProcAddress("CGLGetCurrentContext"); - if(!qCGLEnable || !qCGLDisable || !qCGLGetCurrentContext) - Con_Printf("CGL functions not found; disabling multithreaded OpenGL\n"); - - // Ignore the events from the previous window - AsyncEvent_Quitting = false; - AsyncEvent_Collapsed = false; - - // Create the window, a bit towards the center of the screen - windowBounds.left = 100; - windowBounds.top = 100; - windowBounds.right = mode->width + 100; - windowBounds.bottom = mode->height + 100; - carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window); - if (carbonError != noErr || window == NULL) - { - Con_Printf("Unable to create window (error %u)\n", (unsigned)carbonError); - return false; - } - - // Set the window title - windowTitle = CFSTR("DarkPlaces AGL"); - SetWindowTitleWithCFString(window, windowTitle); - - // Install the callback function for the window events we can't get - // through ReceiveNextEvent (i.e. close, collapse, and expand) - InstallWindowEventHandler (window, NewEventHandlerUPP (MainWindowEventHandler), - GetEventTypeCount(winEvents), winEvents, window, NULL); - - // Create the desired attribute list - VID_BuildAGLAttrib(attributes, mode->bitsperpixel == 32, mode->fullscreen, mode->stereobuffer, mode->samples); - - if (!mode->fullscreen) - { - // Output to Window - pixelFormat = qaglChoosePixelFormat(NULL, 0, attributes); - error = qaglGetError(); - if (error != AGL_NO_ERROR) - { - Con_Printf("qaglChoosePixelFormat FAILED: %s\n", - (char *)qaglErrorString(error)); - ReleaseWindow(window); - return false; - } - } - else // Output is fullScreen - { - CGDirectDisplayID mainDisplay; - CFDictionaryRef refDisplayMode; - GDHandle gdhDisplay; - - // Get the mainDisplay and set resolution to current - mainDisplay = CGMainDisplayID(); - CGDisplayCapture(mainDisplay); - - // TOCHECK: not sure whether or not it's necessary to change the resolution - // "by hand", or if aglSetFullscreen does the job anyway - refDisplayMode = CGDisplayBestModeForParametersAndRefreshRateWithProperty(mainDisplay, mode->bitsperpixel, mode->width, mode->height, mode->refreshrate, kCGDisplayModeIsSafeForHardware, NULL); - CGDisplaySwitchToMode(mainDisplay, refDisplayMode); - DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false); - - // Set pixel format with built attribs - // Note: specifying a device is *required* for AGL_FullScreen - pixelFormat = qaglChoosePixelFormat(&gdhDisplay, 1, attributes); - error = qaglGetError(); - if (error != AGL_NO_ERROR) - { - Con_Printf("qaglChoosePixelFormat FAILED: %s\n", - (char *)qaglErrorString(error)); - ReleaseWindow(window); - return false; - } - } - - // Create a context using the pform - context = qaglCreateContext(pixelFormat, NULL); - error = qaglGetError(); - if (error != AGL_NO_ERROR) - { - Con_Printf("qaglCreateContext FAILED: %s\n", - (char *)qaglErrorString(error)); - } - - // Make the context the current one ('enable' it) - qaglSetCurrentContext(context); - error = qaglGetError(); - if (error != AGL_NO_ERROR) - { - Con_Printf("qaglSetCurrentContext FAILED: %s\n", - (char *)qaglErrorString(error)); - ReleaseWindow(window); - return false; - } - - // Discard pform - qaglDestroyPixelFormat(pixelFormat); - - // Attempt fullscreen if requested - if (mode->fullscreen) - { - qaglSetFullScreen (context, mode->width, mode->height, mode->refreshrate, 0); - error = qaglGetError(); - if (error != AGL_NO_ERROR) - { - Con_Printf("qaglSetFullScreen FAILED: %s\n", - (char *)qaglErrorString(error)); - return false; - } - } - else - { - // Set Window as Drawable - qaglSetDrawable(context, GetWindowPort(window)); - error = qaglGetError(); - if (error != AGL_NO_ERROR) - { - Con_Printf("qaglSetDrawable FAILED: %s\n", - (char *)qaglErrorString(error)); - ReleaseWindow(window); - return false; - } - } - - if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) - Sys_Error("glGetString not found in %s", gl_driver); - - gl_platformextensions = ""; - gl_platform = "AGL"; - - multithreadedgl = false; - vid_isfullscreen = mode->fullscreen; - vid_usingmouse = false; - vid_usinghidecursor = false; - vid_hidden = false; - vid_activewindow = true; - sound_active = true; - GL_Init(); - - SelectWindow(window); - ShowWindow(window); - - return true; -} - -static void Handle_KeyMod(UInt32 keymod) -{ - const struct keymod_to_event_s { UInt32 keybit; keynum_t event; } keymod_events [] = - { - { cmdKey, K_AUX1 }, - { shiftKey, K_SHIFT }, - { alphaLock, K_CAPSLOCK }, - { optionKey, K_ALT }, - { controlKey, K_CTRL }, - { kEventKeyModifierNumLockMask, K_NUMLOCK }, - { kEventKeyModifierFnMask, K_AUX2 } - }; - static UInt32 prev_keymod = 0; - unsigned int i; - UInt32 modChanges; - - modChanges = prev_keymod ^ keymod; - if (modChanges == 0) - return; - - for (i = 0; i < sizeof(keymod_events) / sizeof(keymod_events[0]); i++) - { - UInt32 keybit = keymod_events[i].keybit; - - if ((modChanges & keybit) != 0) - Key_Event(keymod_events[i].event, '\0', (keymod & keybit) != 0); - } - - prev_keymod = keymod; -} - -static void Handle_Key(unsigned char charcode, UInt32 mackeycode, qboolean keypressed) -{ - unsigned int keycode = 0; - char ascii = '\0'; - - switch (mackeycode) - { - case MK_ESCAPE: - keycode = K_ESCAPE; - break; - case MK_F1: - keycode = K_F1; - break; - case MK_F2: - keycode = K_F2; - break; - case MK_F3: - keycode = K_F3; - break; - case MK_F4: - keycode = K_F4; - break; - case MK_F5: - keycode = K_F5; - break; - case MK_F6: - keycode = K_F6; - break; - case MK_F7: - keycode = K_F7; - break; - case MK_F8: - keycode = K_F8; - break; - case MK_F9: - keycode = K_F9; - break; - case MK_F10: - keycode = K_F10; - break; - case MK_F11: - keycode = K_F11; - break; - case MK_F12: - keycode = K_F12; - break; - case MK_SCROLLOCK: - keycode = K_SCROLLOCK; - break; - case MK_PAUSE: - keycode = K_PAUSE; - break; - case MK_BACKSPACE: - keycode = K_BACKSPACE; - break; - case MK_INSERT: - keycode = K_INS; - break; - case MK_HOME: - keycode = K_HOME; - break; - case MK_PAGEUP: - keycode = K_PGUP; - break; - case MK_NUMLOCK: - keycode = K_NUMLOCK; - break; - case MK_KP_EQUALS: - keycode = K_KP_EQUALS; - break; - case MK_KP_DIVIDE: - keycode = K_KP_DIVIDE; - break; - case MK_KP_MULTIPLY: - keycode = K_KP_MULTIPLY; - break; - case MK_TAB: - keycode = K_TAB; - break; - case MK_DELETE: - keycode = K_DEL; - break; - case MK_END: - keycode = K_END; - break; - case MK_PAGEDOWN: - keycode = K_PGDN; - break; - case MK_KP7: - keycode = K_KP_7; - break; - case MK_KP8: - keycode = K_KP_8; - break; - case MK_KP9: - keycode = K_KP_9; - break; - case MK_KP_MINUS: - keycode = K_KP_MINUS; - break; - case MK_CAPSLOCK: - keycode = K_CAPSLOCK; - break; - case MK_RETURN: - keycode = K_ENTER; - break; - case MK_KP4: - keycode = K_KP_4; - break; - case MK_KP5: - keycode = K_KP_5; - break; - case MK_KP6: - keycode = K_KP_6; - break; - case MK_KP_PLUS: - keycode = K_KP_PLUS; - break; - case MK_KP1: - keycode = K_KP_1; - break; - case MK_KP2: - keycode = K_KP_2; - break; - case MK_KP3: - keycode = K_KP_3; - break; - case MK_KP_ENTER: - case MK_IBOOK_ENTER: - keycode = K_KP_ENTER; - break; - case MK_KP0: - keycode = K_KP_0; - break; - case MK_KP_PERIOD: - keycode = K_KP_PERIOD; - break; - default: - switch(charcode) - { - case kUpArrowCharCode: - keycode = K_UPARROW; - break; - case kLeftArrowCharCode: - keycode = K_LEFTARROW; - break; - case kDownArrowCharCode: - keycode = K_DOWNARROW; - break; - case kRightArrowCharCode: - keycode = K_RIGHTARROW; - break; - case 0: - case 191: - // characters 0 and 191 are sent by the mouse buttons (?!) - break; - default: - if ('A' <= charcode && charcode <= 'Z') - { - keycode = charcode + ('a' - 'A'); // lowercase it - ascii = charcode; - } - else if (charcode >= 32) - { - keycode = charcode; - ascii = charcode; - } - else - Con_DPrintf(">> UNKNOWN char/keycode: %d/%u <<\n", charcode, (unsigned) mackeycode); - } - } - - if (keycode != 0) - Key_Event(keycode, ascii, keypressed); -} - -void Sys_SendKeyEvents(void) -{ - EventRef theEvent; - EventTargetRef theTarget; - - // Start by processing the asynchronous events we received since the previous frame - VID_ProcessPendingAsyncEvents(); - - theTarget = GetEventDispatcherTarget(); - while (ReceiveNextEvent(0, NULL, kEventDurationNoWait, true, &theEvent) == noErr) - { - UInt32 eventClass = GetEventClass(theEvent); - UInt32 eventKind = GetEventKind(theEvent); - - switch (eventClass) - { - case kEventClassMouse: - { - EventMouseButton theButton; - int key; - - switch (eventKind) - { - case kEventMouseDown: - case kEventMouseUp: - GetEventParameter(theEvent, kEventParamMouseButton, typeMouseButton, NULL, sizeof(theButton), NULL, &theButton); - switch (theButton) - { - default: - case kEventMouseButtonPrimary: - key = K_MOUSE1; - break; - case kEventMouseButtonSecondary: - key = K_MOUSE2; - break; - case kEventMouseButtonTertiary: - key = K_MOUSE3; - break; - } - Key_Event(key, '\0', eventKind == kEventMouseDown); - break; - - // Note: These two events are mutual exclusives - // Treat MouseDragged in the same statement, so we don't block MouseMoved while a mousebutton is held - case kEventMouseMoved: - case kEventMouseDragged: - { - HIPoint deltaPos; - HIPoint windowPos; - - GetEventParameter(theEvent, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(deltaPos), NULL, &deltaPos); - GetEventParameter(theEvent, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(windowPos), NULL, &windowPos); - - if (vid_usingmouse) - { - in_mouse_x += deltaPos.x; - in_mouse_y += deltaPos.y; - } - - in_windowmouse_x = windowPos.x; - in_windowmouse_y = windowPos.y; - break; - } - - case kEventMouseWheelMoved: - { - SInt32 delta; - unsigned int wheelEvent; - - GetEventParameter(theEvent, kEventParamMouseWheelDelta, typeSInt32, NULL, sizeof(delta), NULL, &delta); - - wheelEvent = (delta > 0) ? K_MWHEELUP : K_MWHEELDOWN; - Key_Event(wheelEvent, 0, true); - Key_Event(wheelEvent, 0, false); - break; - } - - default: - Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); - break; - } - } - - case kEventClassKeyboard: - { - char charcode; - UInt32 keycode; - - switch (eventKind) - { - case kEventRawKeyDown: - GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(charcode), NULL, &charcode); - GetEventParameter(theEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(keycode), NULL, &keycode); - Handle_Key(charcode, keycode, true); - break; - - case kEventRawKeyRepeat: - break; - - case kEventRawKeyUp: - GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(charcode), NULL, &charcode); - GetEventParameter(theEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(keycode), NULL, &keycode); - Handle_Key(charcode, keycode, false); - break; - - case kEventRawKeyModifiersChanged: - { - UInt32 keymod = 0; - GetEventParameter(theEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(keymod), NULL, &keymod); - Handle_KeyMod(keymod); - break; - } - - case kEventHotKeyPressed: - break; - - case kEventHotKeyReleased: - break; - - case kEventMouseWheelMoved: - break; - - default: - Con_Printf (">> kEventClassKeyboard (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); - break; - } - break; - } - - case kEventClassTextInput: - Con_Printf(">> kEventClassTextInput (%d) <<\n", (int)eventKind); - break; - - case kEventClassApplication: - switch (eventKind) - { - case kEventAppActivated : - VID_AppFocusChanged(true); - break; - case kEventAppDeactivated: - VID_AppFocusChanged(false); - break; - case kEventAppQuit: - Sys_Quit(0); - break; - case kEventAppActiveWindowChanged: - break; - default: - Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); - break; - } - break; - - case kEventClassAppleEvent: - switch (eventKind) - { - case kEventAppleEvent : - break; - default: - Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); - break; - } - break; - - case kEventClassWindow: - switch (eventKind) - { - case kEventWindowUpdate : - break; - default: - Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); - break; - } - break; - - case kEventClassControl: - break; - - default: - /*Con_Printf(">> UNKNOWN eventClass: %c%c%c%c, eventKind: %d <<\n", - eventClass >> 24, (eventClass >> 16) & 0xFF, - (eventClass >> 8) & 0xFF, eventClass & 0xFF, - eventKind);*/ - break; - } - - SendEventToEventTarget (theEvent, theTarget); - ReleaseEvent(theEvent); - } -} - -void VID_BuildJoyState(vid_joystate_t *joystate) -{ - VID_Shared_BuildJoyState_Begin(joystate); - VID_Shared_BuildJoyState_Finish(joystate); -} - -void VID_EnableJoystick(qboolean enable) -{ - int index = joy_enable.integer > 0 ? joy_index.integer : -1; - qboolean success = false; - int sharedcount = 0; - sharedcount = VID_Shared_SetJoystick(index); - if (index >= 0 && index < sharedcount) - success = true; - - // update cvar containing count of XInput joysticks - if (joy_detected.integer != sharedcount) - Cvar_SetValueQuick(&joy_detected, sharedcount); - - Cvar_SetValueQuick(&joy_active, success ? 1 : 0); -} - -void IN_Move (void) -{ - vid_joystate_t joystate; - VID_EnableJoystick(true); - VID_BuildJoyState(&joystate); - VID_ApplyJoyState(&joystate); -} - -static bool GetDictionaryBoolean(CFDictionaryRef d, const void *key) -{ - CFBooleanRef ref = (CFBooleanRef) CFDictionaryGetValue(d, key); - if(ref) - return CFBooleanGetValue(ref); - return false; -} - -long GetDictionaryLong(CFDictionaryRef d, const void *key) -{ - long value = 0; - CFNumberRef ref = (CFNumberRef) CFDictionaryGetValue(d, key); - if(ref) - CFNumberGetValue(ref, kCFNumberLongType, &value); - return value; -} - -vid_mode_t *VID_GetDesktopMode(void) -{ - return NULL; // FIXME add desktopfullscreen -} - -size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) -{ - CGDirectDisplayID mainDisplay = CGMainDisplayID(); - CFArrayRef vidmodes = CGDisplayAvailableModes(mainDisplay); - CFDictionaryRef thismode; - unsigned int n = CFArrayGetCount(vidmodes); - unsigned int i; - size_t k; - - k = 0; - for(i = 0; i < n; ++i) - { - thismode = (CFDictionaryRef) CFArrayGetValueAtIndex(vidmodes, i); - if(!GetDictionaryBoolean(thismode, kCGDisplayModeIsSafeForHardware)) - continue; - - if(k >= maxcount) - break; - modes[k].width = GetDictionaryLong(thismode, kCGDisplayWidth); - modes[k].height = GetDictionaryLong(thismode, kCGDisplayHeight); - modes[k].bpp = GetDictionaryLong(thismode, kCGDisplayBitsPerPixel); - modes[k].refreshrate = GetDictionaryLong(thismode, kCGDisplayRefreshRate); - modes[k].pixelheight_num = 1; - modes[k].pixelheight_denom = 1; // OS X doesn't expose this either - ++k; - } - return k; -} diff --git a/vid_agl_mackeys.h b/vid_agl_mackeys.h deleted file mode 100644 index 0f266e9b..00000000 --- a/vid_agl_mackeys.h +++ /dev/null @@ -1,145 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - 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 - Library General Public License for more details. - - 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 - slouken@devolution.com -*/ - -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id$"; -#endif - -/* These are the Macintosh key scancode constants -- from Inside Macintosh */ - -#define MK_ESCAPE 0x35 -#define MK_F1 0x7A -#define MK_F2 0x78 -#define MK_F3 0x63 -#define MK_F4 0x76 -#define MK_F5 0x60 -#define MK_F6 0x61 -#define MK_F7 0x62 -#define MK_F8 0x64 -#define MK_F9 0x65 -#define MK_F10 0x6D -#define MK_F11 0x67 -#define MK_F12 0x6F -#define MK_PRINT 0x69 -#define MK_SCROLLOCK 0x6B -#define MK_PAUSE 0x71 -#define MK_POWER 0x7F -#define MK_BACKQUOTE 0x32 -#define MK_1 0x12 -#define MK_2 0x13 -#define MK_3 0x14 -#define MK_4 0x15 -#define MK_5 0x17 -#define MK_6 0x16 -#define MK_7 0x1A -#define MK_8 0x1C -#define MK_9 0x19 -#define MK_0 0x1D -#define MK_MINUS 0x1B -#define MK_EQUALS 0x18 -#define MK_BACKSPACE 0x33 -#define MK_INSERT 0x72 -#define MK_HOME 0x73 -#define MK_PAGEUP 0x74 -#define MK_NUMLOCK 0x47 -#define MK_KP_EQUALS 0x51 -#define MK_KP_DIVIDE 0x4B -#define MK_KP_MULTIPLY 0x43 -#define MK_TAB 0x30 -#define MK_q 0x0C -#define MK_w 0x0D -#define MK_e 0x0E -#define MK_r 0x0F -#define MK_t 0x11 -#define MK_y 0x10 -#define MK_u 0x20 -#define MK_i 0x22 -#define MK_o 0x1F -#define MK_p 0x23 -#define MK_LEFTBRACKET 0x21 -#define MK_RIGHTBRACKET 0x1E -#define MK_BACKSLASH 0x2A -#define MK_DELETE 0x75 -#define MK_END 0x77 -#define MK_PAGEDOWN 0x79 -#define MK_KP7 0x59 -#define MK_KP8 0x5B -#define MK_KP9 0x5C -#define MK_KP_MINUS 0x4E -#define MK_CAPSLOCK 0x39 -#define MK_a 0x00 -#define MK_s 0x01 -#define MK_d 0x02 -#define MK_f 0x03 -#define MK_g 0x05 -#define MK_h 0x04 -#define MK_j 0x26 -#define MK_k 0x28 -#define MK_l 0x25 -#define MK_SEMICOLON 0x29 -#define MK_QUOTE 0x27 -#define MK_RETURN 0x24 -#define MK_KP4 0x56 -#define MK_KP5 0x57 -#define MK_KP6 0x58 -#define MK_KP_PLUS 0x45 -#define MK_LSHIFT 0x38 -#define MK_z 0x06 -#define MK_x 0x07 -#define MK_c 0x08 -#define MK_v 0x09 -#define MK_b 0x0B -#define MK_n 0x2D -#define MK_m 0x2E -#define MK_COMMA 0x2B -#define MK_PERIOD 0x2F -#define MK_SLASH 0x2C -#if 0 /* These are the same as the left versions - use left by default */ -#define MK_RSHIFT 0x38 -#endif -#define MK_UP 0x7E -#define MK_KP1 0x53 -#define MK_KP2 0x54 -#define MK_KP3 0x55 -#define MK_KP_ENTER 0x4C -#define MK_LCTRL 0x3B -#define MK_LALT 0x3A -#define MK_LMETA 0x37 -#define MK_SPACE 0x31 -#if 0 /* These are the same as the left versions - use left by default */ -#define MK_RMETA 0x37 -#define MK_RALT 0x3A -#define MK_RCTRL 0x3B -#endif -#define MK_LEFT 0x7B -#define MK_DOWN 0x7D -#define MK_RIGHT 0x7C -#define MK_KP0 0x52 -#define MK_KP_PERIOD 0x41 - -/* Wierd, these keys are on my iBook under MacOS X */ -#define MK_IBOOK_ENTER 0x34 -#define MK_IBOOK_LEFT 0x3B -#define MK_IBOOK_RIGHT 0x3C -#define MK_IBOOK_DOWN 0x3D -#define MK_IBOOK_UP 0x3E diff --git a/vid_glx.c b/vid_glx.c deleted file mode 100644 index 863e138e..00000000 --- a/vid_glx.c +++ /dev/null @@ -1,1278 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS) -//#define USEDGA -#endif - -#include - -#include - -#include -#include -#include -#include // TODO possibly ifdef this out on non-supporting systems... Solaris (as always)? -#include - -#include "quakedef.h" - -#include -#include -#include - -#ifdef USEDGA -#include -#endif -#include - -#include - -// get the Uchar type -#include "utf8lib.h" -#include "image.h" - -#include "nexuiz.xpm" -#include "darkplaces.xpm" - -// Tell startup code that we have a client -int cl_available = true; - -// note: if we used the XRandR extension we could support refresh rates -qboolean vid_supportrefreshrate = false; - -//GLX prototypes -XVisualInfo *(GLAPIENTRY *qglXChooseVisual)(Display *dpy, int screen, int *attribList); -GLXContext (GLAPIENTRY *qglXCreateContext)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct); -void (GLAPIENTRY *qglXDestroyContext)(Display *dpy, GLXContext ctx); -Bool (GLAPIENTRY *qglXMakeCurrent)(Display *dpy, GLXDrawable drawable, GLXContext ctx); -void (GLAPIENTRY *qglXSwapBuffers)(Display *dpy, GLXDrawable drawable); -const char *(GLAPIENTRY *qglXQueryExtensionsString)(Display *dpy, int screen); - -//GLX_ARB_get_proc_address -void *(GLAPIENTRY *qglXGetProcAddressARB)(const GLubyte *procName); - -static dllfunction_t getprocaddressfuncs[] = -{ - {"glXGetProcAddressARB", (void **) &qglXGetProcAddressARB}, - {NULL, NULL} -}; - -//GLX_SGI_swap_control -GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval); - -static dllfunction_t swapcontrolfuncs[] = -{ - {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI}, - {NULL, NULL} -}; - -static Display *vidx11_display = NULL; -static int vidx11_screen; -static Window win, root; -static GLXContext ctx = NULL; -static GC vidx11_gc = NULL; - -Atom wm_delete_window_atom; -Atom net_wm_state_atom; -Atom net_wm_state_hidden_atom; -Atom net_wm_state_fullscreen_atom; -Atom net_wm_icon; -Atom cardinal; - -#define KEY_MASK (KeyPressMask | KeyReleaseMask) -#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \ - PointerMotionMask | ButtonMotionMask) -#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | \ - StructureNotifyMask | FocusChangeMask | EnterWindowMask | \ - LeaveWindowMask) - - -static qboolean mouse_avail = true; -static qboolean vid_usingmousegrab = false; -static qboolean vid_usingmouse = false; -static qboolean vid_usinghidecursor = false; -static qboolean vid_usingvsync = false; -static qboolean vid_usevsync = false; -#ifdef USEDGA -static qboolean vid_x11_dgasupported = false; -#endif - -#ifdef USEDGA -cvar_t vid_dgamouse = {CVAR_SAVE, "vid_dgamouse", "0", "make use of DGA mouse input"}; -static qboolean vid_usingdgamouse = false; -#endif - -qboolean vidmode_ext = false; - -static int win_x, win_y; - -static XF86VidModeModeInfo init_vidmode, game_vidmode; -static qboolean vid_isfullscreen = false; -static qboolean vid_isvidmodefullscreen = false; -static qboolean vid_isdesktopfullscreen = false; -static qboolean vid_isoverrideredirect = false; - -static vid_mode_t desktop_mode; -static Visual *vidx11_visual; -static Colormap vidx11_colormap; - -/*-----------------------------------------------------------------------*/ -// - -extern long keysym2ucs(KeySym keysym); // LordHavoc: suppress warning just in this case, it's not worth having a header file for this... -static void DP_Xutf8LookupString(XKeyEvent * ev, - Uchar *uch, - KeySym * keysym_return, - Status * status_return) -{ - int rc; - KeySym keysym; - int codepoint; - char buffer[64]; - int nbytes = sizeof(buffer); - - rc = XLookupString(ev, buffer, nbytes, &keysym, NULL); - - if (rc > 0) { - codepoint = buffer[0] & 0xFF; - } else { - codepoint = keysym2ucs(keysym); - } - - if (codepoint < 0) { - if (keysym == None) { - *status_return = XLookupNone; - } else { - *status_return = XLookupKeySym; - *keysym_return = keysym; - } - *uch = 0; - return; - } - - *uch = codepoint; - - if (keysym != None) { - *keysym_return = keysym; - *status_return = XLookupBoth; - } else { - *status_return = XLookupChars; - } -} -static int XLateKey(XKeyEvent *ev, Uchar *ascii) -{ - int key = 0; - //char buf[64]; - KeySym keysym, shifted; - Status status; - - keysym = XLookupKeysym (ev, 0); - DP_Xutf8LookupString(ev, ascii, &shifted, &status); - - switch(keysym) - { - case XK_KP_Page_Up: key = K_KP_PGUP; break; - case XK_Page_Up: key = K_PGUP; break; - - case XK_KP_Page_Down: key = K_KP_PGDN; break; - case XK_Page_Down: key = K_PGDN; break; - - case XK_KP_Home: key = K_KP_HOME; break; - case XK_Home: key = K_HOME; break; - - case XK_KP_End: key = K_KP_END; break; - case XK_End: key = K_END; break; - - case XK_KP_Left: key = K_KP_LEFTARROW; break; - case XK_Left: key = K_LEFTARROW; break; - - case XK_KP_Right: key = K_KP_RIGHTARROW; break; - case XK_Right: key = K_RIGHTARROW; break; - - case XK_KP_Down: key = K_KP_DOWNARROW; break; - case XK_Down: key = K_DOWNARROW; break; - - case XK_KP_Up: key = K_KP_UPARROW; break; - case XK_Up: key = K_UPARROW; break; - - case XK_Escape: key = K_ESCAPE; break; - - case XK_KP_Enter: key = K_KP_ENTER; break; - case XK_Return: key = K_ENTER; break; - - case XK_Tab: key = K_TAB; break; - - case XK_F1: key = K_F1; break; - - case XK_F2: key = K_F2; break; - - case XK_F3: key = K_F3; break; - - case XK_F4: key = K_F4; break; - - case XK_F5: key = K_F5; break; - - case XK_F6: key = K_F6; break; - - case XK_F7: key = K_F7; break; - - case XK_F8: key = K_F8; break; - - case XK_F9: key = K_F9; break; - - case XK_F10: key = K_F10; break; - - case XK_F11: key = K_F11; break; - - case XK_F12: key = K_F12; break; - - case XK_BackSpace: key = K_BACKSPACE; break; - - case XK_KP_Delete: key = K_KP_DEL; break; - case XK_Delete: key = K_DEL; break; - - case XK_Pause: key = K_PAUSE; break; - - case XK_Shift_L: - case XK_Shift_R: key = K_SHIFT; break; - - case XK_Execute: - case XK_Control_L: - case XK_Control_R: key = K_CTRL; break; - - case XK_Alt_L: - case XK_Meta_L: - case XK_ISO_Level3_Shift: - case XK_Alt_R: - case XK_Meta_R: key = K_ALT; break; - - case XK_KP_Begin: key = K_KP_5; break; - - case XK_Insert:key = K_INS; break; - case XK_KP_Insert: key = K_KP_INS; break; - - case XK_KP_Multiply: key = K_KP_MULTIPLY; break; - case XK_KP_Add: key = K_KP_PLUS; break; - case XK_KP_Subtract: key = K_KP_MINUS; break; - case XK_KP_Divide: key = K_KP_SLASH; break; - - case XK_Num_Lock: key = K_NUMLOCK; break; - case XK_Caps_Lock: key = K_CAPSLOCK; break; - case XK_Scroll_Lock: key = K_SCROLLOCK; break; - - case XK_asciicircum: *ascii = key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2 - - case XK_section: *ascii = key = '~'; break; - - default: - if (keysym < 32) - break; - - if (keysym >= 'A' && keysym <= 'Z') - key = keysym - 'A' + 'a'; - else - key = keysym; - - break; - } - - return key; -} - -static Cursor CreateNullCursor(Display *display, Window root) -{ - Pixmap cursormask; - XGCValues xgc; - GC gc; - XColor dummycolour; - Cursor cursor; - - cursormask = XCreatePixmap(display, root, 1, 1, 1); - xgc.function = GXclear; - gc = XCreateGC(display, cursormask, GCFunction, &xgc); - XFillRectangle(display, cursormask, gc, 0, 0, 1, 1); - dummycolour.pixel = 0; - dummycolour.red = 0; - dummycolour.flags = 04; - cursor = XCreatePixmapCursor(display, cursormask, cursormask, &dummycolour,&dummycolour, 0,0); - XFreePixmap(display,cursormask); - XFreeGC(display,gc); - return cursor; -} - -void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) -{ - static int originalmouseparms_num; - static int originalmouseparms_denom; - static int originalmouseparms_threshold; - static qboolean restore_spi; - -#ifdef USEDGA - qboolean usedgamouse; -#endif - - if (!vidx11_display || !win) - return; - - if (relative) - fullscreengrab = true; - - if (!mouse_avail) - fullscreengrab = relative = hidecursor = false; - -#ifdef USEDGA - usedgamouse = relative && vid_dgamouse.integer; - if (!vid_x11_dgasupported) - usedgamouse = false; - if (fullscreengrab && vid_usingmouse && (vid_usingdgamouse != usedgamouse)) - VID_SetMouse(false, false, false); // ungrab first! -#endif - - if (vid_usingmousegrab != fullscreengrab) - { - vid_usingmousegrab = fullscreengrab; - cl_ignoremousemoves = 2; - if (fullscreengrab) - { - XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); - if (vid_grabkeyboard.integer || vid_isoverrideredirect) - XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); - } - else - { - XUngrabPointer(vidx11_display, CurrentTime); - XUngrabKeyboard(vidx11_display, CurrentTime); - } - } - - if (relative) - { - if (!vid_usingmouse) - { - XWindowAttributes attribs_1; - XSetWindowAttributes attribs_2; - - XGetWindowAttributes(vidx11_display, win, &attribs_1); - attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; - XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2); - -#ifdef USEDGA - vid_usingdgamouse = usedgamouse; - if (usedgamouse) - { - XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse); - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); - } - else -#endif - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); - -// COMMANDLINEOPTION: X11 Input: -noforcemparms disables setting of mouse parameters (not used with DGA, windows only) -#ifdef USEDGA - if (!COM_CheckParm ("-noforcemparms") && !usedgamouse) -#else - if (!COM_CheckParm ("-noforcemparms")) -#endif - { - XGetPointerControl(vidx11_display, &originalmouseparms_num, &originalmouseparms_denom, &originalmouseparms_threshold); - XChangePointerControl (vidx11_display, true, false, 1, 1, -1); // TODO maybe change threshold here, or remove this comment - restore_spi = true; - } - else - restore_spi = false; - - cl_ignoremousemoves = 2; - vid_usingmouse = true; - } - } - else - { - if (vid_usingmouse) - { -#ifdef USEDGA - if (vid_usingdgamouse) - XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); - vid_usingdgamouse = false; -#endif - cl_ignoremousemoves = 2; - - if (restore_spi) - XChangePointerControl (vidx11_display, true, true, originalmouseparms_num, originalmouseparms_denom, originalmouseparms_threshold); - restore_spi = false; - - vid_usingmouse = false; - } - } - - if (vid_usinghidecursor != hidecursor) - { - vid_usinghidecursor = hidecursor; - if (hidecursor) - XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win)); - else - XUndefineCursor(vidx11_display, win); - } -} - -static keynum_t buttonremap[18] = -{ - K_MOUSE1, - K_MOUSE3, - K_MOUSE2, - K_MWHEELUP, - K_MWHEELDOWN, - K_MOUSE4, - K_MOUSE5, - K_MOUSE6, - K_MOUSE7, - K_MOUSE8, - K_MOUSE9, - K_MOUSE10, - K_MOUSE11, - K_MOUSE12, - K_MOUSE13, - K_MOUSE14, - K_MOUSE15, - K_MOUSE16, -}; - -static int in_mouse_x_save = 0, in_mouse_y_save = 0; -static void HandleEvents(void) -{ - XEvent event; - int key; - Uchar unicode; - qboolean dowarp = false; - - if (!vidx11_display) - return; - - in_mouse_x += in_mouse_x_save; - in_mouse_y += in_mouse_y_save; - in_mouse_x_save = 0; - in_mouse_y_save = 0; - - while (XPending(vidx11_display)) - { - XNextEvent(vidx11_display, &event); - - switch (event.type) - { - case KeyPress: - // key pressed - key = XLateKey (&event.xkey, &unicode); - Key_Event(key, unicode, true); - break; - - case KeyRelease: - // key released - key = XLateKey (&event.xkey, &unicode); - Key_Event(key, unicode, false); - break; - - case MotionNotify: - // mouse moved - if (vid_usingmouse) - { -#ifdef USEDGA - if (vid_usingdgamouse) - { - in_mouse_x += event.xmotion.x_root; - in_mouse_y += event.xmotion.y_root; - } - else -#endif - { - if (!event.xmotion.send_event) - { - in_mouse_x += event.xmotion.x - in_windowmouse_x; - in_mouse_y += event.xmotion.y - in_windowmouse_y; - //if (abs(vid.width/2 - event.xmotion.x) + abs(vid.height/2 - event.xmotion.y)) - if (vid_stick_mouse.integer || abs(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4) - dowarp = true; - } - } - } - in_windowmouse_x = event.xmotion.x; - in_windowmouse_y = event.xmotion.y; - break; - - case ButtonPress: - // mouse button pressed - if (event.xbutton.button <= 18) - Key_Event(buttonremap[event.xbutton.button - 1], 0, true); - else - Con_Printf("HandleEvents: ButtonPress gave value %d, 1-18 expected\n", event.xbutton.button); - break; - - case ButtonRelease: - // mouse button released - if (event.xbutton.button <= 18) - Key_Event(buttonremap[event.xbutton.button - 1], 0, false); - else - Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-18 expected\n", event.xbutton.button); - break; - - case CreateNotify: - // window created - win_x = event.xcreatewindow.x; - win_y = event.xcreatewindow.y; - break; - - case ConfigureNotify: - // window changed size/location - win_x = event.xconfigure.x; - win_y = event.xconfigure.y; - // HACK on X11, we just request fullscreen mode, but - // cannot guess what the window manager will do for us - // exactly. That is why we read back the resolution we - // actually got here. - if(vid_isdesktopfullscreen) - { - desktop_mode.width = event.xconfigure.width; - desktop_mode.height = event.xconfigure.height; - } - if((vid_resizable.integer < 2 || vid_isdesktopfullscreen) && (vid.width != event.xconfigure.width || vid.height != event.xconfigure.height)) - { - vid.width = event.xconfigure.width; - vid.height = event.xconfigure.height; - if(vid_isdesktopfullscreen) - Con_Printf("NetWM fullscreen: actually using resolution %dx%d\n", vid.width, vid.height); - else - Con_DPrintf("Updating to ConfigureNotify resolution %dx%d\n", vid.width, vid.height); - } - break; - case DestroyNotify: - // window has been destroyed - Sys_Quit(0); - break; - case ClientMessage: - // window manager messages - if ((event.xclient.format == 32) && ((unsigned int)event.xclient.data.l[0] == wm_delete_window_atom)) - Sys_Quit(0); - break; - case MapNotify: - if (vid_isoverrideredirect) - break; - // window restored - vid_hidden = false; - - if(vid_isvidmodefullscreen) - { - // set our video mode - XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &game_vidmode); - - // Move the viewport to top left - XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); - } - - if(vid_isdesktopfullscreen) - { - // make sure it's fullscreen - XEvent event; - event.type = ClientMessage; - event.xclient.serial = 0; - event.xclient.send_event = True; - event.xclient.message_type = net_wm_state_atom; - event.xclient.window = win; - event.xclient.format = 32; - event.xclient.data.l[0] = 1; - event.xclient.data.l[1] = net_wm_state_fullscreen_atom; - event.xclient.data.l[2] = 0; - event.xclient.data.l[3] = 1; - event.xclient.data.l[4] = 0; - XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event); - } - - dowarp = true; - - break; - case UnmapNotify: - if (vid_isoverrideredirect) - break; - // window iconified/rolledup/whatever - vid_hidden = true; - - if(vid_isvidmodefullscreen) - XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode); - - break; - case FocusIn: - if (vid_isoverrideredirect) - break; - // window is now the input focus - vid_activewindow = true; - break; - case FocusOut: - if (vid_isoverrideredirect) - break; - - if(vid_isdesktopfullscreen && event.xfocus.mode == NotifyNormal) - { - // iconify netwm fullscreen window when it loses focus - // when the user selects it in the taskbar, the window manager will map it again and send MapNotify - XEvent event; - event.type = ClientMessage; - event.xclient.serial = 0; - event.xclient.send_event = True; - event.xclient.message_type = net_wm_state_atom; - event.xclient.window = win; - event.xclient.format = 32; - event.xclient.data.l[0] = 1; - event.xclient.data.l[1] = net_wm_state_hidden_atom; - event.xclient.data.l[2] = 0; - event.xclient.data.l[3] = 1; - event.xclient.data.l[4] = 0; - XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event); - } - - // window is no longer the input focus - vid_activewindow = false; - - break; - case EnterNotify: - // mouse entered window - break; - case LeaveNotify: - // mouse left window - break; - default: - break; - } - } - - if (dowarp) - { - /* move the mouse to the window center again */ - // we'll catch the warp motion by its send_event flag, updating the - // stored mouse position without adding any delta motion - XEvent event; - event.type = MotionNotify; - event.xmotion.display = vidx11_display; - event.xmotion.window = win; - event.xmotion.x = vid.width / 2; - event.xmotion.y = vid.height / 2; - XSendEvent(vidx11_display, win, False, PointerMotionMask, &event); - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); - } -} - -static void *prjobj = NULL; - -static void GL_CloseLibrary(void) -{ - if (prjobj) - dlclose(prjobj); - prjobj = NULL; - gl_driver[0] = 0; - qglXGetProcAddressARB = NULL; - gl_extensions = ""; - gl_platform = ""; - gl_platformextensions = ""; -} - -static int GL_OpenLibrary(const char *name) -{ - Con_Printf("Loading OpenGL driver %s\n", name); - GL_CloseLibrary(); - if (!(prjobj = dlopen(name, RTLD_LAZY | RTLD_GLOBAL))) - { - Con_Printf("Unable to open symbol list for %s\n", name); - return false; - } - strlcpy(gl_driver, name, sizeof(gl_driver)); - return true; -} - -void *GL_GetProcAddress(const char *name) -{ - void *p = NULL; - if (qglXGetProcAddressARB != NULL) - p = (void *) qglXGetProcAddressARB((GLubyte *)name); - if (p == NULL) - p = (void *) dlsym(prjobj, name); - return p; -} - -void VID_Shutdown(void) -{ - if (!vidx11_display) - return; - - VID_EnableJoystick(false); - VID_SetMouse(false, false, false); - - // FIXME: glXDestroyContext here? - if (vid_isvidmodefullscreen) - XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode); - - if(vidx11_gc) - XFreeGC(vidx11_display, vidx11_gc); - vidx11_gc = NULL; - - if (win) - XDestroyWindow(vidx11_display, win); - XCloseDisplay(vidx11_display); - - vid_hidden = true; - vid_isfullscreen = false; - vid_isdesktopfullscreen = false; - vid_isvidmodefullscreen = false; - vid_isoverrideredirect = false; - vidx11_display = NULL; - win = 0; - ctx = NULL; - - GL_CloseLibrary(); -} - -static void signal_handler(int sig) -{ - Con_Printf("Received signal %d, exiting...\n", sig); - Sys_Quit(1); -} - -static void InitSig(void) -{ - signal(SIGHUP, signal_handler); - signal(SIGINT, signal_handler); - signal(SIGQUIT, signal_handler); - signal(SIGILL, signal_handler); - signal(SIGTRAP, signal_handler); - signal(SIGIOT, signal_handler); - signal(SIGBUS, signal_handler); - signal(SIGFPE, signal_handler); - signal(SIGSEGV, signal_handler); - signal(SIGTERM, signal_handler); -} - -void VID_Finish (void) -{ - vid_usevsync = vid_vsync.integer && !cls.timedemo && qglXSwapIntervalSGI; - switch(vid.renderpath) - { - case RENDERPATH_GL20: - case RENDERPATH_GLES2: - if (vid_usingvsync != vid_usevsync) - { - vid_usingvsync = vid_usevsync; - if (qglXSwapIntervalSGI && qglXSwapIntervalSGI (vid_usevsync)) - Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n"); - } - - if (!vid_hidden) - { - CHECKGLERROR - if (r_speeds.integer == 2 || gl_finish.integer) - GL_Finish(); - qglXSwapBuffers(vidx11_display, win);CHECKGLERROR - } - break; - } - - VID_UpdateGamma(); -} - -void VID_Init(void) -{ -#ifdef USEDGA - Cvar_RegisterVariable (&vid_dgamouse); -#endif - Cvar_RegisterVariable (&vid_desktopfullscreen); - InitSig(); // trap evil signals -// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) - if (COM_CheckParm ("-nomouse")) - mouse_avail = false; -} - -static void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples) -{ - *attrib++ = GLX_RGBA; - *attrib++ = GLX_RED_SIZE;*attrib++ = stencil ? 8 : 5; - *attrib++ = GLX_GREEN_SIZE;*attrib++ = stencil ? 8 : 5; - *attrib++ = GLX_BLUE_SIZE;*attrib++ = stencil ? 8 : 5; - *attrib++ = GLX_DOUBLEBUFFER; - *attrib++ = GLX_DEPTH_SIZE;*attrib++ = stencil ? 24 : 16; - // if stencil is enabled, ask for alpha too - if (stencil) - { - *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8; - *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 8; - } - if (stereobuffer) - *attrib++ = GLX_STEREO; - if (samples > 1) - { - *attrib++ = GLX_SAMPLE_BUFFERS_ARB; - *attrib++ = 1; - *attrib++ = GLX_SAMPLES_ARB; - *attrib++ = samples; - } - *attrib++ = None; -} - -static qboolean VID_InitModeGL(viddef_mode_t *mode) -{ - int i, j; - int attrib[32]; - XSetWindowAttributes attr; - XClassHint *clshints; - XWMHints *wmhints; - XSizeHints *szhints; - unsigned long mask; - XVisualInfo *visinfo; - int MajorVersion, MinorVersion; - const char *drivername; - char *xpm; - char **idata; - unsigned char *data; - char vabuf[1024]; - - vid_isfullscreen = false; - vid_isdesktopfullscreen = false; - vid_isvidmodefullscreen = false; - vid_isoverrideredirect = false; - -#if defined(__APPLE__) && defined(__MACH__) - drivername = "/usr/X11R6/lib/libGL.1.dylib"; -#else - drivername = "libGL.so.1"; -#endif -// COMMANDLINEOPTION: Linux GLX: -gl_driver selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it -// COMMANDLINEOPTION: BSD GLX: -gl_driver selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it -// LordHavoc: although this works on MacOSX, it's useless there (as there is only one system libGL) - i = COM_CheckParm("-gl_driver"); - if (i && i < com_argc - 1) - drivername = com_argv[i + 1]; - if (!GL_OpenLibrary(drivername)) - { - Con_Printf("Unable to load GL driver \"%s\"\n", drivername); - return false; - } - - if (!(vidx11_display = XOpenDisplay(NULL))) - { - Con_Print("Couldn't open the X display\n"); - return false; - } - - // LordHavoc: making the close button on a window do the right thing - // seems to involve this mess, sigh... - wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false); - net_wm_state_atom = XInternAtom(vidx11_display, "_NET_WM_STATE", false); - net_wm_state_fullscreen_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_FULLSCREEN", false); - net_wm_state_hidden_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_HIDDEN", false); - net_wm_icon = XInternAtom(vidx11_display, "_NET_WM_ICON", false); - cardinal = XInternAtom(vidx11_display, "CARDINAL", false); - - // make autorepeat send keypress/keypress/.../keyrelease instead of intervening keyrelease - XkbSetDetectableAutoRepeat(vidx11_display, true, NULL); - - vidx11_screen = DefaultScreen(vidx11_display); - root = RootWindow(vidx11_display, vidx11_screen); - - desktop_mode.width = DisplayWidth(vidx11_display, vidx11_screen); - desktop_mode.height = DisplayHeight(vidx11_display, vidx11_screen); - desktop_mode.bpp = DefaultDepth(vidx11_display, vidx11_screen); - desktop_mode.refreshrate = 60; // FIXME - desktop_mode.pixelheight_num = 1; // FIXME - desktop_mode.pixelheight_denom = 1; // FIXME - - // Get video mode list - MajorVersion = MinorVersion = 0; - if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) - vidmode_ext = false; - else - { - Con_DPrintf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion); - vidmode_ext = true; - } - - if ((qglXChooseVisual = (XVisualInfo *(GLAPIENTRY *)(Display *dpy, int screen, int *attribList))GL_GetProcAddress("glXChooseVisual")) == NULL - || (qglXCreateContext = (GLXContext (GLAPIENTRY *)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct))GL_GetProcAddress("glXCreateContext")) == NULL - || (qglXDestroyContext = (void (GLAPIENTRY *)(Display *dpy, GLXContext ctx))GL_GetProcAddress("glXDestroyContext")) == NULL - || (qglXMakeCurrent = (Bool (GLAPIENTRY *)(Display *dpy, GLXDrawable drawable, GLXContext ctx))GL_GetProcAddress("glXMakeCurrent")) == NULL - || (qglXSwapBuffers = (void (GLAPIENTRY *)(Display *dpy, GLXDrawable drawable))GL_GetProcAddress("glXSwapBuffers")) == NULL - || (qglXQueryExtensionsString = (const char *(GLAPIENTRY *)(Display *dpy, int screen))GL_GetProcAddress("glXQueryExtensionsString")) == NULL) - { - Con_Printf("glX functions not found in %s\n", gl_driver); - return false; - } - - VID_BuildGLXAttrib(attrib, mode->bitsperpixel == 32, mode->stereobuffer, mode->samples); - visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); - if (!visinfo) - { - Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n"); - return false; - } - - if (mode->fullscreen) - { - if(vid_desktopfullscreen.integer) - { - // TODO detect WM support - vid_isdesktopfullscreen = true; - vid_isfullscreen = true; - // width and height will be filled in later - Con_DPrintf("Using NetWM fullscreen mode\n"); - } - - if(!vid_isfullscreen && vidmode_ext) - { - int best_fit, best_dist, dist, x, y; - - // Are we going fullscreen? If so, let's change video mode - XF86VidModeModeLine *current_vidmode; - XF86VidModeModeInfo **vidmodes; - int num_vidmodes; - - // This nice hack comes from the SDL source code - current_vidmode = (XF86VidModeModeLine*)((char*)&init_vidmode + sizeof(init_vidmode.dotclock)); - XF86VidModeGetModeLine(vidx11_display, vidx11_screen, (int*)&init_vidmode.dotclock, current_vidmode); - - XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); - best_dist = 0; - best_fit = -1; - - for (i = 0; i < num_vidmodes; i++) - { - if (mode->width > vidmodes[i]->hdisplay || mode->height > vidmodes[i]->vdisplay) - continue; - - x = mode->width - vidmodes[i]->hdisplay; - y = mode->height - vidmodes[i]->vdisplay; - dist = (x * x) + (y * y); - if (best_fit == -1 || dist < best_dist) - { - best_dist = dist; - best_fit = i; - } - } - - if (best_fit != -1) - { - // LordHavoc: changed from ActualWidth/ActualHeight =, - // to width/height =, so the window will take the full area of - // the mode chosen - mode->width = vidmodes[best_fit]->hdisplay; - mode->height = vidmodes[best_fit]->vdisplay; - - // change to the mode - XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]); - memcpy(&game_vidmode, vidmodes[best_fit], sizeof(game_vidmode)); - vid_isvidmodefullscreen = true; - vid_isfullscreen = true; - - // Move the viewport to top left - XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); - Con_DPrintf("Using XVidMode fullscreen mode at %dx%d\n", mode->width, mode->height); - } - - free(vidmodes); - } - - if(!vid_isfullscreen) - { - // sorry, no FS available - // use the full desktop resolution - vid_isfullscreen = true; - // width and height will be filled in later - mode->width = DisplayWidth(vidx11_display, vidx11_screen); - mode->height = DisplayHeight(vidx11_display, vidx11_screen); - Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", mode->width, mode->height); - } - } - - // LordHavoc: save the visual for use in gamma ramp settings later - vidx11_visual = visinfo->visual; - - /* window attributes */ - attr.background_pixel = 0; - attr.border_pixel = 0; - // LordHavoc: save the colormap for later, too - vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone); - attr.event_mask = X_MASK; - - if (mode->fullscreen) - { - if(vid_isdesktopfullscreen) - { - mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask; - attr.backing_store = NotUseful; - attr.save_under = False; - } - else - { - mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect; - attr.override_redirect = True; - attr.backing_store = NotUseful; - attr.save_under = False; - vid_isoverrideredirect = true; // so it knows to grab - } - } - else - { - mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; - } - - win = XCreateWindow(vidx11_display, root, 0, 0, mode->width, mode->height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr); - - data = loadimagepixelsbgra("darkplaces-icon", false, false, false, NULL); - if(data) - { - // use _NET_WM_ICON too - static long netwm_icon[MAX_NETWM_ICON]; - int pos = 0; - int i = 1; - - while(data) - { - if(pos + 2 * image_width * image_height < MAX_NETWM_ICON) - { - netwm_icon[pos++] = image_width; - netwm_icon[pos++] = image_height; - for(i = 0; i < image_height; ++i) - for(j = 0; j < image_width; ++j) - netwm_icon[pos++] = BuffLittleLong(&data[(i*image_width+j)*4]); - } - else - { - Con_Printf("Skipping NETWM icon #%d because there is no space left\n", i); - } - ++i; - Mem_Free(data); - data = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "darkplaces-icon%d", i), false, false, false, NULL); - } - XChangeProperty(vidx11_display, win, net_wm_icon, cardinal, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos); - } - - // fallthrough for old window managers - xpm = (char *) FS_LoadFile("darkplaces-icon.xpm", tempmempool, false, NULL); - idata = NULL; - if(xpm) - idata = XPM_DecodeString(xpm); - if(!idata) - idata = ENGINE_ICON; - - wmhints = XAllocWMHints(); - if(XpmCreatePixmapFromData(vidx11_display, win, - idata, - &wmhints->icon_pixmap, &wmhints->icon_mask, NULL) == XpmSuccess) - wmhints->flags |= IconPixmapHint | IconMaskHint; - - if(xpm) - Mem_Free(xpm); - - clshints = XAllocClassHint(); - clshints->res_name = strdup(gamename); - clshints->res_class = strdup("DarkPlaces"); - - szhints = XAllocSizeHints(); - if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen) - { - szhints->min_width = szhints->max_width = mode->width; - szhints->min_height = szhints->max_height = mode->height; - szhints->flags |= PMinSize | PMaxSize; - } - - XmbSetWMProperties(vidx11_display, win, gamename, gamename, (char **) com_argv, com_argc, szhints, wmhints, clshints); - // strdup() allocates using malloc(), should be freed with free() - free(clshints->res_name); - free(clshints->res_class); - XFree(clshints); - XFree(wmhints); - XFree(szhints); - - //XStoreName(vidx11_display, win, gamename); - XMapWindow(vidx11_display, win); - - XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1); - - if (vid_isoverrideredirect) - { - XMoveWindow(vidx11_display, win, 0, 0); - XRaiseWindow(vidx11_display, win); - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); - XFlush(vidx11_display); - } - - if(vid_isvidmodefullscreen) - { - // Move the viewport to top left - XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); - } - - //XSync(vidx11_display, False); - - ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True); - XFree(visinfo); // glXChooseVisual man page says to use XFree to free visinfo - if (!ctx) - { - Con_Printf ("glXCreateContext failed\n"); - return false; - } - - if (!qglXMakeCurrent(vidx11_display, win, ctx)) - { - Con_Printf ("glXMakeCurrent failed\n"); - return false; - } - - XSync(vidx11_display, False); - - if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) - { - Con_Printf ("glGetString not found in %s\n", gl_driver); - return false; - } - - gl_extensions = (const char *)qglGetString(GL_EXTENSIONS); - gl_platform = "GLX"; - gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen); - -// COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) -// COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) -// COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) - GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false); -// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control -// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control -// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control - GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false); - - vid_usingmousegrab = false; - vid_usingmouse = false; - vid_usinghidecursor = false; - vid_usingvsync = false; - vid_hidden = false; - vid_activewindow = true; -#ifdef USEDGA - vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion); - if (!vid_x11_dgasupported) - Con_Print( "Failed to detect XF86DGA Mouse extension\n" ); -#endif - - GL_Init(); - return true; -} - -qboolean VID_InitMode(viddef_mode_t *mode) -{ - return VID_InitModeGL(mode); -} - -void Sys_SendKeyEvents(void) -{ - static qboolean sound_active = true; - - // enable/disable sound on focus gain/loss - if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer) - { - if (!sound_active) - { - S_UnblockSound (); - sound_active = true; - } - } - else - { - if (sound_active) - { - S_BlockSound (); - sound_active = false; - } - } - - HandleEvents(); -} - -void VID_BuildJoyState(vid_joystate_t *joystate) -{ - VID_Shared_BuildJoyState_Begin(joystate); - VID_Shared_BuildJoyState_Finish(joystate); -} - -void VID_EnableJoystick(qboolean enable) -{ - int index = joy_enable.integer > 0 ? joy_index.integer : -1; - qboolean success = false; - int sharedcount = 0; - sharedcount = VID_Shared_SetJoystick(index); - if (index >= 0 && index < sharedcount) - success = true; - - // update cvar containing count of XInput joysticks - if (joy_detected.integer != sharedcount) - Cvar_SetValueQuick(&joy_detected, sharedcount); - - Cvar_SetValueQuick(&joy_active, success ? 1 : 0); -} - -void IN_Move (void) -{ - vid_joystate_t joystate; - VID_EnableJoystick(true); - VID_BuildJoyState(&joystate); - VID_ApplyJoyState(&joystate); -} - -vid_mode_t *VID_GetDesktopMode(void) -{ - return &desktop_mode; -} - -size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) -{ - if(vidmode_ext) - { - int i, bpp; - size_t k; - XF86VidModeModeInfo **vidmodes; - int num_vidmodes; - - XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); - k = 0; - for (i = 0; i < num_vidmodes; i++) - { - if(k >= maxcount) - break; - // we don't get bpp info, so let's just assume all of 8, 15, 16, 24, 32 work - for(bpp = 8; bpp <= 32; bpp = ((bpp == 8) ? 15 : (bpp & 0xF8) + 8)) - { - if(k >= maxcount) - break; - modes[k].width = vidmodes[i]->hdisplay; - modes[k].height = vidmodes[i]->vdisplay; - modes[k].bpp = 8; - if(vidmodes[i]->dotclock && vidmodes[i]->htotal && vidmodes[i]->vtotal) - modes[k].refreshrate = vidmodes[i]->dotclock / vidmodes[i]->htotal / vidmodes[i]->vtotal; - else - modes[k].refreshrate = 60; - modes[k].pixelheight_num = 1; - modes[k].pixelheight_denom = 1; // xvidmode does not provide this - ++k; - } - } - // manpage of XF86VidModeGetAllModeLines says it should be freed by the caller - XFree(vidmodes); - return k; - } - return 0; // FIXME implement this -} diff --git a/vid_wgl.c b/vid_wgl.c deleted file mode 100644 index fa0091dc..00000000 --- a/vid_wgl.c +++ /dev/null @@ -1,1670 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// vid_wgl.c -- NT GL vid component - -#ifdef _MSC_VER -#pragma comment(lib, "comctl32.lib") -#endif - -#ifdef SUPPORTDIRECTX -// Include DX libs -#ifdef _MSC_VER -#pragma comment(lib, "dinput8.lib") -#pragma comment(lib, "dxguid.lib") -#endif -#ifndef DIRECTINPUT_VERSION -# define DIRECTINPUT_VERSION 0x0500 /* Version 5.0 */ -#endif -#endif - -#include "quakedef.h" -#include -#include -#ifdef SUPPORTDIRECTX -#include -#endif -#include "resource.h" -#include -#ifdef SUPPORTDIRECTX -#include -#endif - -extern HINSTANCE global_hInstance; - -static HINSTANCE gldll; - -#ifndef WM_MOUSEWHEEL -#define WM_MOUSEWHEEL 0x020A -#endif - -// Tell startup code that we have a client -int cl_available = true; - -qboolean vid_supportrefreshrate = true; - -static int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *); -static int (WINAPI *qwglDescribePixelFormat)(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); -//static int (WINAPI *qwglGetPixelFormat)(HDC); -static BOOL (WINAPI *qwglSetPixelFormat)(HDC, int, CONST PIXELFORMATDESCRIPTOR *); -static BOOL (WINAPI *qwglSwapBuffers)(HDC); -static HGLRC (WINAPI *qwglCreateContext)(HDC); -static BOOL (WINAPI *qwglDeleteContext)(HGLRC); -static HGLRC (WINAPI *qwglGetCurrentContext)(VOID); -static HDC (WINAPI *qwglGetCurrentDC)(VOID); -static PROC (WINAPI *qwglGetProcAddress)(LPCSTR); -static BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC); -static BOOL (WINAPI *qwglSwapIntervalEXT)(int interval); -static const char *(WINAPI *qwglGetExtensionsStringARB)(HDC hdc); -static BOOL (WINAPI *qwglChoosePixelFormatARB)(HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -static BOOL (WINAPI *qwglGetPixelFormatAttribivARB)(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); - -static dllfunction_t wglfuncs[] = -{ - {"wglChoosePixelFormat", (void **) &qwglChoosePixelFormat}, - {"wglDescribePixelFormat", (void **) &qwglDescribePixelFormat}, -// {"wglGetPixelFormat", (void **) &qwglGetPixelFormat}, - {"wglSetPixelFormat", (void **) &qwglSetPixelFormat}, - {"wglSwapBuffers", (void **) &qwglSwapBuffers}, - {"wglCreateContext", (void **) &qwglCreateContext}, - {"wglDeleteContext", (void **) &qwglDeleteContext}, - {"wglGetProcAddress", (void **) &qwglGetProcAddress}, - {"wglMakeCurrent", (void **) &qwglMakeCurrent}, - {"wglGetCurrentContext", (void **) &qwglGetCurrentContext}, - {"wglGetCurrentDC", (void **) &qwglGetCurrentDC}, - {NULL, NULL} -}; - -static dllfunction_t wglswapintervalfuncs[] = -{ - {"wglSwapIntervalEXT", (void **) &qwglSwapIntervalEXT}, - {NULL, NULL} -}; - -static dllfunction_t wglpixelformatfuncs[] = -{ - {"wglChoosePixelFormatARB", (void **) &qwglChoosePixelFormatARB}, - {"wglGetPixelFormatAttribivARB", (void **) &qwglGetPixelFormatAttribivARB}, - {NULL, NULL} -}; - -static DEVMODE gdevmode, initialdevmode; -static vid_mode_t desktop_mode; -static qboolean vid_initialized = false; -static qboolean vid_wassuspended = false; -static qboolean vid_usingmouse = false; -static qboolean vid_usinghidecursor = false; -static qboolean vid_usingvsync = false; -static qboolean vid_usevsync = false; -static HICON hIcon; - -// used by cd_win.c and snd_win.c -HWND mainwindow; - -static HDC baseDC; -static HGLRC baseRC; - -//HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow); - -static qboolean vid_isfullscreen; - -//void VID_MenuDraw (void); -//void VID_MenuKey (int key); - -LONG WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -void AppActivate(BOOL fActive, BOOL minimize); -static void ClearAllStates(void); -qboolean VID_InitModeGL(viddef_mode_t *mode); -qboolean VID_InitModeSOFT(viddef_mode_t *mode); - -//==================================== - -static int window_x, window_y; - -static qboolean mouseinitialized; - -#ifdef SUPPORTDIRECTX -static qboolean dinput; -#define DINPUT_BUFFERSIZE 16 -#define iDirectInputCreate(a,b,c,d) pDirectInputCreate(a,b,c,d) - -static HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUT * lplpDirectInput, LPUNKNOWN punkOuter); -#endif - -// LordHavoc: thanks to backslash for this support for mouse buttons 4 and 5 -/* backslash :: imouse explorer buttons */ -/* These are #ifdefed out for non-Win2K in the February 2001 version of - MS's platform SDK, but we need them for compilation. . . */ -#ifndef WM_XBUTTONDOWN - #define WM_XBUTTONDOWN 0x020B - #define WM_XBUTTONUP 0x020C -#endif -#ifndef MK_XBUTTON1 - #define MK_XBUTTON1 0x0020 - #define MK_XBUTTON2 0x0040 -#endif -#ifndef MK_XBUTTON3 -// LordHavoc: lets hope this allows more buttons in the future... - #define MK_XBUTTON3 0x0080 - #define MK_XBUTTON4 0x0100 - #define MK_XBUTTON5 0x0200 - #define MK_XBUTTON6 0x0400 - #define MK_XBUTTON7 0x0800 -#endif -/* :: backslash */ - -// mouse variables -static int mouse_buttons; -static int mouse_oldbuttonstate; - -static unsigned int uiWheelMessage; -#ifdef SUPPORTDIRECTX -static qboolean dinput_acquired; - -static unsigned int mstate_di; -#endif - -static cvar_t vid_forcerefreshrate = {0, "vid_forcerefreshrate", "0", "try to set the given vid_refreshrate even if Windows doesn't list it as valid video mode"}; - -#ifdef SUPPORTDIRECTX -static LPDIRECTINPUT g_pdi; -static LPDIRECTINPUTDEVICE g_pMouse; -static HINSTANCE hInstDI; -#endif - -// forward-referenced functions -static void IN_StartupMouse (void); -static void AdjustWindowBounds(int fullscreen, int *width, int *height, viddef_mode_t *mode, DWORD WindowStyle, RECT *rect); - -//==================================== - -qboolean vid_reallyhidden = true; -void VID_Finish (void) -{ - vid_hidden = vid_reallyhidden; - - vid_usevsync = vid_vsync.integer && !cls.timedemo && qwglSwapIntervalEXT; - - if (!vid_hidden) - { - switch(vid.renderpath) - { - case RENDERPATH_GL20: - case RENDERPATH_GLES2: - if (vid_usingvsync != vid_usevsync) - { - vid_usingvsync = vid_usevsync; - qwglSwapIntervalEXT (vid_usevsync); - } - if (r_speeds.integer == 2 || gl_finish.integer) - GL_Finish(); - SwapBuffers(baseDC); - break; - } - } - - // make sure a context switch can happen every frame - Logitech drivers - // input drivers sometimes eat cpu time every 3 seconds or lag badly - // without this help - Sleep(0); - - VID_UpdateGamma(); -} - -//========================================================================== - - -static unsigned char scantokey[128] = -{ -// 0 1 2 3 4 5 6 7 8 9 A B C D E F - 0 ,K_ESCAPE,'1' ,'2' ,'3' ,'4' ,'5' ,'6' ,'7' ,'8' ,'9' ,'0' ,'-' ,'=' ,K_BACKSPACE,K_TAB,//0 - 'q' ,'w' ,'e' ,'r' ,'t' ,'y' ,'u' ,'i' ,'o' ,'p' ,'[' ,']' ,K_ENTER,K_CTRL ,'a' ,'s' ,//1 - 'd' ,'f' ,'g' ,'h' ,'j' ,'k' ,'l' ,';' ,'\'' ,'`' ,K_SHIFT ,'\\' ,'z' ,'x' ,'c' ,'v' ,//2 - 'b' ,'n' ,'m' ,',' ,'.' ,'/' ,K_SHIFT ,'*' ,K_ALT ,' ' ,K_CAPSLOCK,K_F1 ,K_F2 ,K_F3 ,K_F4 ,K_F5 ,//3 - K_F6 ,K_F7 ,K_F8 ,K_F9 ,K_F10,K_PAUSE,K_SCROLLOCK,K_HOME,K_UPARROW,K_PGUP,K_KP_MINUS,K_LEFTARROW,K_KP_5 ,K_RIGHTARROW,K_KP_PLUS ,K_END,//4 - K_DOWNARROW,K_PGDN ,K_INS,K_DEL,0 ,0 ,0 ,K_F11 ,K_F12 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//5 - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//6 - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 //7 -}; - - -/* -======= -MapKey - -Map from windows to quake keynums -======= -*/ -static int MapKey (int key, int virtualkey) -{ - int result; - int modified = (key >> 16) & 255; - qboolean is_extended = false; - - if (modified < 128 && scantokey[modified]) - result = scantokey[modified]; - else - { - result = 0; - Con_DPrintf("key 0x%02x (0x%8x, 0x%8x) has no translation\n", modified, key, virtualkey); - } - - if (key & (1 << 24)) - is_extended = true; - - if ( !is_extended ) - { - if(((GetKeyState(VK_NUMLOCK)) & 0xffff) == 0) - return result; - - switch ( result ) - { - case K_HOME: - return K_KP_HOME; - case K_UPARROW: - return K_KP_UPARROW; - case K_PGUP: - return K_KP_PGUP; - case K_LEFTARROW: - return K_KP_LEFTARROW; - case K_RIGHTARROW: - return K_KP_RIGHTARROW; - case K_END: - return K_KP_END; - case K_DOWNARROW: - return K_KP_DOWNARROW; - case K_PGDN: - return K_KP_PGDN; - case K_INS: - return K_KP_INS; - case K_DEL: - return K_KP_DEL; - default: - return result; - } - } - else - { - if(virtualkey == VK_NUMLOCK) - return K_NUMLOCK; - - switch ( result ) - { - case 0x0D: - return K_KP_ENTER; - case 0x2F: - return K_KP_SLASH; - case 0xAF: - return K_KP_PLUS; - } - return result; - } -} - -/* -=================================================================== - -MAIN WINDOW - -=================================================================== -*/ - -/* -================ -ClearAllStates -================ -*/ -static void ClearAllStates (void) -{ - Key_ReleaseAll(); - if (vid_usingmouse) - mouse_oldbuttonstate = 0; -} - -void AppActivate(BOOL fActive, BOOL minimize) -/**************************************************************************** -* -* Function: AppActivate -* Parameters: fActive - True if app is activating -* -* Description: If the application is activating, then swap the system -* into SYSPAL_NOSTATIC mode so that our palettes will display -* correctly. -* -****************************************************************************/ -{ - static qboolean sound_active = false; // initially blocked by Sys_InitConsole() - - vid_activewindow = fActive != FALSE; - vid_reallyhidden = minimize != FALSE; - - // enable/disable sound on focus gain/loss - if ((!vid_reallyhidden && vid_activewindow) || !snd_mutewhenidle.integer) - { - if (!sound_active) - { - S_UnblockSound (); - sound_active = true; - } - } - else - { - if (sound_active) - { - S_BlockSound (); - sound_active = false; - } - } - - if (fActive) - { - if (vid_isfullscreen) - { - if (vid_wassuspended) - { - vid_wassuspended = false; - if (gldll) - { - ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN); - ShowWindow(mainwindow, SW_SHOWNORMAL); - } - } - - // LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers - if (gldll) - MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false); - } - } - - if (!fActive) - { - VID_SetMouse(false, false, false); - if (vid_isfullscreen) - { - if (gldll) - ChangeDisplaySettings (NULL, CDS_FULLSCREEN); - vid_wassuspended = true; - } - } -} - -//TODO: move it around in vid_wgl.c since I dont think this is the right position -void Sys_SendKeyEvents (void) -{ - MSG msg; - - while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) - { - if (!GetMessage (&msg, NULL, 0, 0)) - Sys_Quit (1); - - TranslateMessage (&msg); - DispatchMessage (&msg); - } -} - -#ifdef CONFIG_CD -LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -#endif - -static keynum_t buttonremap[16] = -{ - K_MOUSE1, - K_MOUSE2, - K_MOUSE3, - K_MOUSE4, - K_MOUSE5, - K_MOUSE6, - K_MOUSE7, - K_MOUSE8, - K_MOUSE9, - K_MOUSE10, - K_MOUSE11, - K_MOUSE12, - K_MOUSE13, - K_MOUSE14, - K_MOUSE15, - K_MOUSE16, -}; - -/* main window procedure */ -LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - LONG lRet = 1; - int fActive, fMinimized, temp; - unsigned char state[256]; - const unsigned int UNICODE_BUFFER_LENGTH = 4; - WCHAR unicode[UNICODE_BUFFER_LENGTH]; - int vkey; - int charlength; - qboolean down = false; - - if ( uMsg == uiWheelMessage ) - uMsg = WM_MOUSEWHEEL; - - switch (uMsg) - { - case WM_KILLFOCUS: - if (vid_isfullscreen) - ShowWindow(mainwindow, SW_SHOWMINNOACTIVE); - break; - - case WM_CREATE: - break; - - case WM_MOVE: - window_x = (short) LOWORD(lParam); - window_y = (short) HIWORD(lParam); - VID_SetMouse(false, false, false); - break; - - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - down = true; - case WM_KEYUP: - case WM_SYSKEYUP: - vkey = MapKey(lParam, wParam); - GetKeyboardState (state); - // alt/ctrl/shift tend to produce funky ToAscii values, - // and if it's not a single character we don't know care about it - charlength = ToUnicode(wParam, lParam >> 16, state, unicode, UNICODE_BUFFER_LENGTH, 0); - if(vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || charlength == 0) - unicode[0] = 0; - else if(charlength == 2) - unicode[0] = unicode[1]; - if (!VID_JoyBlockEmulatedKeys(vkey)) - Key_Event(vkey, unicode[0], down); - break; - - case WM_SYSCHAR: - // keep Alt-Space from happening - break; - - case WM_SYSCOMMAND: - // prevent screensaver from occuring while the active window - // note: password-locked screensavers on Vista still work - if (vid_activewindow && ((wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER)) - lRet = 0; - else - lRet = DefWindowProc (hWnd, uMsg, wParam, lParam); - break; - - // this is complicated because Win32 seems to pack multiple mouse events into - // one update sometimes, so we always check all states and look for events - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_XBUTTONDOWN: // backslash :: imouse explorer buttons - case WM_XBUTTONUP: // backslash :: imouse explorer buttons - case WM_MOUSEMOVE: - temp = 0; - - if (wParam & MK_LBUTTON) - temp |= 1; - - if (wParam & MK_RBUTTON) - temp |= 2; - - if (wParam & MK_MBUTTON) - temp |= 4; - - /* backslash :: imouse explorer buttons */ - if (wParam & MK_XBUTTON1) - temp |= 8; - - if (wParam & MK_XBUTTON2) - temp |= 16; - /* :: backslash */ - - // LordHavoc: lets hope this allows more buttons in the future... - if (wParam & MK_XBUTTON3) - temp |= 32; - if (wParam & MK_XBUTTON4) - temp |= 64; - if (wParam & MK_XBUTTON5) - temp |= 128; - if (wParam & MK_XBUTTON6) - temp |= 256; - if (wParam & MK_XBUTTON7) - temp |= 512; - -#ifdef SUPPORTDIRECTX - if (!dinput_acquired) -#endif - { - // perform button actions - int i; - for (i=0 ; i 0) { - Key_Event(K_MWHEELUP, 0, true); - Key_Event(K_MWHEELUP, 0, false); - } else { - Key_Event(K_MWHEELDOWN, 0, true); - Key_Event(K_MWHEELDOWN, 0, false); - } - break; - - case WM_SIZE: - break; - - case WM_CLOSE: - if (MessageBox (mainwindow, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION) == IDYES) - Sys_Quit (0); - - break; - - case WM_ACTIVATE: - fActive = LOWORD(wParam); - fMinimized = (BOOL) HIWORD(wParam); - AppActivate(!(fActive == WA_INACTIVE), fMinimized); - - // fix the leftover Alt from any Alt-Tab or the like that switched us away - ClearAllStates (); - - break; - - //case WM_DESTROY: - // PostQuitMessage (0); - // break; - - case MM_MCINOTIFY: -#ifdef CONFIG_CD - lRet = CDAudio_MessageHandler (hWnd, uMsg, wParam, lParam); -#endif - break; - - default: - /* pass all unhandled messages to DefWindowProc */ - lRet = DefWindowProc (hWnd, uMsg, wParam, lParam); - break; - } - - /* return 1 if handled message, 0 if not */ - return lRet; -} - -static void GL_CloseLibrary(void) -{ - if (gldll) - { - FreeLibrary(gldll); - gldll = 0; - gl_driver[0] = 0; - qwglGetProcAddress = NULL; - gl_extensions = ""; - gl_platform = ""; - gl_platformextensions = ""; - } -} - -static int GL_OpenLibrary(const char *name) -{ - Con_Printf("Loading OpenGL driver %s\n", name); - GL_CloseLibrary(); - if (!(gldll = LoadLibrary(name))) - { - Con_Printf("Unable to LoadLibrary %s\n", name); - return false; - } - strlcpy(gl_driver, name, sizeof(gl_driver)); - return true; -} - -void *GL_GetProcAddress(const char *name) -{ - if (gldll) - { - void *p = NULL; - if (qwglGetProcAddress != NULL) - p = (void *) qwglGetProcAddress(name); - if (p == NULL) - p = (void *) GetProcAddress(gldll, name); - return p; - } - else - return NULL; -} - -#ifndef WGL_ARB_pixel_format -#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 -#define WGL_DRAW_TO_WINDOW_ARB 0x2001 -#define WGL_DRAW_TO_BITMAP_ARB 0x2002 -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_NEED_PALETTE_ARB 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 -#define WGL_SWAP_METHOD_ARB 0x2007 -#define WGL_NUMBER_OVERLAYS_ARB 0x2008 -#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 -#define WGL_TRANSPARENT_ARB 0x200A -#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 -#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 -#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 -#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A -#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B -#define WGL_SHARE_DEPTH_ARB 0x200C -#define WGL_SHARE_STENCIL_ARB 0x200D -#define WGL_SHARE_ACCUM_ARB 0x200E -#define WGL_SUPPORT_GDI_ARB 0x200F -#define WGL_SUPPORT_OPENGL_ARB 0x2010 -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_STEREO_ARB 0x2012 -#define WGL_PIXEL_TYPE_ARB 0x2013 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_RED_SHIFT_ARB 0x2016 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_GREEN_SHIFT_ARB 0x2018 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_BLUE_SHIFT_ARB 0x201A -#define WGL_ALPHA_BITS_ARB 0x201B -#define WGL_ALPHA_SHIFT_ARB 0x201C -#define WGL_ACCUM_BITS_ARB 0x201D -#define WGL_ACCUM_RED_BITS_ARB 0x201E -#define WGL_ACCUM_GREEN_BITS_ARB 0x201F -#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 -#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 -#define WGL_DEPTH_BITS_ARB 0x2022 -#define WGL_STENCIL_BITS_ARB 0x2023 -#define WGL_AUX_BUFFERS_ARB 0x2024 -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 -#define WGL_SWAP_EXCHANGE_ARB 0x2028 -#define WGL_SWAP_COPY_ARB 0x2029 -#define WGL_SWAP_UNDEFINED_ARB 0x202A -#define WGL_TYPE_RGBA_ARB 0x202B -#define WGL_TYPE_COLORINDEX_ARB 0x202C -#endif - -#ifndef WGL_ARB_multisample -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 -#endif - - -static void IN_Init(void); -void VID_Init(void) -{ - WNDCLASS wc; - - InitCommonControls(); - hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1)); - - // Register the frame class - wc.style = 0; - wc.lpfnWndProc = (WNDPROC)MainWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = global_hInstance; - wc.hIcon = hIcon; - wc.hCursor = LoadCursor (NULL,IDC_ARROW); - wc.hbrBackground = NULL; - wc.lpszMenuName = 0; - wc.lpszClassName = "DarkPlacesWindowClass"; - - if (!RegisterClass (&wc)) - Con_Printf ("Couldn't register window class\n"); - - memset(&initialdevmode, 0, sizeof(initialdevmode)); - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &initialdevmode); - - desktop_mode.width = initialdevmode.dmPelsWidth; - desktop_mode.height = initialdevmode.dmPelsHeight; - desktop_mode.bpp = initialdevmode.dmBitsPerPel; - desktop_mode.refreshrate = initialdevmode.dmDisplayFrequency; - desktop_mode.pixelheight_num = 1; - desktop_mode.pixelheight_denom = 1; // Win32 apparently does not provide this (FIXME) - - IN_Init(); -} - -qboolean VID_InitModeGL(viddef_mode_t *mode) -{ - int i; - HDC hdc; - RECT rect; - MSG msg; - PIXELFORMATDESCRIPTOR pfd = - { - sizeof(PIXELFORMATDESCRIPTOR), // size of this pfd - 1, // version number - PFD_DRAW_TO_WINDOW // support window - | PFD_SUPPORT_OPENGL // support OpenGL - | PFD_DOUBLEBUFFER , // double buffered - PFD_TYPE_RGBA, // RGBA type - 24, // 24-bit color depth - 0, 0, 0, 0, 0, 0, // color bits ignored - 0, // no alpha buffer - 0, // shift bit ignored - 0, // no accumulation buffer - 0, 0, 0, 0, // accum bits ignored - 32, // 32-bit z-buffer - 0, // no stencil buffer - 0, // no auxiliary buffer - PFD_MAIN_PLANE, // main layer - 0, // reserved - 0, 0, 0 // layer masks ignored - }; - int windowpass; - int pixelformat, newpixelformat; - UINT numpixelformats; - DWORD WindowStyle, ExWindowStyle; - const char *gldrivername; - int depth; - DEVMODE thismode; - qboolean foundmode, foundgoodmode; - int *a; - float *af; - int attribs[128]; - float attribsf[16]; - int bpp = mode->bitsperpixel; - int width = mode->width; - int height = mode->height; - int refreshrate = (int)floor(mode->refreshrate+0.5); - int stereobuffer = mode->stereobuffer; - int samples = mode->samples; - int fullscreen = mode->fullscreen; - - if (vid_initialized) - Sys_Error("VID_InitMode called when video is already initialised"); - - // if stencil is enabled, ask for alpha too - if (bpp >= 32) - { - pfd.cRedBits = 8; - pfd.cGreenBits = 8; - pfd.cBlueBits = 8; - pfd.cAlphaBits = 8; - pfd.cDepthBits = 24; - pfd.cStencilBits = 8; - } - else - { - pfd.cRedBits = 5; - pfd.cGreenBits = 5; - pfd.cBlueBits = 5; - pfd.cAlphaBits = 0; - pfd.cDepthBits = 16; - pfd.cStencilBits = 0; - } - - if (stereobuffer) - pfd.dwFlags |= PFD_STEREO; - - a = attribs; - af = attribsf; - *a++ = WGL_DRAW_TO_WINDOW_ARB; - *a++ = GL_TRUE; - *a++ = WGL_ACCELERATION_ARB; - *a++ = WGL_FULL_ACCELERATION_ARB; - *a++ = WGL_DOUBLE_BUFFER_ARB; - *a++ = true; - - if (bpp >= 32) - { - *a++ = WGL_RED_BITS_ARB; - *a++ = 8; - *a++ = WGL_GREEN_BITS_ARB; - *a++ = 8; - *a++ = WGL_BLUE_BITS_ARB; - *a++ = 8; - *a++ = WGL_ALPHA_BITS_ARB; - *a++ = 8; - *a++ = WGL_DEPTH_BITS_ARB; - *a++ = 24; - *a++ = WGL_STENCIL_BITS_ARB; - *a++ = 8; - } - else - { - *a++ = WGL_RED_BITS_ARB; - *a++ = 1; - *a++ = WGL_GREEN_BITS_ARB; - *a++ = 1; - *a++ = WGL_BLUE_BITS_ARB; - *a++ = 1; - *a++ = WGL_DEPTH_BITS_ARB; - *a++ = 16; - } - - if (stereobuffer) - { - *a++ = WGL_STEREO_ARB; - *a++ = GL_TRUE; - } - - if (samples > 1) - { - *a++ = WGL_SAMPLE_BUFFERS_ARB; - *a++ = 1; - *a++ = WGL_SAMPLES_ARB; - *a++ = samples; - } - - *a = 0; - *af = 0; - - gldrivername = "opengl32.dll"; -// COMMANDLINEOPTION: Windows WGL: -gl_driver selects a GL driver library, default is opengl32.dll, useful only for 3dfxogl.dll or 3dfxvgl.dll, if you don't know what this is for, you don't need it - i = COM_CheckParm("-gl_driver"); - if (i && i < com_argc - 1) - gldrivername = com_argv[i + 1]; - if (!GL_OpenLibrary(gldrivername)) - { - Con_Printf("Unable to load GL driver %s\n", gldrivername); - return false; - } - - memset(&gdevmode, 0, sizeof(gdevmode)); - - vid_isfullscreen = false; - if (fullscreen) - { - if(vid_desktopfullscreen.integer) - { - foundmode = true; - gdevmode = initialdevmode; - width = mode->width = gdevmode.dmPelsWidth; - height = mode->height = gdevmode.dmPelsHeight; - bpp = mode->bitsperpixel = gdevmode.dmBitsPerPel; - } - else if(vid_forcerefreshrate.integer) - { - foundmode = true; - gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - gdevmode.dmBitsPerPel = bpp; - gdevmode.dmPelsWidth = width; - gdevmode.dmPelsHeight = height; - gdevmode.dmSize = sizeof (gdevmode); - if(refreshrate) - { - gdevmode.dmFields |= DM_DISPLAYFREQUENCY; - gdevmode.dmDisplayFrequency = refreshrate; - } - } - else - { - if(refreshrate == 0) - refreshrate = initialdevmode.dmDisplayFrequency; // default vid_refreshrate to the rate of the desktop - - foundmode = false; - foundgoodmode = false; - - thismode.dmSize = sizeof(thismode); - thismode.dmDriverExtra = 0; - for(i = 0; EnumDisplaySettings(NULL, i, &thismode); ++i) - { - if(~thismode.dmFields & (DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY)) - { - Con_DPrintf("enumerating modes yielded a bogus item... please debug this\n"); - continue; - } - if(developer_extra.integer) - Con_DPrintf("Found mode %dx%dx%dbpp %dHz... ", (int)thismode.dmPelsWidth, (int)thismode.dmPelsHeight, (int)thismode.dmBitsPerPel, (int)thismode.dmDisplayFrequency); - if(thismode.dmBitsPerPel != (DWORD)bpp) - { - if(developer_extra.integer) - Con_DPrintf("wrong bpp\n"); - continue; - } - if(thismode.dmPelsWidth != (DWORD)width) - { - if(developer_extra.integer) - Con_DPrintf("wrong width\n"); - continue; - } - if(thismode.dmPelsHeight != (DWORD)height) - { - if(developer_extra.integer) - Con_DPrintf("wrong height\n"); - continue; - } - - if(foundgoodmode) - { - // if we have a good mode, make sure this mode is better than the previous one, and allowed by the refreshrate - if(thismode.dmDisplayFrequency > (DWORD)refreshrate) - { - if(developer_extra.integer) - Con_DPrintf("too high refresh rate\n"); - continue; - } - else if(thismode.dmDisplayFrequency <= gdevmode.dmDisplayFrequency) - { - if(developer_extra.integer) - Con_DPrintf("doesn't beat previous best match (too low)\n"); - continue; - } - } - else if(foundmode) - { - // we do have one, but it isn't good... make sure it has a lower frequency than the previous one - if(thismode.dmDisplayFrequency >= gdevmode.dmDisplayFrequency) - { - if(developer_extra.integer) - Con_DPrintf("doesn't beat previous best match (too high)\n"); - continue; - } - } - // otherwise, take anything - - memcpy(&gdevmode, &thismode, sizeof(gdevmode)); - if(thismode.dmDisplayFrequency <= (DWORD)refreshrate) - foundgoodmode = true; - else - { - if(developer_extra.integer) - Con_DPrintf("(out of range)\n"); - } - foundmode = true; - if(developer_extra.integer) - Con_DPrintf("accepted\n"); - } - } - - if (!foundmode) - { - VID_Shutdown(); - Con_Printf("Unable to find the requested mode %dx%dx%dbpp\n", width, height, bpp); - return false; - } - else if(ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - { - VID_Shutdown(); - Con_Printf("Unable to change to requested mode %dx%dx%dbpp\n", width, height, bpp); - return false; - } - - vid_isfullscreen = true; - WindowStyle = WS_POPUP; - ExWindowStyle = WS_EX_TOPMOST; - } - else - { - hdc = GetDC (NULL); - i = GetDeviceCaps(hdc, RASTERCAPS); - depth = GetDeviceCaps(hdc, PLANES) * GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC (NULL, hdc); - if (i & RC_PALETTE) - { - VID_Shutdown(); - Con_Print("Can't run in non-RGB mode\n"); - return false; - } - if (bpp > depth) - { - VID_Shutdown(); - Con_Print("A higher desktop depth is required to run this video mode\n"); - return false; - } - - WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; - ExWindowStyle = 0; - } - - AdjustWindowBounds(fullscreen, &width, &height, mode, WindowStyle, &rect); - - pixelformat = 0; - newpixelformat = 0; - // start out at the final windowpass if samples is 1 as it's the only feature we need extended pixel formats for - for (windowpass = samples == 1;windowpass < 2;windowpass++) - { - gl_extensions = ""; - gl_platformextensions = ""; - - mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlacesWindowClass", gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL); - if (!mainwindow) - { - Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %p, %p) failed\n", (int)ExWindowStyle, "DarkPlacesWindowClass", gamename, (int)WindowStyle, (int)(rect.left), (int)(rect.top), (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), (void *)NULL, (void *)NULL, (void *)global_hInstance, (void *)NULL); - VID_Shutdown(); - return false; - } - - baseDC = GetDC(mainwindow); - - if (!newpixelformat) - newpixelformat = ChoosePixelFormat(baseDC, &pfd); - pixelformat = newpixelformat; - if (!pixelformat) - { - VID_Shutdown(); - Con_Printf("ChoosePixelFormat(%p, %p) failed\n", (void *)baseDC, (void *)&pfd); - return false; - } - - if (SetPixelFormat(baseDC, pixelformat, &pfd) == false) - { - VID_Shutdown(); - Con_Printf("SetPixelFormat(%p, %d, %p) failed\n", (void *)baseDC, pixelformat, (void *)&pfd); - return false; - } - - if (!GL_CheckExtension("wgl", wglfuncs, NULL, false)) - { - VID_Shutdown(); - Con_Print("wgl functions not found\n"); - return false; - } - - baseRC = qwglCreateContext(baseDC); - if (!baseRC) - { - VID_Shutdown(); - Con_Print("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n"); - return false; - } - if (!qwglMakeCurrent(baseDC, baseRC)) - { - VID_Shutdown(); - Con_Printf("wglMakeCurrent(%p, %p) failed\n", (void *)baseDC, (void *)baseRC); - return false; - } - - if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) - { - VID_Shutdown(); - Con_Print("glGetString not found\n"); - return false; - } - if ((qwglGetExtensionsStringARB = (const char *(WINAPI *)(HDC hdc))GL_GetProcAddress("wglGetExtensionsStringARB")) == NULL) - Con_Print("wglGetExtensionsStringARB not found\n"); - - gl_extensions = (const char *)qglGetString(GL_EXTENSIONS); - gl_platform = "WGL"; - gl_platformextensions = ""; - - if (qwglGetExtensionsStringARB) - gl_platformextensions = (const char *)qwglGetExtensionsStringARB(baseDC); - - if (!gl_extensions) - gl_extensions = ""; - if (!gl_platformextensions) - gl_platformextensions = ""; - - // now some nice Windows pain: - // we have created a window, we needed one to find out if there are - // any multisample pixel formats available, the problem is that to - // actually use one of those multisample formats we now have to - // recreate the window (yes Microsoft OpenGL really is that bad) - - if (windowpass == 0) - { - if (!GL_CheckExtension("WGL_ARB_pixel_format", wglpixelformatfuncs, "-noarbpixelformat", false) || !qwglChoosePixelFormatARB(baseDC, attribs, attribsf, 1, &newpixelformat, &numpixelformats) || !newpixelformat) - break; - // ok we got one - do it all over again with newpixelformat - qwglMakeCurrent(NULL, NULL); - qwglDeleteContext(baseRC);baseRC = 0; - ReleaseDC(mainwindow, baseDC);baseDC = 0; - // eat up any messages waiting for us - while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) - { - TranslateMessage (&msg); - DispatchMessage (&msg); - } - } - } - - /* - if (!fullscreen) - SetWindowPos (mainwindow, NULL, CenterX, CenterY, 0, 0,SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME); - */ - - ShowWindow (mainwindow, SW_SHOWDEFAULT); - UpdateWindow (mainwindow); - - // now we try to make sure we get the focus on the mode switch, because - // sometimes in some systems we don't. We grab the foreground, then - // finish setting up, pump all our messages, and sleep for a little while - // to let messages finish bouncing around the system, then we put - // ourselves at the top of the z order, then grab the foreground again, - // Who knows if it helps, but it probably doesn't hurt - SetForegroundWindow (mainwindow); - - while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) - { - TranslateMessage (&msg); - DispatchMessage (&msg); - } - - Sleep (100); - - SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOCOPYBITS); - - SetForegroundWindow (mainwindow); - - // fix the leftover Alt from any Alt-Tab or the like that switched us away - ClearAllStates (); - -// COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control - GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false); - - GL_Init (); - - //vid_menudrawfn = VID_MenuDraw; - //vid_menukeyfn = VID_MenuKey; - vid_usingmouse = false; - vid_usinghidecursor = false; - vid_usingvsync = false; - vid_reallyhidden = vid_hidden = false; - vid_initialized = true; - - IN_StartupMouse (); - - if (qwglSwapIntervalEXT) - { - vid_usevsync = vid_vsync.integer != 0; - vid_usingvsync = vid_vsync.integer != 0; - qwglSwapIntervalEXT (vid_usevsync); - } - - return true; -} - -static void AdjustWindowBounds(int fullscreen, int *width, int *height, viddef_mode_t *mode, DWORD WindowStyle, RECT *rect) -{ - int CenterX, CenterY; - - rect->top = 0; - rect->left = 0; - rect->right = *width; - rect->bottom = *height; - AdjustWindowRectEx(rect, WindowStyle, false, 0); - - if (fullscreen) - { - CenterX = 0; - CenterY = 0; - } - else - { - RECT workArea; - SystemParametersInfo(SPI_GETWORKAREA, NULL, &workArea, 0); - int workWidth = workArea.right - workArea.left; - int workHeight = workArea.bottom - workArea.top; - - // if height/width matches physical screen height/width, adjust it to available desktop size - // and allow 2 pixels on top for the title bar so the window can be moved - const int titleBarPixels = 2; - if (*width == GetSystemMetrics(SM_CXSCREEN) && (*height == GetSystemMetrics(SM_CYSCREEN) || *height == workHeight - titleBarPixels)) - { - rect->right -= *width - workWidth; - *width = mode->width = workWidth; - rect->bottom -= *height - (workHeight - titleBarPixels); - *height = mode->height = workHeight - titleBarPixels; - CenterX = 0; - CenterY = titleBarPixels; - } - else - { - CenterX = max(0, (workWidth - *width) / 2); - CenterY = max(0, (workHeight - *height) / 2); - } - } - - // x and y may be changed by WM_MOVE messages - window_x = CenterX; - window_y = CenterY; - rect->left += CenterX; - rect->right += CenterX; - rect->top += CenterY; - rect->bottom += CenterY; -} - -qboolean VID_InitMode(viddef_mode_t *mode) -{ - return VID_InitModeGL(mode); -} - - -static void IN_Shutdown(void); -void VID_Shutdown (void) -{ - qboolean isgl; - if(vid_initialized == false) - return; - - VID_EnableJoystick(false); - VID_SetMouse(false, false, false); - - vid_initialized = false; - isgl = gldll != NULL; - IN_Shutdown(); - gl_driver[0] = 0; - gl_extensions = ""; - gl_platform = ""; - gl_platformextensions = ""; - if (qwglMakeCurrent) - qwglMakeCurrent(NULL, NULL); - qwglMakeCurrent = NULL; - if (baseRC && qwglDeleteContext) - qwglDeleteContext(baseRC); - qwglDeleteContext = NULL; - // close the library before we get rid of the window - GL_CloseLibrary(); - if (baseDC && mainwindow) - ReleaseDC(mainwindow, baseDC); - baseDC = NULL; - AppActivate(false, false); - if (mainwindow) - DestroyWindow(mainwindow); - mainwindow = 0; - if (vid_isfullscreen && isgl) - ChangeDisplaySettings (NULL, CDS_FULLSCREEN); - vid_isfullscreen = false; -} - -void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) -{ - static qboolean restore_spi; - static int originalmouseparms[3]; - - if (!mouseinitialized) - return; - - if (relative) - { - if (!vid_usingmouse) - { - vid_usingmouse = true; - cl_ignoremousemoves = 2; -#ifdef SUPPORTDIRECTX - if (dinput && g_pMouse) - { - IDirectInputDevice_Acquire(g_pMouse); - dinput_acquired = true; - } - else -#endif - { - RECT window_rect; - window_rect.left = window_x; - window_rect.top = window_y; - window_rect.right = window_x + vid.width; - window_rect.bottom = window_y + vid.height; - - // change mouse settings to turn off acceleration -// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (not used with -dinput, windows only) - if (!COM_CheckParm ("-noforcemparms") && SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0)) - { - int newmouseparms[3]; - newmouseparms[0] = 0; // threshold to double movement (only if accel level is >= 1) - newmouseparms[1] = 0; // threshold to quadruple movement (only if accel level is >= 2) - newmouseparms[2] = 0; // maximum level of acceleration (0 = off) - restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0) != FALSE; - } - else - restore_spi = false; - SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2)); - - SetCapture (mainwindow); - ClipCursor (&window_rect); - } - } - } - else - { - if (vid_usingmouse) - { - vid_usingmouse = false; - cl_ignoremousemoves = 2; -#ifdef SUPPORTDIRECTX - if (dinput_acquired) - { - IDirectInputDevice_Unacquire(g_pMouse); - dinput_acquired = false; - } - else -#endif - { - // restore system mouseparms if we changed them - if (restore_spi) - SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0); - restore_spi = false; - ClipCursor (NULL); - ReleaseCapture (); - } - } - } - - if (vid_usinghidecursor != hidecursor) - { - vid_usinghidecursor = hidecursor; - ShowCursor (!hidecursor); - } -} - -void VID_BuildJoyState(vid_joystate_t *joystate) -{ - VID_Shared_BuildJoyState_Begin(joystate); - VID_Shared_BuildJoyState_Finish(joystate); -} - -void VID_EnableJoystick(qboolean enable) -{ - int index = joy_enable.integer > 0 ? joy_index.integer : -1; - qboolean success = false; - int sharedcount = 0; - sharedcount = VID_Shared_SetJoystick(index); - if (index >= 0 && index < sharedcount) - success = true; - - // update cvar containing count of XInput joysticks - if (joy_detected.integer != sharedcount) - Cvar_SetValueQuick(&joy_detected, sharedcount); - - if (joy_active.integer != (success ? 1 : 0)) - Cvar_SetValueQuick(&joy_active, success ? 1 : 0); -} - -#ifdef SUPPORTDIRECTX -/* -=========== -IN_InitDInput -=========== -*/ -static qboolean IN_InitDInput (void) -{ - HRESULT hr; - DIPROPDWORD dipdw = { - { - sizeof(DIPROPDWORD), // diph.dwSize - sizeof(DIPROPHEADER), // diph.dwHeaderSize - 0, // diph.dwObj - DIPH_DEVICE, // diph.dwHow - }, - DINPUT_BUFFERSIZE, // dwData - }; - - if (!hInstDI) - { - hInstDI = LoadLibrary("dinput.dll"); - - if (hInstDI == NULL) - { - Con_Print("Couldn't load dinput.dll\n"); - return false; - } - } - - if (!pDirectInputCreate) - { - pDirectInputCreate = (HRESULT (__stdcall *)(HINSTANCE,DWORD,LPDIRECTINPUT *,LPUNKNOWN))GetProcAddress(hInstDI,"DirectInputCreateA"); - - if (!pDirectInputCreate) - { - Con_Print("Couldn't get DI proc addr\n"); - return false; - } - } - -// register with DirectInput and get an IDirectInput to play with. - hr = iDirectInputCreate(global_hInstance, DIRECTINPUT_VERSION, &g_pdi, NULL); - - if (FAILED(hr)) - { - return false; - } - -// obtain an interface to the system mouse device. -#ifdef __cplusplus - hr = IDirectInput_CreateDevice(g_pdi, GUID_SysMouse, &g_pMouse, NULL); -#else - hr = IDirectInput_CreateDevice(g_pdi, &GUID_SysMouse, &g_pMouse, NULL); -#endif - - if (FAILED(hr)) - { - Con_Print("Couldn't open DI mouse device\n"); - return false; - } - -// set the data format to "mouse format". - hr = IDirectInputDevice_SetDataFormat(g_pMouse, &c_dfDIMouse); - - if (FAILED(hr)) - { - Con_Print("Couldn't set DI mouse format\n"); - return false; - } - -// set the cooperativity level. - hr = IDirectInputDevice_SetCooperativeLevel(g_pMouse, mainwindow, - DISCL_EXCLUSIVE | DISCL_FOREGROUND); - - if (FAILED(hr)) - { - Con_Print("Couldn't set DI coop level\n"); - return false; - } - - -// set the buffer size to DINPUT_BUFFERSIZE elements. -// the buffer size is a DWORD property associated with the device - hr = IDirectInputDevice_SetProperty(g_pMouse, DIPROP_BUFFERSIZE, &dipdw.diph); - - if (FAILED(hr)) - { - Con_Print("Couldn't set DI buffersize\n"); - return false; - } - - return true; -} -#endif - - -/* -=========== -IN_StartupMouse -=========== -*/ -static void IN_StartupMouse (void) -{ - if (COM_CheckParm ("-nomouse")) - return; - - mouseinitialized = true; - -#ifdef SUPPORTDIRECTX -// COMMANDLINEOPTION: Windows Input: -dinput enables DirectInput for mouse input - if (COM_CheckParm ("-dinput")) - dinput = IN_InitDInput (); - - if (dinput) - Con_Print("DirectInput initialized\n"); - else - Con_Print("DirectInput not initialized\n"); -#endif - - mouse_buttons = 10; -} - - -/* -=========== -IN_MouseMove -=========== -*/ -static void IN_MouseMove (void) -{ - POINT current_pos; - - GetCursorPos (¤t_pos); - in_windowmouse_x = current_pos.x - window_x; - in_windowmouse_y = current_pos.y - window_y; - - if (!vid_usingmouse) - return; - -#ifdef SUPPORTDIRECTX - if (dinput_acquired) - { - int i; - DIDEVICEOBJECTDATA od; - DWORD dwElements; - HRESULT hr; - - for (;;) - { - dwElements = 1; - - hr = IDirectInputDevice_GetDeviceData(g_pMouse, - sizeof(DIDEVICEOBJECTDATA), &od, &dwElements, 0); - - if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED)) - { - IDirectInputDevice_Acquire(g_pMouse); - break; - } - - /* Unable to read data or no data available */ - if (FAILED(hr) || dwElements == 0) - break; - - /* Look at the element to see what happened */ - - if ((int)od.dwOfs == DIMOFS_X) - in_mouse_x += (LONG) od.dwData; - if ((int)od.dwOfs == DIMOFS_Y) - in_mouse_y += (LONG) od.dwData; - if ((int)od.dwOfs == DIMOFS_Z) - { - if((LONG)od.dwData < 0) - { - Key_Event(K_MWHEELDOWN, 0, true); - Key_Event(K_MWHEELDOWN, 0, false); - } - else if((LONG)od.dwData > 0) - { - Key_Event(K_MWHEELUP, 0, true); - Key_Event(K_MWHEELUP, 0, false); - } - } - if ((int)od.dwOfs == DIMOFS_BUTTON0) - mstate_di = (mstate_di & ~1) | ((od.dwData & 0x80) >> 7); - if ((int)od.dwOfs == DIMOFS_BUTTON1) - mstate_di = (mstate_di & ~2) | ((od.dwData & 0x80) >> 6); - if ((int)od.dwOfs == DIMOFS_BUTTON2) - mstate_di = (mstate_di & ~4) | ((od.dwData & 0x80) >> 5); - if ((int)od.dwOfs == DIMOFS_BUTTON3) - mstate_di = (mstate_di & ~8) | ((od.dwData & 0x80) >> 4); - } - - // perform button actions - for (i=0 ; i= maxcount) - break; - modes[k].width = thismode.dmPelsWidth; - modes[k].height = thismode.dmPelsHeight; - modes[k].bpp = thismode.dmBitsPerPel; - modes[k].refreshrate = thismode.dmDisplayFrequency; - modes[k].pixelheight_num = 1; - modes[k].pixelheight_denom = 1; // Win32 apparently does not provide this (FIXME) - ++k; - } - return k; -} diff --git a/vs2010_sdl2_win32.props b/vs2010_sdl2_win32.props deleted file mode 100644 index 0ca4653d..00000000 --- a/vs2010_sdl2_win32.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath) - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL2-2.0\lib\x86;$(LibraryPath) - <_PropertySheetDisplayName>vs2010_win32 - - - - \ No newline at end of file diff --git a/vs2010_sdl2_win64.props b/vs2010_sdl2_win64.props deleted file mode 100644 index 9539eb51..00000000 --- a/vs2010_sdl2_win64.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath) - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL2-2.0\lib\x64;$(LibraryPath) - <_PropertySheetDisplayName>vs2010_win64 - - - - \ No newline at end of file diff --git a/vs2010_win32.props b/vs2010_win32.props deleted file mode 100644 index a5d12987..00000000 --- a/vs2010_win32.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL-1.2\include;$(IncludePath) - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL-1.2\lib\x86;$(LibraryPath) - <_PropertySheetDisplayName>vs2010_win32 - - - - \ No newline at end of file diff --git a/vs2010_win64.props b/vs2010_win64.props deleted file mode 100644 index 4d7b1f26..00000000 --- a/vs2010_win64.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL-1.2\include;$(IncludePath) - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL-1.2\lib\x64;$(LibraryPath) - <_PropertySheetDisplayName>vs2010_win64 - - - - \ No newline at end of file diff --git a/vs2012_win32.props b/vs2012_win32.props deleted file mode 100644 index 49427b61..00000000 --- a/vs2012_win32.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL-1.2\include;$(IncludePath) - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL-1.2\lib\x86;$(LibraryPath) - <_PropertySheetDisplayName>vs2012_win32 - - - - \ No newline at end of file diff --git a/vs2012_win64.props b/vs2012_win64.props deleted file mode 100644 index 5dce2161..00000000 --- a/vs2012_win64.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL-1.2\include;$(IncludePath) - - - C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL-1.2\lib\x64;$(LibraryPath) - <_PropertySheetDisplayName>vs2012_win64 - - - - \ No newline at end of file