qf
/
newtree
mirror of https://git.code.sf.net/p/quake/newtree
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdl and sgl build now too :)

This commit is contained in:
Bill Currie 2001-08-15 19:39:07 +00:00
parent 305fc0c371
commit 76bee6c8ab
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Makefile.am
View File

@ -235,7 +235,7 @@ qf_client_mgl_DEPENDENCIES=libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs
# #
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.0 and higher # ... Sam Lantinga's Simple DirectMedia Layer, version 1.0 and higher
# #
sdl_SOURCES= vid_sdl.c in_sdl.c sdl_SOURCES= vid_sdl.c in_sdl.c cl_sys_sdl.c
qf_client_sdl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(sdl_SOURCES) qf_client_sdl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(sdl_SOURCES)
qf_client_sdl_LDADD= $(SDL_LIBS) $(CLIENT_LIBS) qf_client_sdl_LDADD= $(SDL_LIBS) $(CLIENT_LIBS)
@ -293,7 +293,7 @@ qf_client_glx_DEPENDENCIES=libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs
# #
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.1 and higher, in GL mode # ... Sam Lantinga's Simple DirectMedia Layer, version 1.1 and higher, in GL mode
# #
sgl_SOURCES= vid_sgl.c vid_common_gl.c in_sdl.c sgl_SOURCES= vid_sgl.c vid_common_gl.c in_sdl.c cl_sys_sdl.c
qf_client_sgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(sgl_SOURCES) qf_client_sgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(sgl_SOURCES)
qf_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(CLIENT_LIBS) $(DL_LIBS) qf_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(CLIENT_LIBS) $(DL_LIBS)

10
source/cl_sys_sdl.c
View File

@ -53,8 +53,8 @@
# include <sys/mman.h> # include <sys/mman.h>
#endif #endif
#include <SDL.H> #include <SDL.h>
#include <SDL_main.H> #include <SDL_main.h>
#include "sys.h" #include "sys.h"
#include "qargs.h" #include "qargs.h"
@ -98,7 +98,7 @@ int
Sys_FileTime (char *path) Sys_FileTime (char *path)
{ {
QFile *f; QFile *f;
int t, retval; int retval;
f = Qopen (path, "rb"); f = Qopen (path, "rb");
@ -242,9 +242,6 @@ SDL_main (int c, char **v)
double time, oldtime, newtime; double time, oldtime, newtime;
int j; int j;
static char cwd[1024];
int t;
#ifndef WIN32 #ifndef WIN32
signal (SIGFPE, SIG_IGN); signal (SIGFPE, SIG_IGN);
#endif #endif
@ -287,6 +284,7 @@ SDL_main (int c, char **v)
} }
/* fixme: evil stub for directsound crap */ /* fixme: evil stub for directsound crap */
void
IN_Accumulate (void) IN_Accumulate (void)
{ {
} }

6
source/sv_sys_win.c
View File

@ -186,6 +186,12 @@ Sys_Init (void)
*/ */
char *newargv[256]; char *newargv[256];
#ifdef main
# if main == SDL_main
# undef main
# endif
#endif
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {