From dd32de5567784e912f28e735b4415344f1d8feb5 Mon Sep 17 00:00:00 2001 From: GhostlyDeath Date: Wed, 16 Jan 2008 13:39:24 +0000 Subject: Added MSVC9 (2k8 Express) Project File; The client builds but -setup and -server just need to have files excluded/included from the project Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1000 --- TODO | 1 - msvc/config.h | 6 +- msvc/win32.rc | 46 ++ pcsound/pcsound.c | 1 + src/deh_mapping.c | 1 + src/doomdef.h | 1 + src/m_argv.c | 1 + src/w_merge.c | 1 + vc9/Chocolate Doom.sln | 32 + vc9/Chocolate Doom.vcproj | 1892 +++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 1978 insertions(+), 4 deletions(-) create mode 100644 msvc/win32.rc create mode 100644 vc9/Chocolate Doom.sln create mode 100644 vc9/Chocolate Doom.vcproj diff --git a/TODO b/TODO index 7c5e5eaa..d5e99bb9 100644 --- a/TODO +++ b/TODO @@ -36,7 +36,6 @@ Crazy pie in the sky ideas: automatically download and play speedruns. * DWANGO-like interface for finding players and setting up games. * Demo hashes for regression testing of this and other ports. -* MSVC build * OPL emulation * Video capture mode? diff --git a/msvc/config.h b/msvc/config.h index 79416b60..001a0f70 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -11,16 +11,16 @@ #define PACKAGE_NAME "Chocolate Doom" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Chocolate Doom 0.0.0" +#define PACKAGE_STRING "Chocolate Doom 1.0.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "chocolate-doom" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.0.0" +#define PACKAGE_VERSION "1.0.0" /* Version number of package */ -#define VERSION "0.0.0" +#define VERSION "1.0.0" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/msvc/win32.rc b/msvc/win32.rc new file mode 100644 index 00000000..400c054d --- /dev/null +++ b/msvc/win32.rc @@ -0,0 +1,46 @@ +//----------------------------------------------------------------------------- +// +// Copyright(C) 2005 Simon Howard +// Copyright(C) 2008 "GhostlyDeath" (ghostlydeath@gmail.com) +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. +// +// DESCRIPTION: +// Win32 Resources +// +//----------------------------------------------------------------------------- + +1 ICON "../data/chocolate-doom.ico" + +1 VERSIONINFO +PRODUCTVERSION 1,0,0,0 +FILEVERSION 1,0,0,0 +FILETYPE 1 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "FileVersion", "1.0.0" + VALUE "FileDescription", "Chocolate Doom 1.0.0" + VALUE "InternalName", "chocolate-doom" + VALUE "CompanyName", "fraggle@gmail.com" + VALUE "LegalCopyright", "GNU General Public License" + VALUE "ProductName", "Chocolate Doom" + VALUE "ProductVersion", "1.0.0" + END + END +END \ No newline at end of file diff --git a/pcsound/pcsound.c b/pcsound/pcsound.c index 3e6c3ae9..2be75435 100644 --- a/pcsound/pcsound.c +++ b/pcsound/pcsound.c @@ -27,6 +27,7 @@ #include #include +#include "doomdef.h" #include "config.h" #include "pcsound.h" #include "pcsound_internal.h" diff --git a/src/deh_mapping.c b/src/deh_mapping.c index a818e7a9..c1466031 100644 --- a/src/deh_mapping.c +++ b/src/deh_mapping.c @@ -30,6 +30,7 @@ #include #include +#include "doomdef.h" #include "i_system.h" #include "deh_mapping.h" diff --git a/src/doomdef.h b/src/doomdef.h index fb944445..795cc221 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -34,6 +34,7 @@ // #define macros to provide functions missing in Windows. // Outside Windows, we use strings.h for str[n]casecmp. + #ifdef _WIN32 #define snprintf _snprintf diff --git a/src/m_argv.c b/src/m_argv.c index 9e119876..509a0b87 100644 --- a/src/m_argv.c +++ b/src/m_argv.c @@ -29,6 +29,7 @@ #include #include +#include "doomdef.h" #include "i_system.h" int myargc; diff --git a/src/w_merge.c b/src/w_merge.c index 1fac471a..ff240e0c 100644 --- a/src/w_merge.c +++ b/src/w_merge.c @@ -29,6 +29,7 @@ #include #include +#include "doomdef.h" #include "i_system.h" #include "w_merge.h" #include "w_wad.h" diff --git a/vc9/Chocolate Doom.sln b/vc9/Chocolate Doom.sln new file mode 100644 index 00000000..29743a85 --- /dev/null +++ b/vc9/Chocolate Doom.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chocolate Doom", "Chocolate Doom.vcproj", "{8B744A3B-8F18-41A0-85A3-293816E85B6E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Client|Win32 = Debug Client|Win32 + Debug Server|Win32 = Debug Server|Win32 + Debug Setup|Win32 = Debug Setup|Win32 + Release Client|Win32 = Release Client|Win32 + Release Server|Win32 = Release Server|Win32 + Release Setup|Win32 = Release Setup|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Debug Client|Win32.ActiveCfg = Debug|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Debug Client|Win32.Build.0 = Debug|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Debug Server|Win32.ActiveCfg = Debug Server|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Debug Server|Win32.Build.0 = Debug Server|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Debug Setup|Win32.ActiveCfg = Debug Setup|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Debug Setup|Win32.Build.0 = Debug Setup|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release Client|Win32.ActiveCfg = Release|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release Client|Win32.Build.0 = Release|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release Server|Win32.ActiveCfg = Release Server|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release Server|Win32.Build.0 = Release Server|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release Setup|Win32.ActiveCfg = Release Setup|Win32 + {8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release Setup|Win32.Build.0 = Release Setup|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vc9/Chocolate Doom.vcproj b/vc9/Chocolate Doom.vcproj new file mode 100644 index 00000000..d3de6501 --- /dev/null +++ b/vc9/Chocolate Doom.vcproj @@ -0,0 +1,1892 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3