mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-14 00:50:38 +00:00
* gl_vidsdl.c, in_sdl.c, main_sdl.c, net_sdlnet.c, pl_linux.c, pl_osx.m,
pl_win.c, sys_sdl.c: Explicitly include SDL.h in the SDL source files. At present, quakedef.h already includes SDL.h you may never know what would happen in the future. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@195 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
58784476dc
commit
2740f44b92
8 changed files with 14 additions and 2 deletions
|
@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "SDL.h"
|
||||||
|
|
||||||
#define MAX_MODE_LIST 600 //johnfitz -- was 30
|
#define MAX_MODE_LIST 600 //johnfitz -- was 30
|
||||||
#define VID_ROW_SIZE 3
|
#define VID_ROW_SIZE 3
|
||||||
|
|
|
@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
|
#include "SDL.h"
|
||||||
|
|
||||||
static qboolean no_mouse = false;
|
static qboolean no_mouse = false;
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,10 @@ along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
#include <stdio.h>
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
|
#include "SDL.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
#define DEFAULT_MEMORY 0x4000000
|
#define DEFAULT_MEMORY 0x4000000
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
#include "SDL_net.h"
|
|
||||||
#include "net_sdlnet.h"
|
#include "net_sdlnet.h"
|
||||||
|
#include "SDL.h"
|
||||||
|
#include "SDL_net.h"
|
||||||
|
|
||||||
#ifndef MAXHOSTNAMELEN
|
#ifndef MAXHOSTNAMELEN
|
||||||
#define MAXHOSTNAMELEN 255
|
#define MAXHOSTNAMELEN 255
|
||||||
|
|
|
@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
|
#include "SDL.h"
|
||||||
|
|
||||||
static const Uint8 bmp_bytes[] =
|
static const Uint8 bmp_bytes[] =
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
|
#include "SDL.h"
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
|
|
||||||
void PL_SetWindowIcon (void)
|
void PL_SetWindowIcon (void)
|
||||||
|
@ -37,3 +38,4 @@ void PL_ErrorDialog(const char *text)
|
||||||
NSString *msg = [NSString stringWithCString:text encoding:NSASCIIStringEncoding];
|
NSString *msg = [NSString stringWithCString:text encoding:NSASCIIStringEncoding];
|
||||||
NSRunAlertPanel(nil, msg, nil, nil, nil);
|
NSRunAlertPanel(nil, msg, nil, nil, nil);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#include "SDL.h"
|
||||||
#include "SDL_syswm.h"
|
#include "SDL_syswm.h"
|
||||||
|
|
||||||
HICON icon;
|
HICON icon;
|
||||||
|
@ -60,3 +61,4 @@ void PL_ErrorDialog(const char *text)
|
||||||
{
|
{
|
||||||
MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
|
MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "SDL.h"
|
||||||
|
|
||||||
#define CONSOLE_ERROR_TIMEOUT 60.0 /* # of seconds to wait on Sys_Error running */
|
#define CONSOLE_ERROR_TIMEOUT 60.0 /* # of seconds to wait on Sys_Error running */
|
||||||
qboolean isDedicated;
|
qboolean isDedicated;
|
||||||
static qboolean sc_return_on_enter = false;
|
static qboolean sc_return_on_enter = false;
|
||||||
|
|
Loading…
Reference in a new issue