nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-05-12 15:31:31 -04:00
parent 2d4e292de6 75f293c369
commit 357165cf68
22 changed files with 1025 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dlb.h
+8
View File
@@ -37,7 +37,15 @@ typedef struct dlb_library {
/* library definitions */ /* library definitions */
#ifndef DLBFILE #ifndef DLBFILE
#ifndef VERSION_IN_DLB_FILENAME
#define DLBFILE "nhdat" /* name of library */ #define DLBFILE "nhdat" /* name of library */
#else
#define MAX_DLB_FILENAME 256
#define DLBFILE dlbfilename
#define DLBBASENAME "nhdat"
extern char dlbfilename[MAX_DLB_FILENAME];
extern char *FDECL(build_dlb_filename, (const char *));
#endif
#endif #endif
#ifndef FILENAME_CMP #ifndef FILENAME_CMP
#define FILENAME_CMP strcmp /* case sensitive */ #define FILENAME_CMP strcmp /* case sensitive */
include/ntconf.h
+2
View File
@@ -43,6 +43,8 @@
/* #define SHORT_FILENAMES */ /* All NT filesystems support long names now /* #define SHORT_FILENAMES */ /* All NT filesystems support long names now
*/ */
#define VERSION_IN_DLB_FILENAME /* Append version digits to nhdat */
#ifdef MICRO #ifdef MICRO
#undef MICRO /* never define this! */ #undef MICRO /* never define this! */
#endif #endif
src/dlb.c
+21 -1
View File
@@ -4,6 +4,9 @@
#include "config.h" #include "config.h"
#include "dlb.h" #include "dlb.h"
#if defined(VERSION_IN_DLB_FILENAME)
#include "patchlevel.h"
#endif
#ifdef __DJGPP__ #ifdef __DJGPP__
#include <string.h> #include <string.h>
@@ -38,6 +41,10 @@ typedef struct dlb_procs {
long FDECL((*dlb_ftell_proc), (DLB_P)); long FDECL((*dlb_ftell_proc), (DLB_P));
} dlb_procs_t; } dlb_procs_t;
#if defined(VERSION_IN_DLB_FILENAME)
char dlbfilename[MAX_DLB_FILENAME];
#endif
/* without extern.h via hack.h, these haven't been declared for us */ /* without extern.h via hack.h, these haven't been declared for us */
extern FILE *FDECL(fopen_datafile, (const char *, const char *, int)); extern FILE *FDECL(fopen_datafile, (const char *, const char *, int));
@@ -240,7 +247,9 @@ lib_dlb_init(VOID_ARGS)
{ {
/* zero out array */ /* zero out array */
(void) memset((char *) &dlb_libs[0], 0, sizeof(dlb_libs)); (void) memset((char *) &dlb_libs[0], 0, sizeof(dlb_libs));
#ifdef VERSION_IN_DLB_FILENAME
build_dlb_filename((const char *) 0);
#endif
/* To open more than one library, add open library calls here. */ /* To open more than one library, add open library calls here. */
if (!open_library(DLBFILE, &dlb_libs[0])) if (!open_library(DLBFILE, &dlb_libs[0]))
return FALSE; return FALSE;
@@ -263,6 +272,17 @@ lib_dlb_cleanup(VOID_ARGS)
close_library(&dlb_libs[i]); close_library(&dlb_libs[i]);
} }
#ifdef VERSION_IN_DLB_FILENAME
char *
build_dlb_filename(lf)
const char *lf;
{
Sprintf(dlbfilename, "%s%d%d%d",
lf ? lf : DLBBASENAME, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL);
return dlbfilename;
}
#endif
/*ARGSUSED*/ /*ARGSUSED*/
STATIC_OVL boolean STATIC_OVL boolean
lib_dlb_fopen(dp, name, mode) lib_dlb_fopen(dp, name, mode)
sys/winnt/Makefile.msc
+3 -3
View File
@@ -671,7 +671,7 @@ install: $(O)envchk.tag $(O)obj.tag $(O)utility.tag $(GAMEDIR)\NetHack.exe $(GAM
$(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \ $(O)install.tag: $(DAT)\data $(DAT)\rumors $(DAT)\dungeon \
$(DAT)\oracles $(DAT)\quest.dat $(O)sp_lev.tag $(DLB) $(DAT)\oracles $(DAT)\quest.dat $(O)sp_lev.tag $(DLB)
! IF ("$(USE_DLB)"=="Y") ! IF ("$(USE_DLB)"=="Y")
copy nhdat $(GAMEDIR) copy nhdat* $(GAMEDIR)
copy $(DAT)\license $(GAMEDIR) copy $(DAT)\license $(GAMEDIR)
copy $(DAT)\opthelp $(GAMEDIR) copy $(DAT)\opthelp $(GAMEDIR)
! ELSE ! ELSE
@@ -1279,7 +1279,7 @@ spotless: clean
if exist $(GAMEDIR)\nhraykey.dll del $(GAMEDIR)\nhraykey.dll if exist $(GAMEDIR)\nhraykey.dll del $(GAMEDIR)\nhraykey.dll
if exist $(GAMEDIR)\NetHack.exe del $(GAMEDIR)\NetHack.exe if exist $(GAMEDIR)\NetHack.exe del $(GAMEDIR)\NetHack.exe
if exist $(GAMEDIR)\NetHack.pdb del $(GAMEDIR)\NetHack.pdb if exist $(GAMEDIR)\NetHack.pdb del $(GAMEDIR)\NetHack.pdb
if exist $(GAMEDIR)\nhdat del $(GAMEDIR)\nhdat if exist $(GAMEDIR)\nhdat* del $(GAMEDIR)\nhdat*
! ENDIF ! ENDIF
if exist $(INCL)\date.h del $(INCL)\date.h if exist $(INCL)\date.h del $(INCL)\date.h
if exist $(INCL)\onames.h del $(INCL)\onames.h if exist $(INCL)\onames.h del $(INCL)\onames.h
@@ -1332,7 +1332,7 @@ spotless: clean
if exist $(DAT)\porthelp del $(DAT)\porthelp if exist $(DAT)\porthelp del $(DAT)\porthelp
if exist $(O)sp_lev.tag del $(O)sp_lev.tag if exist $(O)sp_lev.tag del $(O)sp_lev.tag
if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c
if exist nhdat. del nhdat. if exist nhdat*. del nhdat*.
if exist $(O)obj.tag del $(O)obj.tag if exist $(O)obj.tag del $(O)obj.tag
if exist $(O)gamedir.tag del $(O)gamedir.tag if exist $(O)gamedir.tag del $(O)gamedir.tag
if exist $(O)nh*key.lib del $(O)nh*key.lib if exist $(O)nh*key.lib del $(O)nh*key.lib
util/dlb_main.c
+3
View File
@@ -198,6 +198,9 @@ char **argv;
if (ap == argc) if (ap == argc)
usage(); usage();
library_file = argv[ap++]; library_file = argv[ap++];
#ifdef VERSION_IN_DLB_FILENAME
library_file = build_dlb_filename(library_file);
#endif
if (fseen) if (fseen)
printf("Warning: multiple f options. Previous ignored.\n"); printf("Warning: multiple f options. Previous ignored.\n");
fseen = 1; fseen = 1;
util/makedefs.c
+4
View File
@@ -1522,7 +1522,11 @@ static const char *build_opts[] = {
"ZLIB data file compression", "ZLIB data file compression",
#endif #endif
#ifdef DLB #ifdef DLB
#ifndef VERSION_IN_DLB_FILENAME
"data librarian", "data librarian",
#else
"data librarian with a version-dependent name",
#endif
#endif #endif
#ifdef DUMPLOG #ifdef DUMPLOG
"end-of-game dumplogs", "end-of-game dumplogs",
win/win32/vs2017/NetHack.sln
+215 -207
View File
@@ -1,207 +1,215 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.26730.12 VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895} {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42} {642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
{6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385} {6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385}
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "dgncomp.vcxproj", "{8A3F81C7-2968-49A8-86BF-2669412AD7DE}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "dgncomp.vcxproj", "{8A3F81C7-2968-49A8-86BF-2669412AD7DE}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42} {642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "levcomp.vcxproj", "{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "levcomp.vcxproj", "{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
{6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385} {6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385}
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
EndProject EndProject
Global Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{477BF231-48E0-4312-AA12-9D8576215489}"
GlobalSection(SolutionConfigurationPlatforms) = preSolution ProjectSection(SolutionItems) = preProject
Debug|Win32 = Debug|Win32 NetHackProperties.props = NetHackProperties.props
Debug|x64 = Debug|x64 EndProjectSection
Release|Win32 = Release|Win32 EndProject
Release|x64 = Release|x64 Global
EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution
GlobalSection(ProjectConfigurationPlatforms) = postSolution Debug|Win32 = Debug|Win32
{CEC5D360-8804-454F-8591-002184C23499}.Debug|Win32.ActiveCfg = Debug|Win32 Debug|x64 = Debug|x64
{CEC5D360-8804-454F-8591-002184C23499}.Debug|Win32.Build.0 = Debug|Win32 Release|Win32 = Release|Win32
{CEC5D360-8804-454F-8591-002184C23499}.Debug|x64.ActiveCfg = Debug|x64 Release|x64 = Release|x64
{CEC5D360-8804-454F-8591-002184C23499}.Debug|x64.Build.0 = Debug|x64 EndGlobalSection
{CEC5D360-8804-454F-8591-002184C23499}.Release|Win32.ActiveCfg = Release|Win32 GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CEC5D360-8804-454F-8591-002184C23499}.Release|Win32.Build.0 = Release|Win32 {CEC5D360-8804-454F-8591-002184C23499}.Debug|Win32.ActiveCfg = Debug|Win32
{CEC5D360-8804-454F-8591-002184C23499}.Release|x64.ActiveCfg = Release|x64 {CEC5D360-8804-454F-8591-002184C23499}.Debug|Win32.Build.0 = Debug|Win32
{CEC5D360-8804-454F-8591-002184C23499}.Release|x64.Build.0 = Release|x64 {CEC5D360-8804-454F-8591-002184C23499}.Debug|x64.ActiveCfg = Debug|x64
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|Win32.ActiveCfg = Debug|Win32 {CEC5D360-8804-454F-8591-002184C23499}.Debug|x64.Build.0 = Debug|x64
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|Win32.Build.0 = Debug|Win32 {CEC5D360-8804-454F-8591-002184C23499}.Release|Win32.ActiveCfg = Release|Win32
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|x64.ActiveCfg = Debug|x64 {CEC5D360-8804-454F-8591-002184C23499}.Release|Win32.Build.0 = Release|Win32
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|x64.Build.0 = Debug|x64 {CEC5D360-8804-454F-8591-002184C23499}.Release|x64.ActiveCfg = Release|x64
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.ActiveCfg = Release|Win32 {CEC5D360-8804-454F-8591-002184C23499}.Release|x64.Build.0 = Release|x64
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.Build.0 = Release|Win32 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|Win32.ActiveCfg = Debug|Win32
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.ActiveCfg = Release|x64 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|Win32.Build.0 = Debug|Win32
{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.Build.0 = Release|x64 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|x64.ActiveCfg = Debug|x64
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.ActiveCfg = Debug|Win32 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|x64.Build.0 = Debug|x64
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.Build.0 = Debug|Win32 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.ActiveCfg = Release|Win32
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|x64.ActiveCfg = Debug|x64 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.Build.0 = Release|Win32
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|x64.Build.0 = Debug|x64 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.ActiveCfg = Release|x64
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|Win32.ActiveCfg = Release|Win32 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.Build.0 = Release|x64
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|Win32.Build.0 = Release|Win32 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.ActiveCfg = Debug|Win32
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|x64.ActiveCfg = Release|x64 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.Build.0 = Debug|Win32
{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|x64.Build.0 = Release|x64 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|x64.ActiveCfg = Debug|x64
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|Win32.ActiveCfg = Debug|Win32 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|x64.Build.0 = Debug|x64
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|Win32.Build.0 = Debug|Win32 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|Win32.ActiveCfg = Release|Win32
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|x64.ActiveCfg = Debug|x64 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|Win32.Build.0 = Release|Win32
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|x64.Build.0 = Debug|x64 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|x64.ActiveCfg = Release|x64
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.ActiveCfg = Release|Win32 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|x64.Build.0 = Release|x64
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.Build.0 = Release|Win32 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|Win32.ActiveCfg = Debug|Win32
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.ActiveCfg = Release|x64 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|Win32.Build.0 = Debug|Win32
{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.Build.0 = Release|x64 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|x64.ActiveCfg = Debug|x64
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.ActiveCfg = Debug|Win32 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|x64.Build.0 = Debug|x64
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.Build.0 = Debug|Win32 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.ActiveCfg = Release|Win32
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|x64.ActiveCfg = Debug|x64 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.Build.0 = Release|Win32
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|x64.Build.0 = Debug|x64 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.ActiveCfg = Release|x64
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|Win32.ActiveCfg = Release|Win32 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.Build.0 = Release|x64
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|Win32.Build.0 = Release|Win32 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.ActiveCfg = Debug|Win32
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|x64.ActiveCfg = Release|x64 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.Build.0 = Debug|Win32
{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|x64.Build.0 = Release|x64 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|x64.ActiveCfg = Debug|x64
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|Win32.ActiveCfg = Debug|Win32 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|x64.Build.0 = Debug|x64
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|Win32.Build.0 = Debug|Win32 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|Win32.ActiveCfg = Release|Win32
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|x64.ActiveCfg = Debug|x64 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|Win32.Build.0 = Release|Win32
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|x64.Build.0 = Debug|x64 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|x64.ActiveCfg = Release|x64
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|Win32.ActiveCfg = Release|Win32 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Release|x64.Build.0 = Release|x64
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|Win32.Build.0 = Release|Win32 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|Win32.ActiveCfg = Debug|Win32
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|x64.ActiveCfg = Release|x64 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|Win32.Build.0 = Debug|Win32
{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|x64.Build.0 = Release|x64 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|x64.ActiveCfg = Debug|x64
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|Win32.ActiveCfg = Debug|Win32 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Debug|x64.Build.0 = Debug|x64
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|Win32.Build.0 = Debug|Win32 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|Win32.ActiveCfg = Release|Win32
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|x64.ActiveCfg = Debug|x64 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|Win32.Build.0 = Release|Win32
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|x64.Build.0 = Debug|x64 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|x64.ActiveCfg = Release|x64
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|Win32.ActiveCfg = Release|Win32 {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}.Release|x64.Build.0 = Release|x64
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|Win32.Build.0 = Release|Win32 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|Win32.ActiveCfg = Debug|Win32
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|x64.ActiveCfg = Release|x64 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|Win32.Build.0 = Debug|Win32
{642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|x64.Build.0 = Release|x64 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|x64.ActiveCfg = Debug|x64
{93F10526-209E-41D7-BBEA-775787876895}.Debug|Win32.ActiveCfg = Debug|Win32 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Debug|x64.Build.0 = Debug|x64
{93F10526-209E-41D7-BBEA-775787876895}.Debug|Win32.Build.0 = Debug|Win32 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|Win32.ActiveCfg = Release|Win32
{93F10526-209E-41D7-BBEA-775787876895}.Debug|x64.ActiveCfg = Debug|x64 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|Win32.Build.0 = Release|Win32
{93F10526-209E-41D7-BBEA-775787876895}.Debug|x64.Build.0 = Debug|x64 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|x64.ActiveCfg = Release|x64
{93F10526-209E-41D7-BBEA-775787876895}.Release|Win32.ActiveCfg = Release|Win32 {642BC75D-ABAF-403E-8224-7C725FD4CB42}.Release|x64.Build.0 = Release|x64
{93F10526-209E-41D7-BBEA-775787876895}.Release|Win32.Build.0 = Release|Win32 {93F10526-209E-41D7-BBEA-775787876895}.Debug|Win32.ActiveCfg = Debug|Win32
{93F10526-209E-41D7-BBEA-775787876895}.Release|x64.ActiveCfg = Release|x64 {93F10526-209E-41D7-BBEA-775787876895}.Debug|Win32.Build.0 = Debug|Win32
{93F10526-209E-41D7-BBEA-775787876895}.Release|x64.Build.0 = Release|x64 {93F10526-209E-41D7-BBEA-775787876895}.Debug|x64.ActiveCfg = Debug|x64
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.ActiveCfg = Debug|Win32 {93F10526-209E-41D7-BBEA-775787876895}.Debug|x64.Build.0 = Debug|x64
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.Build.0 = Debug|Win32 {93F10526-209E-41D7-BBEA-775787876895}.Release|Win32.ActiveCfg = Release|Win32
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|x64.ActiveCfg = Debug|x64 {93F10526-209E-41D7-BBEA-775787876895}.Release|Win32.Build.0 = Release|Win32
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|x64.Build.0 = Debug|x64 {93F10526-209E-41D7-BBEA-775787876895}.Release|x64.ActiveCfg = Release|x64
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|Win32.ActiveCfg = Release|Win32 {93F10526-209E-41D7-BBEA-775787876895}.Release|x64.Build.0 = Release|x64
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|Win32.Build.0 = Release|Win32 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.ActiveCfg = Debug|Win32
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|x64.ActiveCfg = Release|x64 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.Build.0 = Debug|Win32
{63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|x64.Build.0 = Release|x64 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|x64.ActiveCfg = Debug|x64
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|Win32.ActiveCfg = Debug|Win32 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|x64.Build.0 = Debug|x64
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|Win32.Build.0 = Debug|Win32 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|Win32.ActiveCfg = Release|Win32
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|x64.ActiveCfg = Debug|x64 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|Win32.Build.0 = Release|Win32
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|x64.Build.0 = Debug|x64 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|x64.ActiveCfg = Release|x64
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.ActiveCfg = Release|Win32 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|x64.Build.0 = Release|x64
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.Build.0 = Release|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|Win32.ActiveCfg = Debug|Win32
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.ActiveCfg = Release|x64 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|Win32.Build.0 = Debug|Win32
{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.Build.0 = Release|x64 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|x64.ActiveCfg = Debug|x64
{6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.ActiveCfg = Debug|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|x64.Build.0 = Debug|x64
{6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.Build.0 = Debug|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.ActiveCfg = Release|Win32
{6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.ActiveCfg = Debug|x64 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.Build.0 = Release|Win32
{6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.Build.0 = Debug|x64 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.ActiveCfg = Release|x64
{6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.ActiveCfg = Release|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.Build.0 = Release|x64
{6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.Build.0 = Release|Win32 {6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.ActiveCfg = Debug|Win32
{6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.ActiveCfg = Release|x64 {6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.Build.0 = Debug|Win32
{6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.Build.0 = Release|x64 {6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.ActiveCfg = Debug|x64
{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.ActiveCfg = Debug|Win32 {6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.Build.0 = Debug|x64
{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.Build.0 = Debug|Win32 {6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.ActiveCfg = Release|Win32
{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.ActiveCfg = Debug|x64 {6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.Build.0 = Release|Win32
{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.Build.0 = Debug|x64 {6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.ActiveCfg = Release|x64
{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.ActiveCfg = Release|Win32 {6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.Build.0 = Release|x64
{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.Build.0 = Release|Win32 {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.ActiveCfg = Debug|Win32
{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.ActiveCfg = Release|x64 {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.Build.0 = Debug|Win32
{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.Build.0 = Release|x64 {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.ActiveCfg = Debug|x64
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.ActiveCfg = Debug|Win32 {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.Build.0 = Debug|x64
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.Build.0 = Debug|Win32 {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.ActiveCfg = Release|Win32
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.ActiveCfg = Debug|x64 {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.Build.0 = Release|Win32
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.Build.0 = Debug|x64 {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.ActiveCfg = Release|x64
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.ActiveCfg = Release|Win32 {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.Build.0 = Release|x64
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.Build.0 = Release|Win32 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.ActiveCfg = Debug|Win32
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.ActiveCfg = Release|x64 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.Build.0 = Debug|Win32
{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.Build.0 = Release|x64 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.ActiveCfg = Debug|x64
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|Win32.ActiveCfg = Debug|Win32 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.Build.0 = Debug|x64
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|Win32.Build.0 = Debug|Win32 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.ActiveCfg = Release|Win32
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|x64.ActiveCfg = Debug|x64 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.Build.0 = Release|Win32
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|x64.Build.0 = Debug|x64 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.ActiveCfg = Release|x64
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|Win32.ActiveCfg = Release|Win32 {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.Build.0 = Release|x64
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|Win32.Build.0 = Release|Win32 {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|Win32.ActiveCfg = Debug|Win32
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|x64.ActiveCfg = Release|x64 {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|Win32.Build.0 = Debug|Win32
{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|x64.Build.0 = Release|x64 {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|x64.ActiveCfg = Debug|x64
EndGlobalSection {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|x64.Build.0 = Debug|x64
GlobalSection(SolutionProperties) = preSolution {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|Win32.ActiveCfg = Release|Win32
HideSolutionNode = FALSE {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|x64.ActiveCfg = Release|x64
EndGlobal {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6DF8F690-552A-4329-8FAB-DD447071A473}
EndGlobalSection
EndGlobal
win/win32/vs2017/NetHack.vcxproj
+16 -4
View File
@@ -9,6 +9,18 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<Import Project="console.props" /> <Import Project="console.props" />
<Import Project="common.props" /> <Import Project="common.props" />
<Import Project="dirs.props" /> <Import Project="dirs.props" />
@@ -19,12 +31,12 @@
<ItemDefinitionGroup Condition="Exists('$(PDCURSES)')"> <ItemDefinitionGroup Condition="Exists('$(PDCURSES)')">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(PDCURSES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(PDCURSES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CURSES_GRAPHICS;CHTYPE_32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>CURSES_GRAPHICS;CHTYPE_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>$(ToolsDir)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(ToolsDir)</AdditionalLibraryDirectories>
<AdditionalDependencies>PDCurses.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PDCurses.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
@@ -255,4 +267,4 @@
<Target Name="AfterRebuild"> <Target Name="AfterRebuild">
<MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target> </Target>
</Project> </Project>
win/win32/vs2017/NetHackProperties.props
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<VERSION_MAJOR>3</VERSION_MAJOR>
<VERSION_MINOR>6</VERSION_MINOR>
<PATCHLEVEL>3</PATCHLEVEL>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="VERSION_MAJOR">
<Value>$(VERSION_MAJOR)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="VERSION_MINOR">
<Value>$(VERSION_MINOR)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="PATCHLEVEL">
<Value>$(PATCHLEVEL)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
</ItemGroup>
</Project>
win/win32/vs2017/NetHackW.vcxproj
+13 -1
View File
@@ -8,6 +8,18 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="NetHackProperties.props" />
</ImportGroup>
<Import Project="common.props" /> <Import Project="common.props" />
<Import Project="dirs.props" /> <Import Project="dirs.props" />
<Import Project="files.props" /> <Import Project="files.props" />
@@ -200,4 +212,4 @@
<Target Name="AfterRebuild"> <Target Name="AfterRebuild">
<MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target> </Target>
</Project> </Project>
win/win32/vs2017/afterdlb.proj
+2 -2
View File
@@ -3,7 +3,7 @@
<Import Project="files.props"/> <Import Project="files.props"/>
<Target Name="Build" <Target Name="Build"
Inputs="$(ToolsDir)dlb.exe;@(DlbList);$(SysWinntDir)porthelp" Inputs="$(ToolsDir)dlb.exe;@(DlbList);$(SysWinntDir)porthelp"
Outputs="$(BinDir)nhdat"> Outputs="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
<Copy SourceFiles="$(SysWinntDir)porthelp" DestinationFolder="$(DatDir)"/> <Copy SourceFiles="$(SysWinntDir)porthelp" DestinationFolder="$(DatDir)"/>
<WriteLinesToFile File="$(DatDir)dlb.lst" Lines="@(DlbList->'%(filename)%(extension)')" Overwrite="true"/> <WriteLinesToFile File="$(DatDir)dlb.lst" Lines="@(DlbList->'%(filename)%(extension)')" Overwrite="true"/>
@@ -12,6 +12,6 @@
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<Delete Files="$(BinDir)nhdat"/> <Delete Files="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)"/>
</Target> </Target>
</Project> </Project>
win/win32/vs2017/dgncomp.vcxproj
+123 -111
View File
@@ -1,120 +1,132 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{8A3F81C7-2968-49A8-86BF-2669412AD7DE}</ProjectGuid> <ProjectGuid>{8A3F81C7-2968-49A8-86BF-2669412AD7DE}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Import Project="NetHackProperties.props" />
</ClCompile> </ImportGroup>
</ItemDefinitionGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ItemGroup> <Import Project="NetHackProperties.props" />
<ClCompile Include="$(SrcDir)alloc.c" /> </ImportGroup>
<ClCompile Include="$(SysShareDir)\dgn_lex.c" /> <Import Project="console.props" />
<ClCompile Include="$(UtilDir)dgn_main.c" /> <Import Project="common.props" />
<ClCompile Include="$(SysShareDir)dgn_yacc.c" /> <Import Project="dirs.props" />
<ClCompile Include="$(UtilDir)panic.c" /> <Import Project="files.props" />
</ItemGroup> <ItemDefinitionGroup>
<ItemGroup> <ClCompile>
<ClInclude Include="$(IncDir)align.h" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClInclude Include="$(IncDir)attrib.h" /> <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ClInclude Include="$(IncDir)color.h" /> </ClCompile>
<ClInclude Include="$(IncDir)config.h" /> </ItemDefinitionGroup>
<ClInclude Include="$(IncDir)config1.h" /> <ItemGroup>
<ClInclude Include="$(IncDir)context.h" /> <ClCompile Include="$(SrcDir)alloc.c" />
<ClInclude Include="$(IncDir)coord.h" /> <ClCompile Include="$(SysShareDir)\dgn_lex.c" />
<ClInclude Include="$(IncDir)decl.h" /> <ClCompile Include="$(UtilDir)dgn_main.c" />
<ClInclude Include="$(IncDir)dgn_comp.h" /> <ClCompile Include="$(SysShareDir)dgn_yacc.c" />
<ClInclude Include="$(IncDir)dgn_file.h" /> <ClCompile Include="$(UtilDir)panic.c" />
<ClInclude Include="$(IncDir)display.h" /> </ItemGroup>
<ClInclude Include="$(IncDir)dungeon.h" /> <ItemGroup>
<ClInclude Include="$(IncDir)engrave.h" /> <ClInclude Include="$(IncDir)align.h" />
<ClInclude Include="$(IncDir)flag.h" /> <ClInclude Include="$(IncDir)attrib.h" />
<ClInclude Include="$(IncDir)global.h" /> <ClInclude Include="$(IncDir)color.h" />
<ClInclude Include="$(IncDir)mkroom.h" /> <ClInclude Include="$(IncDir)config.h" />
<ClInclude Include="$(IncDir)monattk.h" /> <ClInclude Include="$(IncDir)config1.h" />
<ClInclude Include="$(IncDir)monst.h" /> <ClInclude Include="$(IncDir)context.h" />
<ClInclude Include="$(IncDir)monsym.h" /> <ClInclude Include="$(IncDir)coord.h" />
<ClInclude Include="$(IncDir)ntconf.h" /> <ClInclude Include="$(IncDir)decl.h" />
<ClInclude Include="$(IncDir)obj.h" /> <ClInclude Include="$(IncDir)dgn_comp.h" />
<ClInclude Include="$(IncDir)objclass.h" /> <ClInclude Include="$(IncDir)dgn_file.h" />
<ClInclude Include="$(IncDir)onames.h" /> <ClInclude Include="$(IncDir)display.h" />
<ClInclude Include="$(IncDir)permonst.h" /> <ClInclude Include="$(IncDir)dungeon.h" />
<ClInclude Include="$(IncDir)pm.h" /> <ClInclude Include="$(IncDir)engrave.h" />
<ClInclude Include="$(IncDir)prop.h" /> <ClInclude Include="$(IncDir)flag.h" />
<ClInclude Include="$(IncDir)quest.h" /> <ClInclude Include="$(IncDir)global.h" />
<ClInclude Include="$(IncDir)rect.h" /> <ClInclude Include="$(IncDir)mkroom.h" />
<ClInclude Include="$(IncDir)region.h" /> <ClInclude Include="$(IncDir)monattk.h" />
<ClInclude Include="$(IncDir)rm.h" /> <ClInclude Include="$(IncDir)monst.h" />
<ClInclude Include="$(IncDir)skills.h" /> <ClInclude Include="$(IncDir)monsym.h" />
<ClInclude Include="$(IncDir)spell.h" /> <ClInclude Include="$(IncDir)ntconf.h" />
<ClInclude Include="$(IncDir)timeout.h" /> <ClInclude Include="$(IncDir)obj.h" />
<ClInclude Include="$(IncDir)tradstdc.h" /> <ClInclude Include="$(IncDir)objclass.h" />
<ClInclude Include="$(IncDir)trampoli.h" /> <ClInclude Include="$(IncDir)onames.h" />
<ClInclude Include="$(IncDir)trap.h" /> <ClInclude Include="$(IncDir)permonst.h" />
<ClInclude Include="$(IncDir)vision.h" /> <ClInclude Include="$(IncDir)pm.h" />
<ClInclude Include="$(IncDir)winprocs.h" /> <ClInclude Include="$(IncDir)prop.h" />
<ClInclude Include="$(IncDir)wintty.h" /> <ClInclude Include="$(IncDir)quest.h" />
<ClInclude Include="$(IncDir)wintype.h" /> <ClInclude Include="$(IncDir)rect.h" />
<ClInclude Include="$(IncDir)you.h" /> <ClInclude Include="$(IncDir)region.h" />
<ClInclude Include="$(IncDir)youprop.h" /> <ClInclude Include="$(IncDir)rm.h" />
</ItemGroup> <ClInclude Include="$(IncDir)skills.h" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ClInclude Include="$(IncDir)spell.h" />
<Choose> <ClInclude Include="$(IncDir)timeout.h" />
<When Condition=" '$(YACC)'!='' "> <ClInclude Include="$(IncDir)tradstdc.h" />
<PropertyGroup> <ClInclude Include="$(IncDir)trampoli.h" />
<ClInclude Include="$(IncDir)trap.h" />
<ClInclude Include="$(IncDir)vision.h" />
<ClInclude Include="$(IncDir)winprocs.h" />
<ClInclude Include="$(IncDir)wintty.h" />
<ClInclude Include="$(IncDir)wintype.h" />
<ClInclude Include="$(IncDir)you.h" />
<ClInclude Include="$(IncDir)youprop.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Choose>
<When Condition=" '$(YACC)'!='' ">
<PropertyGroup>
<BuildDependsOn> <BuildDependsOn>
Lex; Lex;
Yacc; Yacc;
$(BuildDependsOn); $(BuildDependsOn);
</BuildDependsOn> </BuildDependsOn>
</PropertyGroup> </PropertyGroup>
</When> </When>
<Otherwise> <Otherwise>
<PropertyGroup> <PropertyGroup>
<BuildDependsOn> <BuildDependsOn>
NoLex; NoLex;
NoYacc; NoYacc;
$(BuildDependsOn); $(BuildDependsOn);
</BuildDependsOn> </BuildDependsOn>
</PropertyGroup> </PropertyGroup>
</Otherwise> </Otherwise>
</Choose> </Choose>
<Target Name="Yacc" Inputs="$(UtilDir)dgn_comp.y" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h"> <Target Name="Yacc" Inputs="$(UtilDir)dgn_comp.y" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h">
<Message Text="Running Yacc" Importance="high" /> <Message Text="Running Yacc" Importance="high" />
<Exec Command="$(YACC) -d dgn_comp.y" WorkingDirectory="$(UtilDir)" /> <Exec Command="$(YACC) -d dgn_comp.y" WorkingDirectory="$(UtilDir)" />
<Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" /> <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />
</Target> </Target>
<Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)dgn_lex.c"> <Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)dgn_lex.c">
<Message Text="Running Lex" Importance="high" /> <Message Text="Running Lex" Importance="high" />
<Exec Command="$(LEX) dgn_comp.l" WorkingDirectory="$(UtilDir)" /> <Exec Command="$(LEX) dgn_comp.l" WorkingDirectory="$(UtilDir)" />
<Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)dgn_lex.c" /> <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)dgn_lex.c" />
</Target> </Target>
<Target Name="NoYacc" Inputs="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h"> <Target Name="NoYacc" Inputs="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h">
<Message Text="No Yacc using pre-built files" Importance="high" /> <Message Text="No Yacc using pre-built files" Importance="high" />
<Copy SourceFiles="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" /> <Copy SourceFiles="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />
</Target> </Target>
<Target Name="NoLex" Inputs="$(SysShareDir)dgn_lex.c" Outputs="$(UtilDir)dgn_lex.c"> <Target Name="NoLex" Inputs="$(SysShareDir)dgn_lex.c" Outputs="$(UtilDir)dgn_lex.c">
<Message Text="No Lex using pre-built files" Importance="high" /> <Message Text="No Lex using pre-built files" Importance="high" />
<Copy SourceFiles="$(SysShareDir)dgn_lex.c" DestinationFiles="$(UtilDir)dgn_lex.c" /> <Copy SourceFiles="$(SysShareDir)dgn_lex.c" DestinationFiles="$(UtilDir)dgn_lex.c" />
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
<MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target> </Target>
<Target Name="AfterClean"> <Target Name="AfterClean">
<MSBuild Projects="afterdgncomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afterdgncomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
<Delete Files="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h;$(UtilDir)dgn_lex.c" /> <Delete Files="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h;$(UtilDir)dgn_lex.c" />
</Target> </Target>
<Target Name="AfterRebuild"> <Target Name="AfterRebuild">
<MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target> </Target>
</Project> </Project>
win/win32/vs2017/dlb.vcxproj
+50 -38
View File
@@ -1,39 +1,51 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}</ProjectGuid> <ProjectGuid>{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Import Project="NetHackProperties.props" />
</ClCompile> </ImportGroup>
</ItemDefinitionGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ItemGroup> <Import Project="NetHackProperties.props" />
<ClCompile Include="$(SrcDir)alloc.c" /> </ImportGroup>
<ClCompile Include="$(SrcDir)dlb.c" /> <Import Project="console.props" />
<ClCompile Include="$(UtilDir)dlb_main.c" /> <Import Project="common.props" />
<ClCompile Include="$(UtilDir)panic.c" /> <Import Project="dirs.props" />
</ItemGroup> <Import Project="files.props" />
<ItemGroup> <ItemDefinitionGroup>
<ClInclude Include="$(IncDir)dlb.h" /> <ClCompile>
</ItemGroup> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Target Name="AfterBuild"> </ClCompile>
<MSBuild Projects="afterdlb.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> </ItemDefinitionGroup>
</Target> <ItemGroup>
<Target Name="AfterClean"> <ClCompile Include="$(SrcDir)alloc.c" />
<MSBuild Projects="afterdlb.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <ClCompile Include="$(SrcDir)dlb.c" />
</Target> <ClCompile Include="$(UtilDir)dlb_main.c" />
<Target Name="AfterRebuild"> <ClCompile Include="$(UtilDir)panic.c" />
<MSBuild Projects="afterdlb.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> </ItemGroup>
</Target> <ItemGroup>
<ClInclude Include="$(IncDir)dlb.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="AfterBuild">
<MSBuild Projects="afterdlb.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterClean">
<MSBuild Projects="afterdlb.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterRebuild">
<MSBuild Projects="afterdlb.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project> </Project>
win/win32/vs2017/levcomp.vcxproj
+86 -74
View File
@@ -1,83 +1,95 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}</ProjectGuid> <ProjectGuid>{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Import Project="NetHackProperties.props" />
</ClCompile> </ImportGroup>
</ItemDefinitionGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ItemGroup> <Import Project="NetHackProperties.props" />
<ClCompile Include="$(SrcDir)alloc.c" /> </ImportGroup>
<ClCompile Include="$(SrcDir)decl.c" /> <Import Project="console.props" />
<ClCompile Include="$(SrcDir)drawing.c" /> <Import Project="common.props" />
<ClCompile Include="$(UtilDir)lev_lex.c" /> <Import Project="dirs.props" />
<ClCompile Include="$(UtilDir)lev_main.c" /> <Import Project="files.props" />
<ClCompile Include="$(UtilDir)lev_yacc.c" /> <ItemDefinitionGroup>
<ClCompile Include="$(SrcDir)monst.c" /> <ClCompile>
<ClCompile Include="$(SrcDir)objects.c" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClCompile Include="$(UtilDir)panic.c" /> <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ItemGroup> </ClCompile>
<ItemGroup> </ItemDefinitionGroup>
<ClInclude Include="$(IncDir)lev_comp.h" /> <ItemGroup>
</ItemGroup> <ClCompile Include="$(SrcDir)alloc.c" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ClCompile Include="$(SrcDir)decl.c" />
<Choose> <ClCompile Include="$(SrcDir)drawing.c" />
<When Condition=" '$(YACC)'!='' "> <ClCompile Include="$(UtilDir)lev_lex.c" />
<PropertyGroup> <ClCompile Include="$(UtilDir)lev_main.c" />
<ClCompile Include="$(UtilDir)lev_yacc.c" />
<ClCompile Include="$(SrcDir)monst.c" />
<ClCompile Include="$(SrcDir)objects.c" />
<ClCompile Include="$(UtilDir)panic.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(IncDir)lev_comp.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Choose>
<When Condition=" '$(YACC)'!='' ">
<PropertyGroup>
<BuildDependsOn> <BuildDependsOn>
Lex; Lex;
Yacc; Yacc;
$(BuildDependsOn); $(BuildDependsOn);
</BuildDependsOn> </BuildDependsOn>
</PropertyGroup> </PropertyGroup>
</When> </When>
<Otherwise> <Otherwise>
<PropertyGroup> <PropertyGroup>
<BuildDependsOn> <BuildDependsOn>
NoLex; NoLex;
NoYacc; NoYacc;
$(BuildDependsOn); $(BuildDependsOn);
</BuildDependsOn> </BuildDependsOn>
</PropertyGroup> </PropertyGroup>
</Otherwise> </Otherwise>
</Choose> </Choose>
<Target Name="Yacc" Inputs="$(UtilDir)lev_comp.y" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h"> <Target Name="Yacc" Inputs="$(UtilDir)lev_comp.y" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h">
<Message Text="Running Yacc" Importance="high" /> <Message Text="Running Yacc" Importance="high" />
<Exec Command="$(YACC) -d lev_comp.y" WorkingDirectory="$(UtilDir)" /> <Exec Command="$(YACC) -d lev_comp.y" WorkingDirectory="$(UtilDir)" />
<Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" /> <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />
</Target> </Target>
<Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)lev_lex.c"> <Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)lev_lex.c">
<Message Text="Running Lex" Importance="high" /> <Message Text="Running Lex" Importance="high" />
<Exec Command="$(LEX) lev_comp.l" WorkingDirectory="$(UtilDir)" /> <Exec Command="$(LEX) lev_comp.l" WorkingDirectory="$(UtilDir)" />
<Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)lev_lex.c" /> <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)lev_lex.c" />
</Target> </Target>
<Target Name="NoYacc" Inputs="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h"> <Target Name="NoYacc" Inputs="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h">
<Message Text="No Yacc using pre-built files" Importance="high" /> <Message Text="No Yacc using pre-built files" Importance="high" />
<Copy SourceFiles="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" /> <Copy SourceFiles="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />
</Target> </Target>
<Target Name="NoLex" Inputs="$(SysShareDir)lev_lex.c" Outputs="$(UtilDir)lev_lex.c"> <Target Name="NoLex" Inputs="$(SysShareDir)lev_lex.c" Outputs="$(UtilDir)lev_lex.c">
<Message Text="No Lex using pre-built files" Importance="high" /> <Message Text="No Lex using pre-built files" Importance="high" />
<Copy SourceFiles="$(SysShareDir)lev_lex.c" DestinationFiles="$(UtilDir)lev_lex.c" /> <Copy SourceFiles="$(SysShareDir)lev_lex.c" DestinationFiles="$(UtilDir)lev_lex.c" />
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
<MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target> </Target>
<Target Name="AfterClean"> <Target Name="AfterClean">
<MSBuild Projects="afterlevcomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afterlevcomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
<Delete Files="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h;$(UtilDir)lev_lex.c" /> <Delete Files="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h;$(UtilDir)lev_lex.c" />
</Target> </Target>
<Target Name="AfterRebuild"> <Target Name="AfterRebuild">
<MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target> </Target>
</Project> </Project>
win/win32/vs2017/makedefs.vcxproj
+61 -49
View File
@@ -1,50 +1,62 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{BA3DD34C-04B7-40D0-B373-9329AA9E8945}</ProjectGuid> <ProjectGuid>{BA3DD34C-04B7-40D0-B373-9329AA9E8945}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Import Project="NetHackProperties.props" />
</ClCompile> </ImportGroup>
</ItemDefinitionGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ItemGroup> <Import Project="NetHackProperties.props" />
<ClCompile Include="..\..\..\util\makedefs.c" /> </ImportGroup>
<ClCompile Include="..\..\..\src\monst.c" /> <Import Project="console.props" />
<ClCompile Include="..\..\..\src\objects.c" /> <Import Project="common.props" />
</ItemGroup> <Import Project="dirs.props" />
<ItemGroup> <Import Project="files.props" />
<ClInclude Include="..\..\..\include\config.h" /> <ItemDefinitionGroup>
<ClInclude Include="..\..\..\include\config1.h" /> <ClCompile>
<ClInclude Include="..\..\..\include\context.h" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClInclude Include="..\..\..\include\coord.h" /> <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ClInclude Include="..\..\..\include\global.h" /> </ClCompile>
<ClInclude Include="..\..\..\include\monattk.h" /> </ItemDefinitionGroup>
<ClInclude Include="..\..\..\include\monflag.h" /> <ItemGroup>
<ClInclude Include="..\..\..\include\monsym.h" /> <ClCompile Include="..\..\..\util\makedefs.c" />
<ClInclude Include="..\..\..\include\ntconf.h" /> <ClCompile Include="..\..\..\src\monst.c" />
<ClInclude Include="..\..\..\include\objclass.h" /> <ClCompile Include="..\..\..\src\objects.c" />
<ClInclude Include="..\..\..\include\patchlevel.h" /> </ItemGroup>
<ClInclude Include="..\..\..\include\qtext.h" /> <ItemGroup>
<ClInclude Include="..\..\..\include\tradstdc.h" /> <ClInclude Include="..\..\..\include\config.h" />
</ItemGroup> <ClInclude Include="..\..\..\include\config1.h" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ClInclude Include="..\..\..\include\context.h" />
<Target Name="AfterBuild"> <ClInclude Include="..\..\..\include\coord.h" />
<MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ClInclude Include="..\..\..\include\global.h" />
</Target> <ClInclude Include="..\..\..\include\monattk.h" />
<Target Name="AfterClean"> <ClInclude Include="..\..\..\include\monflag.h" />
<MSBuild Projects="aftermakedefs.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <ClInclude Include="..\..\..\include\monsym.h" />
</Target> <ClInclude Include="..\..\..\include\ntconf.h" />
<Target Name="AfterRebuild"> <ClInclude Include="..\..\..\include\objclass.h" />
<MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ClInclude Include="..\..\..\include\patchlevel.h" />
</Target> <ClInclude Include="..\..\..\include\qtext.h" />
<ClInclude Include="..\..\..\include\tradstdc.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="AfterBuild">
<MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterClean">
<MSBuild Projects="aftermakedefs.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterRebuild">
<MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project> </Project>
win/win32/vs2017/nh340key.vcxproj
+53 -41
View File
@@ -1,42 +1,54 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{BE04E242-A1E9-4593-B95B-057F37330B76}</ProjectGuid> <ProjectGuid>{BE04E242-A1E9-4593-B95B-057F37330B76}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>nh340key</RootNamespace> <RootNamespace>nh340key</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default_dll.props" /> <Import Project="default_dll.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="dll.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PropertyGroup> <Import Project="NetHackProperties.props" />
<OutDir>$(BinDir)</OutDir> </ImportGroup>
</PropertyGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ClCompile> <Import Project="NetHackProperties.props" />
<Link> </ImportGroup>
<ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary> <Import Project="dll.props" />
</Link> <Import Project="common.props" />
</ItemDefinitionGroup> <Import Project="dirs.props" />
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'"> <Import Project="files.props" />
<Link> <PropertyGroup>
<ModuleDefinitionFile>nh340key.def</ModuleDefinitionFile> <OutDir>$(BinDir)</OutDir>
</Link> </PropertyGroup>
</ItemDefinitionGroup> <ItemDefinitionGroup>
<ItemGroup> <ClCompile>
<ClCompile Include="$(SysWinntDir)nh340key.c" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ItemGroup> </ClCompile>
<ItemGroup> <Link>
<ClInclude Include="$(IncDir)hack.h" /> <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
<ClInclude Include="$(IncDir)ntconf.h" /> </Link>
<ClInclude Include="$(IncDir)wintty.h" /> </ItemDefinitionGroup>
<ClInclude Include="$(SysWinntDir)win32api.h" /> <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
</ItemGroup> <Link>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ModuleDefinitionFile>nh340key.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(SysWinntDir)nh340key.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(IncDir)hack.h" />
<ClInclude Include="$(IncDir)ntconf.h" />
<ClInclude Include="$(IncDir)wintty.h" />
<ClInclude Include="$(SysWinntDir)win32api.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>
win/win32/vs2017/nhdefkey.vcxproj
+53 -41
View File
@@ -1,42 +1,54 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{6813477F-64B6-4B97-B230-438D0D233385}</ProjectGuid> <ProjectGuid>{6813477F-64B6-4B97-B230-438D0D233385}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>nhdefkey</RootNamespace> <RootNamespace>nhdefkey</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default_dll.props" /> <Import Project="default_dll.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="dll.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PropertyGroup> <Import Project="NetHackProperties.props" />
<OutDir>$(BinDir)</OutDir> </ImportGroup>
</PropertyGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ClCompile> <Import Project="NetHackProperties.props" />
<Link> </ImportGroup>
<ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary> <Import Project="dll.props" />
</Link> <Import Project="common.props" />
</ItemDefinitionGroup> <Import Project="dirs.props" />
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'"> <Import Project="files.props" />
<Link> <PropertyGroup>
<ModuleDefinitionFile>nhdefkey.def</ModuleDefinitionFile> <OutDir>$(BinDir)</OutDir>
</Link> </PropertyGroup>
</ItemDefinitionGroup> <ItemDefinitionGroup>
<ItemGroup> <ClCompile>
<ClCompile Include="$(SysWinntDir)nhdefkey.c" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ItemGroup> </ClCompile>
<ItemGroup> <Link>
<ClInclude Include="$(IncDir)hack.h" /> <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
<ClInclude Include="$(IncDir)ntconf.h" /> </Link>
<ClInclude Include="$(IncDir)wintty.h" /> </ItemDefinitionGroup>
<ClInclude Include="$(SysWinntDir)win32api.h" /> <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
</ItemGroup> <Link>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ModuleDefinitionFile>nhdefkey.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(SysWinntDir)nhdefkey.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(IncDir)hack.h" />
<ClInclude Include="$(IncDir)ntconf.h" />
<ClInclude Include="$(IncDir)wintty.h" />
<ClInclude Include="$(SysWinntDir)win32api.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>
win/win32/vs2017/nhraykey.vcxproj
+53 -41
View File
@@ -1,42 +1,54 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}</ProjectGuid> <ProjectGuid>{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>nhraykey</RootNamespace> <RootNamespace>nhraykey</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default_dll.props" /> <Import Project="default_dll.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="dll.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PropertyGroup> <Import Project="NetHackProperties.props" />
<OutDir>$(BinDir)</OutDir> </ImportGroup>
</PropertyGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ClCompile> <Import Project="NetHackProperties.props" />
<Link> </ImportGroup>
<ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary> <Import Project="dll.props" />
</Link> <Import Project="common.props" />
</ItemDefinitionGroup> <Import Project="dirs.props" />
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'"> <Import Project="files.props" />
<Link> <PropertyGroup>
<ModuleDefinitionFile>nhraykey.def</ModuleDefinitionFile> <OutDir>$(BinDir)</OutDir>
</Link> </PropertyGroup>
</ItemDefinitionGroup> <ItemDefinitionGroup>
<ItemGroup> <ClCompile>
<ClCompile Include="$(SysWinntDir)nhraykey.c" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ItemGroup> </ClCompile>
<ItemGroup> <Link>
<ClInclude Include="$(IncDir)hack.h" /> <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
<ClInclude Include="$(IncDir)ntconf.h" /> </Link>
<ClInclude Include="$(IncDir)wintty.h" /> </ItemDefinitionGroup>
<ClInclude Include="$(SysWinntDir)win32api.h" /> <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
</ItemGroup> <Link>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ModuleDefinitionFile>nhraykey.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(SysWinntDir)nhraykey.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(IncDir)hack.h" />
<ClInclude Include="$(IncDir)ntconf.h" />
<ClInclude Include="$(IncDir)wintty.h" />
<ClInclude Include="$(SysWinntDir)win32api.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>
win/win32/vs2017/recover.vcxproj
+56 -44
View File
@@ -1,45 +1,57 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}</ProjectGuid> <ProjectGuid>{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PropertyGroup> <Import Project="NetHackProperties.props" />
<OutDir>$(BinDir)</OutDir> </ImportGroup>
</PropertyGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Import Project="NetHackProperties.props" />
</ClCompile> </ImportGroup>
</ItemDefinitionGroup> <Import Project="console.props" />
<ItemGroup> <Import Project="common.props" />
<ClCompile Include="$(UtilDir)recover.c" /> <Import Project="dirs.props" />
</ItemGroup> <Import Project="files.props" />
<ItemGroup> <PropertyGroup>
<ClInclude Include="$(IncDir)config.h" /> <OutDir>$(BinDir)</OutDir>
<ClInclude Include="$(IncDir)config1.h" /> </PropertyGroup>
<ClInclude Include="$(IncDir)coord.h" /> <ItemDefinitionGroup>
<ClInclude Include="$(IncDir)global.h" /> <ClCompile>
<ClInclude Include="$(IncDir)ntconf.h" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClInclude Include="$(IncDir)tradstdc.h" /> <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ClInclude Include="$(SysWinntDir)win32api.h" /> </ClCompile>
</ItemGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ItemGroup>
<Target Name="AfterBuild"> <ClCompile Include="$(UtilDir)recover.c" />
<MSBuild Projects="afterrecover.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> </ItemGroup>
</Target> <ItemGroup>
<Target Name="AfterClean"> <ClInclude Include="$(IncDir)config.h" />
<MSBuild Projects="afterrecover.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <ClInclude Include="$(IncDir)config1.h" />
</Target> <ClInclude Include="$(IncDir)coord.h" />
<Target Name="AfterRebuild"> <ClInclude Include="$(IncDir)global.h" />
<MSBuild Projects="afterrecover.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ClInclude Include="$(IncDir)ntconf.h" />
</Target> <ClInclude Include="$(IncDir)tradstdc.h" />
<ClInclude Include="$(SysWinntDir)win32api.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="AfterBuild">
<MSBuild Projects="afterrecover.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterClean">
<MSBuild Projects="afterrecover.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterRebuild">
<MSBuild Projects="afterrecover.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project> </Project>
win/win32/vs2017/tile2bmp.vcxproj
+52 -40
View File
@@ -1,41 +1,53 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{642BC75D-ABAF-403E-8224-7C725FD4CB42}</ProjectGuid> <ProjectGuid>{642BC75D-ABAF-403E-8224-7C725FD4CB42}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Import Project="NetHackProperties.props" />
</ClCompile> </ImportGroup>
</ItemDefinitionGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ItemGroup> <Import Project="NetHackProperties.props" />
<ClCompile Include="$(SrcDir)decl.c" /> </ImportGroup>
<ClCompile Include="$(SrcDir)drawing.c" /> <Import Project="console.props" />
<ClCompile Include="$(SrcDir)monst.c" /> <Import Project="common.props" />
<ClCompile Include="$(SrcDir)objects.c" /> <Import Project="dirs.props" />
<ClCompile Include="$(WinShareDir)tile2bmp.c" /> <Import Project="files.props" />
<ClCompile Include="$(WinShareDir)tiletext.c" /> <ItemDefinitionGroup>
<ClCompile Include="$(WinShareDir)tilemap.c"> <ClCompile>
<PreprocessorDefinitions>TILETEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ItemGroup> </ClCompile>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> </ItemDefinitionGroup>
<Target Name="AfterBuild"> <ItemGroup>
<MSBuild Projects="aftertile2bmp.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ClCompile Include="$(SrcDir)decl.c" />
</Target> <ClCompile Include="$(SrcDir)drawing.c" />
<Target Name="AfterClean"> <ClCompile Include="$(SrcDir)monst.c" />
<MSBuild Projects="aftertile2bmp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <ClCompile Include="$(SrcDir)objects.c" />
</Target> <ClCompile Include="$(WinShareDir)tile2bmp.c" />
<Target Name="AfterRebuild"> <ClCompile Include="$(WinShareDir)tiletext.c" />
<MSBuild Projects="aftertile2bmp.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ClCompile Include="$(WinShareDir)tilemap.c">
</Target> <PreprocessorDefinitions>TILETEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="AfterBuild">
<MSBuild Projects="aftertile2bmp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterClean">
<MSBuild Projects="aftertile2bmp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterRebuild">
<MSBuild Projects="aftertile2bmp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project> </Project>
win/win32/vs2017/tilemap.vcxproj
+88 -76
View File
@@ -1,77 +1,89 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{93F10526-209E-41D7-BBEA-775787876895}</ProjectGuid> <ProjectGuid>{93F10526-209E-41D7-BBEA-775787876895}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemDefinitionGroup> <Import Project="NetHackProperties.props" />
<ClCompile> </ImportGroup>
<AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Import Project="NetHackProperties.props" />
</ClCompile> </ImportGroup>
</ItemDefinitionGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ItemGroup> <Import Project="NetHackProperties.props" />
<ClCompile Include="$(WinShareDir)tilemap.c" /> </ImportGroup>
</ItemGroup> <Import Project="console.props" />
<ItemGroup> <Import Project="common.props" />
<ClInclude Include="$(IncDir)align.h" /> <Import Project="dirs.props" />
<ClInclude Include="$(IncDir)attrib.h" /> <Import Project="files.props" />
<ClInclude Include="$(IncDir)color.h" /> <ItemDefinitionGroup>
<ClInclude Include="$(IncDir)config.h" /> <ClCompile>
<ClInclude Include="$(IncDir)config1.h" /> <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClInclude Include="$(IncDir)context.h" /> <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ClInclude Include="$(IncDir)coord.h" /> </ClCompile>
<ClInclude Include="$(IncDir)decl.h" /> </ItemDefinitionGroup>
<ClInclude Include="$(IncDir)dgn_comp.h" /> <ItemGroup>
<ClInclude Include="$(IncDir)dgn_file.h" /> <ClCompile Include="$(WinShareDir)tilemap.c" />
<ClInclude Include="$(IncDir)display.h" /> </ItemGroup>
<ClInclude Include="$(IncDir)dungeon.h" /> <ItemGroup>
<ClInclude Include="$(IncDir)engrave.h" /> <ClInclude Include="$(IncDir)align.h" />
<ClInclude Include="$(IncDir)flag.h" /> <ClInclude Include="$(IncDir)attrib.h" />
<ClInclude Include="$(IncDir)global.h" /> <ClInclude Include="$(IncDir)color.h" />
<ClInclude Include="$(IncDir)mkroom.h" /> <ClInclude Include="$(IncDir)config.h" />
<ClInclude Include="$(IncDir)monattk.h" /> <ClInclude Include="$(IncDir)config1.h" />
<ClInclude Include="$(IncDir)monst.h" /> <ClInclude Include="$(IncDir)context.h" />
<ClInclude Include="$(IncDir)monsym.h" /> <ClInclude Include="$(IncDir)coord.h" />
<ClInclude Include="$(IncDir)ntconf.h" /> <ClInclude Include="$(IncDir)decl.h" />
<ClInclude Include="$(IncDir)obj.h" /> <ClInclude Include="$(IncDir)dgn_comp.h" />
<ClInclude Include="$(IncDir)objclass.h" /> <ClInclude Include="$(IncDir)dgn_file.h" />
<ClInclude Include="$(IncDir)onames.h" /> <ClInclude Include="$(IncDir)display.h" />
<ClInclude Include="$(IncDir)permonst.h" /> <ClInclude Include="$(IncDir)dungeon.h" />
<ClInclude Include="$(IncDir)pm.h" /> <ClInclude Include="$(IncDir)engrave.h" />
<ClInclude Include="$(IncDir)prop.h" /> <ClInclude Include="$(IncDir)flag.h" />
<ClInclude Include="$(IncDir)quest.h" /> <ClInclude Include="$(IncDir)global.h" />
<ClInclude Include="$(IncDir)rect.h" /> <ClInclude Include="$(IncDir)mkroom.h" />
<ClInclude Include="$(IncDir)region.h" /> <ClInclude Include="$(IncDir)monattk.h" />
<ClInclude Include="$(IncDir)rm.h" /> <ClInclude Include="$(IncDir)monst.h" />
<ClInclude Include="$(IncDir)skills.h" /> <ClInclude Include="$(IncDir)monsym.h" />
<ClInclude Include="$(IncDir)spell.h" /> <ClInclude Include="$(IncDir)ntconf.h" />
<ClInclude Include="$(IncDir)timeout.h" /> <ClInclude Include="$(IncDir)obj.h" />
<ClInclude Include="$(IncDir)tradstdc.h" /> <ClInclude Include="$(IncDir)objclass.h" />
<ClInclude Include="$(IncDir)trampoli.h" /> <ClInclude Include="$(IncDir)onames.h" />
<ClInclude Include="$(IncDir)trap.h" /> <ClInclude Include="$(IncDir)permonst.h" />
<ClInclude Include="$(IncDir)vision.h" /> <ClInclude Include="$(IncDir)pm.h" />
<ClInclude Include="$(IncDir)winprocs.h" /> <ClInclude Include="$(IncDir)prop.h" />
<ClInclude Include="$(IncDir)wintty.h" /> <ClInclude Include="$(IncDir)quest.h" />
<ClInclude Include="$(IncDir)wintype.h" /> <ClInclude Include="$(IncDir)rect.h" />
<ClInclude Include="$(IncDir)you.h" /> <ClInclude Include="$(IncDir)region.h" />
<ClInclude Include="$(IncDir)youprop.h" /> <ClInclude Include="$(IncDir)rm.h" />
</ItemGroup> <ClInclude Include="$(IncDir)skills.h" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ClInclude Include="$(IncDir)spell.h" />
<Target Name="AfterBuild"> <ClInclude Include="$(IncDir)timeout.h" />
<MSBuild Projects="aftertilemap.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ClInclude Include="$(IncDir)tradstdc.h" />
</Target> <ClInclude Include="$(IncDir)trampoli.h" />
<Target Name="AfterClean"> <ClInclude Include="$(IncDir)trap.h" />
<MSBuild Projects="aftertilemap.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <ClInclude Include="$(IncDir)vision.h" />
</Target> <ClInclude Include="$(IncDir)winprocs.h" />
<Target Name="AfterRebuild"> <ClInclude Include="$(IncDir)wintty.h" />
<MSBuild Projects="aftertilemap.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ClInclude Include="$(IncDir)wintype.h" />
</Target> <ClInclude Include="$(IncDir)you.h" />
<ClInclude Include="$(IncDir)youprop.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="AfterBuild">
<MSBuild Projects="aftertilemap.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterClean">
<MSBuild Projects="aftertilemap.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterRebuild">
<MSBuild Projects="aftertilemap.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project> </Project>
win/win32/vs2017/uudecode.vcxproj
+38 -26
View File
@@ -1,27 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="config.props" /> <Import Project="config.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{63F9B82B-F589-4082-ABE5-D4F0682050AB}</ProjectGuid> <ProjectGuid>{63F9B82B-F589-4082-ABE5-D4F0682050AB}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="default.props" /> <Import Project="default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="console.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="common.props" /> <Import Project="NetHackProperties.props" />
<Import Project="dirs.props" /> </ImportGroup>
<Import Project="files.props" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemGroup> <Import Project="NetHackProperties.props" />
<ClCompile Include="$(SysShareDir)uudecode.c" /> </ImportGroup>
</ItemGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="NetHackProperties.props" />
<Target Name="AfterBuild"> </ImportGroup>
<MSBuild Projects="afteruudecode.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</Target> <Import Project="NetHackProperties.props" />
<Target Name="AfterClean"> </ImportGroup>
<MSBuild Projects="afteruudecode.proj" Targets="Clean" Properties="Configuration=$(Configuration)" /> <Import Project="console.props" />
</Target> <Import Project="common.props" />
<Target Name="AfterRebuild"> <Import Project="dirs.props" />
<MSBuild Projects="afteruudecode.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> <Import Project="files.props" />
</Target> <ItemGroup>
<ClCompile Include="$(SysShareDir)uudecode.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Target Name="AfterBuild">
<MSBuild Projects="afteruudecode.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterClean">
<MSBuild Projects="afteruudecode.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
</Target>
<Target Name="AfterRebuild">
<MSBuild Projects="afteruudecode.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project> </Project>