From 1b980f34ac1256d4ad52e66fc154d292b0a9c7b1 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 28 Feb 2015 00:52:00 -0500 Subject: [PATCH] adjust project dependencies to ensure makedefs builds before nethack.exe --- src/vision.c | 10 +++++----- win/win32/vs2013/NetHack.sln | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/vision.c b/src/vision.c index a6585de14..9908ea273 100644 --- a/src/vision.c +++ b/src/vision.c @@ -513,7 +513,7 @@ vision_recalc(control) vision_full_recalc = 0; /* reset flag */ if (in_mklev || !iflags.vision_inited) return; -#ifdef GCC_WARN +#if defined(GCC_WARN) || defined(_MSC_VER) row = 0; #endif @@ -1664,7 +1664,7 @@ right_side(row, cb_row, cb_col, fb_row, fb_col, left, right_mark, limits) char *row_max; /* right most */ int lim_max; /* right most limit of circle */ -#ifdef GCC_WARN +#if defined(GCC_WARN) || defined(_MSC_VER) rowp = 0; #endif nrow = row + step; @@ -1919,7 +1919,7 @@ left_side(row, cb_row, cb_col, fb_row, fb_col, left_mark, right, limits) char *row_max; /* right most */ int lim_min; -#ifdef GCC_WARN +#if defined(GCC_WARN) || defined(_MSC_VER) rowp = 0; #endif nrow = row + step; @@ -2203,7 +2203,7 @@ right_side(row, left, right_mark, limits) char *row_max; /* right most [used by macro set_max()] */ int lim_max; /* right most limit of circle */ -#ifdef GCC_WARN +#if defined(GCC_WARN) || defined(_MSC_VER) rowp = row_min = row_max = 0; #endif nrow = row + step; @@ -2378,7 +2378,7 @@ left_side(row, left_mark, right, limits) char *row_min, *row_max; int lim_min; -#ifdef GCC_WARN +#if defined(GCC_WARN) || defined(_MSC_VER) rowp = row_min = row_max = 0; #endif nrow = row+step; diff --git a/win/win32/vs2013/NetHack.sln b/win/win32/vs2013/NetHack.sln index 4c70d4ffd..22610b817 100644 --- a/win/win32/vs2013/NetHack.sln +++ b/win/win32/vs2013/NetHack.sln @@ -49,6 +49,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "build\uudecode. EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "build\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}" + ProjectSection(ProjectDependencies) = postProject + {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} + {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} + {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} + {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} + {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution