diff --git a/source/qf-client-wgl.mak b/source/qf-client-wgl.mak index 3871b29..c02c452 100644 --- a/source/qf-client-wgl.mak +++ b/source/qf-client-wgl.mak @@ -63,8 +63,6 @@ OBJS = $(QFROOT)\SOURCE #EXE = $(QFROOT)\TARGETS EXE = $(QFROOT) -# Path to your SCITECH root directory (where you installed MGL) -SCITECHROOT=D:\SCITECH # Path to your Direct-X libraries and includes DIRECTXSDK=D:\project\dx7sdk # Path to ZLIB source code @@ -73,12 +71,12 @@ ZLIB=D:\PROJECT\ZLIB # end of system dependant stuffs SYSLIBS = $(CROOT)\LIB -MISCLIBS = $(DIRECTXSDK)\lib\borland;$(SCITECHROOT)\lib\win32\bc5 +MISCLIBS = $(DIRECTXSDK)\lib\borland LIBS=$(SYSLIBS);$(MISCLIBS) SYSINCLUDE = $(CROOT)\INCLUDE QFINCLUDES = $(QFROOT)\INCLUDE\WIN32\BC;$(QFROOT)\INCLUDE\WIN32;$(QFROOT)\INCLUDE;$(QFROOT)\INCLUDE\WIN32\RESOURCES -MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include;$(ZLIB) +MISCINCLUDES = $(DIRECTXSDK)\include;$(ZLIB) INCLUDES = $(QFINCLUDES);$(SYSINCLUDE);$(MISCINCLUDES) diff --git a/source/qf-server.mak b/source/qf-server.mak index 592e46a..1cf6da7 100644 --- a/source/qf-server.mak +++ b/source/qf-server.mak @@ -59,22 +59,18 @@ OBJS = $(QFROOT)\SOURCE #EXE = $(QFROOT)\TARGETS EXE = $(QFROOT) -# Path to your SCITECH root directory (where you installed MGL) -SCITECHROOT=D:\SCITECH -# Path to your Direct-X libraries and includes -DIRECTXSDK=D:\project\dx7sdk # Path to ZLIB source code ZLIB=D:\PROJECT\ZLIB # end of system dependant stuffs SYSLIBS = $(CROOT)\LIB -MISCLIBS = $(DIRECTXSDK)\lib\borland;$(SCITECHROOT)\lib\win32\bc5 +MISCLIBS = LIBS=$(SYSLIBS);$(MISCLIBS) SYSINCLUDE = $(CROOT)\INCLUDE QFINCLUDES = $(QFROOT)\INCLUDE\WIN32\BC;$(QFROOT)\INCLUDE\WIN32;$(QFROOT)\INCLUDE -MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include;$(ZLIB) +MISCINCLUDES = $(ZLIB) INCLUDES = $(QFINCLUDES);$(SYSINCLUDE);$(MISCINCLUDES)