From f81fcb88a6a7bec7f5b954493679d1bb0c615035 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 2 Dec 2004 08:52:59 +0000 Subject: [PATCH] Updated MSVC build, now uses dynamic opengl loading --- ChangeLog | 8 + README | 41 +- VisualC/d2x/conf.h | 174 +++ VisualC/d2x/d2x.dsp | 2362 ++++++++++++++++--------------- VisualC/d2xgl/conf.h | 174 +++ VisualC/d2xgl/d2xgl.dsp | 68 +- VisualC/libmve/conf.h | 9 + VisualC/libmve/libmve.dsp | 260 ++-- VisualC/mveplayer/mveplayer.dsp | 252 ++-- configure.ac | 2 +- include/loadgl.h | 8 +- include/ogl_init.h | 6 +- include/physfsx.h | 4 +- 13 files changed, 1929 insertions(+), 1439 deletions(-) create mode 100644 VisualC/d2x/conf.h create mode 100644 VisualC/d2xgl/conf.h create mode 100644 VisualC/libmve/conf.h diff --git a/ChangeLog b/ChangeLog index deeaf541..27ace677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-12-01 Bradley Bell + + * README, configure.ac, VisualC/d2x/d2x.dsp, + VisualC/d2xgl/d2xgl.dsp, VisualC/libmve/libmve.dsp, + VisualC/mveplayer/mveplayer.dsp, include/loadgl.h, + include/ogl_init.h, include/physfsx.h: Updated MSVC build, now + uses dynamic opengl loading + 2004-12-01 Chris Taylor * arch/ogl/gr.c: make write_bmp use PhysicsFS diff --git a/README b/README index 635156ba..d2ae6a19 100644 --- a/README +++ b/README @@ -52,11 +52,11 @@ Known bugs/issues: kind of works) (btb: works pretty good for me.) -Win32: -====== +Win32 (unix style): +=================== Required tools: -* Cygwin or MinGW + MSys +* MSYS (with MinGW) or Cygwin * SDL 1.2 * PhysicsFS * NASM 0.98 (OPTIONAL but RECOMMENDED) @@ -76,8 +76,41 @@ Now you can configure d2x as normal. i.e. ./configure or ./configure --with-opengl +and build with: +make + +VPATH builds, described above, also work in MSYS or Cygwin +Then just copy your executable and SDL.dll into the descent2 +directory. + + +Win32 (MSVC): +============= + +Required tools: +* MSVC++ +* SDL 1.2 +* PhysicsFS + +Download the SDL 1.2 SDK for MSVC and the source code for PhysicsFS. +Unpack them in your source directory, along with the d2x source code. +This can be whereever you like, but if your directory structure looks +like this, then you won't have to mess with the project settings: + +sdl\ +sdl\SDL-1.2.7\ +physfs +physfs\physfs-1.0.0\ +descent\d2x\ + +First you have to compile the PhysicsFS library. Open +physfs_static.dsw, select the "Release" configuration, and build. + +Now open d2x.dsw, select the active project to d2x or d2xgl, select +the "Release" or "Debug" configuration as desired, and build. -Then just copy your executable and SDL.dll into the descent2 directory. +Then just copy your executable and SDL.dll into your descent2 +directory. MS-DOS: diff --git a/VisualC/d2x/conf.h b/VisualC/d2x/conf.h new file mode 100644 index 00000000..7bc65d8e --- /dev/null +++ b/VisualC/d2x/conf.h @@ -0,0 +1,174 @@ +/* conf.h. Generated by configure. */ +/* conf.h.in. Generated from configure.ac by autoheader. */ +/* modified to use with MSVC */ + +/* Define to enable console */ +#define CONSOLE + +/* d2x major version */ +#define D2XMAJOR 0 + +/* d2x minor version */ +#define D2XMINOR 2 + +/* d2x micro version */ +#define D2XMICRO 6 + +/* Define if you want to build the editor */ +/* #undef EDITOR */ + +/* Define for faster i/o on little-endian cpus */ +#define FAST_FILE_IO + +/* Define if you want a GGI build */ +/* #undef GGI */ + +/* Define to 1 if you have the declaration of `nanosleep', and to 0 if you + don't. */ +#define HAVE_DECL_NANOSLEEP 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETIPX_IPX_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if the system has the type `struct timespec'. */ +#define HAVE_STRUCT_TIMESPEC 1 + +/* Define to 1 if the system has the type `struct timeval'. */ +#define HAVE_STRUCT_TIMEVAL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to enable use of the KaliNix driver */ +/* #undef KALINIX */ + +/* Define if you want to build for mac datafiles */ +/* #undef MACDATA */ + +/* Define to use the IPX support of the OS */ +#define NATIVE_IPX + +/* Define to disable asserts, int3, etc. */ +/* #undef NDEBUG */ + +/* Define if you want a network build */ +#define NETWORK + +/* Define if you want an assembler free build */ +#define NO_ASM + +/* Define if you want an OpenGL build */ +/* #undef OGL */ + +/* Name of package */ +#define PACKAGE "d2x" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "descent-source@warpcore.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "d2x" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "d2x 0.2.6" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "d2x" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.2.6" + +/* Define for a "release" build */ +/* #undef RELEASE */ + +/* Define if you have the SDL_image library */ +/* #undef SDL_IMAGE */ + +/* Define this to be the shared game directory root */ +/* #undef SHAREPATH */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you want an SVGALib build */ +/* #undef SVGA */ + +/* define to not use the SDL_Joystick routines. */ +/* #undef USE_LINUX_JOY */ + +/* Version number of package */ +#define VERSION "0.2.6" + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define if your processor needs data to be word-aligned */ +/* #undef WORDS_NEED_ALIGNMENT */ + + + /* General defines */ +#ifndef PACKAGE_STRING +#define PACKAGE_STRING "d2x 0.2.6" +#endif +#define VERSION_NAME PACKAGE_STRING +#define NMONO 1 +#define PIGGY_USE_PAGING 1 +#define NEWDEMO 1 + +#if defined(__APPLE__) && defined(__MACH__) +#define __unix__ /* since we're doing a unix-style compilation... */ +#endif + +#ifdef __unix__ +# ifdef GGI +# define GII_INPUT 1 +# define GGI_VIDEO 1 +# else +# ifdef SVGA +# define SVGALIB_INPUT 1 +# define SVGALIB_VIDEO 1 +# else +# define SDL_INPUT 1 +# ifdef OGL +# define SDL_GL_VIDEO 1 +# else +# define SDL_VIDEO 1 +# endif +# endif +# endif +#endif + +#ifdef _WIN32 +# define SDL_INPUT 1 +# ifdef OGL +# define SDL_GL_VIDEO 1 +# else +# define SDL_VIDEO 1 +# endif +#endif + diff --git a/VisualC/d2x/d2x.dsp b/VisualC/d2x/d2x.dsp index 1114e9b8..d3a36821 100644 --- a/VisualC/d2x/d2x.dsp +++ b/VisualC/d2x/d2x.dsp @@ -1,1163 +1,1199 @@ -# Microsoft Developer Studio Project File - Name="d2x" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -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 -!MESSAGE NMAKE /f "d2x.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 "d2x.mak" CFG="d2x - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "d2x - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "d2x - 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)" == "d2x - 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.7\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" -# 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 /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "d2x - 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.7\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" -# 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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "d2x - Win32 Release" -# Name "d2x - 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\sdl\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\sdl\rbaudio.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=..\..\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\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.7\lib\SDL.lib" -# End Source File -# Begin Source File - -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="d2x" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +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 +!MESSAGE NMAKE /f "d2x.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 "d2x.mak" CFG="d2x - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "d2x - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "d2x - 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)" == "d2x - 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 "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /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 winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt" + +!ELSEIF "$(CFG)" == "d2x - 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 "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /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 winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "d2x - Win32 Release" +# Name "d2x - 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\sdl\gr.c +# End Source File +# Begin Source File + +SOURCE=..\..\arch\win32\hmpfile.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\midi.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\sdl\rbaudio.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=..\..\console\CON_console.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=..\..\misc\ignorecase.c +# End Source File +# Begin Source File + +SOURCE=..\..\mem\mem.c +# End Source File +# Begin Source File + +SOURCE=..\..\misc\physfsrwops.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\digiobj.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=..\..\include\CON_console.h +# End Source File +# Begin Source File + +SOURCE=.\conf.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=..\..\arch\win32\include\hmpfile.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=..\..\include\ignorecase.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=..\..\include\libmve.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\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=..\..\include\physfsrwops.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\physfsx.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.7\lib\SDLmain.lib" +# End Source File +# Begin Source File + +SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDL.lib" +# End Source File +# Begin Source File + +SOURCE="..\..\..\..\physfs\physfs-1.0.0\physfs_static_release\physfs_static.lib" +# End Source File +# End Target +# End Project diff --git a/VisualC/d2xgl/conf.h b/VisualC/d2xgl/conf.h new file mode 100644 index 00000000..b96c4e9f --- /dev/null +++ b/VisualC/d2xgl/conf.h @@ -0,0 +1,174 @@ +/* conf.h. Generated by configure. */ +/* conf.h.in. Generated from configure.ac by autoheader. */ +/* modified to use with MSVC */ + +/* Define to enable console */ +#define CONSOLE + +/* d2x major version */ +#define D2XMAJOR 0 + +/* d2x minor version */ +#define D2XMINOR 2 + +/* d2x micro version */ +#define D2XMICRO 6 + +/* Define if you want to build the editor */ +/* #undef EDITOR */ + +/* Define for faster i/o on little-endian cpus */ +#define FAST_FILE_IO + +/* Define if you want a GGI build */ +/* #undef GGI */ + +/* Define to 1 if you have the declaration of `nanosleep', and to 0 if you + don't. */ +#define HAVE_DECL_NANOSLEEP 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETIPX_IPX_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if the system has the type `struct timespec'. */ +#define HAVE_STRUCT_TIMESPEC 1 + +/* Define to 1 if the system has the type `struct timeval'. */ +#define HAVE_STRUCT_TIMEVAL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to enable use of the KaliNix driver */ +/* #undef KALINIX */ + +/* Define if you want to build for mac datafiles */ +/* #undef MACDATA */ + +/* Define to use the IPX support of the OS */ +#define NATIVE_IPX + +/* Define to disable asserts, int3, etc. */ +/* #undef NDEBUG */ + +/* Define if you want a network build */ +#define NETWORK + +/* Define if you want an assembler free build */ +#define NO_ASM + +/* Define if you want an OpenGL build */ +#define OGL + +/* Name of package */ +#define PACKAGE "d2x" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "descent-source@warpcore.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "d2x" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "d2x 0.2.6" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "d2x" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.2.6" + +/* Define for a "release" build */ +/* #undef RELEASE */ + +/* Define if you have the SDL_image library */ +/* #undef SDL_IMAGE */ + +/* Define this to be the shared game directory root */ +/* #undef SHAREPATH */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you want an SVGALib build */ +/* #undef SVGA */ + +/* define to not use the SDL_Joystick routines. */ +/* #undef USE_LINUX_JOY */ + +/* Version number of package */ +#define VERSION "0.2.6" + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define if your processor needs data to be word-aligned */ +/* #undef WORDS_NEED_ALIGNMENT */ + + + /* General defines */ +#ifndef PACKAGE_STRING +#define PACKAGE_STRING "d2x 0.2.6" +#endif +#define VERSION_NAME PACKAGE_STRING +#define NMONO 1 +#define PIGGY_USE_PAGING 1 +#define NEWDEMO 1 + +#if defined(__APPLE__) && defined(__MACH__) +#define __unix__ /* since we're doing a unix-style compilation... */ +#endif + +#ifdef __unix__ +# ifdef GGI +# define GII_INPUT 1 +# define GGI_VIDEO 1 +# else +# ifdef SVGA +# define SVGALIB_INPUT 1 +# define SVGALIB_VIDEO 1 +# else +# define SDL_INPUT 1 +# ifdef OGL +# define SDL_GL_VIDEO 1 +# else +# define SDL_VIDEO 1 +# endif +# endif +# endif +#endif + +#ifdef _WIN32 +# define SDL_INPUT 1 +# ifdef OGL +# define SDL_GL_VIDEO 1 +# else +# define SDL_VIDEO 1 +# endif +#endif + diff --git a/VisualC/d2xgl/d2xgl.dsp b/VisualC/d2xgl/d2xgl.dsp index fec7a13e..cfb73750 100644 --- a/VisualC/d2xgl/d2xgl.dsp +++ b/VisualC/d2xgl/d2xgl.dsp @@ -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.7\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 CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "NDEBUG" /D "RELEASE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /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" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 +# 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 winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt" !ELSEIF "$(CFG)" == "d2xgl - Win32 Debug" @@ -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.7\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 CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\main" /I "..\..\arch\include" /I "..\..\arch\win32\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /I "..\..\..\..\physfs\physfs-1.0.0" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /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" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # 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 glu32.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 winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept !ENDIF @@ -223,11 +223,11 @@ SOURCE=..\..\arch\sdl\event.c # End Source File # Begin Source File -SOURCE=..\..\arch\win32\findfile.c +SOURCE=..\..\arch\ogl\gr.c # End Source File # Begin Source File -SOURCE=..\..\arch\ogl\gr.c +SOURCE=..\..\arch\win32\hmpfile.c # End Source File # Begin Source File @@ -247,6 +247,10 @@ SOURCE=..\..\arch\sdl\key.c # End Source File # Begin Source File +SOURCE=..\..\arch\win32\midi.c +# End Source File +# Begin Source File + SOURCE=..\..\arch\win32\mingw_init.c # End Source File # Begin Source File @@ -279,31 +283,31 @@ SOURCE=..\..\misc\args.c # End Source File # Begin Source File -SOURCE=..\..\cfile\cfile.c +SOURCE=..\..\console\CON_console.c # End Source File # Begin Source File -SOURCE=..\..\console\CON_console.c +SOURCE=..\..\misc\error.c # End Source File # Begin Source File -SOURCE=..\..\misc\d_io.c +SOURCE=..\..\misc\hash.c # End Source File # Begin Source File -SOURCE=..\..\misc\error.c +SOURCE=..\..\iff\iff.c # End Source File # Begin Source File -SOURCE=..\..\misc\hash.c +SOURCE=..\..\misc\ignorecase.c # End Source File # Begin Source File -SOURCE=..\..\iff\iff.c +SOURCE=..\..\mem\mem.c # End Source File # Begin Source File -SOURCE=..\..\mem\mem.c +SOURCE=..\..\misc\physfsrwops.c # End Source File # Begin Source File @@ -371,6 +375,10 @@ SOURCE=..\..\main\crypt.c # End Source File # Begin Source File +SOURCE=..\..\main\digiobj.c +# End Source File +# Begin Source File + SOURCE=..\..\main\effects.c # End Source File # Begin Source File @@ -720,6 +728,10 @@ SOURCE=..\..\include\CON_console.h # End Source File # Begin Source File +SOURCE=.\conf.h +# End Source File +# Begin Source File + SOURCE=..\..\main\config.h # End Source File # Begin Source File @@ -860,10 +872,18 @@ SOURCE=..\..\include\iff.h # End Source File # Begin Source File +SOURCE=..\..\include\ignorecase.h +# End Source File +# Begin Source File + SOURCE=..\..\main\inferno.h # End Source File # Begin Source File +SOURCE=..\..\arch\ogl\internal.h +# End Source File +# Begin Source File + SOURCE=..\..\include\interp.h # End Source File # Begin Source File @@ -908,10 +928,18 @@ SOURCE=..\..\main\laser.h # End Source File # Begin Source File +SOURCE=..\..\include\libmve.h +# End Source File +# Begin Source File + SOURCE=..\..\main\lighting.h # End Source File # Begin Source File +SOURCE=..\..\include\loadgl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\makesig.h # End Source File # Begin Source File @@ -996,6 +1024,14 @@ SOURCE=..\..\include\pcx.h # End Source File # Begin Source File +SOURCE=..\..\include\physfsrwops.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\physfsx.h +# End Source File +# Begin Source File + SOURCE=..\..\main\physics.h # End Source File # Begin Source File @@ -1161,11 +1197,15 @@ SOURCE=..\..\main\weapon.h # End Group # Begin Source File +SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" +# End Source File +# Begin Source File + SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDL.lib" # End Source File # Begin Source File -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" +SOURCE="..\..\..\..\physfs\physfs-1.0.0\physfs_static_release\physfs_static.lib" # End Source File # End Target # End Project diff --git a/VisualC/libmve/conf.h b/VisualC/libmve/conf.h new file mode 100644 index 00000000..34c17f89 --- /dev/null +++ b/VisualC/libmve/conf.h @@ -0,0 +1,9 @@ +/* conf.h. Generated by configure. */ +/* conf.h.in. Generated from configure.ac by autoheader. */ +/* modified to use with MSVC */ + +/* Define to 1 if the system has the type `struct timespec'. */ +#define HAVE_STRUCT_TIMESPEC 0 + +/* Define to 1 if the system has the type `struct timeval'. */ +#define HAVE_STRUCT_TIMEVAL 1 diff --git a/VisualC/libmve/libmve.dsp b/VisualC/libmve/libmve.dsp index 49598aa9..0fbe638b 100644 --- a/VisualC/libmve/libmve.dsp +++ b/VisualC/libmve/libmve.dsp @@ -1,128 +1,132 @@ -# Microsoft Developer Studio Project File - Name="libmve" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libmve - Win32 Debug -!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 "libmve.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 "libmve.mak" CFG="libmve - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libmve - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libmve - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libmve - 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 Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libmve - 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 Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libmve - Win32 Release" -# Name "libmve - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\libmve\decoder16.c -# End Source File -# Begin Source File - -SOURCE=..\..\libmve\decoder8.c -# End Source File -# Begin Source File - -SOURCE=..\..\libmve\mve_audio.c -# End Source File -# Begin Source File - -SOURCE=..\..\libmve\mvelib.c -# End Source File -# Begin Source File - -SOURCE=..\..\libmve\mveplay.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\libmve\decoders.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\libmve.h -# End Source File -# Begin Source File - -SOURCE=..\..\libmve\mve_audio.h -# End Source File -# Begin Source File - -SOURCE=..\..\libmve\mvelib.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libmve" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libmve - Win32 Debug +!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 "libmve.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 "libmve.mak" CFG="libmve - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libmve - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libmve - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libmve - 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 Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libmve - 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 Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libmve - Win32 Release" +# Name "libmve - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\libmve\decoder16.c +# End Source File +# Begin Source File + +SOURCE=..\..\libmve\decoder8.c +# End Source File +# Begin Source File + +SOURCE=..\..\libmve\mve_audio.c +# End Source File +# Begin Source File + +SOURCE=..\..\libmve\mvelib.c +# End Source File +# Begin Source File + +SOURCE=..\..\libmve\mveplay.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\conf.h +# End Source File +# Begin Source File + +SOURCE=..\..\libmve\decoders.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\libmve.h +# End Source File +# Begin Source File + +SOURCE=..\..\libmve\mve_audio.h +# End Source File +# Begin Source File + +SOURCE=..\..\libmve\mvelib.h +# End Source File +# End Group +# End Target +# End Project diff --git a/VisualC/mveplayer/mveplayer.dsp b/VisualC/mveplayer/mveplayer.dsp index 3a855c32..6b343243 100644 --- a/VisualC/mveplayer/mveplayer.dsp +++ b/VisualC/mveplayer/mveplayer.dsp @@ -1,122 +1,130 @@ -# Microsoft Developer Studio Project File - Name="mveplayer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=mveplayer - Win32 Debug -!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 "mveplayer.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 "mveplayer.mak" CFG="mveplayer - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mveplayer - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "mveplayer - 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)" == "mveplayer - 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 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 "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /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 /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "mveplayer - 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 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 "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "mveplayer - Win32 Release" -# Name "mveplayer - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\libmve\mve_main.c - -!IF "$(CFG)" == "mveplayer - Win32 Release" - -!ELSEIF "$(CFG)" == "mveplayer - Win32 Debug" - -# ADD CPP /MD - -!ENDIF - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# 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.7\lib\SDL.lib" -# End Source File -# Begin Source File - -SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="mveplayer" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=mveplayer - Win32 Debug +!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 "mveplayer.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 "mveplayer.mak" CFG="mveplayer - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mveplayer - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "mveplayer - 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)" == "mveplayer - 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 "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /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 /nologo /subsystem:windows /machine:I386 +# SUBTRACT LINK32 /nodefaultlib + +!ELSEIF "$(CFG)" == "mveplayer - 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 "..\..\..\..\sdl\SDL-1.2.7\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "mveplayer - Win32 Release" +# Name "mveplayer - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\libmve\mve_main.c + +!IF "$(CFG)" == "mveplayer - Win32 Release" + +!ELSEIF "$(CFG)" == "mveplayer - Win32 Debug" + +# ADD CPP /MD + +!ENDIF + +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\include\libmve.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.7\lib\SDL.lib" +# End Source File +# Begin Source File + +SOURCE="..\..\..\..\sdl\SDL-1.2.7\lib\SDLmain.lib" +# End Source File +# End Target +# End Project diff --git a/configure.ac b/configure.ac index 27f11cd1..8aa38792 100644 --- a/configure.ac +++ b/configure.ac @@ -381,7 +381,7 @@ AH_BOTTOM([ # endif #endif -#ifdef __MINGW32__ +#ifdef _WIN32 # define SDL_INPUT 1 # ifdef OGL # define SDL_GL_VIDEO 1 diff --git a/include/loadgl.h b/include/loadgl.h index 100af66a..0c24c12c 100644 --- a/include/loadgl.h +++ b/include/loadgl.h @@ -1,4 +1,4 @@ -/* $Id: loadgl.h,v 1.10 2004-05-22 21:55:33 btb Exp $ */ +/* $Id: loadgl.h,v 1.11 2004-12-02 08:52:59 btb Exp $ */ /* * * dynamic opengl loading - courtesy of Jeff Slutter @@ -40,7 +40,11 @@ #define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED #endif -+ #ifndef GL_NV_register_combiners +#ifndef GL_TEXTURE_INDEX_SIZE_EXT +#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED +#endif + +#ifndef GL_NV_register_combiners #define GL_NV_register_combiners 1 #define GL_REGISTER_COMBINERS_NV 0x8522 #define GL_VARIABLE_A_NV 0x8523 diff --git a/include/ogl_init.h b/include/ogl_init.h index b19cb09d..098e8ed0 100644 --- a/include/ogl_init.h +++ b/include/ogl_init.h @@ -13,9 +13,9 @@ # define MAC(x) #endif -//#ifdef _WIN32 -//#define OGL_RUNTIME_LOAD -//#endif +#ifdef _MSC_VER //_WIN32 +#define OGL_RUNTIME_LOAD +#endif #ifdef OGL_RUNTIME_LOAD #include "loadgl.h" diff --git a/include/physfsx.h b/include/physfsx.h index ded82a7a..4c7608c6 100644 --- a/include/physfsx.h +++ b/include/physfsx.h @@ -1,4 +1,4 @@ -/* $Id: physfsx.h,v 1.2 2004-12-01 12:48:13 btb Exp $ */ +/* $Id: physfsx.h,v 1.3 2004-12-02 08:52:59 btb Exp $ */ /* * @@ -9,7 +9,7 @@ #ifndef PHYSFSX_H #define PHYSFSX_H -#ifndef macintosh +#if !defined(macintosh) && !defined(_MSC_VER) #include #endif #if defined(__linux__) -- 2.39.2