From c805fa9f339ab61ec70a400ce51cb01a06ecb1cc Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 9 Jul 2026 06:34:38 +0200 Subject: [PATCH] remove a bunch of unused crap --- src/Makefile.d/platform.mk | 2 - src/Makefile.d/sdl.mk | 10 - src/hardware/r_opengl/ogl_win.c | 549 -------------- src/hardware/r_opengl/r_opengl.dev | 79 -- src/hardware/r_opengl/r_opengl.dsp | 105 --- src/sdl/SDL_main/SDL_openxdk_main.c | 7 - src/sdl/SRB2Pandora/Makefile.cfg | 39 - src/sdl/SRB2Pandora/PXML.xml | 17 - src/sdl/SRB2Pandora/icon.png | Bin 1690 -> 0 bytes src/sdl/Srb2SDL.dsp | 1035 --------------------------- src/sdl/Srb2SDL.dsw | 62 -- src/sdl/Srb2SDL.ico | Bin 50558 -> 0 bytes src/sdl/Srb2SDL.props | 15 - src/sdl/i_system.cpp | 2 +- 14 files changed, 1 insertion(+), 1921 deletions(-) delete mode 100644 src/hardware/r_opengl/ogl_win.c delete mode 100644 src/hardware/r_opengl/r_opengl.dev delete mode 100644 src/hardware/r_opengl/r_opengl.dsp delete mode 100644 src/sdl/SDL_main/SDL_openxdk_main.c delete mode 100644 src/sdl/SRB2Pandora/Makefile.cfg delete mode 100644 src/sdl/SRB2Pandora/PXML.xml delete mode 100644 src/sdl/SRB2Pandora/icon.png delete mode 100644 src/sdl/Srb2SDL.dsp delete mode 100644 src/sdl/Srb2SDL.dsw delete mode 100644 src/sdl/Srb2SDL.ico delete mode 100644 src/sdl/Srb2SDL.props diff --git a/src/Makefile.d/platform.mk b/src/Makefile.d/platform.mk index d5423a397..12c3220d7 100644 --- a/src/Makefile.d/platform.mk +++ b/src/Makefile.d/platform.mk @@ -42,8 +42,6 @@ include Makefile.d/haiku.mk else ifdef SOLARIS # FIXME: UNTESTED UNIX=1 platform=solaris -else ifdef CYGWIN32 # FIXME: UNTESTED -platform=cygwin else ifdef MINGW ifdef MINGW64 NONX86=1 diff --git a/src/Makefile.d/sdl.mk b/src/Makefile.d/sdl.mk index 36f87fe30..aa4d4a7ee 100644 --- a/src/Makefile.d/sdl.mk +++ b/src/Makefile.d/sdl.mk @@ -15,16 +15,6 @@ sources+=$(call List,sdl/Sourcefile) NOUPNP=1 -# FIXME: UNTESTED -#ifdef PANDORA -#include sdl/SRB2Pandora/Makefile.cfg -#endif #ifdef PANDORA - -# FIXME: UNTESTED -#ifdef CYGWIN32 -#include sdl/MakeCYG.cfg -#endif #ifdef CYGWIN32 - ifndef NOHW sources+=sdl/ogl_sdl.c endif diff --git a/src/hardware/r_opengl/ogl_win.c b/src/hardware/r_opengl/ogl_win.c deleted file mode 100644 index 31daa22fd..000000000 --- a/src/hardware/r_opengl/ogl_win.c +++ /dev/null @@ -1,549 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// 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. -// -//----------------------------------------------------------------------------- -/// \file -/// \brief Windows specific part of the OpenGL API for Doom Legacy -/// -/// TODO: -/// - check if windowed mode works -/// - support different pixel formats - - -#if defined (_WIN32) - -//#define WIN32_LEAN_AND_MEAN -#define RPC_NO_WINDOWS_H -#include -#include -#include "r_opengl.h" - - -// ************************************************************************** -// GLOBALS -// ************************************************************************** - -#ifdef DEBUG_TO_FILE -static unsigned long nb_frames = 0; -static clock_t my_clock; -FILE *gllogstream; -#endif - -static HDC hDC = NULL; // the window's device context -static HGLRC hGLRC = NULL; // the OpenGL rendering context -static HWND hWnd = NULL; -static BOOL WasFullScreen = FALSE; -static void UnSetRes(void); - -#ifdef USE_WGL_SWAP -PFNWGLEXTSWAPCONTROLPROC wglSwapIntervalEXT = NULL; -#endif - -PFNglClear pglClear; -PFNglGetIntegerv pglGetIntegerv; -PFNglGetString pglGetString; - -#define MAX_VIDEO_MODES 32 -static vmode_t video_modes[MAX_VIDEO_MODES]; -INT32 oglflags = 0; - -// ************************************************************************** -// FUNCTIONS -// ************************************************************************** - -// -----------------+ -// APIENTRY DllMain : DLL Entry Point, -// : open/close debug log -// Returns : -// -----------------+ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module - DWORD fdwReason, // reason for calling function - LPVOID lpvReserved) // reserved -{ - // Perform actions based on the reason for calling. - UNREFERENCED_PARAMETER(lpvReserved); - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - // Initialize once for each new process. - // Return FALSE to fail DLL load. -#ifdef DEBUG_TO_FILE - gllogstream = fopen("ogllog.txt", "wt"); - if (gllogstream == NULL) - return FALSE; -#endif - DisableThreadLibraryCalls(hinstDLL); - break; - - case DLL_THREAD_ATTACH: - // Do thread-specific initialization. - break; - - case DLL_THREAD_DETACH: - // Do thread-specific cleanup. - break; - - case DLL_PROCESS_DETACH: - // Perform any necessary cleanup. -#ifdef DEBUG_TO_FILE - if (gllogstream) - { - fclose(gllogstream); - gllogstream = NULL; - } -#endif - break; - } - - return TRUE; // Successful DLL_PROCESS_ATTACH. -} - -#ifdef STATIC_OPENGL -#define pwglGetProcAddress wglGetProcAddress; -#define pwglCreateContext wglCreateContext; -#define pwglDeleteContext wglDeleteContext; -#define pwglMakeCurrent wglMakeCurrent; -#else -static HMODULE OGL32; -typedef void *(WINAPI *PFNwglGetProcAddress) (const char *); -static PFNwglGetProcAddress pwglGetProcAddress; -typedef HGLRC (WINAPI *PFNwglCreateContext) (HDC hdc); -static PFNwglCreateContext pwglCreateContext; -typedef BOOL (WINAPI *PFNwglDeleteContext) (HGLRC hglrc); -static PFNwglDeleteContext pwglDeleteContext; -typedef BOOL (WINAPI *PFNwglMakeCurrent) (HDC hdc, HGLRC hglrc); -static PFNwglMakeCurrent pwglMakeCurrent; -#endif - -#ifndef STATIC_OPENGL -void *GetGLFunc(const char *proc) -{ - void *func = NULL; - if (pwglGetProcAddress) - func = pwglGetProcAddress(proc); - if (!func) - func = GetProcAddress(OGL32, proc); - return func; -} -#endif - -boolean LoadGL(void) -{ -#ifndef STATIC_OPENGL - OGL32 = LoadLibrary("OPENGL32.DLL"); - - if (!OGL32) - return 0; - - pwglGetProcAddress = GetGLFunc("wglGetProcAddress"); - pwglCreateContext = GetGLFunc("wglCreateContext"); - pwglDeleteContext = GetGLFunc("wglDeleteContext"); - pwglMakeCurrent = GetGLFunc("wglMakeCurrent"); -#endif - return SetupGLfunc(); -} - -// -----------------+ -// SetupPixelFormat : Set the device context's pixel format -// Note : Because we currently use only the desktop's BPP format, all the -// : video modes in Doom Legacy OpenGL are of the same BPP, thus the -// : PixelFormat is set only once. -// : Setting the pixel format more than once on the same window -// : doesn't work. (ultimately for different pixel formats, we -// : should close the window, and re-create it) -// -----------------+ -int SetupPixelFormat(INT32 WantColorBits, INT32 WantStencilBits, INT32 WantDepthBits) -{ - static DWORD iLastPFD = 0; - INT32 nPixelFormat; - PIXELFORMATDESCRIPTOR pfd = - { - sizeof (PIXELFORMATDESCRIPTOR), // size - 1, // version - PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, - PFD_TYPE_RGBA, // color type - 32 /*WantColorBits*/, // cColorBits : prefered color depth - 0, 0, // cRedBits, cRedShift - 0, 0, // cGreenBits, cGreenShift - 0, 0, // cBlueBits, cBlueShift - 0, 0, // cAlphaBits, cAlphaShift - 0, // cAccumBits - 0, 0, 0, 0, // cAccum Red/Green/Blue/Alpha Bits - 0, // cDepthBits (0,16,24,32) - 0, // cStencilBits - 0, // cAuxBuffers - PFD_MAIN_PLANE, // iLayerType - 0, // reserved, must be zero - 0, 0, 0, // dwLayerMask, dwVisibleMask, dwDamageMask - }; - - DWORD iPFD = (WantColorBits<<16) | (WantStencilBits<<8) | WantDepthBits; - - pfd.cDepthBits = (BYTE)WantDepthBits; - pfd.cStencilBits = (BYTE)WantStencilBits; - - if (iLastPFD) - { - DBG_Printf("WARNING : SetPixelFormat() called twise not supported by all drivers !\n"); - } - - // set the pixel format only if different than the current - if (iPFD == iLastPFD) - return 2; - else - iLastPFD = iPFD; - - DBG_Printf("SetupPixelFormat() - %d ColorBits - %d StencilBits - %d DepthBits\n", - WantColorBits, WantStencilBits, WantDepthBits); - - nPixelFormat = ChoosePixelFormat(hDC, &pfd); - - if (nPixelFormat == 0) - DBG_Printf("ChoosePixelFormat() FAILED\n"); - - if (SetPixelFormat(hDC, nPixelFormat, &pfd) == 0) - { - DBG_Printf("SetPixelFormat() FAILED\n"); - return 0; - } - - return 1; -} - - -// -----------------+ -// SetRes : Set a display mode -// Notes : pcurrentmode is actually not used -// -----------------+ -static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode) -{ - LPCSTR renderer; - BOOL WantFullScreen = !(lvid->u.windowed); //(lvid->u.windowed ? 0 : CDS_FULLSCREEN); - - UNREFERENCED_PARAMETER(pcurrentmode); - DBG_Printf ("SetMode(): %dx%d %d bits (%s)\n", - lvid->width, lvid->height, lvid->bpp*8, - WantFullScreen ? "fullscreen" : "windowed"); - - hWnd = lvid->WndParent; - - // BP : why flush texture ? - // if important flush also the first one (white texture) and restore it ! - Flush(); // Flush textures. - -// TODO: if not fullscreen, skip display stuff and just resize viewport stuff ... - - // Exit previous mode - //if (hGLRC) //Hurdler: TODO: check if this is valid - // UnSetRes(); - if (WasFullScreen) - ChangeDisplaySettings(NULL, CDS_FULLSCREEN); //switch in and out of fullscreen - - // Change display settings. - if (WantFullScreen) - { - DEVMODE dm; - ZeroMemory(&dm, sizeof (dm)); - dm.dmSize = sizeof (dm); - dm.dmPelsWidth = lvid->width; - dm.dmPelsHeight = lvid->height; - dm.dmBitsPerPel = lvid->bpp*8; - dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL; - if (ChangeDisplaySettings(&dm, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) - return -2; - if (ChangeDisplaySettings(&dm, CDS_FULLSCREEN) !=DISP_CHANGE_SUCCESSFUL) - return -3; - - SetWindowLong(hWnd, GWL_STYLE, WS_POPUP|WS_VISIBLE); - // faB : book says to put these, surely for windowed mode - //WS_CLIPCHILDREN|WS_CLIPSIBLINGS); - SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, lvid->width, lvid->height, SWP_NOACTIVATE|SWP_NOZORDER); - } - else - { - RECT bounds; - INT32 x, y; - INT32 w = lvid->width, h = lvid->height; - GetWindowRect(hWnd, &bounds); - bounds.right = bounds.left+w; - bounds.bottom = bounds.top+h; - AdjustWindowRectEx(&bounds, GetWindowLong(hWnd, GWL_STYLE), (GetMenu(hWnd) != NULL), 0); - w = bounds.right-bounds.left; - h = bounds.bottom-bounds.top; - x = (GetSystemMetrics(SM_CXSCREEN)-w)/2; - y = (GetSystemMetrics(SM_CYSCREEN)-h)/2; - SetWindowPos(hWnd, NULL, x, y, w, h, SWP_NOACTIVATE|SWP_NOZORDER); - } - - if (!hDC) - hDC = GetDC(hWnd); - if (!hDC) - { - DBG_Printf("GetDC() FAILED\n"); - return 0; - } - - { - INT32 res; - - // Set res. - res = SetupPixelFormat(lvid->bpp*8, 0, 16); - - if (res == 0) - return 0; - else if (res == 1) - { - // Exit previous mode - if (hGLRC) - UnSetRes(); - hGLRC = pwglCreateContext(hDC); - if (!hGLRC) - { - DBG_Printf("pwglCreateContext() FAILED\n"); - return 0; - } - if (!pwglMakeCurrent(hDC, hGLRC)) - { - DBG_Printf("wglMakeCurrent() FAILED\n"); - return 0; - } - } - } - - gl_extensions = pglGetString(GL_EXTENSIONS); - // Get info and extensions. - //BP: why don't we make it earlier ? - //Hurdler: we cannot do that before intialising gl context - renderer = (LPCSTR)pglGetString(GL_RENDERER); - DBG_Printf("Vendor : %s\n", pglGetString(GL_VENDOR)); - DBG_Printf("Renderer : %s\n", renderer); - DBG_Printf("Version : %s\n", pglGetString(GL_VERSION)); - DBG_Printf("Extensions : %s\n", gl_extensions); - - // BP: disable advenced feature that don't work on somes hardware - // Hurdler: Now works on G400 with bios 1.6 and certified drivers 6.04 - if (strstr(renderer, "810")) oglflags |= GLF_NOZBUFREAD; - DBG_Printf("oglflags : 0x%X\n", oglflags); - -#ifdef USE_WGL_SWAP - if (isExtAvailable("WGL_EXT_swap_control",gl_extensions)) - wglSwapIntervalEXT = GetGLFunc("wglSwapIntervalEXT"); - else - wglSwapIntervalEXT = NULL; -#endif - - if (isExtAvailable("GL_EXT_texture_filter_anisotropic",gl_extensions)) - pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy); - else - maximumAnisotropy = 0; - - SetupGLFunc13(); - - screen_depth = (GLbyte)(lvid->bpp*8); - if (screen_depth > 16) - textureformatGL = GL_RGBA; - else - textureformatGL = GL_RGB5_A1; - - GL_SetModelView(lvid->width, lvid->height); - GL_SetStates(); - // we need to clear the depth buffer. Very important!!! - pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); - - lvid->buffer = NULL; // unless we use the software view - lvid->direct = NULL; // direct access to video memory, old DOS crap - - WasFullScreen = WantFullScreen; - - return 1; // on renvoie une valeur pour dire que cela s'est bien pass� -} - - -// -----------------+ -// UnSetRes : Restore the original display mode -// -----------------+ -static void UnSetRes(void) -{ - DBG_Printf("UnSetRes()\n"); - - pwglMakeCurrent(hDC, NULL); - pwglDeleteContext(hGLRC); - hGLRC = NULL; - if (WasFullScreen) - ChangeDisplaySettings(NULL, CDS_FULLSCREEN); -} - - -// -----------------+ -// GetModeList : Return the list of available display modes. -// Returns : pvidmodes - points to list of detected OpenGL video modes -// : numvidmodes - number of detected OpenGL video modes -// -----------------+ -EXPORT void HWRAPI(GetModeList) (vmode_t** pvidmodes, INT32 *numvidmodes) -{ - INT32 i; - -#if 1 - INT32 iMode; -/* - faB test code - - Commented out because there might be a problem with combo (Voodoo2 + other card), - we need to get the 3D card's display modes only. -*/ - (*pvidmodes) = &video_modes[0]; - - // Get list of device modes - for (i = 0,iMode = 0; iMode < MAX_VIDEO_MODES; i++) - { - DEVMODE Tmp; - ZeroMemory(&Tmp, sizeof (Tmp)); - Tmp.dmSize = sizeof (Tmp); - if (!EnumDisplaySettings(NULL, i, &Tmp)) - break; - - // add video mode - if (Tmp.dmBitsPerPel == 16 && - (iMode == 0 || ! - (Tmp.dmPelsWidth == video_modes[iMode-1].width && - Tmp.dmPelsHeight == video_modes[iMode-1].height) - ) - ) - { - video_modes[iMode].pnext = &video_modes[iMode+1]; - video_modes[iMode].windowed = 0; // fullscreen is the default - video_modes[iMode].misc = 0; - video_modes[iMode].name = malloc(12 * sizeof (CHAR)); - sprintf(video_modes[iMode].name, "%dx%d", (INT32)Tmp.dmPelsWidth, (INT32)Tmp.dmPelsHeight); - DBG_Printf ("Mode: %s\n", video_modes[iMode].name); - video_modes[iMode].width = Tmp.dmPelsWidth; - video_modes[iMode].height = Tmp.dmPelsHeight; - video_modes[iMode].bytesperpixel = Tmp.dmBitsPerPel/8; - video_modes[iMode].rowbytes = Tmp.dmPelsWidth * video_modes[iMode].bytesperpixel; - video_modes[iMode].pextradata = NULL; - video_modes[iMode].setmode = SetRes; - iMode++; - } - } - (*numvidmodes) = iMode; -#else - - // classic video modes (fullscreen/windowed) - // Added some. Tails - INT32 res[][2] = { - { 320, 200}, - { 320, 240}, - { 400, 300}, - { 512, 384}, - { 640, 400}, - { 640, 480}, - { 800, 600}, - { 960, 600}, - {1024, 768}, - {1152, 864}, - {1280, 800}, - {1280, 960}, - {1280,1024}, - {1600,1000}, - {1680,1050}, - {1920,1200}, -}; - - HDC bpphdc; - INT32 iBitsPerPel; - - DBG_Printf ("HWRAPI GetModeList()\n"); - - bpphdc = GetDC(NULL); // on obtient le bpp actuel - iBitsPerPel = GetDeviceCaps(bpphdc, BITSPIXEL); - - ReleaseDC(NULL, bpphdc); - - (*pvidmodes) = &video_modes[0]; - (*numvidmodes) = sizeof (res) / sizeof (res[0]); - for (i = 0; i < (*numvidmodes); i++) - { - video_modes[i].pnext = &video_modes[i+1]; - video_modes[i].windowed = 0; // fullscreen is the default - video_modes[i].misc = 0; - video_modes[i].name = malloc(12 * sizeof (CHAR)); - sprintf(video_modes[i].name, "%dx%d", res[i][0], res[i][1]); - DBG_Printf ("Mode: %s\n", video_modes[i].name); - video_modes[i].width = res[i][0]; - video_modes[i].height = res[i][1]; - video_modes[i].bytesperpixel = iBitsPerPel/8; - video_modes[i].rowbytes = res[i][0] * video_modes[i].bytesperpixel; - video_modes[i].pextradata = NULL; - video_modes[i].setmode = SetRes; - } -#endif - video_modes[(*numvidmodes)-1].pnext = NULL; -} - - -// -----------------+ -// Shutdown : Shutdown OpenGL, restore the display mode -// -----------------+ -EXPORT void HWRAPI(Shutdown) (void) -{ -#ifdef DEBUG_TO_FILE - long nb_centiemes; - - DBG_Printf ("HWRAPI Shutdown()\n"); - nb_centiemes = ((clock()-my_clock)*100)/CLOCKS_PER_SEC; - DBG_Printf("Nb frames: %li; Nb sec: %2.2f -> %2.1f fps\n", - nb_frames, nb_centiemes/100.0f, (100*nb_frames)/(double)nb_centiemes); -#endif - - Flush(); - - // Exit previous mode - if (hGLRC) - UnSetRes(); - - if (hDC) - { - ReleaseDC(hWnd, hDC); - hDC = NULL; - } - FreeLibrary(OGL32); - DBG_Printf ("HWRAPI Shutdown(DONE)\n"); -} - -// -----------------+ -// FinishUpdate : Swap front and back buffers -// -----------------+ -void GL_FinishUpdate (INT32 waitvbl) -{ -#ifdef USE_WGL_SWAP - static INT32 oldwaitvbl = 0; -#else - UNREFERENCED_PARAMETER(waitvbl); -#endif - // DBG_Printf ("FinishUpdate()\n"); -#ifdef DEBUG_TO_FILE - if ((++nb_frames)==2) // on ne commence pas � la premi�re frame - my_clock = clock(); -#endif - -#ifdef USE_WGL_SWAP - if (oldwaitvbl != waitvbl && wglSwapIntervalEXT) - wglSwapIntervalEXT(waitvbl); - oldwaitvbl = waitvbl; -#endif - - SwapBuffers(hDC); -} -#endif diff --git a/src/hardware/r_opengl/r_opengl.dev b/src/hardware/r_opengl/r_opengl.dev deleted file mode 100644 index f0b23ae23..000000000 --- a/src/hardware/r_opengl/r_opengl.dev +++ /dev/null @@ -1,79 +0,0 @@ -[Project] -FileName=r_opengl.dev -Name=r_opengl -Ver=1 -IsCpp=1 -Type=3 -Compiler=-D_M_IX86=500_@@_-Wall_@@_-D_WINDOWS_@@_-DUSE_WGL_SWAP_@@_-Os_@@_-fomit-frame-pointer_@@_ -CppCompiler= -Includes= -Linker=--def ../r_mingw.def_@@_-lgdi32_@@_ -Libs= -UnitCount=3 -Folders= -ObjFiles= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Icon= -ExeOutput=C:\srb2demo2 -ObjectOutput=..\..\..\objs\Mingw\r_opengl -OverrideOutput=1 -OverrideOutputName=r_opengl.dll -HostApplication= -CommandLine= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=00000000000000000111d0 -UseCustomMakefile=0 -CustomMakefile= - -[Unit1] -FileName=ogl_win.c -Folder= -Compile=1 -CompileCpp=0 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=r_opengl.c -Folder= -Compile=1 -CompileCpp=0 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=r_opengl.h -Folder= -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[VersionInfo] -Major=0 -Minor=1 -Release=1 -Build=1 -LanguageID=1033 -CharsetID=1252 -CompanyName= -FileVersion=0.1 -FileDescription=Developed using the Dev-C++ IDE -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename=r_opengl.exe -ProductName=r_opengl -ProductVersion=0.1 -AutoIncBuildNr=0 - diff --git a/src/hardware/r_opengl/r_opengl.dsp b/src/hardware/r_opengl/r_opengl.dsp deleted file mode 100644 index b1603e7f2..000000000 --- a/src/hardware/r_opengl/r_opengl.dsp +++ /dev/null @@ -1,105 +0,0 @@ -# Microsoft Developer Studio Project File - Name="r_opengl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=r_opengl - 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 "r_opengl.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 "r_opengl.mak" CFG="r_opengl - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "r_opengl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "r_opengl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "r_opengl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "r_opengl___Win32_Release" -# PROP BASE Intermediate_Dir "r_opengl___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\bin\VC\Release\r_opengl" -# PROP Intermediate_Dir "..\..\..\objs\VC\Release\r_opengl" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /G5 /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x80c /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\r_opengl.pdb" /machine:I386 /out:"C:\srb2demo2\r_opengl.dll" -# SUBTRACT LINK32 /pdb:none /debug - -!ELSEIF "$(CFG)" == "r_opengl - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\..\..\objs\Debug" -# PROP BASE Intermediate_Dir "..\..\..\objs\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\bin\VC\Debug\r_opengl" -# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\r_opengl" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x80c /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\r_opengl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\r_opengld.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "r_opengl - Win32 Release" -# Name "r_opengl - Win32 Debug" -# Begin Source File - -SOURCE=.\ogl_win.c -# End Source File -# Begin Source File - -SOURCE=.\r_opengl.c -# End Source File -# Begin Source File - -SOURCE=.\r_opengl.h -# End Source File -# End Target -# End Project diff --git a/src/sdl/SDL_main/SDL_openxdk_main.c b/src/sdl/SDL_main/SDL_openxdk_main.c deleted file mode 100644 index 63db8da2d..000000000 --- a/src/sdl/SDL_main/SDL_openxdk_main.c +++ /dev/null @@ -1,7 +0,0 @@ -/* Include the SDL main definition header */ -#include "SDL_main.h" - -void XBoxStartup() -{ - SDL_main(0, NULL); /// \todo ? -} diff --git a/src/sdl/SRB2Pandora/Makefile.cfg b/src/sdl/SRB2Pandora/Makefile.cfg deleted file mode 100644 index c7f0f8449..000000000 --- a/src/sdl/SRB2Pandora/Makefile.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Quick Pandora target to make a compliant SRB2 PND file. - -PNDNAME=SRB2.pnd -PNDDIR=$(BIN)/pnd -ICON=sdl/SRB2Pandora/icon.png -PXML=sdl/SRB2Pandora/PXML.xml - -SED=sed -CAT=cat -CP=cp -XARGS=xargs -FOR=for -WGET=wget -P $(PNDDIR) -c -nc - -SHXARGS:=$(XARGS) -SHSED:=$(SED) - -ifndef ECHO - CP:=@$(CP) - CAT:=@$(CAT) - SED:=@$(SED) - XARGS:=@$(XARGS) - FOR:=@(FOR) -endif - -$(BIN)/$(PNDNAME): $(BIN)/$(EXENAME) - @echo Linking $(PNDNAME)... - $(MKDIR) $(PNDDIR) - $(CP) $(BIN)/$(EXENAME) $(PNDDIR) - $(CP) $(ICON) $(PNDDIR) - $(CP) $(PXML) $(PNDDIR) -ifdef WITHDATA - $(FOR) datafile in $(shell echo $(D_FILES) | $(SHSED) 's/\.srb/\.wad/' | $(SHXARGS) -n 1 basename); do \ - $(WGET) http://alam.srb2.org/SRB2/2.0.6-Final/Resources/$$datafile; \ - done -endif - $(MKISOFS) -l -r -o $@ $(PNDDIR) - $(CAT) $(PXML) >> $@ - $(REMOVE) -r $(PNDDIR) diff --git a/src/sdl/SRB2Pandora/PXML.xml b/src/sdl/SRB2Pandora/PXML.xml deleted file mode 100644 index 33a9587db..000000000 --- a/src/sdl/SRB2Pandora/PXML.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Sonic Robo Blast 2 - ソニック・ロボ・ブラスト・2 - A 3D Sonic fangame with a huge fanbase developing custom content, including characters, levels, and even large-scale modifications - - - - - - - - - - - diff --git a/src/sdl/SRB2Pandora/icon.png b/src/sdl/SRB2Pandora/icon.png deleted file mode 100644 index 63af73ac3a4e3046783312465aec2d985172f726..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1690 zcmV;L24(q)P)O!-2lB^gLcZMPU)B9hVuf<6yDwU?fX z3ky{b9)wn$97OyF7K$k7!Y+%HJ!Fs`_8_7N3oYwmd#LMDR_Z(CP+?IDQqitximl=- z%<|pC{K!l*NoUfO-9q1`O(rwn_j%vXd*Amyi6Vr+ezp$mb2|X=Ut3!fKnNjCa|i$d z=m+oxhzJ0{%mCgvpL`8f{Rx(3DZ5=$X-5(ZA>`1|Eyr<+aVLY>*cF&v0kEv1B+>!s zAY$JY0&~1)F<*tM-i!^TB><|b%6$I&5Xb!vQ41kqFqa@iB{B#loleWGtt};b)Tbm- z88)?>g_#`Q2iyZipjaFbB9}V@B3&}OiN;7K@4z%o08oN-DFdK}QLj0`4mf{KxXyE1 ztB@jukj3JUPPOoJ*G@1YW?@-H5Ix;7>a~cwjxz`b-~cuZ9iZmBV6Pd2LP7}i_4Uc| z@t;GJkohWzrXxD9JFg7r#Lhi6D;YYN4X?Crx0RJEv6EN;!20^S!pySvV0&?92GO+l zUNf`rWiSJU!V-uQJ^%#X;r>>f4^*L4DkaaH`8716J119nu3 zhCLfjiJr#L(C@IUqKpl|=A_=F(zuI6c{F*aF@vzMun~h81fr*rb|cVA6pMezXw4X7 zZ0tUc965rQFJEF~Bj;-$s9}Atr{(V33lBiCSd@13^&P9rg$w^+aB#5h%AGrZg1HqZ zqcnRZ2r;WP1hBBMAQu-GF*i5eFcO8r3??QfplKQg2M5v9)8k#;+}y;wckgia>_UVf zv=2lF0E~=`$kEYJoH%i!VZARDW-vK9iDSo(;rQ|60p|fg(=_CAIo!K9*7km@@0p@vsYx}=cBU~!g&6A%$e+KXx07F%;z_Nh%@88FI_>(6L zU|=`(rXhX&W}4^gWtFwHH3+ecLg8;zDi#3X!-o%h98Y!*EOr970?V?(LPCC9Akj3t`U#A-+5EjZ5cBu#7%? z_AKzhuC6W+5e^+X1OU$Y5a+;&CZjNy?C2B07Q|YV79T!*=)I9jrQq(y*w`3URmJe| za17@;g1E&1&3UaXInA4@s@B7{IDlabG#KZmAixN+kK3WWly)lFnF8Z=FVpI$pz zsZ{c5LgCFFqqHqG%igXCaXtP_T&-4>yLa!(d_Ircw{PR^+qXEE&w~hfLxiJ8kK*v* z!#h4~Zf*`b0dCW2uwg3^0T3MOyuBHxu(EPf#+i-1X0ETVPiC`OEH5v67pICvl*>8{ zhZZ9vBk1n#4ve2`Yirot+{Bytd1uH8M*Qrz3s_yf7aD!P^EC>dj5Qy7WpsUg9pmG@ zn3$yzBF4=3~sF*W-tuqpmgFn|Jpw=Hf`2a zRc%R?sDZdNi;`iqbfA{K-Lt_we*8G#d=&fm@mzc4^-LxsuYH|`uE+V}g5e6q*M9j6 zuU_@~+8ElF1Jv-4i&{=2eLrApr@c;|))TU%6k?f@q0-c?mo(SL`V)Y{^ zqf!}e9{|4-sZ -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Srb2SDL - 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 "Srb2SDL.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 "Srb2SDL.mak" CFG="Srb2SDL - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Srb2SDL - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Srb2SDL - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Srb2SDL - 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 "..\..\bin\VC\Release\SDL" -# PROP Intermediate_Dir "..\..\objs\VC\Release\SDL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\..\objs\SDL\Release\SRB2.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 SDL.lib SDL_mixer.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows /pdb:"C:\srb2demo2\srb2sdl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\srb2sdl.exe" -# SUBTRACT LINK32 /profile /pdb:none /incremental:yes - -!ELSEIF "$(CFG)" == "Srb2SDL - 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 "..\..\bin\VC\Debug\SDL" -# PROP Intermediate_Dir "..\..\objs\VC\Debug\SDL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\..\objs\SDL\Debug\SRB2.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 SDL.lib SDL_mixer.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /pdb:"C:\srb2demo2\srb2sdldebug.pdb" /debug /machine:I386 /out:"C:\srb2demo2\srb2sdldebug.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "Srb2SDL - Win32 Release" -# Name "Srb2SDL - Win32 Debug" -# Begin Group "SDLapp" - -# PROP Default_Filter "" -# Begin Group "filter" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\filter\filters.c -# End Source File -# Begin Source File - -SOURCE=.\filter\filters.h -# End Source File -# Begin Source File - -SOURCE=.\filter\hq2x.c -# End Source File -# Begin Source File - -SOURCE=.\filter\hq2x.h -# End Source File -# Begin Source File - -SOURCE=.\filter\interp.h -# End Source File -# Begin Source File - -SOURCE=.\filter\lq2x.c -# End Source File -# Begin Source File - -SOURCE=.\filter\lq2x.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\dosstr.c -# End Source File -# Begin Source File - -SOURCE=.\endtxt.c -# End Source File -# Begin Source File - -SOURCE=.\endtxt.h -# End Source File -# Begin Source File - -SOURCE=..\filesrch.c -# End Source File -# Begin Source File - -SOURCE=..\filesrch.h -# End Source File -# Begin Source File - -SOURCE=.\hwsym_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\hwsym_sdl.h -# End Source File -# Begin Source File - -SOURCE=.\i_cdmus.c -# End Source File -# Begin Source File - -SOURCE=.\i_main.c -# End Source File -# Begin Source File - -SOURCE=.\i_net.c -# End Source File -# Begin Source File - -SOURCE=.\i_sound.c -# End Source File -# Begin Source File - -SOURCE=.\i_system.c -# End Source File -# Begin Source File - -SOURCE=.\i_video.c -# End Source File -# Begin Source File - -SOURCE=.\IMG_xpm.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\ogl_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\ogl_sdl.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\r_opengl\r_opengl.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\r_opengl\r_opengl.h -# End Source File -# Begin Source File - -SOURCE=.\SDL_icon.xpm -# End Source File -# Begin Source File - -SOURCE=.\SDL_main\SDL_win32_main.c - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\sdlmain.h -# End Source File -# Begin Source File - -SOURCE=..\win32\Srb2win.rc -# End Source File -# Begin Source File - -SOURCE=..\win32\win_dbg.c -# End Source File -# Begin Source File - -SOURCE=..\win32\win_dbg.h -# End Source File -# Begin Source File - -SOURCE=..\win32\win_main.h -# End Source File -# End Group -# Begin Group "A_Asm" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\p5prof.h -# End Source File -# Begin Source File - -SOURCE=..\tmap.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_mmx.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... - -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_vc.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# Begin Group "D_Doom" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\comptime.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.h -# End Source File -# Begin Source File - -SOURCE=..\d_event.h -# End Source File -# Begin Source File - -SOURCE=..\d_main.c -# End Source File -# Begin Source File - -SOURCE=..\d_main.h -# End Source File -# Begin Source File - -SOURCE=..\d_net.c -# End Source File -# Begin Source File - -SOURCE=..\d_net.h -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.c -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.h -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.c -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.h -# End Source File -# Begin Source File - -SOURCE=..\d_player.h -# End Source File -# Begin Source File - -SOURCE=..\d_think.h -# End Source File -# Begin Source File - -SOURCE=..\d_ticcmd.h -# End Source File -# Begin Source File - -SOURCE=..\dehacked.c -# End Source File -# Begin Source File - -SOURCE=..\dehacked.h -# End Source File -# Begin Source File - -SOURCE=..\doomdata.h -# End Source File -# Begin Source File - -SOURCE=..\doomdef.h -# End Source File -# Begin Source File - -SOURCE=..\doomstat.h -# End Source File -# Begin Source File - -SOURCE=..\doomtype.h -# End Source File -# Begin Source File - -SOURCE=..\z_zone.c -# End Source File -# Begin Source File - -SOURCE=..\z_zone.h -# End Source File -# End Group -# Begin Group "F_Frame" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\f_finale.c -# End Source File -# Begin Source File - -SOURCE=..\f_finale.h -# End Source File -# Begin Source File - -SOURCE=..\f_wipe.c -# End Source File -# End Group -# Begin Group "G_Game" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\g_game.c -# End Source File -# Begin Source File - -SOURCE=..\g_game.h -# End Source File -# Begin Source File - -SOURCE=..\g_input.c -# End Source File -# Begin Source File - -SOURCE=..\g_input.h -# End Source File -# Begin Source File - -SOURCE=..\g_state.h -# End Source File -# End Group -# Begin Group "H_Hud" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\am_map.c -# End Source File -# Begin Source File - -SOURCE=..\am_map.h -# End Source File -# Begin Source File - -SOURCE=..\command.c -# End Source File -# Begin Source File - -SOURCE=..\command.h -# End Source File -# Begin Source File - -SOURCE=..\console.c -# End Source File -# Begin Source File - -SOURCE=..\console.h -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\y_inter.c -# End Source File -# Begin Source File - -SOURCE=..\y_inter.h -# End Source File -# End Group -# Begin Group "Hw_Hardware" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\hardware\hw_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_cache.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_data.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_defs.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_dll.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_draw.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_gl.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_glob.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.h -# End Source File -# Begin Source File - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\byteptr.h -# End Source File -# Begin Source File - -SOURCE=..\i_joy.h -# End Source File -# Begin Source File - -SOURCE=..\i_net.h -# End Source File -# Begin Source File - -SOURCE=..\i_sound.h -# End Source File -# Begin Source File - -SOURCE=..\i_system.h -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.c -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.h -# End Source File -# Begin Source File - -SOURCE=..\i_video.h -# End Source File -# Begin Source File - -SOURCE=..\keys.h -# End Source File -# Begin Source File - -SOURCE=..\mserv.c -# End Source File -# Begin Source File - -SOURCE=..\mserv.h -# End Source File -# End Group -# Begin Group "M_Misc" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\m_argv.c -# End Source File -# Begin Source File - -SOURCE=..\m_argv.h -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.c -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.h -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.c -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.h -# End Source File -# Begin Source File - -SOURCE=..\m_dllist.h -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.c -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.h -# End Source File -# Begin Source File - -SOURCE=..\m_menu.c -# End Source File -# Begin Source File - -SOURCE=..\m_menu.h -# End Source File -# Begin Source File - -SOURCE=..\m_misc.c -# End Source File -# Begin Source File - -SOURCE=..\m_misc.h -# End Source File -# Begin Source File - -SOURCE=..\m_queue.c -# End Source File -# Begin Source File - -SOURCE=..\m_queue.h -# End Source File -# Begin Source File - -SOURCE=..\m_random.c -# End Source File -# Begin Source File - -SOURCE=..\m_random.h -# End Source File -# Begin Source File - -SOURCE=..\m_swap.h -# End Source File -# Begin Source File - -SOURCE=..\string.c -# End Source File -# End Group -# Begin Group "P_Play" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\info.c -# End Source File -# Begin Source File - -SOURCE=..\info.h -# End Source File -# Begin Source File - -SOURCE=..\p_ceilng.c -# End Source File -# Begin Source File - -SOURCE=..\p_enemy.c -# End Source File -# Begin Source File - -SOURCE=..\p_fab.c -# End Source File -# Begin Source File - -SOURCE=..\p_floor.c -# End Source File -# Begin Source File - -SOURCE=..\p_inter.c -# End Source File -# Begin Source File - -SOURCE=..\p_lights.c -# End Source File -# Begin Source File - -SOURCE=..\p_local.h -# End Source File -# Begin Source File - -SOURCE=..\p_map.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.h -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_pspr.h -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.c -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.h -# End Source File -# Begin Source File - -SOURCE=..\p_setup.c -# End Source File -# Begin Source File - -SOURCE=..\p_setup.h -# End Source File -# Begin Source File - -SOURCE=..\p_sight.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.h -# End Source File -# Begin Source File - -SOURCE=..\p_telept.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.h -# End Source File -# Begin Source File - -SOURCE=..\p_user.c -# End Source File -# Begin Source File - -SOURCE=..\tables.c -# End Source File -# Begin Source File - -SOURCE=..\tables.h -# End Source File -# End Group -# Begin Group "R_Rend" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\r_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\r_bsp.h -# End Source File -# Begin Source File - -SOURCE=..\r_data.c -# End Source File -# Begin Source File - -SOURCE=..\r_data.h -# End Source File -# Begin Source File - -SOURCE=..\r_defs.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw.c -# End Source File -# Begin Source File - -SOURCE=..\r_draw.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw8.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\r_local.h -# End Source File -# Begin Source File - -SOURCE=..\r_main.c -# End Source File -# Begin Source File - -SOURCE=..\r_main.h -# End Source File -# Begin Source File - -SOURCE=..\r_patch.c -# End Source File -# Begin Source File - -SOURCE=..\r_patch.h -# End Source File -# Begin Source File - -SOURCE=..\r_patchrotation.c -# End Source File -# Begin Source File - -SOURCE=..\r_patchrotation.h -# End Source File -# Begin Source File - -SOURCE=..\r_plane.c -# End Source File -# Begin Source File - -SOURCE=..\r_plane.h -# End Source File -# Begin Source File - -SOURCE=..\r_segs.c -# End Source File -# Begin Source File - -SOURCE=..\r_segs.h -# End Source File -# Begin Source File - -SOURCE=..\r_sky.c -# End Source File -# Begin Source File - -SOURCE=..\r_sky.h -# End Source File -# Begin Source File - -SOURCE=..\r_splats.c -# End Source File -# Begin Source File - -SOURCE=..\r_splats.h -# End Source File -# Begin Source File - -SOURCE=..\r_state.h -# End Source File -# Begin Source File - -SOURCE=..\r_things.c -# End Source File -# Begin Source File - -SOURCE=..\r_things.h -# End Source File -# Begin Source File - -SOURCE=..\screen.c -# End Source File -# Begin Source File - -SOURCE=..\screen.h -# End Source File -# Begin Source File - -SOURCE=..\v_video.c -# End Source File -# Begin Source File - -SOURCE=..\v_video.h -# End Source File -# End Group -# Begin Group "S_Sounds" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\s_sound.c -# End Source File -# Begin Source File - -SOURCE=..\s_sound.h -# End Source File -# Begin Source File - -SOURCE=..\sounds.c -# End Source File -# Begin Source File - -SOURCE=..\sounds.h -# End Source File -# End Group -# Begin Group "W_Wad" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\lzf.c -# End Source File -# Begin Source File - -SOURCE=..\lzf.h -# End Source File -# Begin Source File - -SOURCE=..\md5.c -# End Source File -# Begin Source File - -SOURCE=..\md5.h -# End Source File -# Begin Source File - -SOURCE=..\w_wad.c -# End Source File -# Begin Source File - -SOURCE=..\w_wad.h -# End Source File -# End Group -# Begin Group "Docs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\doc\copying -# End Source File -# Begin Source File - -SOURCE=..\..\doc\faq.txt -# End Source File -# Begin Source File - -SOURCE=..\..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\..\doc\source.txt -# End Source File -# End Group -# Begin Source File - -SOURCE=..\win32\Srb2win.ico -# End Source File -# End Target -# End Project diff --git a/src/sdl/Srb2SDL.dsw b/src/sdl/Srb2SDL.dsw deleted file mode 100644 index 888d2fcf3..000000000 --- a/src/sdl/Srb2SDL.dsw +++ /dev/null @@ -1,62 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Srb2SDL"=.\Srb2SDL.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "libpng"="..\..\libs\libpng-src\projects\visualc6\libpng.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "zlib"=..\..\libs\zlib\projects\visualc6\zlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/sdl/Srb2SDL.ico b/src/sdl/Srb2SDL.ico deleted file mode 100644 index 87bd2766e8e8ad6a86ca94ed207b402aafa151f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50558 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 Z?Q_Yq4~B`=@JlbKBXUZz4`lSc{vS}T*p2`I diff --git a/src/sdl/Srb2SDL.props b/src/sdl/Srb2SDL.props deleted file mode 100644 index 8c4799f20..000000000 --- a/src/sdl/Srb2SDL.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - HAVE_ZLIB;HAVE_LIBGME;USE_WGL_SWAP;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions) - - USE_WGL_SWAP;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions) - - - - diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 3ecef0b9f..4e9de24c2 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -691,7 +691,7 @@ void I_OutputMsg(const char *fmt, ...) // // I_GetKey // -INT32 I_GetKey (void) +INT32 I_GetKey(void) { // Warning: I_GetKey empties the event queue till next keypress event_t *ev;