mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-22 11:22:18 -04:00
get rid of the MY_SDL_VER definition
We depend on SDL for more than just a handful of additional variables.
This commit is contained in:
parent
413cc81009
commit
4d3826b6f0
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
if [ "$ANALYZE" = "true" ] ; then
|
||||
cppcheck --error-exitcode=1 -j2 -DMY_SDL_VER -DRANGECHECK -DDOGS -DBETA -ISource Source 2> stderr.txt
|
||||
cppcheck --error-exitcode=1 -j2 -DRANGECHECK -DDOGS -DBETA -ISource Source 2> stderr.txt
|
||||
RET=$?
|
||||
if [ -s stderr.txt ]
|
||||
then
|
||||
|
@ -271,7 +271,7 @@ void I_Quit (void)
|
||||
G_CheckDemoStatus();
|
||||
M_SaveDefaults();
|
||||
|
||||
#if defined(MY_SDL_VER) && defined(_MSC_VER)
|
||||
#if defined(_MSC_VER)
|
||||
// Under Visual C++, the console window likes to rudely slam
|
||||
// shut -- this can stop it
|
||||
if(*errmsg || waitAtExit)
|
||||
|
@ -83,7 +83,6 @@ extern int realtic_clock_rate; // killough 4/13/98: adjustable timer
|
||||
extern int tran_filter_pct; // killough 2/21/98
|
||||
extern int showMessages;
|
||||
|
||||
#ifdef MY_SDL_VER
|
||||
extern int i_SDLJoystickNum;
|
||||
extern int joystickSens_x;
|
||||
extern int joystickSens_y;
|
||||
@ -93,7 +92,6 @@ extern int grabmouse;
|
||||
extern int cfg_scalefactor; // haleyjd 05/11/09
|
||||
extern int cfg_aspectratio; // haleyjd 05/11/09
|
||||
extern int fullscreen;
|
||||
#endif
|
||||
|
||||
extern char *chat_macros[], *wad_files[], *deh_files[]; // killough 10/98
|
||||
|
||||
@ -1686,7 +1684,6 @@ default_t defaults[] = {
|
||||
"ninth choice for weapon (worst)"
|
||||
},
|
||||
|
||||
#ifdef MY_SDL_VER
|
||||
// haleyjd 04/15/02: SDL joystick device number
|
||||
{
|
||||
"joystick_num",
|
||||
@ -1751,7 +1748,6 @@ default_t defaults[] = {
|
||||
{0}, {0, 1}, number, ss_none, wad_no,
|
||||
"1 to enable fullscreen mode"
|
||||
},
|
||||
#endif
|
||||
|
||||
{NULL} // last entry
|
||||
};
|
||||
|
@ -16,7 +16,6 @@ AC_SEARCH_LIBS([dlopen], [dl dld], [AC_CHECK_FUNCS([dlopen])])
|
||||
PKG_CHECK_MODULES([SDL], [sdl2])
|
||||
PKG_CHECK_MODULES([SDL_mixer], [SDL2_mixer])
|
||||
PKG_CHECK_MODULES([SDL_net], [SDL2_net])
|
||||
AC_DEFINE([MY_SDL_VER], [1], [This is WinMBF])
|
||||
AC_DEFINE([RANGECHECK], [1], [Parameter Validation Debugging])
|
||||
|
||||
# Checks for header files.
|
||||
|
Loading…
x
Reference in New Issue
Block a user