Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
SRB2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
245
Issues
245
List
Board
Labels
Milestones
Merge Requests
70
Merge Requests
70
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
STJr
SRB2
Commits
f03e591f
Commit
f03e591f
authored
Jul 25, 2014
by
Alam Ed Arias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change SDL into HAVE_SDL
parent
086463bc
Hide whitespace changes
Inline
Side-by-side
Showing
47 changed files
with
95 additions
and
97 deletions
+95
-97
SRB2.cbp
SRB2.cbp
+8
-8
Srb2.dev
Srb2.dev
+4
-4
Makefile
src/Makefile
+1
-1
console.c
src/console.c
+1
-1
d_main.c
src/d_main.c
+5
-5
d_netcmd.c
src/d_netcmd.c
+1
-1
doomdef.h
src/doomdef.h
+1
-1
hw3dsdrv.h
src/hardware/hw3dsdrv.h
+1
-1
hw_data.h
src/hardware/hw_data.h
+1
-1
hw_drv.h
src/hardware/hw_drv.h
+3
-3
r_opengl.c
src/hardware/r_opengl/r_opengl.c
+1
-1
r_opengl.h
src/hardware/r_opengl/r_opengl.h
+3
-3
s_ds3d.c
src/hardware/s_ds3d/s_ds3d.c
+1
-1
s_fmod.c
src/hardware/s_fmod/s_fmod.c
+2
-2
s_openal.c
src/hardware/s_openal/s_openal.c
+2
-2
m_menu.c
src/m_menu.c
+2
-2
m_misc.c
src/m_misc.c
+4
-4
s_sound.c
src/s_sound.c
+4
-4
s_sound.h
src/s_sound.h
+1
-1
Makefile.cfg
src/sdl/Makefile.cfg
+1
-1
Srb2SDL-vc10.vcxproj
src/sdl/Srb2SDL-vc10.vcxproj
+5
-6
Srb2SDL-vc9.vcproj
src/sdl/Srb2SDL-vc9.vcproj
+4
-4
Srb2SDL.dsp
src/sdl/Srb2SDL.dsp
+2
-2
hwsym_sdl.c
src/sdl/hwsym_sdl.c
+1
-1
i_cdmus.c
src/sdl/i_cdmus.c
+1
-1
i_main.c
src/sdl/i_main.c
+1
-1
i_net.c
src/sdl/i_net.c
+1
-1
i_system.c
src/sdl/i_system.c
+1
-1
i_video.c
src/sdl/i_video.c
+1
-1
project.pbxproj
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+2
-2
mixer_sound.c
src/sdl/mixer_sound.c
+1
-1
ogl_sdl.c
src/sdl/ogl_sdl.c
+1
-1
sdl_sound.c
src/sdl/sdl_sound.c
+2
-2
Srb2SDL-vc10.vcxproj
src/sdl2/Srb2SDL-vc10.vcxproj
+5
-6
Srb2SDL-vc9.vcproj
src/sdl2/Srb2SDL-vc9.vcproj
+4
-4
Srb2SDL.dsp
src/sdl2/Srb2SDL.dsp
+2
-2
hwsym_sdl.c
src/sdl2/hwsym_sdl.c
+1
-1
i_main.c
src/sdl2/i_main.c
+1
-1
i_net.c
src/sdl2/i_net.c
+1
-1
i_system.c
src/sdl2/i_system.c
+1
-1
i_ttf.c
src/sdl2/i_ttf.c
+1
-1
i_video.c
src/sdl2/i_video.c
+1
-1
project.pbxproj
src/sdl2/macosx/Srb2mac.xcodeproj/project.pbxproj
+2
-2
mixer_sound.c
src/sdl2/mixer_sound.c
+1
-1
ogl_sdl.c
src/sdl2/ogl_sdl.c
+1
-1
sdl_sound.c
src/sdl2/sdl_sound.c
+2
-2
v_video.c
src/v_video.c
+2
-2
No files found.
SRB2.cbp
View file @
f03e591f
...
...
@@ -33,7 +33,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"-g"
/>
<Add
option=
"`sdl-config --cflags`"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DPARANOIA"
/>
<Add
option=
"-DRANGECHECK"
/>
<Add
option=
"-D_DEBUG"
/>
...
...
@@ -56,7 +56,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"-g"
/>
<Add
option=
"`sdl-config --cflags`"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DNDEBUG"
/>
<Add
option=
"-DCOMPVERSION"
/>
<Add
option=
"-DHAVE_BLUA"
/>
...
...
@@ -77,7 +77,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"`sdl-config --cflags`"
/>
<Add
option=
"`libpng-config --cflags`"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DHAVE_MIXER"
/>
<Add
option=
"-DHWRENDER"
/>
<Add
option=
"-DHW3SOUND"
/>
...
...
@@ -107,7 +107,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"`sdl-config --cflags`"
/>
<Add
option=
"`libpng-config --cflags`"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DHAVE_MIXER"
/>
<Add
option=
"-DHWRENDER"
/>
<Add
option=
"-DHW3SOUND"
/>
...
...
@@ -138,7 +138,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"-D__USE_MINGW_ANSI_STDIO=0"
/>
<Add
option=
"-DUSE_WGL_SWAP"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DHAVE_MIXER"
/>
<Add
option=
"-DHWRENDER"
/>
<Add
option=
"-DHW3SOUND"
/>
...
...
@@ -185,7 +185,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"-D__USE_MINGW_ANSI_STDIO=0"
/>
<Add
option=
"-DUSE_WGL_SWAP"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DHAVE_MIXER"
/>
<Add
option=
"-DHAVE_FMOD"
/>
<Add
option=
"-DHWRENDER"
/>
...
...
@@ -551,7 +551,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"-DSTDC_HEADERS"
/>
<Add
option=
"-DUSE_WGL_SWAP"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DHAVE_MIXER"
/>
<Add
option=
"-DHWRENDER"
/>
<Add
option=
"-DHW3SOUND"
/>
...
...
@@ -592,7 +592,7 @@ HW3SOUND for 3D hardware sound support
<Add
option=
"-DSTDC_HEADERS"
/>
<Add
option=
"-DUSE_WGL_SWAP"
/>
<Add
option=
"-DDIRECTFULLSCREEN"
/>
<Add
option=
"-DSDL"
/>
<Add
option=
"-D
HAVE_
SDL"
/>
<Add
option=
"-DHAVE_MIXER"
/>
<Add
option=
"-DHWRENDER"
/>
<Add
option=
"-DHW3SOUND"
/>
...
...
Srb2.dev
View file @
f03e591f
...
...
@@ -2228,7 +2228,7 @@ Includes=libs/libpng-src;libs/zlib;libs
Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw32
ResourceIncludes=src/win32
MakeIncludes=comptime.mk;cpdebug.mk
Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-gdwarf-2_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-gdwarf-2_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-D
HAVE_
SDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
CppCompiler=-Os_@@_-g_@@_-gdwarf-2_@@_
Linker=-lSDL_@@_-lSDL_Mixer_@@_-lpng32_@@_-lz32_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mconsole_@@_
PreprocDefines=NORMALSRB2_@@_
...
...
@@ -2305,7 +2305,7 @@ Includes=libs/libpng-src;libs/zlib;libs
Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw32
ResourceIncludes=src/win32
MakeIncludes=comptime.mk;cpdebug.mk
Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-gdwarf-2_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-gdwarf-2_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-D
HAVE_
SDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
CppCompiler=-O0_@@_-g_@@_-gdwarf-2_@@_
Linker=-lSDL_@@_-lSDL_Mixer_@@_-lpng32_@@_-lz32_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mconsole_@@_
PreprocDefines=NORMALSRB2_@@_
...
...
@@ -2386,7 +2386,7 @@ Includes=libs/libpng-src;libs/zlib;libs
Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw64
ResourceIncludes=src/win32
MakeIncludes=comptime.mk;cpdebug.mk
Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
Compiler=-DNDEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-Os_@@_-g_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-D
HAVE_
SDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
CppCompiler=-Os_@@_-g_@@_
Linker=-lSDL_@@_-lSDL_Mixer_@@_-lpng64_@@_-lz64_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mconsole_@@_
PreprocDefines=NORMALSRB2_@@_
...
...
@@ -2413,7 +2413,7 @@ Includes=libs/libpng-src;libs/zlib;libs
Libs=libs/libpng-src/projects;libs/zlib/win32;libs/miniupnpc/mingw64
ResourceIncludes=src/win32
MakeIncludes=comptime.mk;cpdebug.mk
Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-DSDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
Compiler=-D_DEBUG_@@_-fno-exceptions_@@_-DSTDC_HEADERS_@@_-Wall_@@_-O0_@@_-g_@@_-DUSE_WGL_SWAP_@@_-DDIRECTFULLSCREEN_@@_-D
HAVE_
SDL_@@_-DHWRENDER_@@_-DHW3SOUND_@@_-DHAVE_MIXER_@@_-DHAVE_PNG_@@_-D__USE_MINGW_ANSI_STDIO=0_@@_-DHAVE_MINIUPNPC_@@_-DSTATIC_MINIUPNPC_@@_-DHAVE_BLUA_@@_
CppCompiler=-O0_@@_-g_@@_
Linker=-lSDL_@@_-lSDL_Mixer_@@_-lpng64_@@_-lz64_@@_-lminiupnpc_@@_-lws2_32_@@_-liphlpapi_@@_-mconsole_@@_
PreprocDefines=NORMALSRB2_@@_
...
...
src/Makefile
View file @
f03e591f
...
...
@@ -10,7 +10,7 @@
# -DPC_DOS -> use DOS specific code (eg:textmode stuff)...
# -DLINUX -> use for the GNU/Linux specific
# -D_WINDOWS -> use for the Win32/DirectX specific
# -D
SDL
-> use for the SDL interface
# -D
HAVE_SDL
-> use for the SDL interface
#
# Sets:
# Compile the DGJPP/DOS version with 'make WATTCP=1'
...
...
src/console.c
View file @
f03e591f
...
...
@@ -1139,7 +1139,7 @@ void CONS_Printf(const char *fmt, ...)
// if not in display loop, force screen update
if
(
con_startup
)
{
#if (defined (_WINDOWS)) || (defined (__OS2__) && !defined (SDL))
#if (defined (_WINDOWS)) || (defined (__OS2__) && !defined (
HAVE_
SDL))
static
lumpnum_t
con_backpic_lumpnum
=
UINT32_MAX
;
patch_t
*
con_backpic
;
...
...
src/d_main.c
View file @
f03e591f
...
...
@@ -731,7 +731,7 @@ static void IdentifyVersion(void)
char
*
srb2wad1
,
*
srb2wad2
;
const
char
*
srb2waddir
=
NULL
;
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (SDL)
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (
HAVE_
SDL)
// change to the directory where 'srb2.srb' is found
srb2waddir
=
I_LocateWad
();
#endif
...
...
@@ -757,7 +757,7 @@ static void IdentifyVersion(void)
}
}
#if defined (macintosh) && !defined (SDL)
#if defined (macintosh) && !defined (
HAVE_
SDL)
// cwd is always "/" when app is dbl-clicked
if
(
!
stricmp
(
srb2waddir
,
"/"
))
srb2waddir
=
I_GetWadDir
();
...
...
@@ -804,7 +804,7 @@ static void IdentifyVersion(void)
// Add our crappy patches to fix our bugs
D_AddFile
(
va
(
pandf
,
srb2waddir
,
"patch.dta"
));
#if !defined (SDL) || defined (HAVE_MIXER)
#if !defined (
HAVE_
SDL) || defined (HAVE_MIXER)
{
#if defined (DC) && 0
const
char
*
musicfile
=
"music_dc.dta"
;
...
...
@@ -929,7 +929,7 @@ void D_SRB2Main(void)
D_Titlebar
(
srb2
,
title
);
#endif
#if defined (__OS2__) && !defined (SDL)
#if defined (__OS2__) && !defined (
HAVE_
SDL)
// set PM window title
snprintf
(
pmData
->
title
,
sizeof
(
pmData
->
title
),
"Sonic Robo Blast 2"
VERSIONSTRING
": %s"
,
...
...
@@ -1136,7 +1136,7 @@ void D_SRB2Main(void)
G_LoadGameData
();
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (SDL)
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (
HAVE_
SDL)
VID_PrepareModeList
();
// Regenerate Modelist according to cv_fullscreen
#endif
...
...
src/d_netcmd.c
View file @
f03e591f
...
...
@@ -258,7 +258,7 @@ consvar_t cv_usejoystick = {"use_joystick", "0", CV_SAVE|CV_CALL, usejoystick_co
consvar_t
cv_usejoystick2
=
{
"use_joystick2"
,
"0"
,
CV_SAVE
|
CV_CALL
,
usejoystick_cons_t
,
I_InitJoystick2
,
0
,
NULL
,
NULL
,
0
,
0
,
NULL
};
#endif
#if (defined (LJOYSTICK) || defined (SDL))
#if (defined (LJOYSTICK) || defined (
HAVE_
SDL))
#ifdef LJOYSTICK
consvar_t
cv_joyport
=
{
"joyport"
,
"/dev/js0"
,
CV_SAVE
,
joyport_cons_t
,
NULL
,
0
,
NULL
,
NULL
,
0
,
0
,
NULL
};
consvar_t
cv_joyport2
=
{
"joyport2"
,
"/dev/js0"
,
CV_SAVE
,
joyport_cons_t
,
NULL
,
0
,
NULL
,
NULL
,
0
,
0
,
NULL
};
//Alam: for later
...
...
src/doomdef.h
View file @
f03e591f
...
...
@@ -24,7 +24,7 @@
#define SOUND_FMOD 3
#ifndef SOUND
#ifdef SDL
#ifdef
HAVE_
SDL
// Use Mixer interface?
#ifdef HAVE_MIXER
...
...
src/hardware/hw3dsdrv.h
View file @
f03e591f
...
...
@@ -24,7 +24,7 @@
#include "hw_dll.h"
#include "hws_data.h"
#if defined (SDL) || !defined (HWD)
#if defined (
HAVE_
SDL) || !defined (HWD)
EXPORT
void
HWRAPI
(
Shutdown
)
(
void
);
#endif
...
...
src/hardware/hw_data.h
View file @
f03e591f
...
...
@@ -26,7 +26,7 @@
#include <windows.h>
#endif
#if defined (VID_X11) && !defined (SDL)
#if defined (VID_X11) && !defined (
HAVE_
SDL)
#include <GL/glx.h>
#endif
...
...
src/hardware/hw_drv.h
View file @
f03e591f
...
...
@@ -32,12 +32,12 @@
// STANDARD DLL EXPORTS
// ==========================================================================
#ifdef SDL
#ifdef
HAVE_
SDL
#undef VID_X11
#endif
EXPORT
boolean
HWRAPI
(
Init
)
(
I_Error_t
ErrorFunction
);
#ifndef SDL
#ifndef
HAVE_
SDL
EXPORT
void
HWRAPI
(
Shutdown
)
(
void
);
#endif
#ifdef _WINDOWS
...
...
@@ -116,7 +116,7 @@ struct hwdriver_s
HookXwin
pfnHookXwin
;
GetRenderer
pfnGetRenderer
;
#endif
#ifndef SDL
#ifndef
HAVE_
SDL
Shutdown
pfnShutdown
;
#endif
#ifdef SHUFFLE
...
...
src/hardware/r_opengl/r_opengl.c
View file @
f03e591f
...
...
@@ -163,7 +163,7 @@ static I_Error_t I_Error_GL = NULL;
// : else do nothing
// Returns :
// -----------------+
#if !(defined (SDL) && defined (STATIC3DS))
#if !(defined (
HAVE_
SDL) && defined (STATIC3DS))
FUNCPRINTF
void
DBG_Printf
(
const
char
*
lpFmt
,
...)
{
#ifdef DEBUG_TO_FILE
...
...
src/hardware/r_opengl/r_opengl.h
View file @
f03e591f
...
...
@@ -20,7 +20,7 @@
#ifndef _R_OPENGL_H_
#define _R_OPENGL_H_
#ifdef SDL
#ifdef
HAVE_
SDL
#ifdef _MSC_VER
#pragma warning(disable : 4214 4244)
...
...
@@ -50,7 +50,7 @@
#undef DEBUG_TO_FILE // maybe defined in previous *.h
#define DEBUG_TO_FILE // output debugging msgs to ogllog.txt
#if defined ( SDL ) && !defined ( LOGMESSAGES )
#if defined (
HAVE_
SDL ) && !defined ( LOGMESSAGES )
#undef DEBUG_TO_FILE
#endif
...
...
@@ -109,7 +109,7 @@ extern PFNglGetString pglGetString;
extern
const
GLubyte
*
gl_extensions
;
extern
RGBA_t
myPaletteData
[];
#ifndef SDL
#ifndef
HAVE_
SDL
extern
FILE
*
logstream
;
#endif
extern
GLint
screen_width
;
...
...
src/hardware/s_ds3d/s_ds3d.c
View file @
f03e591f
...
...
@@ -48,7 +48,7 @@
#undef DEBUG_TO_FILE
#define DEBUG_TO_FILE
#if defined ( SDL ) && !defined ( LOGMESSAGES )
#if defined (
HAVE_
SDL ) && !defined ( LOGMESSAGES )
#undef DEBUG_TO_FILE
#endif
...
...
src/hardware/s_fmod/s_fmod.c
View file @
f03e591f
...
...
@@ -55,7 +55,7 @@ FILE *logstream = NULL;
#define MAXCHANNEL 1024
#undef DEBUG_TO_FILE
#if defined ( SDL ) && !defined ( LOGMESSAGES )
#if defined (
HAVE_
SDL ) && !defined ( LOGMESSAGES )
#define DEBUG_TO_FILE
#endif
...
...
@@ -1187,7 +1187,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module
}
return
TRUE
;
// Successful DLL_PROCESS_ATTACH.
}
#elif !defined (SDL)
#elif !defined (
HAVE_
SDL)
// **************************************************************************
// FUNCTIONS
...
...
src/hardware/s_openal/s_openal.c
View file @
f03e591f
...
...
@@ -31,7 +31,7 @@ FILE* logstream = NULL;
#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
#ifndef SDL // let not make a logstream here is we are inline the HW3D in the SDL binary
#ifndef
HAVE_
SDL // let not make a logstream here is we are inline the HW3D in the SDL binary
FILE
*
logstream
=
NULL
;
#endif
#endif
...
...
@@ -49,7 +49,7 @@ FILE* logstream = NULL;
#include "../hw3dsdrv.h"
//#undef DEBUG_TO_FILE
//#if defined ( SDL ) && !defined ( LOGMESSAGES )
//#if defined (
HAVE_
SDL ) && !defined ( LOGMESSAGES )
#define DEBUG_TO_FILE
//#endif
...
...
src/m_menu.c
View file @
f03e591f
...
...
@@ -1110,7 +1110,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
{
IT_SUBMENU
|
IT_STRING
,
NULL
,
"3D Card Options..."
,
&
OP_OpenGLOptionsDef
,
20
},
#endif
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (SDL)
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (
HAVE_
SDL)
{
IT_STRING
|
IT_CVAR
,
NULL
,
"Fullscreen"
,
&
cv_fullscreen
,
30
},
#endif
...
...
@@ -6827,7 +6827,7 @@ static void M_VideoModeMenu(INT32 choice)
memset
(
modedescs
,
0
,
sizeof
(
modedescs
));
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (SDL)
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (
HAVE_
SDL)
VID_PrepareModeList
();
// FIXME: hack
#endif
vidm_nummodes
=
0
;
...
...
src/m_misc.c
View file @
f03e591f
...
...
@@ -47,7 +47,7 @@
#include "hardware/hw_main.h"
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#include "sdl/hwsym_sdl.h"
#ifdef __linux__
typedef
off_t
off64_t
;
...
...
@@ -654,7 +654,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
char
Movietxt
[]
=
"SRB2 Movie"
;
size_t
i
;
char
interfacetxt
[]
=
#ifdef SDL
#ifdef
HAVE_
SDL
"SDL"
;
#elif defined (_WINDOWS)
"DirectX"
;
...
...
@@ -809,7 +809,7 @@ static inline boolean M_PNGLib(void)
pnglib
=
GetModuleHandleA
(
"libpng12.dll"
);
if
(
!
pnglib
)
pnglib
=
GetModuleHandleA
(
"libpng13.dll"
);
#elif defined (SDL)
#elif defined (
HAVE_
SDL)
#ifdef __APPLE__
pnglib
=
hwOpen
(
"libpng.dylib"
);
#else
...
...
@@ -818,7 +818,7 @@ static inline boolean M_PNGLib(void)
#endif
if
(
!
pnglib
)
return
false
;
#ifdef SDL
#ifdef
HAVE_
SDL
apng_set_acTL
=
hwSym
(
"png_set_acTL"
,
pnglib
);
apng_write_frame_head
=
hwSym
(
"png_write_frame_head"
,
pnglib
);
apng_write_frame_tail
=
hwSym
(
"png_write_frame_tail"
,
pnglib
);
...
...
src/s_sound.c
View file @
f03e591f
...
...
@@ -253,7 +253,7 @@ void S_RegisterSoundStuff(void)
CV_RegisterVar
(
&
surround
);
CV_RegisterVar
(
&
cv_samplerate
);
#if defined (macintosh) && !defined (SDL) // mp3 playlist stuff
#if defined (macintosh) && !defined (
HAVE_
SDL) // mp3 playlist stuff
{
INT32
i
;
for
(
i
=
0
;
i
<
PLAYLIST_LENGTH
;
i
++
)
...
...
@@ -761,7 +761,7 @@ void S_PauseSound(void)
}
// pause cd music
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (SDL)
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (
HAVE_
SDL)
I_PauseCD
();
#else
I_StopCD
();
...
...
@@ -1050,7 +1050,7 @@ static boolean S_MIDIMusic(musicinfo_t *music, boolean looping)
// load & register it
music
->
data
=
W_CacheLumpNum
(
music
->
lumpnum
,
PU_MUSIC
);
#if defined (macintosh) && !defined (SDL)
#if defined (macintosh) && !defined (
HAVE_
SDL)
music
->
handle
=
I_RegisterSong
(
music_num
);
#else
music
->
handle
=
I_RegisterSong
(
music
->
data
,
W_LumpLength
(
music
->
lumpnum
));
...
...
@@ -1154,7 +1154,7 @@ void S_StopMusic(void)
I_StopSong
(
mus_playing
->
handle
);
I_UnRegisterSong
(
mus_playing
->
handle
);
#ifndef SDL //SDL uses RWOPS
#ifndef
HAVE_
SDL //SDL uses RWOPS
Z_ChangeTag
(
mus_playing
->
data
,
PU_CACHE
);
#endif
...
...
src/s_sound.h
View file @
f03e591f
...
...
@@ -37,7 +37,7 @@ extern CV_PossibleValue_t soundvolume_cons_t[];
//part of i_cdmus.c
extern
consvar_t
cd_volume
,
cdUpdate
;
#if defined (macintosh) && !defined (SDL)
#if defined (macintosh) && !defined (
HAVE_
SDL)
typedef
enum
{
music_normal
,
...
...
src/sdl/Makefile.cfg
View file @
f03e591f
...
...
@@ -67,7 +67,7 @@ endif
OBJS
+=
$(OBJDIR)
/i_video.o
$(OBJDIR)
/dosstr.o
$(OBJDIR)
/endtxt.o
$(OBJDIR)
/hwsym_sdl.o
OPTS
+=
-DDIRECTFULLSCREEN
-DSDL
OPTS
+=
-DDIRECTFULLSCREEN
-D
HAVE_
SDL
ifndef
NOHW
OBJS
+=
$(OBJDIR)
/r_opengl.o
$(OBJDIR)
/ogl_sdl.o
...
...
src/sdl/Srb2SDL-vc10.vcxproj
View file @
f03e591f
...
...
@@ -96,7 +96,7 @@
<ClCompile>
<Optimization>
Disabled
</Optimization>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<MinimalRebuild>
true
</MinimalRebuild>
<BasicRuntimeChecks>
EnableFastChecks
</BasicRuntimeChecks>
<RuntimeLibrary>
MultiThreadedDebug
</RuntimeLibrary>
...
...
@@ -145,7 +145,7 @@
<ClCompile>
<Optimization>
Disabled
</Optimization>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<MinimalRebuild>
true
</MinimalRebuild>
<BasicRuntimeChecks>
EnableFastChecks
</BasicRuntimeChecks>
<RuntimeLibrary>
MultiThreadedDebug
</RuntimeLibrary>
...
...
@@ -202,7 +202,7 @@
<FavorSizeOrSpeed>
Speed
</FavorSizeOrSpeed>
<OmitFramePointers>
true
</OmitFramePointers>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<StringPooling>
true
</StringPooling>
<RuntimeLibrary>
MultiThreaded
</RuntimeLibrary>
<PrecompiledHeaderOutputFile>
.\..\..\objs\VC10\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch
</PrecompiledHeaderOutputFile>
...
...
@@ -258,7 +258,7 @@
<FavorSizeOrSpeed>
Speed
</FavorSizeOrSpeed>
<OmitFramePointers>
true
</OmitFramePointers>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<StringPooling>
true
</StringPooling>
<RuntimeLibrary>
MultiThreaded
</RuntimeLibrary>
<PrecompiledHeaderOutputFile>
.\..\..\objs\VC10\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch
</PrecompiledHeaderOutputFile>
...
...
@@ -1461,4 +1461,4 @@
<Import
Project=
"$(VCTargetsPath)\Microsoft.Cpp.targets"
/>
<ImportGroup
Label=
"ExtensionTargets"
>
</ImportGroup>
</Project>
\ No newline at end of file
</Project>
src/sdl/Srb2SDL-vc9.vcproj
View file @
f03e591f
...
...
@@ -50,7 +50,7 @@
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild=
"true"
BasicRuntimeChecks=
"3"
RuntimeLibrary=
"1"
...
...
@@ -145,7 +145,7 @@
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild=
"true"
BasicRuntimeChecks=
"3"
RuntimeLibrary=
"1"
...
...
@@ -248,7 +248,7 @@
FavorSizeOrSpeed=
"1"
OmitFramePointers=
"true"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling=
"true"
RuntimeLibrary=
"0"
PrecompiledHeaderFile=
".\..\..\objs\VC9\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch"
...
...
@@ -350,7 +350,7 @@
FavorSizeOrSpeed=
"1"
OmitFramePointers=
"true"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling=
"true"
RuntimeLibrary=
"0"
PrecompiledHeaderFile=
".\..\..\objs\VC9\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch"
...
...
src/sdl/Srb2SDL.dsp
View file @
f03e591f
...
...
@@ -45,7 +45,7 @@ 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 "DIRECTFULLSCREEN" /D "SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /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 "DIRECTFULLSCREEN" /D "
HAVE_
SDL" /D "HWRENDER" /D "HW3SOUND" /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
...
...
@@ -72,7 +72,7 @@ LINK32=link.exe
# 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 "DIRECTFULLSCREEN" /D "SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /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 "DIRECTFULLSCREEN" /D "
HAVE_
SDL" /D "HWRENDER" /D "HW3SOUND" /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"
...
...
src/sdl/hwsym_sdl.c
View file @
f03e591f
...
...
@@ -29,7 +29,7 @@
#pragma warning(disable : 4214 4244)
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#include "SDL.h"
...
...
src/sdl/i_cdmus.c
View file @
f03e591f
...
...
@@ -17,7 +17,7 @@
/// \brief cd music interface
///
#ifdef SDL
#ifdef
HAVE_
SDL
#if defined (DC) || defined (_WIN32_WCE) || defined(GP2X) || defined(_PS3)
#define NOSDLCD
...
...
src/sdl/i_main.c
View file @
f03e591f
...
...
@@ -48,7 +48,7 @@ PSP_MAIN_THREAD_NAME("SRB2");
PSP_MAIN_THREAD_STACK_SIZE_KB
(
256
);
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#ifdef HAVE_TTF
#include "SDL.h"
...
...
src/sdl/i_net.c
View file @
f03e591f
...
...
@@ -32,7 +32,7 @@
#include "../i_tcp.h"
#ifdef SDL
#ifdef
HAVE_
SDL
#ifdef HAVE_SDLNET
...
...
src/sdl/i_system.c
View file @
f03e591f
...
...
@@ -73,7 +73,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
#pragma warning(disable : 4214 4244)
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#include "SDL.h"
...
...
src/sdl/i_video.c
View file @
f03e591f
...
...
@@ -27,7 +27,7 @@
#pragma warning(disable : 4214 4244)
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#include "SDL.h"
...
...
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
View file @
f03e591f
...
...
@@ -1264,7 +1264,7 @@
GCC_PREPROCESSOR_DEFINITIONS
=
(
MAC_ALERT
,
SDLMAIN
,
SDL
,
HAVE_
SDL
,
HAVE_MIXER
,
HAVE_PNG
,
HAVE_BLUA
,
...
...
@@ -1386,7 +1386,7 @@
GCC_PREPROCESSOR_DEFINITIONS
=
(
MAC_ALERT
,
SDLMAIN
,
SDL
,
HAVE_
SDL
,
HAVE_MIXER
,
HAVE_PNG
,
HAVE_BLUA
,
...
...
src/sdl/mixer_sound.c
View file @
f03e591f
...
...
@@ -3,7 +3,7 @@
#include "../doomdef.h"
#if defined(SDL) && defined(HAVE_MIXER) && SOUND==SOUND_MIXER
#if defined(
HAVE_
SDL) && defined(HAVE_MIXER) && SOUND==SOUND_MIXER
#include "../sounds.h"
#include "../s_sound.h"
...
...
src/sdl/ogl_sdl.c
View file @
f03e591f
...
...
@@ -21,7 +21,7 @@
#pragma warning(disable : 4214 4244)
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#include "SDL.h"
...
...
src/sdl/sdl_sound.c
View file @
f03e591f
...
...
@@ -23,7 +23,7 @@
#pragma warning(disable : 4214 4244)
#endif
#if defined(SDL) && SOUND==SOUND_SDL
#if defined(
HAVE_
SDL) && SOUND==SOUND_SDL
#include "SDL.h"
...
...
@@ -2027,4 +2027,4 @@ static void SDLCALL I_FinishMusic(void)
if
(
Msc_Mutex
)
SDL_UnlockMutex
(
Msc_Mutex
);
}
#endif
#endif //SDL
#endif //
HAVE_
SDL
src/sdl2/Srb2SDL-vc10.vcxproj
View file @
f03e591f
...
...
@@ -96,7 +96,7 @@
<ClCompile>
<Optimization>
Disabled
</Optimization>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<MinimalRebuild>
true
</MinimalRebuild>
<BasicRuntimeChecks>
EnableFastChecks
</BasicRuntimeChecks>
<RuntimeLibrary>
MultiThreadedDebug
</RuntimeLibrary>
...
...
@@ -145,7 +145,7 @@
<ClCompile>
<Optimization>
Disabled
</Optimization>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<MinimalRebuild>
true
</MinimalRebuild>
<BasicRuntimeChecks>
EnableFastChecks
</BasicRuntimeChecks>
<RuntimeLibrary>
MultiThreadedDebug
</RuntimeLibrary>
...
...
@@ -202,7 +202,7 @@
<FavorSizeOrSpeed>
Speed
</FavorSizeOrSpeed>
<OmitFramePointers>
true
</OmitFramePointers>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<StringPooling>
true
</StringPooling>
<RuntimeLibrary>
MultiThreaded
</RuntimeLibrary>
<PrecompiledHeaderOutputFile>
.\..\..\objs\VC10\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch
</PrecompiledHeaderOutputFile>
...
...
@@ -258,7 +258,7 @@
<FavorSizeOrSpeed>
Speed
</FavorSizeOrSpeed>
<OmitFramePointers>
true
</OmitFramePointers>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\libs\libpng-src;$(ProjectDir)..\..\libs\zlib;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<StringPooling>
true
</StringPooling>
<RuntimeLibrary>
MultiThreaded
</RuntimeLibrary>
<PrecompiledHeaderOutputFile>
.\..\..\objs\VC10\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch
</PrecompiledHeaderOutputFile>
...
...
@@ -1461,4 +1461,4 @@
<Import
Project=
"$(VCTargetsPath)\Microsoft.Cpp.targets"
/>
<ImportGroup
Label=
"ExtensionTargets"
>
</ImportGroup>
</Project>
\ No newline at end of file
</Project>
src/sdl2/Srb2SDL-vc9.vcproj
View file @
f03e591f
...
...
@@ -50,7 +50,7 @@
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild=
"true"
BasicRuntimeChecks=
"3"
RuntimeLibrary=
"1"
...
...
@@ -145,7 +145,7 @@
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild=
"true"
BasicRuntimeChecks=
"3"
RuntimeLibrary=
"1"
...
...
@@ -248,7 +248,7 @@
FavorSizeOrSpeed=
"1"
OmitFramePointers=
"true"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling=
"true"
RuntimeLibrary=
"0"
PrecompiledHeaderFile=
".\..\..\objs\VC9\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch"
...
...
@@ -350,7 +350,7 @@
FavorSizeOrSpeed=
"1"
OmitFramePointers=
"true"
AdditionalIncludeDirectories=
""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
PreprocessorDefinitions=
"NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;
HAVE_
SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling=
"true"
RuntimeLibrary=
"0"
PrecompiledHeaderFile=
".\..\..\objs\VC9\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch"
...
...
src/sdl2/Srb2SDL.dsp
View file @
f03e591f
...
...
@@ -45,7 +45,7 @@ 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 "DIRECTFULLSCREEN" /D "SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /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 "DIRECTFULLSCREEN" /D "
HAVE_
SDL" /D "HWRENDER" /D "HW3SOUND" /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
...
...
@@ -72,7 +72,7 @@ LINK32=link.exe
# 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 "DIRECTFULLSCREEN" /D "SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /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 "DIRECTFULLSCREEN" /D "
HAVE_
SDL" /D "HWRENDER" /D "HW3SOUND" /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"
...
...
src/sdl2/hwsym_sdl.c
View file @
f03e591f
...
...
@@ -29,7 +29,7 @@
#pragma warning(disable : 4214 4244)
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#include "SDL.h"
...
...
src/sdl2/i_main.c
View file @
f03e591f
...
...
@@ -48,7 +48,7 @@ PSP_MAIN_THREAD_NAME("SRB2");
PSP_MAIN_THREAD_STACK_SIZE_KB
(
256
);
#endif
#ifdef SDL
#ifdef
HAVE_
SDL
#ifdef HAVE_TTF
#include "SDL.h"
...
...
src/sdl2/i_net.c
View file @
f03e591f
...
...
@@ -32,7 +32,7 @@
#include "../i_tcp.h"