From c1f1d0662260fe6d403449435e82b1f7f98d005a Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 27 Nov 2003 00:21:04 +0000 Subject: [PATCH] added Visual C project for opengl, buncha macro fixes and stuff --- ChangeLog | 7 + VisualC/d2x.dsw | 15 + VisualC/d2x/d2x.dsp | 683 +--------------------- VisualC/d2xgl/.cvsignore | 3 + VisualC/d2xgl/d2xgl.dsp | 1179 ++++++++++++++++++++++++++++++++++++++ arch/ogl/gr.c | 14 +- arch/ogl/ogl.c | 6 +- configure.ac | 5 + cygconf | 2 +- include/d_io.h | 2 +- include/loadgl.h | 20 +- include/ogl_init.h | 6 +- include/pstypes.h | 19 +- include/u_mem.h | 6 +- main/state.c | 5 +- main/vers_id.h | 6 +- misc/d_io.c | 4 +- 17 files changed, 1260 insertions(+), 722 deletions(-) create mode 100644 VisualC/d2xgl/.cvsignore create mode 100644 VisualC/d2xgl/d2xgl.dsp diff --git a/ChangeLog b/ChangeLog index 6d672ee2..dea81555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2003-11-26 Bradley Bell + * configure.ac cygconf VisualC/d2x.dsw VisualC/d2x/d2x.dsp + VisualC/d2xgl/.cvsignore VisualC/d2xgl/d2xgl.dsp arch/ogl/gr.c + arch/ogl/ogl.c include/d_io.h include/loadgl.h include/ogl_init.h + include/pstypes.h include/u_mem.h main /state.c main/vers_id.h + misc/d_io.c: added Visual C project for opengl, buncha macro fixes + and stuff + * arch/sdl/gr.c: fix sdl gr_update * 2d/font.c, VisualC/d2x/d2x.dsp, VisualCE/d2x/d2x.vcp, diff --git a/VisualC/d2x.dsw b/VisualC/d2x.dsw index d3b24f74..fec4ccdf 100644 --- a/VisualC/d2x.dsw +++ b/VisualC/d2x.dsw @@ -18,6 +18,21 @@ Package=<4> ############################################################################### +Project: "d2xgl"=.\d2xgl\d2xgl.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmve + End Project Dependency +}}} + +############################################################################### + Project: "libmve"=.\libmve\libmve.dsp - Package Owner=<4> Package=<5> diff --git a/VisualC/d2x/d2x.dsp b/VisualC/d2x/d2x.dsp index c2394e13..9838bb4d 100644 --- a/VisualC/d2x/d2x.dsp +++ b/VisualC/d2x/d2x.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=d2x - Win32 Debug +CFG=d2x - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=d2x - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "d2x.mak" CFG="d2x - Win32 Debug" +!MESSAGE NMAKE /f "d2x.mak" CFG="d2x - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.6\include" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_ASM" /D "NMONO" /D "PIGGY_USE_PAGING" /D "NEWDEMO" /D "SDL_INPUT" /D "SDL_VIDEO" /D "FAST_FILE_IO" /D "CONSOLE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.6\include" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_ASM" /D "NMONO" /D "PIGGY_USE_PAGING" /D "NEWDEMO" /D "SDL_INPUT" /D "SDL_VIDEO" /D "FAST_FILE_IO" /D "CONSOLE" /D "NETWORK" /D "NATIVE_IPX" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.6\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_ASM" /D "NMONO" /D "PIGGY_USE_PAGING" /D "NEWDEMO" /D "SDL_INPUT" /D "SDL_VIDEO" /D "FAST_FILE_IO" /D "CONSOLE" /D "NETWORK" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.6\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_ASM" /D "NMONO" /D "PIGGY_USE_PAGING" /D "NEWDEMO" /D "SDL_INPUT" /D "SDL_VIDEO" /D "FAST_FILE_IO" /D "CONSOLE" /D "NETWORK" /D "NATIVE_IPX" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -312,977 +312,302 @@ SOURCE=..\..\misc\strutil.c # Begin Source File SOURCE=..\..\main\ai.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\ai2.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\aipath.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\automap.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\bm.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\cmd.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\cntrlcen.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\collide.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\config.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\console.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\controls.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\credits.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\crypt.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\effects.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\endlevel.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\escort.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\fireball.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\fuelcen.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\fvi.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\game.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gamecntl.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gamefont.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gamemine.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gamepal.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gamerend.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gamesave.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gameseg.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gameseq.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\gauges.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\hostage.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\hud.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\inferno.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\arch\win32\ipx_mcast4.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\arch\win32\ipx_udp.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\arch\win32\ipx_win.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\kconfig.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\kludge.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\kmatrix.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\laser.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\lighting.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\menu.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\mglobal.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\mission.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\morph.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\movie.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\multi.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\multibot.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\netmisc.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\network.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\newdemo.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\newmenu.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\object.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\paging.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\physics.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\piggy.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\player.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\playsave.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\polyobj.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\powerup.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\render.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\robot.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\scores.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\segment.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\slew.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\songs.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\state.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\switch.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\terrain.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\texmerge.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\text.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\titles.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\vclip.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\wall.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\main\weapon.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # Begin Source File SOURCE=..\..\arch\win32\winnet.c - -!IF "$(CFG)" == "d2x - Win32 Release" - -!ELSEIF "$(CFG)" == "d2x - Win32 Debug" - -# ADD CPP /D "NATIVE_IPX" - -!ENDIF - # End Source File # End Group # Begin Group "maths" diff --git a/VisualC/d2xgl/.cvsignore b/VisualC/d2xgl/.cvsignore new file mode 100644 index 00000000..ccf03cf4 --- /dev/null +++ b/VisualC/d2xgl/.cvsignore @@ -0,0 +1,3 @@ +Debug +Release +d2xgl.plg diff --git a/VisualC/d2xgl/d2xgl.dsp b/VisualC/d2xgl/d2xgl.dsp new file mode 100644 index 00000000..2bb8edab --- /dev/null +++ b/VisualC/d2xgl/d2xgl.dsp @@ -0,0 +1,1179 @@ +# Microsoft Developer Studio Project File - Name="d2xgl" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=d2xgl - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "d2xgl.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "d2xgl.mak" CFG="d2xgl - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "d2xgl - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "d2xgl - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "d2xgl - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.6\include" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_ASM" /D "NMONO" /D "PIGGY_USE_PAGING" /D "NEWDEMO" /D "SDL_INPUT" /D "SDL_GL_VIDEO" /D "FAST_FILE_IO" /D "CONSOLE" /D "NETWORK" /D "NATIVE_IPX" /D "OGL" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib opengl32.lib glu32.lib /nologo /subsystem:windows /machine:I386 + +!ELSEIF "$(CFG)" == "d2xgl - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.6\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_ASM" /D "NMONO" /D "PIGGY_USE_PAGING" /D "NEWDEMO" /D "SDL_INPUT" /D "SDL_GL_VIDEO" /D "FAST_FILE_IO" /D "CONSOLE" /D "NETWORK" /D "NATIVE_IPX" /D "OGL" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib opengl32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "d2xgl - Win32 Release" +# Name "d2xgl - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Group "2d" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\2d\2dsline.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\bitblt.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\bitmap.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\box.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\canvas.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\circle.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\disc.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\font.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\gpixel.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\ibitblt.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\line.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\palette.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\pcx.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\pixel.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\poly.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\rect.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\rle.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\scalec.c +# End Source File +# Begin Source File + +SOURCE=..\..\2d\tmerge.c +# End Source File +# End Group +# Begin Group "3d" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\3d\clipper.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\draw.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\globvars.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\instance.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\interp.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\matrix.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\points.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\rod.c +# End Source File +# Begin Source File + +SOURCE=..\..\3d\setup.c +# End Source File +# End Group +# Begin Group "arch" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\arch\sdl\digi.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\event.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\findfile.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\ogl\gr.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\init.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\joy.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\joydefs.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\key.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\mingw_init.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\mouse.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\ogl\ogl.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\rbaudio.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\ogl\sdlgl.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\sdl\timer.c +# End Source File +# End Group +# Begin Group "misc" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\misc\args.c +# End Source File +# Begin Source File + +SOURCE=..\..\cfile\cfile.c +# End Source File +# Begin Source File + +SOURCE=..\..\console\CON_console.c +# End Source File +# Begin Source File + +SOURCE=..\..\misc\d_io.c +# End Source File +# Begin Source File + +SOURCE=..\..\misc\error.c +# End Source File +# Begin Source File + +SOURCE=..\..\misc\hash.c +# End Source File +# Begin Source File + +SOURCE=..\..\iff\iff.c +# End Source File +# Begin Source File + +SOURCE=..\..\mem\mem.c +# End Source File +# Begin Source File + +SOURCE=..\..\misc\strio.c +# End Source File +# Begin Source File + +SOURCE=..\..\misc\strutil.c +# End Source File +# End Group +# Begin Group "main" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\main\ai.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\ai2.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\aipath.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\automap.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\bm.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\cmd.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\cntrlcen.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\collide.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\config.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\console.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\controls.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\credits.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\crypt.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\effects.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\endlevel.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\escort.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\fireball.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\fuelcen.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\fvi.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\game.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamecntl.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamefont.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamemine.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamepal.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamerend.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamesave.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gameseg.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gameseq.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\gauges.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\hostage.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\hud.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\inferno.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\ipx_mcast4.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\ipx_udp.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\ipx_win.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\kconfig.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\kludge.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\kmatrix.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\laser.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\lighting.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\menu.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\mglobal.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\mission.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\morph.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\movie.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\multi.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\multibot.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\netmisc.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\network.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\newdemo.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\newmenu.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\object.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\paging.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\physics.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\piggy.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\player.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\playsave.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\polyobj.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\powerup.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\render.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\robot.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\scores.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\segment.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\slew.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\songs.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\state.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\switch.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\terrain.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\texmerge.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\text.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\titles.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\vclip.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\wall.c +# End Source File +# Begin Source File + +SOURCE=..\..\main\weapon.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\winnet.c +# End Source File +# End Group +# Begin Group "maths" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\maths\fixc.c +# End Source File +# Begin Source File + +SOURCE=..\..\maths\rand.c +# End Source File +# Begin Source File + +SOURCE=..\..\maths\tables.c +# End Source File +# Begin Source File + +SOURCE=..\..\maths\vecmat.c +# End Source File +# End Group +# Begin Group "texmap" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\texmap\ntmap.c +# End Source File +# Begin Source File + +SOURCE=..\..\texmap\scanline.c +# End Source File +# Begin Source File + +SOURCE=..\..\texmap\tmapflat.c +# End Source File +# End Group +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\include\3d.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\ai.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\aistruct.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\args.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\automap.h +# End Source File +# Begin Source File + +SOURCE=..\..\2d\bitmap.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\bm.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\bmread.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\byteswap.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\cfile.h +# End Source File +# Begin Source File + +SOURCE=..\..\2d\clip.h +# End Source File +# Begin Source File + +SOURCE=..\..\3d\clipper.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\cmd.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\cntrlcen.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\collide.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\compbit.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\CON_console.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\config.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\console.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\controls.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\credits.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\d_io.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\desc_id.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\digi.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\effects.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\endlevel.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\error.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\escort.h +# End Source File +# Begin Source File + +SOURCE=..\..\arch\include\event.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\findfile.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\fireball.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\fix.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\fuelcen.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\fvi.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\fvi_a.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\game.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamefont.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamemine.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamepal.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamesave.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gameseg.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gameseq.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gamestat.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\gauges.h +# End Source File +# Begin Source File + +SOURCE=..\..\3d\globvars.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\gr.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\grdef.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\hash.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\hostage.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\hudmsg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ibitblt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\iff.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\inferno.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\interp.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ipx.h +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\ipx_drv.h +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\include\ipx_mcast4.h +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\include\ipx_udp.h +# End Source File +# Begin Source File + +SOURCE=..\..\arch\include\joy.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\joydefs.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\kconfig.h +# End Source File +# Begin Source File + +SOURCE=..\..\arch\include\key.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\kmatrix.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\laser.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\lighting.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\makesig.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\maths.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\menu.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\mission.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\modem.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\modex.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\mono.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\morph.h +# End Source File +# Begin Source File + +SOURCE=..\..\arch\include\mouse.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\movie.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\multi.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\multibot.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\netmisc.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\newdemo.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\newmenu.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\object.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ogl_init.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\pa_enabl.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\paging.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\palette.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\pcx.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\physics.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\piggy.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\player.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\playsave.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\polyobj.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\powerup.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\pstypes.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\rbaudio.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\render.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\reorder.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\rle.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\robot.h +# End Source File +# Begin Source File + +SOURCE=..\..\texmap\scanline.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\scores.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\screens.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\segment.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\segpoint.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\slew.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\songs.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\sounds.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\state.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\strio.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\strutil.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\switch.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\terrain.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\texmap.h +# End Source File +# Begin Source File + +SOURCE=..\..\texmap\texmapl.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\texmerge.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\text.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\textures.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\timer.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\titles.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\u_dpmi.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\u_mem.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\vclip.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\vecmat.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\vers_id.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\vesa.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\wall.h +# End Source File +# Begin Source File + +SOURCE=..\..\main\weapon.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# Begin Source File + +SOURCE="..\..\..\..\sdl\SDL-1.2.6\lib\SDL.lib" +# End Source File +# Begin Source File + +SOURCE="..\..\..\..\sdl\SDL-1.2.6\lib\SDLmain.lib" +# End Source File +# End Target +# End Project diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index 66734100..4a4d8bf7 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.14 2003-11-06 08:58:53 btb Exp $ */ +/* $Id: gr.c,v 1.15 2003-11-27 00:21:04 btb Exp $ */ /* * * OGL video functions. - Added 9/15/99 Matthew Mueller @@ -13,7 +13,7 @@ #include #include #include -#ifdef __WINDOWS__ +#ifdef _MSC_VER #include #endif @@ -22,7 +22,9 @@ #else //#include #endif +#ifndef _MSC_VER #include +#endif #include #include #include @@ -169,7 +171,7 @@ void ogl_get_verinfo(void){ ogl_intensity4_ok=1;ogl_luminance4_alpha4_ok=1;ogl_rgba2_ok=1;ogl_gettexlevelparam_ok=1; -#ifdef __WINDOWS__ +#if 0 //WGL only, I think dglMultiTexCoord2fARB = (glMultiTexCoord2fARB_fp)wglGetProcAddress("glMultiTexCoord2fARB"); dglActiveTextureARB = (glActiveTextureARB_fp)wglGetProcAddress("glActiveTextureARB"); dglMultiTexCoord2fSGIS = (glMultiTexCoord2fSGIS_fp)wglGetProcAddress("glMultiTexCoord2fSGIS"); @@ -312,7 +314,7 @@ int ogl_testneedmipmaps(int i){ // return -1; } #ifdef OGL_RUNTIME_LOAD -#if defined(__WINDOWS__) || defined(__MINGW32__) +#ifdef _WIN32 char *OglLibPath="opengl32.dll"; #endif #ifdef __unix__ @@ -614,8 +616,8 @@ void gr_palette_read(ubyte * pal) //if we got really spiffy, we could optionally link in libpng or something, and use that. void write_bmp(char *savename,int w,int h,unsigned char *buf){ int f; -#if defined(__WINDOWS__) || defined(__MINGW32__) - f=open(savename,O_CREAT|O_EXCL|O_WRONLY,S_IRUSR|S_IWUSR); +#ifdef _WIN32 + f=open(savename,O_CREAT|O_EXCL|O_WRONLY,S_IREAD|S_IWRITE); #else f=open(savename,O_CREAT|O_EXCL|O_WRONLY,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); #endif diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index d680002f..607ec302 100644 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -1,4 +1,4 @@ -/* $Id: ogl.c,v 1.10 2003-11-07 18:09:48 btb Exp $ */ +/* $Id: ogl.c,v 1.11 2003-11-27 00:21:04 btb Exp $ */ /* * * Graphics support functions for OpenGL. @@ -11,7 +11,7 @@ #endif //#include -#ifdef __WINDOWS__ +#ifdef _WIN32 #include #include #endif @@ -56,7 +56,7 @@ #define M_PI 3.14159 #endif -#if defined(__WINDOWS__) || defined(__MINGW32__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__sun__) +#if defined(_WIN32) || (defined(__APPLE__) && defined(__MACH__)) || defined(__sun__) #define cosf(a) cos(a) #define sinf(a) sin(a) #endif diff --git a/configure.ac b/configure.ac index 3234ac10..72098621 100644 --- a/configure.ac +++ b/configure.ac @@ -281,6 +281,11 @@ if test x$enable_network != xno; then enable_native_ipx="no"; ;; esac + case $host_os in + cygwin* | mingw* | msdos*) + enable_kalinix="no"; + ;; + esac case $host_os in *solaris*) AC_CHECK_LIB(socket, socket, LIBS="${LIBS} -lsocket", diff --git a/cygconf b/cygconf index 26557b64..d15a2617 100644 --- a/cygconf +++ b/cygconf @@ -1 +1 @@ -export ACLOCAL_FLAGS="-I /usr/local/share/aclocal" +export ACLOCAL_FLAGS="-I /usr/local/share/aclocal" diff --git a/include/d_io.h b/include/d_io.h index b9fcc1e7..e4eb3855 100644 --- a/include/d_io.h +++ b/include/d_io.h @@ -4,7 +4,7 @@ #define _D_IO_H #ifndef _WIN32_WCE -#if _WIN32 +#ifdef _WIN32 #include #else #include diff --git a/include/loadgl.h b/include/loadgl.h index a4a3f18f..7af6b1bc 100644 --- a/include/loadgl.h +++ b/include/loadgl.h @@ -9,13 +9,7 @@ #ifndef __LOADGL_H__ #define __LOADGL_H__ -#ifndef WIN32 -#ifdef __WINDOWS__ -#define WIN32 -#endif -#endif - -#if defined(WIN32) +#ifdef _WIN32 #include #define OGLFUNCCALL __stdcall #else @@ -394,7 +388,7 @@ #define glMultiTexCoord2fSGIS dglMultiTexCoord2fSGIS #define glSelectTextureSGIS dglSelectTextureSGIS -#ifdef WIN32 +#ifdef _WIN32 #define wglCopyContext dwglCopyContext #define wglCreateContext dwglCreateContext #define wglCreateLayerContext dwglCreateLayerContext @@ -760,7 +754,7 @@ typedef void (OGLFUNCCALL *glActiveTextureARB_fp)(GLenum target); typedef void (OGLFUNCCALL *glMultiTexCoord2fSGIS_fp)(GLenum target, GLfloat s, GLfloat t); typedef void (OGLFUNCCALL *glSelectTextureSGIS_fp)(GLenum target); -#ifdef WIN32 +#ifdef _WIN32 typedef BOOL (OGLFUNCCALL *wglCopyContext_fp)(HGLRC, HGLRC, UINT); typedef HGLRC (OGLFUNCCALL *wglCreateContext_fp)(HDC); typedef HGLRC (OGLFUNCCALL *wglCreateLayerContext_fp)(HDC, int); @@ -1126,7 +1120,7 @@ DEFVAR glActiveTextureARB_fp dglActiveTextureARB; DEFVAR glMultiTexCoord2fSGIS_fp dglMultiTexCoord2fSGIS; DEFVAR glSelectTextureSGIS_fp dglSelectTextureSGIS; -#ifdef WIN32 +#ifdef _WIN32 DEFVAR wglCopyContext_fp dwglCopyContext; DEFVAR wglCreateContext_fp dwglCreateContext; DEFVAR wglCreateLayerContext_fp dwglCreateLayerContext; @@ -1153,7 +1147,7 @@ DEFVAR wglSwapMultipleBuffers_fp dwglSwapMultipleBuffers; #ifdef DECLARE_VARS // Dynamic module load functions -#ifdef WIN32 +#ifdef _WIN32 void *dll_LoadModule(const char *name) { HINSTANCE handle; @@ -1569,7 +1563,7 @@ bool OpenGL_LoadLibrary(bool load) dglVertexPointer = (glVertexPointer_fp)dll_GetSymbol(OpenGLModuleHandle,"glVertexPointer"); dglViewport = (glViewport_fp)dll_GetSymbol(OpenGLModuleHandle,"glViewport"); -#ifdef WIN32 +#ifdef _WIN32 dwglCopyContext = (wglCopyContext_fp)dll_GetSymbol(OpenGLModuleHandle,"wglCopyContext"); dwglCreateContext = (wglCreateContext_fp)dll_GetSymbol(OpenGLModuleHandle,"wglCreateContext"); dwglCreateLayerContext = (wglCreateLayerContext_fp)dll_GetSymbol(OpenGLModuleHandle,"wglCreateLayerContext"); @@ -1942,7 +1936,7 @@ void OpenGL_SetFuncsToNull(void) dglMultiTexCoord2fSGIS = NULL; dglSelectTextureSGIS = NULL; -#ifdef WIN32 +#ifdef _WIN32 dwglCopyContext = NULL; dwglCreateContext = NULL; dwglCreateLayerContext = NULL; diff --git a/include/ogl_init.h b/include/ogl_init.h index 393571fc..5047a24f 100644 --- a/include/ogl_init.h +++ b/include/ogl_init.h @@ -2,12 +2,14 @@ #ifndef _OGL_INIT_H_ #define _OGL_INIT_H_ -#ifdef __WINDOWS__ +#ifdef _MSC_VER +# undef MAC // dirty feckin hack #include #include +# define MAC(x) #endif -//#ifdef __WINDOWS__ +//#ifdef _WIN32 //#define OGL_RUNTIME_LOAD //#endif diff --git a/include/pstypes.h b/include/pstypes.h index 2a1579b1..65b2df3a 100644 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -1,4 +1,4 @@ -/* $Id: pstypes.h,v 1.21 2003-11-26 12:26:28 btb Exp $ */ +/* $Id: pstypes.h,v 1.22 2003-11-27 00:21:04 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -64,15 +64,14 @@ typedef Uint64 u_int64_t; #define max(a,b) (((a)<(b))?(b):(a)) #endif -#ifdef _MSC_VER -# define PATH_MAX _MAX_PATH -#endif - -#ifdef _WIN32_WCE -# define _MAX_DIR 256 -#endif - -#ifdef __unix__ +#ifdef _WIN32 +# ifndef __MINGW32__ +# define PATH_MAX _MAX_PATH +# endif +# ifdef _WIN32_WCE +# define _MAX_DIR 256 +# endif +#elif defined(__unix__) # include # define _MAX_PATH 1024 # define _MAX_DIR 256 diff --git a/include/u_mem.h b/include/u_mem.h index 017cb43b..aef72efd 100644 --- a/include/u_mem.h +++ b/include/u_mem.h @@ -1,4 +1,4 @@ -/* $Id: u_mem.h,v 1.6 2003-06-18 08:00:31 btb Exp $ */ +/* $Id: u_mem.h,v 1.7 2003-11-27 00:21:04 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -8,10 +8,10 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ - + #include #ifdef MACINTOSH diff --git a/main/state.c b/main/state.c index 49369801..f35259d2 100644 --- a/main/state.c +++ b/main/state.c @@ -1,4 +1,4 @@ -/* $Id: state.c,v 1.11 2003-11-26 12:26:33 btb Exp $ */ +/* $Id: state.c,v 1.12 2003-11-27 00:21:04 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -253,6 +253,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef OGL +# ifdef _MSC_VER +# include +# endif #if defined(__APPLE__) && defined(__MACH__) #include #else diff --git a/main/vers_id.h b/main/vers_id.h index 7606930b..a9624184 100644 --- a/main/vers_id.h +++ b/main/vers_id.h @@ -1,4 +1,4 @@ -/* $Id: vers_id.h,v 1.4 2003-10-10 09:36:35 btb Exp $ */ +/* $Id: vers_id.h,v 1.5 2003-11-27 00:21:04 btb Exp $ */ // // Auto-generated include file [used to be] // Generated by MAKE from INFERNO.INI settings @@ -8,6 +8,10 @@ #ifndef _VERS_ID #define _VERS_ID +#ifndef VERSION +# define VERSION +#endif + #define VERSION_TYPE "Full Version" #define DESCENT_VERSION "D2X " VERSION #define D2X_IVER (D2XMAJOR*10000+D2XMINOR*100+D2XMICRO) diff --git a/misc/d_io.c b/misc/d_io.c index 7faefd8e..fea96683 100644 --- a/misc/d_io.c +++ b/misc/d_io.c @@ -1,4 +1,4 @@ -/* $Id: d_io.c,v 1.6 2003-11-26 12:26:36 btb Exp $ */ +/* $Id: d_io.c,v 1.7 2003-11-27 00:21:04 btb Exp $ */ /* * some misc. file/disk routines * Arne de Bruijn, 1998 @@ -53,7 +53,7 @@ unsigned long d_getdiskfree() #ifdef __MSDOS__ return getdiskfree(); #else -#ifdef __WINDOWS__ +#if 0//def __WINDOWS__ ULONG cbCluster = 0; ULONG cClusters = 0; -- 2.39.2