qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-25 13:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

My stuff. :P

Browse source
This commit is contained in:
James Brown 2000-05-20 04:48:51 +00:00
parent 88701b5038
commit b2a8652d33
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/makefile.winc
View file

@ -8,7 +8,7 @@ MGLPATH=E:\quakesrc\q1src\libs # Path to other librarys (mgl)
DXPATH=E:\quakesrc\q1src\libs # Path to other librarys (DirectX)
LIBS=winmm.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib $(DXPATH)\dinput.lib $(DXPATH)\dxguid.lib $(MGLPATH)\mgllt.lib
NCFLAGS=-c -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -DWIN32 -D_WIN32 -D_MT -ML -I$(INCPATH) -Ox -D_WINDOWS -DNoAsm -Zl -I..\include
NCFLAGS=/c /nologo /DWIN32 /D_WIN32 /I..\include /I..\include\win32\vc /I$(INCPATH) /MT /DHAVE_CONFIG_H
COM_sources=\
net_chan.obj \
net_com.obj \

18
source/makefile.wingl
View file

@ -8,7 +8,7 @@ MGLPATH=E:\quakesrc\q1src\libs # Path to other librarys (mgl)
DXPATH=E:\quakesrc\q1src\libs # Path to other librarys (DirectX)
LIBS=winmm.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib $(DXPATH)\dinput.lib $(DXPATH)\dxguid.lib $(MGLPATH)\mgllt.lib glu32.lib opengl32.lib
NCFLAGS=/c /nologo /DWIN32 /D_WIN32 /I..\include /MT /I$(INCPATH)
NCFLAGS=/c /nologo /DWIN32 /D_WIN32 /I..\include /I..\include\win32\vc /I$(INCPATH) /MT /DHAVE_CONFIG_H
COM_sources=\
net_chan.obj \
@ -24,23 +24,27 @@ COM_sources=\
cmd.obj
CL_GL_sources=\
r_view.obj \
gl_draw.obj \
gl_mesh.obj \
gl_model.obj \
gl_ngraph.obj \
gl_parse.obj \
gl_part.obj \
gl_refrag.obj \
gl_rlight.obj \
gl_rmain.obj \
gl_rmisc.obj \
gl_mesh.obj \
gl_rsurf.obj \
gl_screen.obj \
gl_view.obj \
gl_warp.obj \
gl_vidnt.obj
vid_wgl.obj
CL_sources=\
cl_trans.obj \
cl_parse.obj \
cl_slist.obj \
cl_cmd.obj \
cl_cvar.obj \
cl_demo.obj \
@ -51,6 +55,7 @@ CL_sources=\
cl_pred.obj \
cl_tent.obj \
cl_cam.obj \
model.obj \
wad.obj \
snd_dma.obj \
snd_mem.obj \
@ -60,6 +65,7 @@ CL_sources=\
nonintel.obj \
menu.obj \
keys.obj \
vc6fix.obj \
console.obj
CL_platform=\
@ -71,11 +77,11 @@ CL_platform=\
net_udp.obj
CL_asm=\
sys_wina.obj
sys_x86.obj
glclient.exe: $(COM_sources) $(CL_GL_sources) $(CL_sources) $(CL_platform) $(CL_asm)
$(link) /nologo /subsystem:windows /incremental:yes /machine:I386 -out:glclient.exe *.obj $(LIBS)
$(link) /nologo /subsystem:windows /incremental:yes /machine:I386 -out:glclient.exe gl\*.obj $(LIBS)
.c.obj:
$(cc) $(NCFLAGS) $*.c
$(cc) $(NCFLAGS) $*.c /Fogl\$*.obj

2
source/makefile.wins
View file

@ -4,7 +4,7 @@ include <win32.mak>
all:server.exe
LIBS=winmm.lib wsock32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib libc.lib
NCFLAGS=/c /nologo /DWIN32 /D_WIN32 /I..\include /MT
NCFLAGS=/c /nologo /DWIN32 /D_WIN32 /I..\include /I..\include\win32\vc /MT /DHAVE_CONFIG_H
COM_sources=\
net_chan.obj \
net_com.obj \

2
source/zone.c
View file

@ -423,7 +423,7 @@ void *Hunk_AllocName (int size, char *name)
if (hunk_size - hunk_low_used - hunk_high_used < size)
// Sys_Error ("Hunk_Alloc: failed on %i bytes",size);
#ifdef _WIN32
Sys_Error ("Not enough RAM allocated. Try starting using \"-heapsize 16000\" on the " PROGRAM " command line.");
Sys_Error ("Not enough RAM allocated. Try starting using \"-heapsize 16000\" on the " PROGRAM " command line.");
#else
Sys_Error ("Not enough RAM allocated. Try starting using \"-mem 16\" on the " PROGRAM " command line.");
#endif