From 1eca824321baf75e64cb7fb2efe4271324895ca6 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sun, 20 Aug 2017 23:04:55 +0300 Subject: [PATCH 01/21] Add sysconf BONES_POOLS to allow more bones-files per level Reduce the chance of a player playing on a public server encountering their own bones, by implementing separate bones pools. The pool a player belongs to is determined at game start, and only bones in that pool are used. The sysconf BONES_POOLS allows the sysadmin to define how many pools there are. --- doc/fixes36.1 | 1 + include/sys.h | 1 + src/files.c | 7 +++++++ src/sys.c | 1 + sys/unix/sysconf | 8 ++++++++ sys/vms/sysconf | 8 ++++++++ sys/winnt/sysconf | 8 ++++++++ 7 files changed, 34 insertions(+) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 5e7826855..530523f43 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -615,6 +615,7 @@ blinded hero or monster who eats a nurse corpse will have blindness cured blinded hero or monster who breathes vapor from broken potion of healing, extra healing, or full healing might have blindness cured (depends on potion: full == always; extra == if not-cursed; plain == if blessed) +sysconf definition BONES_POOLS to allow more bones files per level Platform- and/or Interface-Specific New Features diff --git a/include/sys.h b/include/sys.h index 91c5d3522..17bbadb85 100644 --- a/include/sys.h +++ b/include/sys.h @@ -27,6 +27,7 @@ struct sysopt { int seduce; int check_save_uid; /* restoring savefile checks UID? */ int check_plname; /* use plname for checking wizards/explorers/shellers */ + int bones_pools; /* record file */ int persmax; diff --git a/src/files.c b/src/files.c index 1c55133cb..abda2a770 100644 --- a/src/files.c +++ b/src/files.c @@ -704,6 +704,10 @@ d_level *lev; Sprintf(dptr, ".%c", sptr->boneid); else Sprintf(dptr, ".%d", lev->dlevel); +#ifdef SYSCF + if (sysopt.bones_pools > 1) + Sprintf(eos(file), ".%d", (ubirthday % sysopt.bones_pools)); +#endif #ifdef VMS Strcat(dptr, ";1"); #endif @@ -2278,6 +2282,9 @@ int src; if (sysopt.genericusers) free((genericptr_t) sysopt.genericusers); sysopt.genericusers = dupstr(bufp); + } else if (src == SET_IN_SYS && match_varname(buf, "BONES_POOLS", 10)) { + n = atoi(bufp); + sysopt.bones_pools = (n < 0) ? 0 : n; } else if (src == SET_IN_SYS && match_varname(buf, "SUPPORT", 7)) { if (sysopt.support) free((genericptr_t) sysopt.support); diff --git a/src/sys.c b/src/sys.c index c0803d480..6adc8f71f 100644 --- a/src/sys.c +++ b/src/sys.c @@ -40,6 +40,7 @@ sys_early_init() sysopt.explorers = (char *) 0; sysopt.genericusers = (char *) 0; sysopt.maxplayers = 0; /* XXX eventually replace MAX_NR_OF_PLAYERS */ + sysopt.bones_pools = 0; /* record file */ sysopt.persmax = PERSMAX; diff --git a/sys/unix/sysconf b/sys/unix/sysconf index d83aeff7d..eacca35ed 100644 --- a/sys/unix/sysconf +++ b/sys/unix/sysconf @@ -98,6 +98,14 @@ MAXPLAYERS=10 # %N first character of player name #DUMPLOGFILE=/tmp/nethack.%n.%d.log +# Number of bones file pools. +# The pool you belong to is determined at game start. You will +# load and save bones only from that pool. Generally useful +# for public servers only. +# Changing this might make existing bones inaccessible. +# Disabled by setting to 0, or commenting out. +#BONES_POOLS=10 + # Try to get more info in case of a program bug or crash. Only used # if the program is built with the PANICTRACE compile-time option enabled. # By default PANICTRACE is enabled if BETA is defined, otherwise disabled. diff --git a/sys/vms/sysconf b/sys/vms/sysconf index 8b52270da..0d46cd4f6 100644 --- a/sys/vms/sysconf +++ b/sys/vms/sysconf @@ -53,6 +53,14 @@ # Maximum number of score file entries to use for random statue names #MAX_STATUENAME_RANK=10 +# Number of bones file pools. +# The pool you belong to is determined at game start. You will +# load and save bones only from that pool. Generally useful +# for public servers only. +# Changing this might make existing bones inaccessible. +# Disabled by setting to 0, or commenting out. +#BONES_POOLS=10 + # Show debugging information originating from these source files. # Use '*' for all, or list source files separated by spaces. # Only available if game has been compiled with DEBUG, and can be diff --git a/sys/winnt/sysconf b/sys/winnt/sysconf index 2ce1da300..7e4d9da0a 100644 --- a/sys/winnt/sysconf +++ b/sys/winnt/sysconf @@ -32,6 +32,14 @@ WIZARDS=* # %N first character of player name #DUMPLOGFILE=nethack-%n-%d.log +# Number of bones file pools. +# The pool you belong to is determined at game start. You will +# load and save bones only from that pool. Generally useful +# for public servers only. +# Changing this might make existing bones inaccessible. +# Disabled by setting to 0, or commenting out. +#BONES_POOLS=10 + # Limit the number of simultaneous games (see also nethack.sh). #MAXPLAYERS=10 From 1854d21dd7e88754511e1e8b7a6bae47b003165f Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sun, 20 Aug 2017 23:44:35 +0300 Subject: [PATCH 02/21] Update NetHackW.exe version details --- win/win32/winhack.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/win/win32/winhack.rc b/win/win32/winhack.rc index fbe856b42..4c69358c9 100644 --- a/win/win32/winhack.rc +++ b/win/win32/winhack.rc @@ -326,8 +326,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,0,0 - PRODUCTVERSION 3,5,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x1fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -343,13 +343,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "NetHack for Windows - Graphical Interface\0" - VALUE "FileVersion", "3.5.0\0" + VALUE "FileVersion", "3.6.1\0" VALUE "InternalName", "NetHackW\0" - VALUE "LegalCopyright", "Copyright (C) 1985 - 2006. By Stichting Mathematisch Centrum and M. Stephenson. See license for details.\0" + VALUE "LegalCopyright", "Copyright (C) 1985 - 2017. By Stichting Mathematisch Centrum and M. Stephenson. See license for details.\0" VALUE "OriginalFilename", "NetHackW.exe\0" VALUE "PrivateBuild", "140606\0" VALUE "ProductName", "NetHack\0" - VALUE "ProductVersion", "3.5.0\0" + VALUE "ProductVersion", "3.6.1\0" END END BLOCK "VarFileInfo" From 73d36b59ddacdc8b4487a5d991582ca70ecee4c0 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Mon, 21 Aug 2017 12:00:08 +0300 Subject: [PATCH 03/21] Typofix --- src/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options.c b/src/options.c index 0d9d81468..f0de0cab0 100644 --- a/src/options.c +++ b/src/options.c @@ -485,7 +485,7 @@ static const menu_cmd_t default_menu_cmd_info[] = { { "menu_previous_page", MENU_PREVIOUS_PAGE, "Go to previous page" }, { "menu_select_all", MENU_SELECT_ALL, "Select all items" }, { "menu_deselect_all", MENU_UNSELECT_ALL, "Unselect all items" }, - { "menu_invert_all", MENU_INVERT_ALL, "Insert selection" }, + { "menu_invert_all", MENU_INVERT_ALL, "Invert selection" }, { "menu_select_page", MENU_SELECT_PAGE, "Select items in current page" }, { "menu_deselect_page", MENU_UNSELECT_PAGE, "Unselect items in current page" }, { "menu_invert_page", MENU_INVERT_PAGE, "Invert current page selection" }, From eadecb1bafb58bc15454e611178b9a65dbf46e07 Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 21 Aug 2017 02:50:26 -0700 Subject: [PATCH 04/21] BONES_POOLS fix and bonesid fix The BONES_POOLS implementation added an extra dot to the bones file name (only when enabled) which would be a problem on some filesystems. This changes the name from "bonD0.15.3" to "bon3D0.15" which avoids the second dot and also fits within 8.3 characters. To enforce that, the maximum value for BONES_POOLS is now 10 (yielding single-digit pool numbers 0 through 9). BONES_POOLS==1 will omit the pool number (that's not a change, just a reminder), yielding "bonD0.15" and so on. Right now, BONES_POOLS==0 is equivalent to BONES_POOLS=1, but it could be changed someday to mean that bones files shouldn't be used if we decide to support that. The pool number as a suffix was being included in content validation, so it wasn't possible to move "bonD0.15.3" to pool 2 by renaming it to "bonD0.15.2". I'm not sure whether that was intentional, but it seems overly draconian. "bon3D0.15" can be renamed to "bon2D0.15" and then be loaded by a game assigned to pool 2. Also, pre-pool bones can be retained by renaming to any valid pool and should still work. The three letter filecode for quest bones has made the bonesid be broken since 3.3.0 introduced it (the three letter code, not bones-id). "QArc.2" for level 2 of the Archeologist quest was being written into the bones file as "rc.2", but worked as intended because validation when loading bones had the same mistake. This fixes it to use "QArc.2" when saving and accept either "QArc.2" or "rc.2" when loading, so 3.6.0 bones files (and existing to-be-3.6.1 bones) will continue to work. --- doc/fixes36.1 | 4 ++++ src/bones.c | 14 ++++++++++--- src/files.c | 55 ++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 58 insertions(+), 15 deletions(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 530523f43..7324c9eac 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -410,6 +410,10 @@ throne room's throne is occupied by a king using a grappling hook and getting pulled toward the target into water would drown hero without any chance to crawl out blinded monster who eats a carrot will have blindness cured (hero already did) +the "bonesid" written into bones files when they're created so that they can + be validated when loaded was incorrect for bones in the quest branch + ("QBar.2" ended up being "ar.2", "QKni.4" ended up as "ni.4", and so + forth) but worked anyway, because validation used same incorrect value Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository diff --git a/src/bones.c b/src/bones.c index 6f35d2631..4d3f67138 100644 --- a/src/bones.c +++ b/src/bones.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 bones.c $NHDT-Date: 1450432756 2015/12/18 09:59:16 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.68 $ */ +/* NetHack 3.6 bones.c $NHDT-Date: 1503309019 2017/08/21 09:50:19 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.70 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985,1993. */ /* NetHack may be freely redistributed. See license for details. */ @@ -549,7 +549,7 @@ getbones() { register int fd; register int ok; - char c, *bonesid, oldbonesid[10]; + char c, *bonesid, oldbonesid[40]; /* was [10]; more should be safer */ if (discover) /* save bones files for real games */ return 0; @@ -581,7 +581,15 @@ getbones() } mread(fd, (genericptr_t) &c, sizeof c); /* length incl. '\0' */ mread(fd, (genericptr_t) oldbonesid, (unsigned) c); /* DD.nnn */ - if (strcmp(bonesid, oldbonesid) != 0) { + if (strcmp(bonesid, oldbonesid) != 0 + /* from 3.3.0 through 3.6.0, bones in the quest branch stored + a bogus bonesid in the file; 3.6.1 fixed that, but for + 3.6.0 bones to remain compatible, we need an extra test; + once compatibility with 3.6.x goes away, this can too + (we don't try to make this conditional upon the value of + VERSION_COMPATIBILITY because then we'd need patchlevel.h) */ + && (strlen(bonesid) <= 2 + || strcmp(bonesid + 2, oldbonesid) != 0)) { char errbuf[BUFSZ]; Sprintf(errbuf, "This is bones level '%s', not '%s'!", oldbonesid, diff --git a/src/files.c b/src/files.c index abda2a770..a8efcb5d6 100644 --- a/src/files.c +++ b/src/files.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 files.c $NHDT-Date: 1502581476 2017/08/12 23:44:36 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.211 $ */ +/* NetHack 3.6 files.c $NHDT-Date: 1503309020 2017/08/21 09:50:20 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.215 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -697,21 +697,47 @@ d_level *lev; s_level *sptr; char *dptr; - Sprintf(file, "bon%c%s", dungeons[lev->dnum].boneid, - In_quest(lev) ? urole.filecode : "0"); - dptr = eos(file); - if ((sptr = Is_special(lev)) != 0) - Sprintf(dptr, ".%c", sptr->boneid); - else - Sprintf(dptr, ".%d", lev->dlevel); + /* + * "bonD0.nn" = bones for level nn in the main dungeon; + * "bonM0.T" = bones for Minetown; + * "bonQBar.n" = bones for level n in the Barbarian quest; + * "bon3D0.nn" = \ + * "bon3M0.T" = > same as above, but for bones pool #3. + * "bon3QBar.n" = / + * + * Return value for content validation skips "bon" and the + * pool number (if present), making it feasible for the admin + * to manually move a bones file from one pool to another by + * renaming it. + */ + Strcpy(file, "bon"); #ifdef SYSCF - if (sysopt.bones_pools > 1) - Sprintf(eos(file), ".%d", (ubirthday % sysopt.bones_pools)); + if (sysopt.bones_pools > 1) { + unsigned poolnum = min((unsigned) sysopt.bones_pools, 10); + + poolnum = (unsigned) ubirthday % poolnum; /* 0..9 */ + Sprintf(eos(file), "%u", poolnum); + } #endif + dptr = eos(file); /* this used to be after the following Sprintf() + and the return value was (dptr - 2) */ + /* when this naming scheme was adopted, 'filecode' was one letter; + 3.3.0 turned it into a three letter string (via roles[] in role.c); + from that version through 3.6.0, 'dptr' pointed past the filecode + and the return value of (dptr - 2) was wrong for bones produced + in the quest branch, skipping the boneid character 'Q' and the + first letter of the role's filecode; bones loading still worked + because the bonesid used for validation had the same error */ + Sprintf(dptr, "%c%s", dungeons[lev->dnum].boneid, + In_quest(lev) ? urole.filecode : "0"); + if ((sptr = Is_special(lev)) != 0) + Sprintf(eos(dptr), ".%c", sptr->boneid); + else + Sprintf(eos(dptr), ".%d", lev->dlevel); #ifdef VMS Strcat(dptr, ";1"); #endif - return (dptr - 2); + return dptr; } /* set up temporary file name for writing bones, to avoid another game's @@ -2283,8 +2309,13 @@ int src; free((genericptr_t) sysopt.genericusers); sysopt.genericusers = dupstr(bufp); } else if (src == SET_IN_SYS && match_varname(buf, "BONES_POOLS", 10)) { + /* max value of 10 guarantees (N % bones.pools) will be one digit + so we don't lose control of the length of bones file names */ n = atoi(bufp); - sysopt.bones_pools = (n < 0) ? 0 : n; + sysopt.bones_pools = (n <= 0) ? 0 : min(n, 10); + /* note: right now bones_pools==0 is the same as bones_pools==1, + but we could change that and make bones_pools==0 become an + indicator to suppress bones usage altogether */ } else if (src == SET_IN_SYS && match_varname(buf, "SUPPORT", 7)) { if (sysopt.support) free((genericptr_t) sysopt.support); From 0ad33783f0c9005d1baf05fee3172e488a4bc803 Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 21 Aug 2017 15:50:36 -0700 Subject: [PATCH 05/21] crushed to death by a gas spore's explosion From the newsgroup, remarking on an usual cause of death seen at NAO. Surviving a gas spore's explosion (via hit points, not from life-saving) left "gas spore's explosion" as stale killer.name. Being killed by opening a drawbridge (but not by closing or breaking one) only assigned killer.name if it didn't already have a value, so the stale reason got used: crushed to death by a gas spore's explosion. This fixes it two ways: clear the stale value after surviving the explosion, and assign a specific reason when opening the drawbridge. This also removes stale reason for death set up by various drawbridge activity. For the usual case, the hero only survives by life-saving which does its own clearing of killer.name. But there might have been cases where it was being set for the hero when operating on a monster, so no life-saving involved. The drawbridge code is not the easiest code to navigate.... --- doc/fixes36.1 | 3 +++ src/dbridge.c | 42 +++++++++++++++++++++--------------------- src/explode.c | 6 ++++-- src/mon.c | 4 +++- 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 7324c9eac..ed5d98304 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -414,6 +414,9 @@ the "bonesid" written into bones files when they're created so that they can be validated when loaded was incorrect for bones in the quest branch ("QBar.2" ended up being "ar.2", "QKni.4" ended up as "ni.4", and so forth) but worked anyway, because validation used same incorrect value +surviving a gas spore's explosion would leave that explosion as a stale reason + for death which might show up strangely ("crushed to death by a gas + spore's explosion" when killed by an opening drawbridge) Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository diff --git a/src/dbridge.c b/src/dbridge.c index 0d0421862..bf03f8d4a 100644 --- a/src/dbridge.c +++ b/src/dbridge.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 dbridge.c $NHDT-Date: 1449269914 2015/12/04 22:58:34 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.35 $ */ +/* NetHack 3.6 dbridge.c $NHDT-Date: 1503355815 2017/08/21 22:50:15 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.39 $ */ /* Copyright (c) 1989 by Jean-Christophe Collet */ /* NetHack may be freely redistributed. See license for details. */ @@ -230,7 +230,6 @@ int *x, *y; * dir is the direction. * flag must be put to TRUE if we want the drawbridge to be opened. */ - boolean create_drawbridge(x, y, dir, flag) int x, y, dir; @@ -375,7 +374,6 @@ struct entity *etmp; * Generates capitalized entity name, makes 2nd -> 3rd person conversion on * verb, where necessary. */ - STATIC_OVL const char * E_phrase(etmp, verb) struct entity *etmp; @@ -397,7 +395,6 @@ const char *verb; /* * Simple-minded "can it be here?" routine */ - STATIC_OVL boolean e_survives_at(etmp, x, y) struct entity *etmp; @@ -486,7 +483,6 @@ int xkill_flags, how; /* * These are never directly affected by a bridge or portcullis. */ - STATIC_OVL boolean automiss(etmp) struct entity *etmp; @@ -498,7 +494,6 @@ struct entity *etmp; /* * Does falling drawbridge or portcullis miss etmp? */ - STATIC_OVL boolean e_missed(etmp, chunks) struct entity *etmp; @@ -536,7 +531,6 @@ boolean chunks; /* * Can etmp jump from death? */ - STATIC_OVL boolean e_jumps(etmp) struct entity *etmp; @@ -604,6 +598,11 @@ struct entity *etmp; } } else { if (crm->typ == DRAWBRIDGE_DOWN) { + if (is_u(etmp)) { + killer.format = NO_KILLER_PREFIX; + Strcpy(killer.name, + "crushed to death underneath a drawbridge"); + } pline("%s crushed underneath the drawbridge.", E_phrase(etmp, "are")); /* no jump */ e_died(etmp, @@ -639,11 +638,10 @@ struct entity *etmp; /* * Here's where we try to do relocation. Assumes that etmp is not - * arriving - * at the portcullis square while the drawbridge is falling, since this - * square - * would be inaccessible (i.e. etmp started on drawbridge square) or - * unnecessary (i.e. etmp started here) in such a situation. + * arriving at the portcullis square while the drawbridge is + * falling, since this square would be inaccessible (i.e. etmp + * started on drawbridge square) or unnecessary (i.e. etmp started + * here) in such a situation. */ debugpline0("Doing relocation."); newx = oldx; @@ -654,12 +652,10 @@ struct entity *etmp; debugpline0("Checking new square for occupancy."); if (relocates && (e_at(newx, newy))) { /* - * Standoff problem: one or both entities must die, and/or both - * switch - * places. Avoid infinite recursion by checking first whether the - * other - * entity is staying put. Clean up if we happen to move/die in - * recursion. + * Standoff problem: one or both entities must die, and/or + * both switch places. Avoid infinite recursion by checking + * first whether the other entity is staying put. Clean up if + * we happen to move/die in recursion. */ struct entity *other; @@ -763,10 +759,12 @@ struct entity *etmp; } } +/* clear stale reason for death before returning */ +#define nokiller() (killer.name[0] = '\0', killer.format = 0) + /* * Close the drawbridge located at x,y */ - void close_drawbridge(x, y) int x, y; @@ -823,12 +821,12 @@ int x, y; newsym(x, y); newsym(x2, y2); block_point(x2, y2); /* vision */ + nokiller(); } /* * Open the drawbridge located at x,y */ - void open_drawbridge(x, y) int x, y; @@ -870,12 +868,12 @@ int x, y; unblock_point(x2, y2); /* vision */ if (Is_stronghold(&u.uz)) u.uevent.uopened_dbridge = TRUE; + nokiller(); } /* * Let's destroy the drawbridge located at x,y */ - void destroy_drawbridge(x, y) int x, y; @@ -898,6 +896,7 @@ int x, y; || (lev1->drawbridgemask & DB_UNDER) == DB_LAVA) { struct obj *otmp2; boolean lava = (lev1->drawbridgemask & DB_UNDER) == DB_LAVA; + if (lev1->typ == DRAWBRIDGE_UP) { if (cansee(x2, y2)) pline_The("portcullis of the drawbridge falls into the %s!", @@ -999,6 +998,7 @@ int x, y; do_entity(etmp1); } } + nokiller(); } /*dbridge.c*/ diff --git a/src/explode.c b/src/explode.c index 74dfcdae2..50674f087 100644 --- a/src/explode.c +++ b/src/explode.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 explode.c $NHDT-Date: 1496103440 2017/05/30 00:17:20 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.49 $ */ +/* NetHack 3.6 explode.c $NHDT-Date: 1503355817 2017/08/21 22:50:17 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.50 $ */ /* Copyright (C) 1990 by Ken Arromdee */ /* NetHack may be freely redistributed. See license for details. */ @@ -90,7 +90,9 @@ int expltype; if (olet == MON_EXPLODE) { str = killer.name; - do_hallu = Hallucination && strstri(str, "'s explosion"); + do_hallu = (Hallucination + && (strstri(str, "'s explosion") + || strstri(str, "s' explosion"))); adtyp = AD_PHYS; } else switch (abs(type) % 10) { diff --git a/src/mon.c b/src/mon.c index 466de5c31..118b58a8e 100644 --- a/src/mon.c +++ b/src/mon.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mon.c $NHDT-Date: 1502753408 2017/08/14 23:30:08 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.242 $ */ +/* NetHack 3.6 mon.c $NHDT-Date: 1503355818 2017/08/21 22:50:18 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.243 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1994,6 +1994,8 @@ boolean was_swallowed; /* digestion */ Sprintf(killer.name, "%s explosion", s_suffix(mdat->mname)); killer.format = KILLED_BY_AN; explode(mon->mx, mon->my, -1, tmp, MON_EXPLODE, EXPL_NOXIOUS); + killer.name[0] = '\0'; + killer.format = 0; return FALSE; } } From c7d13d6fa3da684472cdf8e0f34fb2c3dcc66315 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Wed, 23 Aug 2017 23:35:49 +0300 Subject: [PATCH 06/21] Make blessed scroll of fire useful Blessed scroll of fire allows to choose the explosion location like scroll of stinking cloud does. This should make it somewhat useful in the early game. --- doc/fixes36.1 | 1 + src/read.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index ed5d98304..a4f90a550 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -417,6 +417,7 @@ the "bonesid" written into bones files when they're created so that they can surviving a gas spore's explosion would leave that explosion as a stale reason for death which might show up strangely ("crushed to death by a gas spore's explosion" when killed by an opening drawbridge) +blessed scroll of fire lets you choose explosion location like stinking cloud Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository diff --git a/src/read.c b/src/read.c index f1fef012d..9c0b5ccf7 100644 --- a/src/read.c +++ b/src/read.c @@ -1556,8 +1556,14 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */ pline("Thinking of Maud you forget everything else."); exercise(A_WIS, FALSE); break; - case SCR_FIRE: + case SCR_FIRE: { + coord cc; + int dam; + + cc.x = u.ux; + cc.y = u.uy; cval = bcsign(sobj); + dam = (2 * (rn1(3, 3) + 2 * cval) + 1) / 3; useup(sobj); sobj = 0; /* it's gone */ if (!already_known) @@ -1581,13 +1587,27 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */ if (Underwater) { pline_The("%s around you vaporizes violently!", hliquid("water")); } else { - pline_The("scroll erupts in a tower of flame!"); - iflags.last_msg = PLNMSG_TOWER_OF_FLAME; /* for explode() */ - burn_away_slime(); + if (sblessed) { + if (!already_known) + pline("This is a scroll of fire!"); + dam *= 5; + pline("Where do you want to center the explosion?"); + getpos_sethilite(display_stinking_cloud_positions, get_valid_stinking_cloud_pos); + (void) getpos(&cc, TRUE, "the desired position"); + if (is_valid_stinking_cloud_pos(cc.x, cc.y, FALSE)) { + /* try to reach too far, get burned */ + cc.x = u.ux; + cc.y = u.uy; + } + } else { + pline_The("scroll erupts in a tower of flame!"); + iflags.last_msg = PLNMSG_TOWER_OF_FLAME; /* for explode() */ + burn_away_slime(); + } } - explode(u.ux, u.uy, 11, (2 * (rn1(3, 3) + 2 * cval) + 1) / 3, - SCROLL_CLASS, EXPL_FIERY); + explode(cc.x, cc.y, 11, dam, SCROLL_CLASS, EXPL_FIERY); break; + } case SCR_EARTH: /* TODO: handle steeds */ if (!Is_rogue_level(&u.uz) && has_ceiling(&u.uz) From d1b42533072d206f0ff7cbe68143b4fb438c0661 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 24 Aug 2017 09:04:50 +0300 Subject: [PATCH 07/21] Fix reversed stinking cloud targeting logic ...and give indication when blessed scroll of fire was targeted at illegal position. --- src/read.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/read.c b/src/read.c index 9c0b5ccf7..9732fea96 100644 --- a/src/read.c +++ b/src/read.c @@ -930,7 +930,7 @@ is_valid_stinking_cloud_pos(x, y, showmsg) int x, y; boolean showmsg; { - if (get_valid_stinking_cloud_pos(x,y)) { + if (!get_valid_stinking_cloud_pos(x,y)) { if (showmsg) You("smell rotten eggs."); return FALSE; @@ -1594,12 +1594,13 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */ pline("Where do you want to center the explosion?"); getpos_sethilite(display_stinking_cloud_positions, get_valid_stinking_cloud_pos); (void) getpos(&cc, TRUE, "the desired position"); - if (is_valid_stinking_cloud_pos(cc.x, cc.y, FALSE)) { + if (!is_valid_stinking_cloud_pos(cc.x, cc.y, FALSE)) { /* try to reach too far, get burned */ cc.x = u.ux; cc.y = u.uy; } - } else { + } + if (cc.x == u.ux && cc.y == u.uy) { pline_The("scroll erupts in a tower of flame!"); iflags.last_msg = PLNMSG_TOWER_OF_FLAME; /* for explode() */ burn_away_slime(); From ef9d198d53a77644f5f4e998cc3589f206cccdee Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 24 Aug 2017 10:33:23 +0300 Subject: [PATCH 08/21] Explain "no travel path" in Guidebook --- doc/Guidebook.mn | 6 +++++- doc/Guidebook.tex | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 074df9aa4..ad25c9c34 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1126,7 +1126,11 @@ The `m' prefix makes the command use a menu. .lp #travel Travel to a specific location on the map. Default key is '_'. Using the ``request menu'' prefix shows a menu of interesting targets in sight -without asking to move the cursor. +without asking to move the cursor. When picking a target with cursor and +the +.op autodescribe +-option is on, the top line will show "(no travel path)" if +your character does not know of a path to that location. .lp #turn Turn undead away. Autocompletes. Default key is 'M-t'. .lp #twoweapon diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 188c83c86..f18c6e364 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -1394,7 +1394,9 @@ The `{\tt m}' prefix makes the command use a menu. \item[\tb{\#travel}] Travel to a specific location on the map. Default key is '{\tt _}'. Using the ``request menu'' prefix shows a menu of interesting targets in sight -without asking to move the cursor. +without asking to move the cursor. When picking a target with cursor and +the {\it autodescribe\/}-option is on, the top line will show "(no travel path)" if +your character does not know of a path to that location. %.lp \item[\tb{\#turn}] Turn undead away. Autocompletes. Default key is '{\tt M-t}'. @@ -4573,7 +4575,7 @@ of moving 8 units at a time. \item[\ib{nostatus\verb+_+updates}] Prevent updates to the status lines at the bottom of the screen, if your screen-reader reads those lines. The same information can be -seen via the #attributes command. +seen via the {\tt \#attributes} command. \elist %.hn2 From 23be1b81d2caafc8495f05000fa7ece409e23450 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 24 Aug 2017 10:34:37 +0300 Subject: [PATCH 09/21] Typofix in Guidebook.tex --- doc/Guidebook.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index f18c6e364..105ea0bab 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -2686,7 +2686,7 @@ can be created with any text editor. %.pg Any line in the configuration file starting with `{\tt \#}' is treated as a comment. -Empty lines are ignore. +Empty lines are ignored. %.pg You can use different configuration statements in the file, some From 30aea05f47073bec06127af3d33f7d851ab2fc60 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Thu, 24 Aug 2017 22:59:46 +0300 Subject: [PATCH 10/21] Minor Guidebook tweakage --- doc/Guidebook.mn | 10 +++++----- doc/Guidebook.tex | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index ad25c9c34..a2014253c 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -608,7 +608,7 @@ objects, similar to the `M' command. For ports with mouse support, the command is also invoked when a mouse-click takes place on a location other than the current position. .lp . -Rest, do nothing for one turn. +Wait or rest, do nothing for one turn. .lp a Apply (use) a tool (pick-axe, key, lamp...). .lp A @@ -1431,8 +1431,8 @@ help you locate them before they locate you (which some monsters can do very well). .pg The commands `/' and `;' may be used to obtain information about those -monsters who are displayed on the screen. The command ``#name'', or -its synonym `C', allows you +monsters who are displayed on the screen. The command ``#name'' +(by default bound to `C'), allows you to assign a name to a monster, which may be useful to help distinguish one from another when multiple monsters are present. Assigning a name which is just a space will remove any prior name. @@ -1565,7 +1565,7 @@ When you use one of these objects, if its effect is obvious, NetHack will remember what it is for you. If its effect isn't extremely obvious, you will be asked what you want to call this type of object so you will recognize it later. You can also use the ``#name'' -command, or its synonym `C', for the same purpose at any time, to name +command, for the same purpose at any time, to name all objects of a particular type or just an individual object. When you use ``#name'' on an object which has already been named, specifying a space as the value will remove the prior name instead @@ -2797,7 +2797,7 @@ If you prefix the value with `!' or ``no'', you will exclude that race from being picked randomly. Cannot be set with the `O' command. Persistent. .lp rest_on_space -Make the space bar a synonym for the `.' (rest) command (default off). +Make the space bar a synonym for the `.' (#wait) command (default off). Persistent. .lp "role " Pick your type of character (ex. ``role:Samurai''); diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 105ea0bab..8937072e9 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -735,7 +735,7 @@ support, the command is also invoked when a mouse-click takes place on a location other than the current position. %.lp \item[\tb{.}] -Rest, do nothing for one turn. +Wait or rest, do nothing for one turn. %.lp \item[\tb{a}] Apply (use) a tool (pick-axe, key, lamp \ldots). @@ -1796,8 +1796,8 @@ very well). %.pg The commands `{\tt /}' and `{\tt ;}' may be used to obtain information about those -monsters who are displayed on the screen. The command ``{\tt \#name}'', or -its synonym `{\tt C}', allows you +monsters who are displayed on the screen. The command ``{\tt \#name}'' +(by default bound to `{\tt C}'), allows you to assign a name to a monster, which may be useful to help distinguish one from another when multiple monsters are present. Assigning a name which is just a space will remove any prior name. @@ -1949,7 +1949,7 @@ When you use one of these objects, if its effect is obvious, {\it NetHack\/} will remember what it is for you. If its effect isn't extremely obvious, you will be asked what you want to call this type of object so you will recognize it later. You can also use the ``{\tt \#name}'' -command, or its synonym `{\tt C}', for the same purpose at any time, to name +command, for the same purpose at any time, to name all objects of a particular type or just an individual object. When you use ``{\tt \#name}'' on an object which has already been named, specifying a space as the value will remove the prior name instead @@ -3399,7 +3399,7 @@ exclude that race from being picked randomly. Cannot be set with the `{\tt O}' command. Persistent. %.lp \item[\ib{rest\verb+_+on\verb+_+space}] -Make the space bar a synonym for the `{\tt .}' (rest) command (default off). +Make the space bar a synonym for the `{\tt .}' (\#wait) command (default off). Persistent. %.lp \item[\ib{role}] From 7e793a09d7f7d3e83afd32dfd58812e3141519bf Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Mon, 28 Aug 2017 20:38:25 +0300 Subject: [PATCH 11/21] Add database entry for "martial arts" the skill --- dat/data.base | 13 +++++++++++-- doc/fixes36.1 | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dat/data.base b/dat/data.base index b18af14ef..9f2e6433a 100644 --- a/dat/data.base +++ b/dat/data.base @@ -426,8 +426,8 @@ barbed devil Barbed devils lack any real special abilities, though they are quite difficult to kill. # takes "bat or bird" when specifying 'B' -~combat -~wombat +~*combat +~*wombat *bat bat or bird A bat, flitting in the darkness outside, took the wrong turn @@ -3179,6 +3179,15 @@ mars explain why he became a god of death and finally a god of war. He is the son of Jupiter and Juno. [ Encyclopedia Mythica, ed. M.F. Lindemans ] +martial arts +unarmed combat +bare*handed combat + "What else can we do? None of this is fast enough." "It will have + to be." He stood up, a tall, broad wall of a man. "Why don't you + ask around, see if anyone in the neighborhoods knows anything + about martial arts. You need more than a book or two to learn + good dependable unarmed combat." + [ Parable of the Sower, by Octavia Butler ] master assassin He strolled down the stairs, followed by a number of assassins. When he was directly in front of Ymor he said: "I've come for diff --git a/doc/fixes36.1 b/doc/fixes36.1 index a4f90a550..6b25341be 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -418,6 +418,7 @@ surviving a gas spore's explosion would leave that explosion as a stale reason for death which might show up strangely ("crushed to death by a gas spore's explosion" when killed by an opening drawbridge) blessed scroll of fire lets you choose explosion location like stinking cloud +add database entry for "martial arts" Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository From 06d211f75c76a69dcb29e5c5a7c2c10f63cc7d4d Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 28 Aug 2017 15:56:16 -0700 Subject: [PATCH 12/21] rogue starting invent: +9 lock pick Reported directly to devteam, the starting inventory for rogue chars specified that their lock pick be +9, but the 'spe' enchantment field is meaningless for that type of item. A followup report indicated that it had been this way since at least the 3.0 era. It might have been a typo, since 9 and 0 are next to each other. Or perhaps before lock picks were introduced, rogues started with a skeleton key. That assumes spe==9 meant skeleton key back in the days when each key and lock had a designated shape and a non-skeleton key had to match the lock's shape to work. I don't know whether that was how skeleton keys were flagged and don't care eough to delve deeper.... --- doc/fixes36.1 | 3 ++- src/u_init.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 6b25341be..487588a24 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -417,8 +417,8 @@ the "bonesid" written into bones files when they're created so that they can surviving a gas spore's explosion would leave that explosion as a stale reason for death which might show up strangely ("crushed to death by a gas spore's explosion" when killed by an opening drawbridge) -blessed scroll of fire lets you choose explosion location like stinking cloud add database entry for "martial arts" +starting inventory for rogues specified +9 lock pick, where +/-N is meaningless Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository @@ -625,6 +625,7 @@ blinded hero or monster who breathes vapor from broken potion of healing, extra healing, or full healing might have blindness cured (depends on potion: full == always; extra == if not-cursed; plain == if blessed) sysconf definition BONES_POOLS to allow more bones files per level +blessed scroll of fire lets you choose explosion location like stinking cloud Platform- and/or Interface-Specific New Features diff --git a/src/u_init.c b/src/u_init.c index 3dadf09d0..447d16d16 100644 --- a/src/u_init.c +++ b/src/u_init.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 u_init.c $NHDT-Date: 1454660565 2016/02/05 08:22:45 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.37 $ */ +/* NetHack 3.6 u_init.c $NHDT-Date: 1503960969 2017/08/28 22:56:09 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.40 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -124,7 +124,7 @@ static struct trobj Rogue[] = { { DAGGER, 0, WEAPON_CLASS, 10, 0 }, /* quan is variable */ { LEATHER_ARMOR, 1, ARMOR_CLASS, 1, UNDEF_BLESS }, { POT_SICKNESS, 0, POTION_CLASS, 1, 0 }, - { LOCK_PICK, 9, TOOL_CLASS, 1, 0 }, + { LOCK_PICK, 0, TOOL_CLASS, 1, 0 }, { SACK, 0, TOOL_CLASS, 1, 0 }, { 0, 0, 0, 0, 0 } }; From ffb3f12997084e5a79b5949f531ce9d0ec3827a6 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 1 Sep 2017 09:43:36 +0300 Subject: [PATCH 13/21] Fix pile display when picking up items while invisible Reported directly to the devteam. Set hilite_pile on, become invisible, pick up all but one item from a pile on the floor, the pile symbol was still there afterwards. This is yet another case of evil hack, because the gbuf doesn't distinguish between object piles and single items, see commit 854fe40609 --- doc/fixes36.1 | 1 + src/pickup.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 487588a24..2a0ea77a1 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -419,6 +419,7 @@ surviving a gas spore's explosion would leave that explosion as a stale reason spore's explosion" when killed by an opening drawbridge) add database entry for "martial arts" starting inventory for rogues specified +9 lock pick, where +/-N is meaningless +fix pile mark when picking up all-but-one items while invisible Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository diff --git a/src/pickup.c b/src/pickup.c index 0b91a4bb4..0f63a43bf 100644 --- a/src/pickup.c +++ b/src/pickup.c @@ -707,7 +707,7 @@ int what; /* should be a long */ /* position may need updating (invisible hero) */ if (n_picked) - newsym(u.ux, u.uy); + newsym_force(u.ux, u.uy); /* check if there's anything else here after auto-pickup is done */ if (autopickup) From 5a4df357abdae4c095e8b5e5fd9257359550ac84 Mon Sep 17 00:00:00 2001 From: Bart House Date: Sun, 27 Aug 2017 17:56:11 -0700 Subject: [PATCH 14/21] Improvements to vs2015 build. --- win/win32/.gitignore | 1 + win/win32/vs2015/NetHack.sln | 78 ++-- win/win32/vs2015/NetHack.vcxproj | 672 +++++++++------------------- win/win32/vs2015/NetHackW.vcxproj | 648 +++++++-------------------- win/win32/vs2015/afterdgncomp.proj | 12 + win/win32/vs2015/afterdlb.proj | 17 + win/win32/vs2015/afterlevcomp.proj | 12 + win/win32/vs2015/aftermakedefs.proj | 22 + win/win32/vs2015/afternethack.proj | 15 + win/win32/vs2015/afterrecover.proj | 12 + win/win32/vs2015/aftertile2bmp.proj | 13 + win/win32/vs2015/aftertilemap.proj | 12 + win/win32/vs2015/afteruudecode.proj | 19 + win/win32/vs2015/common.props | 40 ++ win/win32/vs2015/config.props | 21 + win/win32/vs2015/console.props | 11 + win/win32/vs2015/default.props | 17 + win/win32/vs2015/default_dll.props | 17 + win/win32/vs2015/dgncomp.vcxproj | 492 +++++--------------- win/win32/vs2015/dgnstuff.vcxproj | 124 ----- win/win32/vs2015/dirs.props | 22 + win/win32/vs2015/dlb.vcxproj | 43 ++ win/win32/vs2015/dlb_main.vcxproj | 447 ------------------ win/win32/vs2015/dll.props | 11 + win/win32/vs2015/files.props | 228 ++++++++++ win/win32/vs2015/levcomp.vcxproj | 637 +++----------------------- win/win32/vs2015/levstuff.vcxproj | 124 ----- win/win32/vs2015/makedefs.vcxproj | 489 ++------------------ win/win32/vs2015/nhdefkey.def | 8 + win/win32/vs2015/nhdefkey.vcxproj | 196 +------- win/win32/vs2015/notes.txt | 7 + win/win32/vs2015/recover.vcxproj | 320 ++----------- win/win32/vs2015/tile2bmp.vcxproj | 345 ++------------ win/win32/vs2015/tilemap.vcxproj | 394 +++------------- win/win32/vs2015/uudecode.vcxproj | 359 +-------------- 35 files changed, 1342 insertions(+), 4543 deletions(-) create mode 100644 win/win32/vs2015/afterdgncomp.proj create mode 100644 win/win32/vs2015/afterdlb.proj create mode 100644 win/win32/vs2015/afterlevcomp.proj create mode 100644 win/win32/vs2015/aftermakedefs.proj create mode 100644 win/win32/vs2015/afternethack.proj create mode 100644 win/win32/vs2015/afterrecover.proj create mode 100644 win/win32/vs2015/aftertile2bmp.proj create mode 100644 win/win32/vs2015/aftertilemap.proj create mode 100644 win/win32/vs2015/afteruudecode.proj create mode 100644 win/win32/vs2015/common.props create mode 100644 win/win32/vs2015/config.props create mode 100644 win/win32/vs2015/console.props create mode 100644 win/win32/vs2015/default.props create mode 100644 win/win32/vs2015/default_dll.props delete mode 100755 win/win32/vs2015/dgnstuff.vcxproj create mode 100644 win/win32/vs2015/dirs.props create mode 100644 win/win32/vs2015/dlb.vcxproj delete mode 100755 win/win32/vs2015/dlb_main.vcxproj create mode 100644 win/win32/vs2015/dll.props create mode 100644 win/win32/vs2015/files.props delete mode 100755 win/win32/vs2015/levstuff.vcxproj create mode 100644 win/win32/vs2015/nhdefkey.def create mode 100644 win/win32/vs2015/notes.txt diff --git a/win/win32/.gitignore b/win/win32/.gitignore index c40993f47..ad63feee5 100644 --- a/win/win32/.gitignore +++ b/win/win32/.gitignore @@ -1,4 +1,5 @@ # Build-generated stuff that we don't want *.bmp *.ico +*.db diff --git a/win/win32/vs2015/NetHack.sln b/win/win32/vs2015/NetHack.sln index 3b335b62f..c2cf16ff5 100755 --- a/win/win32/vs2015/NetHack.sln +++ b/win/win32/vs2015/NetHack.sln @@ -1,63 +1,69 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "build\dgncomp.vcxproj", "{8A3F81C7-2968-49A8-86BF-2669412AD7DE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}" ProjectSection(ProjectDependencies) = postProject + {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895} + {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} {642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42} + {6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385} + {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} + {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgnstuff", "build\dgnstuff.vcxproj", "{B9E02F2C-8851-442B-BF2A-3581802B78D4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "dgncomp.vcxproj", "{8A3F81C7-2968-49A8-86BF-2669412AD7DE}" ProjectSection(ProjectDependencies) = postProject - {FF144DFB-83A5-4D26-A598-715A2B354782} = {FF144DFB-83A5-4D26-A598-715A2B354782} + {642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb_main", "build\dlb_main.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vcxproj", "{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}" ProjectSection(ProjectDependencies) = postProject - {B9E02F2C-8851-442B-BF2A-3581802B78D4} = {B9E02F2C-8851-442B-BF2A-3581802B78D4} + {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} + {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levstuff", "build\levstuff.vcxproj", "{FF144DFB-83A5-4D26-A598-715A2B354782}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "levcomp.vcxproj", "{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}" + ProjectSection(ProjectDependencies) = postProject + {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "build\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "build\tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}" ProjectSection(ProjectDependencies) = postProject {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} + {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "build\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}" ProjectSection(ProjectDependencies) = postProject {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiles", "build\tiles.vcxproj", "{55946465-FC65-47B3-BB48-742C7694C0D6}" - ProjectSection(ProjectDependencies) = postProject - {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "build\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "build\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "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} + {6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385} {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "build\nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}" ProjectSection(ProjectDependencies) = postProject {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection @@ -86,14 +92,6 @@ Global {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.Build.0 = Release|Win32 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.ActiveCfg = Release|x64 {8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.Build.0 = Release|x64 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|Win32.ActiveCfg = Debug|Win32 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|Win32.Build.0 = Debug|Win32 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|x64.ActiveCfg = Debug|x64 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Debug|x64.Build.0 = Debug|x64 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|Win32.ActiveCfg = Release|Win32 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|Win32.Build.0 = Release|Win32 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|x64.ActiveCfg = Release|x64 - {B9E02F2C-8851-442B-BF2A-3581802B78D4}.Release|x64.Build.0 = Release|x64 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.ActiveCfg = Debug|Win32 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.Build.0 = Debug|Win32 {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|x64.ActiveCfg = Debug|x64 @@ -110,14 +108,6 @@ Global {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.Build.0 = Release|Win32 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.ActiveCfg = Release|x64 {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.Build.0 = Release|x64 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|Win32.ActiveCfg = Debug|Win32 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|Win32.Build.0 = Debug|Win32 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|x64.ActiveCfg = Debug|x64 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Debug|x64.Build.0 = Debug|x64 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|Win32.ActiveCfg = Release|Win32 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|Win32.Build.0 = Release|Win32 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|x64.ActiveCfg = Release|x64 - {FF144DFB-83A5-4D26-A598-715A2B354782}.Release|x64.Build.0 = Release|x64 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.ActiveCfg = Debug|Win32 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.Build.0 = Debug|Win32 {BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|x64.ActiveCfg = Debug|x64 @@ -150,14 +140,6 @@ Global {93F10526-209E-41D7-BBEA-775787876895}.Release|Win32.Build.0 = Release|Win32 {93F10526-209E-41D7-BBEA-775787876895}.Release|x64.ActiveCfg = Release|x64 {93F10526-209E-41D7-BBEA-775787876895}.Release|x64.Build.0 = Release|x64 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|Win32.ActiveCfg = Debug|Win32 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|Win32.Build.0 = Debug|Win32 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|x64.ActiveCfg = Debug|x64 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Debug|x64.Build.0 = Debug|x64 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|Win32.ActiveCfg = Release|Win32 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|Win32.Build.0 = Release|Win32 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|x64.ActiveCfg = Release|x64 - {55946465-FC65-47B3-BB48-742C7694C0D6}.Release|x64.Build.0 = Release|x64 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.ActiveCfg = Debug|Win32 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|Win32.Build.0 = Debug|Win32 {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/win/win32/vs2015/NetHack.vcxproj b/win/win32/vs2015/NetHack.vcxproj index 6826894e3..b9f29c289 100755 --- a/win/win32/vs2015/NetHack.vcxproj +++ b/win/win32/vs2015/NetHack.vcxproj @@ -1,492 +1,228 @@  - - - Release - Win32 - - - Release - x64 - - - Debug - Win32 - - - Debug - x64 - - + + + {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751} Win32Proj NetHack - - - Application - true - v140 - MultiByte - - - Application - false - MultiByte - v140 - - - Application - false - v140 - true - MultiByte - - - Application - false - MultiByte - v140 - + + + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - .\Debug\ - .\Debug\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - - + + + + + + - /Gs /Oi- /FS %(AdditionalOptions) + /Gs /Oi- %(AdditionalOptions) Disabled - Level3 Default Speed true - MaxSpeed - true - false - TILES;MSWIN_GRAPHICS;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - true - MultiThreaded - true - .\Release/NetHack.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false + $(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories) + TILES;WIN32CON;DLB;MSWIN_GRAPHICS;_LIB;%(PreprocessorDefinitions) - Console - true - true - true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies) - true - true - .\Release/NetHack.pdb - true - .\Release/NetHack.map - - - MachineX86 - true - - true - .\Release/NetHack.bsc - - - Install exe - - copy $(OutDir)NetHack.exe ..\binary - copy ..\dat\nhdat ..\binary - copy ..\dat\license ..\binary - if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf - if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt - if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt - copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh - if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - - - - - /Gs /Oi- /FS %(AdditionalOptions) - Disabled - Level3 - Default - Speed - true - MaxSpeed - true - false - TILES;MSWIN_GRAPHICS;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - true - MultiThreaded - true - .\Release/NetHack.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - - - Console - true - true - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) - true - true - .\Release/NetHack.pdb - true - .\Release/NetHack.map - - - - - true - .\Release/NetHack.bsc - - - Install exe - - copy $(OutDir)NetHack.exe ..\binary - copy ..\dat\nhdat ..\binary - copy ..\dat\license ..\binary - if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf - if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt - if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt - copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh - if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - - - - - /Gs /Oi- /FS %(AdditionalOptions) - Disabled - Default - Speed - true - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - TILES;MSWIN_GRAPHICS;NDEBUG;WIN32;WIN32CON;DLB;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - true - MultiThreadedDebug - true - .\Debug/NetHack.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - - - .\Release/NetHack.pdb - true - .\Release/NetHack.map - Console - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) - MachineX86 - - - true - .\Debug/NetHack.bsc - - - Install exe - - if NOT exist ..\binary\*.* mkdir ..\binary - copy $(OutDir)NetHack.exe ..\binary - copy ..\dat\nhdat ..\binary - copy ..\dat\license ..\binary - copy ..\dat\symbols ..\binary - if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf - if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt - if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt - copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh - if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - - - - - /Gs /Oi- /FS %(AdditionalOptions) - Disabled - Default - Speed - true - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - TILES;MSWIN_GRAPHICS;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - true - MultiThreadedDebug - true - .\Debug/NetHack.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - - - .\Release/NetHack.pdb - true - .\Release/NetHack.map - Console - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies) - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/NetHack.bsc - - - Install exe - - if NOT exist ..\binary\*.* mkdir ..\binary - copy $(OutDir)NetHack.exe ..\binary - copy ..\dat\nhdat ..\binary - copy ..\dat\license ..\binary - copy ..\dat\symbols ..\binary - if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf - if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt - if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt - copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh - if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GUISTUB;NDEBUG;WIN32;WIN32CON;DLB;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - GUISTUB;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - GUISTUB;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - GUISTUB;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GUISTUB;%(PreprocessorDefinitions) - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/NetHackW.vcxproj b/win/win32/vs2015/NetHackW.vcxproj index 15100ba54..51ba95e5b 100755 --- a/win/win32/vs2015/NetHackW.vcxproj +++ b/win/win32/vs2015/NetHackW.vcxproj @@ -1,514 +1,188 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {CEC5D360-8804-454F-8591-002184C23499} NetHackW + - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - .\Debug\ - .\Debug\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/NetHackW.tlb - - - + + + + + - /Gs /Oi- /FS %(AdditionalOptions) + /Gs /Oi- %(AdditionalOptions) Disabled - OnlyExplicitInline - Speed true - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - TILES;MSWIN_GRAPHICS;WIN32CONNDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/NetHackW.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false + $(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories) + TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;WIN32CONNDEBUG;%(PreprocessorDefinitions) NDEBUG;%(PreprocessorDefinitions) 0x0409 - /MAPINFO:EXPORTS %(AdditionalOptions) - comctl32.lib;winmm.lib;%(AdditionalDependencies) - true - true - .\Release/NetHackW.pdb - true - .\Release/NetHackW.map + Windows - false - - - MachineX86 - - - true - .\Release/NetHackW.bsc - - - Install exe - copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -copy ..\dat\symbols ..\binary -if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh -if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/NetHackW.tlb - - - - - /Gs /Oi- /FS %(AdditionalOptions) - Disabled - OnlyExplicitInline - Speed - true - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - TILES;MSWIN_GRAPHICS;WIN32CONNDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/NetHackW.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MAPINFO:EXPORTS %(AdditionalOptions) comctl32.lib;winmm.lib;%(AdditionalDependencies) - true - true - .\Release/NetHackW.pdb - true - .\Release/NetHackW.map - Windows - false - - - - true - .\Release/NetHackW.bsc - - - Install exe - copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -copy ..\dat\symbols ..\binary -if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh -if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/NetHackW.tlb - - - - - Disabled - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - TILES;MSWIN_GRAPHICS;WIN32CON_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/NetHackW.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /Gs /Oi- /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - comctl32.lib;winmm.lib;%(AdditionalDependencies) - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Windows - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/NetHackW.bsc - - - Install exe - if NOT exist ..\binary\*.* mkdir ..\binary -copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -copy ..\dat\symbols ..\binary -if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh -if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/NetHackW.tlb - - - - - Disabled - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - TILES;MSWIN_GRAPHICS;WIN32CON_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/NetHackW.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - ProgramDatabase - false - /Gs /Oi- /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - comctl32.lib;winmm.lib;%(AdditionalDependencies) - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Windows - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/NetHackW.bsc - - - Install exe - if NOT exist ..\binary\*.* mkdir ..\binary -copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -copy ..\dat\symbols ..\binary -if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh -if NOT exist ..\binary\record copy ..\win\win32\record ..\binary\record - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TTYSTUB; _DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - TTYSTUB;NDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - TTYSTUB; _DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - TTYSTUB;NDEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TTYSTUB; - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - {8a3f81c7-2968-49a8-86bf-2669412ad7de} - false - - - {0303a585-3f83-4bb7-af6b-1e12c8fb54ac} - false - - - {9dd9c52e-e8c9-4533-bd22-83c055c0aaba} - false - - - {ba3dd34c-04b7-40d0-b373-9329aa9e8945} - false - - - {93f10526-209e-41d7-bbea-775787876895} - false - - - {55946465-fc65-47b3-bb48-742c7694c0d6} - false - false - false - true - false - - - {63f9b82b-f589-4082-abe5-d4f0682050ab} - false - - - - + - - - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/afterdgncomp.proj b/win/win32/vs2015/afterdgncomp.proj new file mode 100644 index 000000000..74ed0d96a --- /dev/null +++ b/win/win32/vs2015/afterdgncomp.proj @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/afterdlb.proj b/win/win32/vs2015/afterdlb.proj new file mode 100644 index 000000000..a93c8f720 --- /dev/null +++ b/win/win32/vs2015/afterdlb.proj @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/win/win32/vs2015/afterlevcomp.proj b/win/win32/vs2015/afterlevcomp.proj new file mode 100644 index 000000000..3b8cd4313 --- /dev/null +++ b/win/win32/vs2015/afterlevcomp.proj @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/win/win32/vs2015/aftermakedefs.proj b/win/win32/vs2015/aftermakedefs.proj new file mode 100644 index 000000000..4986f8e6c --- /dev/null +++ b/win/win32/vs2015/aftermakedefs.proj @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/win/win32/vs2015/afternethack.proj b/win/win32/vs2015/afternethack.proj new file mode 100644 index 000000000..4e03f278f --- /dev/null +++ b/win/win32/vs2015/afternethack.proj @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/win/win32/vs2015/afterrecover.proj b/win/win32/vs2015/afterrecover.proj new file mode 100644 index 000000000..0652e7828 --- /dev/null +++ b/win/win32/vs2015/afterrecover.proj @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/win/win32/vs2015/aftertile2bmp.proj b/win/win32/vs2015/aftertile2bmp.proj new file mode 100644 index 000000000..ab37b2e91 --- /dev/null +++ b/win/win32/vs2015/aftertile2bmp.proj @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/win/win32/vs2015/aftertilemap.proj b/win/win32/vs2015/aftertilemap.proj new file mode 100644 index 000000000..f2e710ddf --- /dev/null +++ b/win/win32/vs2015/aftertilemap.proj @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/win/win32/vs2015/afteruudecode.proj b/win/win32/vs2015/afteruudecode.proj new file mode 100644 index 000000000..f871981e0 --- /dev/null +++ b/win/win32/vs2015/afteruudecode.proj @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/win/win32/vs2015/common.props b/win/win32/vs2015/common.props new file mode 100644 index 000000000..443ebf05f --- /dev/null +++ b/win/win32/vs2015/common.props @@ -0,0 +1,40 @@ + + + + true + + + false + + + + Level3 + WIN32;CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + false + /FS %(AdditionalOptions) + + + Console + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + true + /SAFESEH:NO %(AdditionalOptions) + + + + + MaxSpeed + OnlyExplicitInline + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded + + + \ No newline at end of file diff --git a/win/win32/vs2015/config.props b/win/win32/vs2015/config.props new file mode 100644 index 000000000..84ef04da2 --- /dev/null +++ b/win/win32/vs2015/config.props @@ -0,0 +1,21 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + \ No newline at end of file diff --git a/win/win32/vs2015/console.props b/win/win32/vs2015/console.props new file mode 100644 index 000000000..8fdca9d9e --- /dev/null +++ b/win/win32/vs2015/console.props @@ -0,0 +1,11 @@ + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + \ No newline at end of file diff --git a/win/win32/vs2015/default.props b/win/win32/vs2015/default.props new file mode 100644 index 000000000..688b5d311 --- /dev/null +++ b/win/win32/vs2015/default.props @@ -0,0 +1,17 @@ + + + + Application + false + MultiByte + v140 + + + true + + + false + true + + + \ No newline at end of file diff --git a/win/win32/vs2015/default_dll.props b/win/win32/vs2015/default_dll.props new file mode 100644 index 000000000..94a07f465 --- /dev/null +++ b/win/win32/vs2015/default_dll.props @@ -0,0 +1,17 @@ + + + + DynamicLibrary + false + MultiByte + v140 + + + true + + + false + true + + + \ No newline at end of file diff --git a/win/win32/vs2015/dgncomp.vcxproj b/win/win32/vs2015/dgncomp.vcxproj index 88b06a032..a44735de3 100755 --- a/win/win32/vs2015/dgncomp.vcxproj +++ b/win/win32/vs2015/dgncomp.vcxproj @@ -1,399 +1,125 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {8A3F81C7-2968-49A8-86BF-2669412AD7DE} + - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - .\..\util\ - .\..\util\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - - - - .\..\util/dgncomp.tlb - - - + + + + + + - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/dgncomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) + $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories) + WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\..\util/dgncomp.pdb - Console - false - - - MachineX86 - - - true - .\..\util/dgncomp.bsc - - - dgncomp - echo Building dungeon -echo chdir ..\dat -chdir ..\dat -echo ..\util\dgncomp.exe dungeon.pdf -..\util\dgncomp.exe dungeon.pdf -echo chdir ..\build -chdir ..\build - - - - - - .\..\util/dgncomp.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/dgncomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\..\util/dgncomp.pdb - Console - false - - - - - true - .\..\util/dgncomp.bsc - - - dgncomp - echo Building dungeon -echo chdir ..\dat -chdir ..\dat -echo ..\util\dgncomp.exe dungeon.pdf -..\util\dgncomp.exe dungeon.pdf -echo chdir ..\build -chdir ..\build - - - - - - .\..\util/dgncomp.tlb - - - - - Disabled - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/dgncomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\..\util/dgncomp.bsc - - - dgncomp - echo Building dungeon -echo chdir ..\dat -chdir ..\dat -echo ..\util\dgncomp.exe dungeon.pdf -..\util\dgncomp.exe dungeon.pdf -echo chdir ..\build -chdir ..\build - - - - - - .\..\util/dgncomp.tlb - - - - - Disabled - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/dgncomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\..\util/dgncomp.bsc - - - dgncomp - echo Building dungeon -echo chdir ..\dat -chdir ..\dat -echo ..\util\dgncomp.exe dungeon.pdf -..\util\dgncomp.exe dungeon.pdf -echo chdir ..\build -chdir ..\build - - + + - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {b9e02f2c-8851-442b-bf2a-3581802b78d4} - false - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + Lex; + Yacc; + $(BuildDependsOn); + + + + + + + NoLex; + NoYacc; + $(BuildDependsOn); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/dgnstuff.vcxproj b/win/win32/vs2015/dgnstuff.vcxproj deleted file mode 100755 index 48d33786e..000000000 --- a/win/win32/vs2015/dgnstuff.vcxproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B9E02F2C-8851-442B-BF2A-3581802B78D4} - MakeFileProj - - - - Makefile - false - v120 - - - Makefile - false - v120 - - - Makefile - false - v120 - - - Makefile - false - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\dgnstuff___Win32_Debug\ - .\dgnstuff___Win32_Debug\ - .\Debug\ - .\Debug\ - nmake /f "dgnstuff.mak" - nmake /f "dgnstuff.mak" - nmake /f "dgnstuff.mak" /a - nmake /f "dgnstuff.mak" /a - - - ..\util\dgncomp.exe - ..\util\dgncomp.exe - $(NMakePreprocessorDefinitions) - $(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - $(NMakeForcedUsingAssemblies) - .\Release\ - .\Release\ - .\Release\ - .\Release\ - nmake /f "dgnstuff.mak" - nmake /f "dgnstuff.mak" - nmake /f "dgnstuff.mak" /a - nmake /f "dgnstuff.mak" /a - - - ..\util\dgncomp.exe - ..\util\dgncomp.exe - $(NMakePreprocessorDefinitions) - $(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - $(NMakeForcedUsingAssemblies) - - - - - - {ba3dd34c-04b7-40d0-b373-9329aa9e8945} - false - - - - - - diff --git a/win/win32/vs2015/dirs.props b/win/win32/vs2015/dirs.props new file mode 100644 index 000000000..2395f2153 --- /dev/null +++ b/win/win32/vs2015/dirs.props @@ -0,0 +1,22 @@ + + + + $(MSBuildProjectDirectory)\..\..\..\ + $(RootDir)util\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\ + $(RootDir)bin\$(Configuration)\$(Platform)\ + $(RootDir)obj\$(Configuration)\$(Platform)\$(TargetName)\ + $(RootDir)dat\ + $(RootDir)doc\ + $(RootDir)include\ + $(RootDir)src\ + $(RootDir)sys\ + $(RootDir)util\ + $(RootDir)sys\share\ + $(RootDir)sys\winnt\ + $(RootDir)win\share\ + $(RootDir)win\tty\ + $(RootDir)win\win32\ + $(OutDir) + + \ No newline at end of file diff --git a/win/win32/vs2015/dlb.vcxproj b/win/win32/vs2015/dlb.vcxproj new file mode 100644 index 000000000..06424d447 --- /dev/null +++ b/win/win32/vs2015/dlb.vcxproj @@ -0,0 +1,43 @@ + + + + + + {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} + + + + + + + + + + + + + $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories) + WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/dlb_main.vcxproj b/win/win32/vs2015/dlb_main.vcxproj deleted file mode 100755 index a87d8c285..000000000 --- a/win/win32/vs2015/dlb_main.vcxproj +++ /dev/null @@ -1,447 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} - - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - .\..\util\ - .\..\util\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - - - - .\Release/dlb_main.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/dlb_main.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/dlb_main.pdb - Console - false - - - MachineX86 - - - true - .\Release/dlb_main.bsc - - - Packaging via DLB - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo engrave >>dlb.lst -echo epitaph >>dlb.lst -echo bogusmon >>dlb.lst -echo tribute >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary - - - - - - .\Release/dlb_main.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/dlb_main.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/dlb_main.pdb - Console - false - - - - - true - .\Release/dlb_main.bsc - - - Packaging via DLB - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo engrave >>dlb.lst -echo epitaph >>dlb.lst -echo bogusmon >>dlb.lst -echo tribute >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary - - - - - - .\Debug/dlb_main.tlb - - - - - Disabled - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/dlb_main.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/dlb_main.bsc - - - Packaging via dlb - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo engrave >>dlb.lst -echo epitaph >>dlb.lst -echo bogusmon >>dlb.lst -echo tribute >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary - - - - - - .\Debug/dlb_main.tlb - - - - - Disabled - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;DLB;WIN32CON;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/dlb_main.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/dlb_main.bsc - - - Packaging via dlb - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo engrave >>dlb.lst -echo epitaph >>dlb.lst -echo bogusmon >>dlb.lst -echo tribute >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary - - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - {8a3f81c7-2968-49a8-86bf-2669412ad7de} - false - - - {9dd9c52e-e8c9-4533-bd22-83c055c0aaba} - false - - - {ba3dd34c-04b7-40d0-b373-9329aa9e8945} - false - - - - - - \ No newline at end of file diff --git a/win/win32/vs2015/dll.props b/win/win32/vs2015/dll.props new file mode 100644 index 000000000..3b37e2ede --- /dev/null +++ b/win/win32/vs2015/dll.props @@ -0,0 +1,11 @@ + + + + + WIN32CON;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + + + Windows + + + \ No newline at end of file diff --git a/win/win32/vs2015/files.props b/win/win32/vs2015/files.props new file mode 100644 index 000000000..d905edbdd --- /dev/null +++ b/win/win32/vs2015/files.props @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/levcomp.vcxproj b/win/win32/vs2015/levcomp.vcxproj index 48fa929a7..1d01ffa87 100755 --- a/win/win32/vs2015/levcomp.vcxproj +++ b/win/win32/vs2015/levcomp.vcxproj @@ -1,581 +1,88 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {9DD9C52E-E8C9-4533-BD22-83C055C0AABA} + - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - .\..\util\ - .\..\util\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - - - - .\..\util/levcomp.tlb - - - + + + + + + - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/levcomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) + $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories) + WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions) - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\..\util/levcomp.pdb - Console - false - - - MachineX86 - - - true - .\..\util/levcomp.bsc - - - levcomp - echo Building special levels -echo chdir ..\dat -chdir ..\dat -echo arch.des -..\util\levcomp.exe arch.des -echo barb.des -..\util\levcomp.exe barb.des -echo bigroom.des -..\util\levcomp.exe bigroom.des -echo castle.des -..\util\levcomp.exe castle.des -echo caveman.des -..\util\levcomp.exe caveman.des -echo endgame.des -..\util\levcomp.exe endgame.des -echo gehennom.des -..\util\levcomp.exe gehennom.des -echo healer.des -..\util\levcomp.exe healer.des -echo knight.des -..\util\levcomp.exe knight.des -echo knox.des -..\util\levcomp.exe knox.des -echo medusa.des -..\util\levcomp.exe medusa.des -echo mines.des -..\util\levcomp.exe mines.des -echo monk.des -..\util\levcomp.exe monk.des -echo oracle.des -..\util\levcomp.exe oracle.des -echo priest.des -..\util\levcomp.exe priest.des -echo ranger.des -..\util\levcomp.exe ranger.des -echo rogue.des -..\util\levcomp.exe rogue.des -echo samurai.des -..\util\levcomp.exe samurai.des -echo sokoban.des -..\util\levcomp.exe sokoban.des -echo tourist.des -..\util\levcomp.exe tourist.des -echo tower.des -..\util\levcomp.exe tower.des -echo valkyrie.des -..\util\levcomp.exe valkyrie.des -echo wizard .des -..\util\levcomp.exe wizard.des -echo yendor.des -..\util\levcomp.exe yendor.des -echo chdir ..\build -chdir ..\build - - - - - - .\..\util/levcomp.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/levcomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\..\util/levcomp.pdb - Console - false - - - - - true - .\..\util/levcomp.bsc - - - levcomp - echo Building special levels -echo chdir ..\dat -chdir ..\dat -echo arch.des -..\util\levcomp.exe arch.des -echo barb.des -..\util\levcomp.exe barb.des -echo bigroom.des -..\util\levcomp.exe bigroom.des -echo castle.des -..\util\levcomp.exe castle.des -echo caveman.des -..\util\levcomp.exe caveman.des -echo endgame.des -..\util\levcomp.exe endgame.des -echo gehennom.des -..\util\levcomp.exe gehennom.des -echo healer.des -..\util\levcomp.exe healer.des -echo knight.des -..\util\levcomp.exe knight.des -echo knox.des -..\util\levcomp.exe knox.des -echo medusa.des -..\util\levcomp.exe medusa.des -echo mines.des -..\util\levcomp.exe mines.des -echo monk.des -..\util\levcomp.exe monk.des -echo oracle.des -..\util\levcomp.exe oracle.des -echo priest.des -..\util\levcomp.exe priest.des -echo ranger.des -..\util\levcomp.exe ranger.des -echo rogue.des -..\util\levcomp.exe rogue.des -echo samurai.des -..\util\levcomp.exe samurai.des -echo sokoban.des -..\util\levcomp.exe sokoban.des -echo tourist.des -..\util\levcomp.exe tourist.des -echo tower.des -..\util\levcomp.exe tower.des -echo valkyrie.des -..\util\levcomp.exe valkyrie.des -echo wizard .des -..\util\levcomp.exe wizard.des -echo yendor.des -..\util\levcomp.exe yendor.des -echo chdir ..\build -chdir ..\build - - - - - - .\..\util/levcomp.tlb - - - - - Disabled - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;YY_NO_UNISTD_H;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/levcomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\..\util/levcomp.bsc - - - levcomp - echo Building special levels -echo chdir ..\dat -chdir ..\dat -echo arch.des -..\util\levcomp.exe arch.des -echo barb.des -..\util\levcomp.exe barb.des -echo bigroom.des -..\util\levcomp.exe bigroom.des -echo castle.des -..\util\levcomp.exe castle.des -echo caveman.des -..\util\levcomp.exe caveman.des -echo endgame.des -..\util\levcomp.exe endgame.des -echo gehennom.des -..\util\levcomp.exe gehennom.des -echo healer.des -..\util\levcomp.exe healer.des -echo knight.des -..\util\levcomp.exe knight.des -echo knox.des -..\util\levcomp.exe knox.des -echo medusa.des -..\util\levcomp.exe medusa.des -echo mines.des -..\util\levcomp.exe mines.des -echo monk.des -..\util\levcomp.exe monk.des -echo oracle.des -..\util\levcomp.exe oracle.des -echo priest.des -..\util\levcomp.exe priest.des -echo ranger.des -..\util\levcomp.exe ranger.des -echo rogue.des -..\util\levcomp.exe rogue.des -echo samurai.des -..\util\levcomp.exe samurai.des -echo sokoban.des -..\util\levcomp.exe sokoban.des -echo tourist.des -..\util\levcomp.exe tourist.des -echo tower.des -..\util\levcomp.exe tower.des -echo valkyrie.des -..\util\levcomp.exe valkyrie.des -echo wizard .des -..\util\levcomp.exe wizard.des -echo yendor.des -..\util\levcomp.exe yendor.des -echo chdir ..\build -chdir ..\build - - - - - - .\..\util/levcomp.tlb - - - - - Disabled - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;YY_NO_UNISTD_H;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/levcomp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\..\util/levcomp.bsc - - - levcomp - echo Building special levels -echo chdir ..\dat -chdir ..\dat -echo arch.des -..\util\levcomp.exe arch.des -echo barb.des -..\util\levcomp.exe barb.des -echo bigroom.des -..\util\levcomp.exe bigroom.des -echo castle.des -..\util\levcomp.exe castle.des -echo caveman.des -..\util\levcomp.exe caveman.des -echo endgame.des -..\util\levcomp.exe endgame.des -echo gehennom.des -..\util\levcomp.exe gehennom.des -echo healer.des -..\util\levcomp.exe healer.des -echo knight.des -..\util\levcomp.exe knight.des -echo knox.des -..\util\levcomp.exe knox.des -echo medusa.des -..\util\levcomp.exe medusa.des -echo mines.des -..\util\levcomp.exe mines.des -echo monk.des -..\util\levcomp.exe monk.des -echo oracle.des -..\util\levcomp.exe oracle.des -echo priest.des -..\util\levcomp.exe priest.des -echo ranger.des -..\util\levcomp.exe ranger.des -echo rogue.des -..\util\levcomp.exe rogue.des -echo samurai.des -..\util\levcomp.exe samurai.des -echo sokoban.des -..\util\levcomp.exe sokoban.des -echo tourist.des -..\util\levcomp.exe tourist.des -echo tower.des -..\util\levcomp.exe tower.des -echo valkyrie.des -..\util\levcomp.exe valkyrie.des -echo wizard .des -..\util\levcomp.exe wizard.des -echo yendor.des -..\util\levcomp.exe yendor.des -echo chdir ..\build -chdir ..\build - - + - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + + + + + + + + + + - - - - - {ff144dfb-83a5-4d26-a598-715a2b354782} - false - + - - + + + + + Lex; + Yacc; + $(BuildDependsOn); + + + + + + + NoLex; + NoYacc; + $(BuildDependsOn); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/levstuff.vcxproj b/win/win32/vs2015/levstuff.vcxproj deleted file mode 100755 index f7bb276f4..000000000 --- a/win/win32/vs2015/levstuff.vcxproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FF144DFB-83A5-4D26-A598-715A2B354782} - MakeFileProj - - - - Makefile - false - v120 - - - Makefile - false - v120 - - - Makefile - false - v120 - - - Makefile - false - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Release\ - .\Release\ - .\Release\ - .\Release\ - nmake /f "levstuff.mak" - nmake /f "levstuff.mak" - nmake /f "levstuff.mak" /a - nmake /f "levstuff.mak" /a - - - ..\util\lev_lex.c - ..\util\lev_lex.c - $(NMakePreprocessorDefinitions) - $(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - $(NMakeForcedUsingAssemblies) - .\levstuff___Win32_Debug0\ - .\levstuff___Win32_Debug0\ - .\levstuff___Win32_Debug0\ - .\levstuff___Win32_Debug0\ - nmake /f "levstuff.mak" - nmake /f "levstuff.mak" - nmake /f "levstuff.mak" /a - nmake /f "levstuff.mak" /a - - - ..\util\lev_lex.c - ..\util\lev_lex.c - $(NMakePreprocessorDefinitions) - $(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - $(NMakeForcedUsingAssemblies) - - - - - - {ba3dd34c-04b7-40d0-b373-9329aa9e8945} - false - - - - - - diff --git a/win/win32/vs2015/makedefs.vcxproj b/win/win32/vs2015/makedefs.vcxproj index 38ad439ad..cedd41204 100755 --- a/win/win32/vs2015/makedefs.vcxproj +++ b/win/win32/vs2015/makedefs.vcxproj @@ -1,464 +1,55 @@  - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + + {BA3DD34C-04B7-40D0-B373-9329AA9E8945} - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - .\..\util\ - .\..\util\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - - - - .\..\util/makedefs.tlb - - - + + + + + + + - MaxSpeed - OnlyExplicitInline - .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/makedefs.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) + $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) + WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - .\..\util/makedefs.pdb - Console - false - - - MachineX86 - - - true - .\..\util/makedefs.bsc - - - Running makedefs - echo chdir ..\util -chdir ..\util -chdir -echo makedefs.exe -v -makedefs.exe -v -echo makedefs.exe -o -makedefs.exe -o -echo makedefs.exe -p -makedefs.exe -p -echo makedefs.exe -m -makedefs.exe -m -echo makedefs.exe -z -makedefs.exe -z -echo chdir ..\dat -chdir ..\dat -chdir -echo Generating NetHack database -echo ..\util\makedefs.exe -d -..\util\makedefs.exe -d -echo Generating rumors -echo ..\util\makedefs.exe -r -..\util\makedefs.exe -r -echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon -echo ..\util\makedefs.exe -s -..\util\makedefs.exe -s -echo Generating quests -echo ..\util\makedefs.exe -q -..\util\makedefs.exe -q -echo Generating oracles -echo ..\util\makedefs.exe -h -..\util\makedefs.exe -h -echo Generating dungeon.pdf -echo ..\util\makedefs.exe -e -..\util\makedefs.exe -e -echo chdir ..\build -chdir ..\build -copy ..\win\share\tilemap.c ..\win\share\tiletxt.c - - - - - - .\..\util/makedefs.tlb - - - - - MaxSpeed - OnlyExplicitInline - .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/makedefs.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - .\..\util/makedefs.pdb - Console - false - - - - - true - .\..\util/makedefs.bsc - - - Running makedefs - echo chdir ..\util -chdir ..\util -chdir -echo makedefs.exe -v -makedefs.exe -v -echo makedefs.exe -o -makedefs.exe -o -echo makedefs.exe -p -makedefs.exe -p -echo makedefs.exe -m -makedefs.exe -m -echo makedefs.exe -z -makedefs.exe -z -echo chdir ..\dat -chdir ..\dat -chdir -echo Generating NetHack database -echo ..\util\makedefs.exe -d -..\util\makedefs.exe -d -echo Generating rumors -echo ..\util\makedefs.exe -r -..\util\makedefs.exe -r -echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon -echo ..\util\makedefs.exe -s -..\util\makedefs.exe -s -echo Generating quests -echo ..\util\makedefs.exe -q -..\util\makedefs.exe -q -echo Generating oracles -echo ..\util\makedefs.exe -h -..\util\makedefs.exe -h -echo Generating dungeon.pdf -echo ..\util\makedefs.exe -e -..\util\makedefs.exe -e -echo chdir ..\build -chdir ..\build -copy ..\win\share\tilemap.c ..\win\share\tiletxt.c - - - - - - .\..\util/makedefs.tlb - - - - - Disabled - .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/makedefs.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\..\util/makedefs.bsc - - - Running makedefs - echo chdir ..\util -chdir ..\util -chdir -echo makedefs.exe -v -makedefs.exe -v -echo makedefs.exe -o -makedefs.exe -o -echo makedefs.exe -p -makedefs.exe -p -echo makedefs.exe -m -makedefs.exe -m -echo makedefs.exe -z -makedefs.exe -z -echo chdir ..\dat -chdir ..\dat -chdir -echo Generating NetHack database -echo ..\util\makedefs.exe -d -..\util\makedefs.exe -d -echo Generating rumors -echo ..\util\makedefs.exe -r -..\util\makedefs.exe -r -echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon -echo ..\util\makedefs.exe -s -..\util\makedefs.exe -s -echo Generating quests -echo ..\util\makedefs.exe -q -..\util\makedefs.exe -q -echo Generating oracles -echo ..\util\makedefs.exe -h -..\util\makedefs.exe -h -echo Generating dungeon.pdf -echo ..\util\makedefs.exe -e -..\util\makedefs.exe -e -echo chdir ..\build -chdir ..\build -copy ..\win\share\tilemap.c ..\win\share\tiletxt.c - - - - - - .\..\util/makedefs.tlb - - - - - Disabled - .;..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/makedefs.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\..\util/makedefs.bsc - - - Running makedefs - echo chdir ..\util -chdir ..\util -chdir -echo makedefs.exe -v -makedefs.exe -v -echo makedefs.exe -o -makedefs.exe -o -echo makedefs.exe -p -makedefs.exe -p -echo makedefs.exe -m -makedefs.exe -m -echo makedefs.exe -z -makedefs.exe -z -echo chdir ..\dat -chdir ..\dat -chdir -echo Generating NetHack database -echo ..\util\makedefs.exe -d -..\util\makedefs.exe -d -echo Generating rumors -echo ..\util\makedefs.exe -r -..\util\makedefs.exe -r -echo Generating ..\dat\engrave, ..\dat\epitaph, ..\dat\bogusmon -echo ..\util\makedefs.exe -s -..\util\makedefs.exe -s -echo Generating quests -echo ..\util\makedefs.exe -q -..\util\makedefs.exe -q -echo Generating oracles -echo ..\util\makedefs.exe -h -..\util\makedefs.exe -h -echo Generating dungeon.pdf -echo ..\util\makedefs.exe -e -..\util\makedefs.exe -e -echo chdir ..\build -chdir ..\build -copy ..\win\share\tilemap.c ..\win\share\tiletxt.c - - + + - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/nhdefkey.def b/win/win32/vs2015/nhdefkey.def new file mode 100644 index 000000000..2950904e4 --- /dev/null +++ b/win/win32/vs2015/nhdefkey.def @@ -0,0 +1,8 @@ +LIBRARY nhdefkey +EXPORTS +ProcessKeystroke +NHkbhit +CheckInput +SourceWhere +SourceAuthor +KeyHandlerName diff --git a/win/win32/vs2015/nhdefkey.vcxproj b/win/win32/vs2015/nhdefkey.vcxproj index ff353a055..31fd7d7cc 100755 --- a/win/win32/vs2015/nhdefkey.vcxproj +++ b/win/win32/vs2015/nhdefkey.vcxproj @@ -1,197 +1,39 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {6813477F-64B6-4B97-B230-438D0D233385} Win32Proj nhdefkey + - - DynamicLibrary - true - v140 - NotSet - - - DynamicLibrary - true - v140 - NotSet - - - DynamicLibrary - false - v140 - true - NotSet - - - DynamicLibrary - false - v140 - true - NotSet - + - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - + + + + + + - - - Level3 - Disabled - WIN32;WIN32CON;_DEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) - $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) - false + NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) + $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) - Windows - true - $(ProjectDir)..\build\nhdefkey.def - true - true + nhdefkey.def - - copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary - - - - - - - - - - - Level3 - Disabled - WIN32;WIN32CON;_DEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) - $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) - false - - - Windows - true - $(ProjectDir)..\build\nhdefkey64.def - - - copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary - - - - - - - - - Level3 - - - MaxSpeed - true - true - WIN32;WIN32CON;NDEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) - $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) - false - - - Windows - true - true - true - $(ProjectDir)..\build\nhdefkey.def - true - true - - - copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary - - - - - - - - - Level3 - - - MaxSpeed - true - true - WIN32;WIN32CON;NDEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) - $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) - false - - - Windows - true - true - true - $(ProjectDir)..\build\nhdefkey64.def - - - copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary - - - - - + - + - - - - + + + + - - \ No newline at end of file diff --git a/win/win32/vs2015/notes.txt b/win/win32/vs2015/notes.txt new file mode 100644 index 000000000..d0aaf24e1 --- /dev/null +++ b/win/win32/vs2015/notes.txt @@ -0,0 +1,7 @@ +Changes made to vs2015 build + +1. allow solution to be used in place + +To Do + +1. win\share\tiletxt.c is copied from win\share\tilemap.c ... use tilemap.c instead directly. diff --git a/win/win32/vs2015/recover.vcxproj b/win/win32/vs2015/recover.vcxproj index a5ab56e0b..5b4626ca4 100755 --- a/win/win32/vs2015/recover.vcxproj +++ b/win/win32/vs2015/recover.vcxproj @@ -1,306 +1,46 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E} + - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - - - - .\Debug/recover.tlb - - - + + + + + + - Disabled - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/recover.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) + $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) + WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/recover.bsc - - - install exe - copy $(OutDir)recover.exe ..\binary -if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt - - - - - - .\Debug/recover.tlb - - - - - Disabled - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/recover.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/recover.bsc - - - install exe - copy $(OutDir)recover.exe ..\binary -if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt - - - - - - .\Release/recover.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/recover.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/recover.pdb - Console - false - - - MachineX86 - - - true - .\Release/recover.bsc - - - copy $(OutDir)recover.exe ..\binary -if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt - - - - - - .\Release/recover.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/recover.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/recover.pdb - Console - false - - - - - true - .\Release/recover.bsc - - - copy $(OutDir)recover.exe ..\binary -if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt - - + - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + - - - - - - - - - - - - {0303a585-3f83-4bb7-af6b-1e12c8fb54ac} - false - - - {ba3dd34c-04b7-40d0-b373-9329aa9e8945} - false - + + + + + + + - - + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/tile2bmp.vcxproj b/win/win32/vs2015/tile2bmp.vcxproj index e4b2bd881..9b72b98f1 100755 --- a/win/win32/vs2015/tile2bmp.vcxproj +++ b/win/win32/vs2015/tile2bmp.vcxproj @@ -1,324 +1,47 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {642BC75D-ABAF-403E-8224-7C725FD4CB42} + - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - - - - .\Debug/tile2bmp.tlb - - - + + + + + + - Disabled - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/tile2bmp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - ProgramDatabase - false - /FS %(AdditionalOptions) + $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories) + WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/tile2bmp.bsc - - - - - .\Debug/tile2bmp.tlb - - - - - Disabled - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/tile2bmp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - ProgramDatabase - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/tile2bmp.bsc - - - - - .\Release/tile2bmp.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/tile2bmp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/tile2bmp.pdb - Console - false - - - MachineX86 - - - true - .\Release/tile2bmp.bsc - - - - - .\Release/tile2bmp.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt;..\win\share;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/tile2bmp.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/tile2bmp.pdb - Console - false - - - - - true - .\Release/tile2bmp.bsc - + - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - PACKED_FILE;%(PreprocessorDefinitions) - PACKED_FILE;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - TILETEXT;%(PreprocessorDefinitions) - TILETEXT;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - TILETEXT;%(PreprocessorDefinitions) - TILETEXT;%(PreprocessorDefinitions) - + + + + + + + + TILETEXT;%(PreprocessorDefinitions) + - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/tilemap.vcxproj b/win/win32/vs2015/tilemap.vcxproj index 6057b2bac..a970b2aa6 100755 --- a/win/win32/vs2015/tilemap.vcxproj +++ b/win/win32/vs2015/tilemap.vcxproj @@ -1,345 +1,81 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {93F10526-209E-41D7-BBEA-775787876895} + - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - - - - .\Debug/tilemap.tlb - - - + + + + + + - Disabled - ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/tilemap.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) + $(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories) + WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/tilemap.bsc - - - Generating src\tile.c - echo chdir ..\src -chdir ..\src -..\util\tilemap.exe -echo chdir ..\build -chdir ..\build - - - - - - .\Debug/tilemap.tlb - - - - - Disabled - ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/tilemap.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/tilemap.bsc - - - Generating src\tile.c - echo chdir ..\src -chdir ..\src -..\util\tilemap.exe -echo chdir ..\build -chdir ..\build - - - - - - .\Release/tilemap.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/tilemap.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/tilemap.pdb - Console - false - - - MachineX86 - - - true - .\Release/tilemap.bsc - - - Generating src\tile.c - echo chdir ..\src -chdir ..\src -..\util\tilemap.exe -echo chdir ..\build -chdir ..\build - - - - - - .\Release/tilemap.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\include;..\sys\winnt\include;..\win\share;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/tilemap.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x1009 - - - true - .\Release/tilemap.pdb - Console - false - - - - - true - .\Release/tilemap.bsc - - - Generating src\tile.c - echo chdir ..\src -chdir ..\src -..\util\tilemap.exe -echo chdir ..\build -chdir ..\build - - + - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/uudecode.vcxproj b/win/win32/vs2015/uudecode.vcxproj index 4ca0b12d5..d37115eed 100755 --- a/win/win32/vs2015/uudecode.vcxproj +++ b/win/win32/vs2015/uudecode.vcxproj @@ -1,352 +1,29 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - + + {63F9B82B-F589-4082-ABE5-D4F0682050AB} + - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - + - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\util\ - .\..\util\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - false - false - .\Debug\$(ProjectName)\ - .\Debug\$(ProjectName)\ - true - true - .\..\util\ - .\..\util\ - - - - .\Release/uudecode.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/uudecode.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - .\Release/uudecode.pdb - Console - false - - - MachineX86 - - - true - .\Release/uudecode.bsc - - - echo chdir ..\win\win32 -chdir ..\win\win32 -echo decoding icon (nhico.uu to NetHack.ico) -..\..\util\uudecode.exe ../../sys/winnt/nhico.uu -echo decoding mnsel (mnsel.uu to mnsel.bmp) -..\..\util\uudecode.exe mnsel.uu -echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp) -..\..\util\uudecode.exe mnselcnt.uu -echo decoding mnunsel (mnunsel.uu to mnunsel.bmp) -..\..\util\uudecode.exe mnunsel.uu -echo decoding petmark (petmark.uu to petmark.bmp) -..\..\util\uudecode.exe petmark.uu -echo decoding pilemark (pilemark.uu to pilemark.bmp) -..\..\util\uudecode.exe pilemark.uu -echo decoding splash (splash.uu to splash.bmp) -..\..\util\uudecode.exe splash.uu -echo decoding tombstone (rip.uu to rip.bmp) -..\..\util\uudecode.exe rip.uu -echo decoding record (record.uu to record.) -..\..\util\uudecode.exe record.uu -chdir ..\..\binary - - - - - - .\Release/uudecode.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - .\Release/uudecode.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - false - /FS %(AdditionalOptions) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - .\Release/uudecode.pdb - Console - false - - - - - true - .\Release/uudecode.bsc - - - echo chdir ..\win\win32 -chdir ..\win\win32 -echo decoding icon (nhico.uu to NetHack.ico) -..\..\util\uudecode.exe ../../sys/winnt/nhico.uu -echo decoding mnsel (mnsel.uu to mnsel.bmp) -..\..\util\uudecode.exe mnsel.uu -echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp) -..\..\util\uudecode.exe mnselcnt.uu -echo decoding mnunsel (mnunsel.uu to mnunsel.bmp) -..\..\util\uudecode.exe mnunsel.uu -echo decoding petmark (petmark.uu to petmark.bmp) -..\..\util\uudecode.exe petmark.uu -echo decoding pilemark (pilemark.uu to pilemark.bmp) -..\..\util\uudecode.exe pilemark.uu -echo decoding splash (splash.uu to splash.bmp) -..\..\util\uudecode.exe splash.uu -echo decoding tombstone (rip.uu to rip.bmp) -..\..\util\uudecode.exe rip.uu -echo decoding record (record.uu to record.) -..\..\util\uudecode.exe record.uu -chdir ..\..\binary - - - - - - .\Debug/uudecode.tlb - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - .\Debug/uudecode.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - MachineX86 - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/uudecode.bsc - - - echo chdir ..\win\win32 -chdir ..\win\win32 -echo decoding icon (nhico.uu to NetHack.ico) -..\..\util\uudecode.exe ../../sys/winnt/nhico.uu -echo decoding mnsel (mnsel.uu to mnsel.bmp) -..\..\util\uudecode.exe mnsel.uu -echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp) -..\..\util\uudecode.exe mnselcnt.uu -echo decoding mnunsel (mnunsel.uu to mnunsel.bmp) -..\..\util\uudecode.exe mnunsel.uu -echo decoding petmark (petmark.uu to petmark.bmp) -..\..\util\uudecode.exe petmark.uu -echo decoding pilemark (pilemark.uu to pilemark.bmp) -..\..\util\uudecode.exe pilemark.uu -echo decoding splash (splash.uu to splash.bmp) -..\..\util\uudecode.exe splash.uu -echo decoding tombstone (rip.uu to rip.bmp) -..\..\util\uudecode.exe rip.uu -echo decoding record (record.uu to record.) -..\..\util\uudecode.exe record.uu -chdir ..\..\binary - - - - - - .\Debug/uudecode.tlb - - - - - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - .\Debug/uudecode.pch - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - .\$(ConfigurationName)\$(ProjectName)\ - Level3 - true - EditAndContinue - false - /FS %(AdditionalOptions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - true - .\$(ConfigurationName)\$(ProjectName)\ - Console - false - - - /SAFESEH:NO %(AdditionalOptions) - - - true - .\Debug/uudecode.bsc - - - echo chdir ..\win\win32 -chdir ..\win\win32 -echo decoding icon (nhico.uu to NetHack.ico) -..\..\util\uudecode.exe ../../sys/winnt/nhico.uu -echo decoding mnsel (mnsel.uu to mnsel.bmp) -..\..\util\uudecode.exe mnsel.uu -echo decoding mnselcnt (mnselcnt.uu to mnselcnt.bmp) -..\..\util\uudecode.exe mnselcnt.uu -echo decoding mnunsel (mnunsel.uu to mnunsel.bmp) -..\..\util\uudecode.exe mnunsel.uu -echo decoding petmark (petmark.uu to petmark.bmp) -..\..\util\uudecode.exe petmark.uu -echo decoding pilemark (pilemark.uu to pilemark.bmp) -..\..\util\uudecode.exe pilemark.uu -echo decoding splash (splash.uu to splash.bmp) -..\..\util\uudecode.exe splash.uu -echo decoding tombstone (rip.uu to rip.bmp) -..\..\util\uudecode.exe rip.uu -echo decoding record (record.uu to record.) -..\..\util\uudecode.exe record.uu -chdir ..\..\binary - - - + + + + - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + - - + + + + + + + + + \ No newline at end of file From e5dadd525f6f9e75f9db40a98b1e4e673f547b24 Mon Sep 17 00:00:00 2001 From: Bart House Date: Mon, 28 Aug 2017 22:32:16 -0700 Subject: [PATCH 15/21] Visual Studio 2015 build improvements. --- win/win32/.gitignore | 2 +- win/win32/nethack.rc | 14 ++++++++++++++ win/win32/vs2015/NetHack.vcxproj | 17 ++++++++++------- win/win32/vs2015/NetHackW.vcxproj | 4 ++++ win/win32/vs2015/afterdgncomp.proj | 4 ++-- win/win32/vs2015/afterdlb.proj | 4 ++-- win/win32/vs2015/afterlevcomp.proj | 2 +- win/win32/vs2015/aftermakedefs.proj | 24 ++++++++++++------------ win/win32/vs2015/afternethack.proj | 8 ++++---- win/win32/vs2015/aftertile2bmp.proj | 4 ++-- win/win32/vs2015/aftertilemap.proj | 4 ++-- win/win32/vs2015/afteruudecode.proj | 23 ++++++++++++----------- win/win32/vs2015/common.props | 1 + win/win32/vs2015/dirs.props | 10 ++++++---- win/win32/vs2015/recover.vcxproj | 7 +++---- 15 files changed, 76 insertions(+), 52 deletions(-) create mode 100644 win/win32/nethack.rc diff --git a/win/win32/.gitignore b/win/win32/.gitignore index ad63feee5..00483b5c1 100644 --- a/win/win32/.gitignore +++ b/win/win32/.gitignore @@ -2,4 +2,4 @@ *.bmp *.ico *.db - +record diff --git a/win/win32/nethack.rc b/win/win32/nethack.rc new file mode 100644 index 000000000..0877532d2 --- /dev/null +++ b/win/win32/nethack.rc @@ -0,0 +1,14 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_NETHACKW ICON DISCARDABLE "NETHACK.ICO" + + diff --git a/win/win32/vs2015/NetHack.vcxproj b/win/win32/vs2015/NetHack.vcxproj index b9f29c289..306f74ae7 100755 --- a/win/win32/vs2015/NetHack.vcxproj +++ b/win/win32/vs2015/NetHack.vcxproj @@ -1,21 +1,22 @@  - - {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751} Win32Proj NetHack - - + + + + $(BinDir) + @@ -31,7 +32,6 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies) - @@ -215,8 +215,11 @@ + + + - + @@ -225,4 +228,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/win/win32/vs2015/NetHackW.vcxproj b/win/win32/vs2015/NetHackW.vcxproj index 51ba95e5b..52403bbf6 100755 --- a/win/win32/vs2015/NetHackW.vcxproj +++ b/win/win32/vs2015/NetHackW.vcxproj @@ -14,6 +14,10 @@ + + $(BinDir) + + /Gs /Oi- %(AdditionalOptions) diff --git a/win/win32/vs2015/afterdgncomp.proj b/win/win32/vs2015/afterdgncomp.proj index 74ed0d96a..7aebee743 100644 --- a/win/win32/vs2015/afterdgncomp.proj +++ b/win/win32/vs2015/afterdgncomp.proj @@ -2,9 +2,9 @@ - + diff --git a/win/win32/vs2015/afterdlb.proj b/win/win32/vs2015/afterdlb.proj index a93c8f720..ed68ba33e 100644 --- a/win/win32/vs2015/afterdlb.proj +++ b/win/win32/vs2015/afterdlb.proj @@ -2,12 +2,12 @@ - + diff --git a/win/win32/vs2015/afterlevcomp.proj b/win/win32/vs2015/afterlevcomp.proj index 3b8cd4313..924f66cd5 100644 --- a/win/win32/vs2015/afterlevcomp.proj +++ b/win/win32/vs2015/afterlevcomp.proj @@ -4,7 +4,7 @@ - + diff --git a/win/win32/vs2015/aftermakedefs.proj b/win/win32/vs2015/aftermakedefs.proj index 4986f8e6c..20adf1b15 100644 --- a/win/win32/vs2015/aftermakedefs.proj +++ b/win/win32/vs2015/aftermakedefs.proj @@ -2,19 +2,19 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/win/win32/vs2015/afternethack.proj b/win/win32/vs2015/afternethack.proj index 4e03f278f..3b769323e 100644 --- a/win/win32/vs2015/afternethack.proj +++ b/win/win32/vs2015/afternethack.proj @@ -3,13 +3,13 @@ + Inputs="$(SysWinntDir)defaults.nh;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp" + Outputs="$(BinDir)defaults.nh;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf;$(BinDir)symbols;$(BinDir)record;$(BinDir)opthelp"> - + - + diff --git a/win/win32/vs2015/aftertile2bmp.proj b/win/win32/vs2015/aftertile2bmp.proj index ab37b2e91..28d2b2e39 100644 --- a/win/win32/vs2015/aftertile2bmp.proj +++ b/win/win32/vs2015/aftertile2bmp.proj @@ -2,9 +2,9 @@ - + diff --git a/win/win32/vs2015/aftertilemap.proj b/win/win32/vs2015/aftertilemap.proj index f2e710ddf..bfdb48fe9 100644 --- a/win/win32/vs2015/aftertilemap.proj +++ b/win/win32/vs2015/aftertilemap.proj @@ -2,9 +2,9 @@ - + diff --git a/win/win32/vs2015/afteruudecode.proj b/win/win32/vs2015/afteruudecode.proj index f871981e0..b33e3c4f4 100644 --- a/win/win32/vs2015/afteruudecode.proj +++ b/win/win32/vs2015/afteruudecode.proj @@ -2,18 +2,19 @@ - - - - - - - - + Inputs="$(ToolsDir)uudecode.exe;@(UUFiles)" + Outputs="@(IconFiles);@(BmpFiles);@(RecordFiles)"> + + + + + + + + + - + diff --git a/win/win32/vs2015/common.props b/win/win32/vs2015/common.props index 443ebf05f..d39cf4616 100644 --- a/win/win32/vs2015/common.props +++ b/win/win32/vs2015/common.props @@ -15,6 +15,7 @@ Console + $(SymbolsDir)$(TargetName).pdb diff --git a/win/win32/vs2015/dirs.props b/win/win32/vs2015/dirs.props index 2395f2153..8cdcf60c2 100644 --- a/win/win32/vs2015/dirs.props +++ b/win/win32/vs2015/dirs.props @@ -2,10 +2,11 @@ $(MSBuildProjectDirectory)\..\..\..\ - $(RootDir)util\ + $(RootDir)bin\$(Configuration)\$(Platform)\ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\ - $(RootDir)bin\$(Configuration)\$(Platform)\ - $(RootDir)obj\$(Configuration)\$(Platform)\$(TargetName)\ + $(ProjectDir)symbols\$(Configuration)\$(Platform)\$(TargetName)\ + $(RootDir)tools\$(Configuration)\$(Platform)\ + $(RootDir)util\ $(RootDir)dat\ $(RootDir)doc\ $(RootDir)include\ @@ -17,6 +18,7 @@ $(RootDir)win\share\ $(RootDir)win\tty\ $(RootDir)win\win32\ - $(OutDir) + $(ToolsDir) + $(ObjDir) \ No newline at end of file diff --git a/win/win32/vs2015/recover.vcxproj b/win/win32/vs2015/recover.vcxproj index 5b4626ca4..7abba076f 100755 --- a/win/win32/vs2015/recover.vcxproj +++ b/win/win32/vs2015/recover.vcxproj @@ -1,11 +1,9 @@  - {2F35F228-6733-4FE5-9B46-B3AA10D4BC2E} - @@ -13,14 +11,15 @@ - + + $(BinDir) + $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions) - From 98266801b6db67807a5101d648e088d24896aaa9 Mon Sep 17 00:00:00 2001 From: Bart House Date: Tue, 29 Aug 2017 21:26:12 -0700 Subject: [PATCH 16/21] Improve Visual Studio 2015 build. --- win/win32/.gitignore | 2 ++ win/win32/vs2015/common.props | 3 --- win/win32/vs2015/notes.txt | 46 ++++++++++++++++++++++++++++++++--- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/win/win32/.gitignore b/win/win32/.gitignore index 00483b5c1..5f3465e5f 100644 --- a/win/win32/.gitignore +++ b/win/win32/.gitignore @@ -3,3 +3,5 @@ *.ico *.db record +*.user + diff --git a/win/win32/vs2015/common.props b/win/win32/vs2015/common.props index d39cf4616..2504e3912 100644 --- a/win/win32/vs2015/common.props +++ b/win/win32/vs2015/common.props @@ -10,8 +10,6 @@ Level3 WIN32;CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - false - /FS %(AdditionalOptions) Console @@ -27,7 +25,6 @@ true - /SAFESEH:NO %(AdditionalOptions) diff --git a/win/win32/vs2015/notes.txt b/win/win32/vs2015/notes.txt index d0aaf24e1..c63113fd9 100644 --- a/win/win32/vs2015/notes.txt +++ b/win/win32/vs2015/notes.txt @@ -1,7 +1,47 @@ Changes made to vs2015 build -1. allow solution to be used in place +Changes +1. Removed the use of /FS. +2. Allow multi-processor compilation. -To Do +Questions -1. win\share\tiletxt.c is copied from win\share\tilemap.c ... use tilemap.c instead directly. +1. Why is /Gs used? This initiates stack probes for every function call (not just functions that use more then 4k)? +2. Why is /Oi- used? This turns off compiler intrinsics. +3. Why is /FS used? This forces serialization of writes to PDB. This really isn't needed. +4. Why are we disabling optimizations for release builds? +5. Why are we omitting frame pointers? Makes debugging harder. Crash dumps less usefull. +6. Why are we forcing function level linking? +7. Why are we turning off intrinsics (again)? +8. Why are we enabling additional security checks? (SDLCheck) +9. Why are we using string pooling? +10. Why do we turn off multi-processor compilation? + +Nethack Compiler Settings - Release +/Gs +/Oi- +/FS +Optimizations:Disabled +WarningLevel:Level3 +InlineFunctionExpansion:Default +FavorSizeOrSpeed:Speed +OmitFramePointers:true +Optimization:MaxSpeed +FunctionLevelLinking:true +IntrinsicFunctions:false +PreprocessorDefinitions:TILES;MSWIN_GRAPHICS;WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB; +SDLCheck:true +AdditionalIncludeDirectories:..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share; +StringPooling:true +RuntimeLibrary:MultiThreaded +SuppressStartupBanner:true +MultiProcessorCompilation:false + +Nethack Link Settings - Release +SubSystem:Console +GenetateDebugInformation:true +EnableCOMDATFolding:true +OptimizeReferenes:true +AdditionalDependencies:kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib; +SuppressStartupBanner:true +TargetMachine:MachineX86 From 77bd37b435d6488976725faf143eec1c29c0ec5d Mon Sep 17 00:00:00 2001 From: Bart House Date: Tue, 29 Aug 2017 22:27:57 -0700 Subject: [PATCH 17/21] Visual Studio 2015 build improvements. --- sys/winnt/Install.nt | 29 ++++++++++++++++++++++++++++- win/win32/.gitignore | 1 + win/win32/vs2015/common.props | 3 +++ win/win32/vs2015/nhdefkey.vcxproj | 9 ++++----- win/win32/vs2015/notes.txt | 4 ++++ 5 files changed, 40 insertions(+), 6 deletions(-) diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index a9b2201b0..c6e5643b7 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -21,6 +21,10 @@ tty and graphical win32 versions of NetHack 3.6.1. You can build a TTY version of NetHack and a Windows Graphical version. You can use one of the following build environments: + o A copy of Microsoft Visual Studio 2015 Express + + OR + o A copy of Microsoft Visual Studio 2013 Express The current NetHack code has not been tested with earlier versions of the compiler. @@ -34,12 +38,35 @@ version. You can use one of the following build environments: http://www.mingw.org/ Earlier versions of MinGW will not allow you to build the Windows Graphical version. - + + In addition to the makefiles that allow you to build NetHack from the command line, there is also a set of project files and a workspace file that allow you to build the Windows Graphical version from Microsoft Visual C's IDE (Integrated Development Environment.) +/-------------------------------------------------------\ +| Buildig And Running Using Visual Studio 2015 | +\-------------------------------------------------------/ + +If you are NOT using Visual Studio 2015, proceed to "FIRST STEP - +MOVING THINGS AROUND". + +When using Visual Studio 2015, you do not need to move things around. +You simply need to load the Visual Studio 2015 NetHack solution file +within the IDE, build the solution and run the version of NetHack +you wish to run. + +The Visual Studio 2015 NetHack solution file can be found here: + win\win32\vs2015\NetHack.sln + +From a command prompt, you can launch and load this solution file by: + start win\win32\vs2015\NetHack.sln + +From within the IDE: + 1. select the build configuration you wish to use. + 2. from build menu, select build solution. + 3. type F5 to start debugging. /-----------------------------------\ | FIRST STEP - MOVING THINGS AROUND | diff --git a/win/win32/.gitignore b/win/win32/.gitignore index 5f3465e5f..670e92b59 100644 --- a/win/win32/.gitignore +++ b/win/win32/.gitignore @@ -4,4 +4,5 @@ *.db record *.user +*.opendb diff --git a/win/win32/vs2015/common.props b/win/win32/vs2015/common.props index 2504e3912..5a5b2ed2e 100644 --- a/win/win32/vs2015/common.props +++ b/win/win32/vs2015/common.props @@ -34,5 +34,8 @@ NDEBUG;%(PreprocessorDefinitions) MultiThreaded + + UseLinkTimeCodeGeneration + \ No newline at end of file diff --git a/win/win32/vs2015/nhdefkey.vcxproj b/win/win32/vs2015/nhdefkey.vcxproj index 31fd7d7cc..f77c26ad3 100755 --- a/win/win32/vs2015/nhdefkey.vcxproj +++ b/win/win32/vs2015/nhdefkey.vcxproj @@ -1,13 +1,11 @@  - {6813477F-64B6-4B97-B230-438D0D233385} Win32Proj nhdefkey - @@ -15,17 +13,18 @@ - + + $(BinDir) + - NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) nhdefkey.def + $(ToolsDir)$(TargetName).lib - diff --git a/win/win32/vs2015/notes.txt b/win/win32/vs2015/notes.txt index c63113fd9..cdcba3334 100644 --- a/win/win32/vs2015/notes.txt +++ b/win/win32/vs2015/notes.txt @@ -1,5 +1,9 @@ Changes made to vs2015 build +To Do +1. Build other key handler DLLs. +2. Ensure Release build does not have unexpected files after clean build. + Changes 1. Removed the use of /FS. 2. Allow multi-processor compilation. From f9a6cf2bf72892f8cae90ead85ee6d7bfa1e99a3 Mon Sep 17 00:00:00 2001 From: Bart House Date: Wed, 30 Aug 2017 19:30:52 -0700 Subject: [PATCH 18/21] Improvements to Visual Studio 2015 build. --- sys/winnt/Install.nt | 4 ++++ win/win32/.gitignore | 2 +- win/win32/vs2015/NetHack.sln | 26 ++++++++++++++++++++ win/win32/vs2015/build.bat | 4 ++++ win/win32/vs2015/nh340key.def | 8 +++++++ win/win32/vs2015/nh340key.vcxproj | 40 +++++++++++++++++++++++++++++++ win/win32/vs2015/nhdefkey.vcxproj | 7 ++++++ win/win32/vs2015/nhraykey.def | 8 +++++++ win/win32/vs2015/nhraykey.vcxproj | 40 +++++++++++++++++++++++++++++++ win/win32/vs2015/notes.txt | 6 ----- 10 files changed, 138 insertions(+), 7 deletions(-) create mode 100644 win/win32/vs2015/build.bat create mode 100644 win/win32/vs2015/nh340key.def create mode 100644 win/win32/vs2015/nh340key.vcxproj create mode 100644 win/win32/vs2015/nhraykey.def create mode 100644 win/win32/vs2015/nhraykey.vcxproj diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index c6e5643b7..12484b05b 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -68,6 +68,10 @@ From within the IDE: 2. from build menu, select build solution. 3. type F5 to start debugging. +You can build all the projects for all platforms and configurations +using a Visual Studio MSBuild command prompt. Open the MSBuild command +prompt, change directory to win\win32\vs2015 and run "build.bat". + /-----------------------------------\ | FIRST STEP - MOVING THINGS AROUND | \-----------------------------------/ diff --git a/win/win32/.gitignore b/win/win32/.gitignore index 670e92b59..e4eff42d6 100644 --- a/win/win32/.gitignore +++ b/win/win32/.gitignore @@ -5,4 +5,4 @@ record *.user *.opendb - +*.log diff --git a/win/win32/vs2015/NetHack.sln b/win/win32/vs2015/NetHack.sln index c2cf16ff5..63617e5f0 100755 --- a/win/win32/vs2015/NetHack.sln +++ b/win/win32/vs2015/NetHack.sln @@ -68,6 +68,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxpro {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}" + ProjectSection(ProjectDependencies) = postProject + {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}" + ProjectSection(ProjectDependencies) = postProject + {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -162,6 +172,22 @@ Global {6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.Build.0 = Release|Win32 {6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.ActiveCfg = Release|x64 {6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.Build.0 = Release|x64 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.Build.0 = Debug|Win32 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.ActiveCfg = Debug|x64 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.Build.0 = Debug|x64 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.ActiveCfg = Release|Win32 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.Build.0 = Release|Win32 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.ActiveCfg = Release|x64 + {BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.Build.0 = Release|x64 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.Build.0 = Debug|Win32 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.ActiveCfg = Debug|x64 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.Build.0 = Debug|x64 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.ActiveCfg = Release|Win32 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.Build.0 = Release|Win32 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.ActiveCfg = Release|x64 + {2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win/win32/vs2015/build.bat b/win/win32/vs2015/build.bat new file mode 100644 index 000000000..512b4f22d --- /dev/null +++ b/win/win32/vs2015/build.bat @@ -0,0 +1,4 @@ +msbuild NetHack.sln /t:Build /p:Configuration=Debug;Platform=Win32 +msbuild NetHack.sln /t:Build /p:Configuration=Debug;Platform=x64 +msbuild NetHack.sln /t:Build /p:Configuration=Release;Platform=Win32 +msbuild NetHack.sln /t:Build /p:Configuration=Release;Platform=x64 diff --git a/win/win32/vs2015/nh340key.def b/win/win32/vs2015/nh340key.def new file mode 100644 index 000000000..f484a536f --- /dev/null +++ b/win/win32/vs2015/nh340key.def @@ -0,0 +1,8 @@ +LIBRARY nh340key +EXPORTS +ProcessKeystroke +NHkbhit +CheckInput +SourceWhere +SourceAuthor +KeyHandlerName diff --git a/win/win32/vs2015/nh340key.vcxproj b/win/win32/vs2015/nh340key.vcxproj new file mode 100644 index 000000000..7b5c06a4f --- /dev/null +++ b/win/win32/vs2015/nh340key.vcxproj @@ -0,0 +1,40 @@ + + + + + {be04e242-a1e9-4593-b95b-057f37330b76} + Win32Proj + nh340key + + + + + + + + + + $(BinDir) + + + + $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) + + + + $(ToolsDir)$(TargetName).lib + + + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/nhdefkey.vcxproj b/win/win32/vs2015/nhdefkey.vcxproj index f77c26ad3..3b0c0f675 100755 --- a/win/win32/vs2015/nhdefkey.vcxproj +++ b/win/win32/vs2015/nhdefkey.vcxproj @@ -21,10 +21,17 @@ $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) + $(ToolsDir)$(TargetName).lib + + + nhdefkey.def + + diff --git a/win/win32/vs2015/nhraykey.def b/win/win32/vs2015/nhraykey.def new file mode 100644 index 000000000..5432a1af3 --- /dev/null +++ b/win/win32/vs2015/nhraykey.def @@ -0,0 +1,8 @@ +LIBRARY nhraykey +EXPORTS +ProcessKeystroke +NHkbhit +CheckInput +SourceWhere +SourceAuthor +KeyHandlerName diff --git a/win/win32/vs2015/nhraykey.vcxproj b/win/win32/vs2015/nhraykey.vcxproj new file mode 100644 index 000000000..f2e7890b6 --- /dev/null +++ b/win/win32/vs2015/nhraykey.vcxproj @@ -0,0 +1,40 @@ + + + + + {2e1f4bb3-3bd7-43ad-8e64-d3b8a2f5d7b2} + Win32Proj + nhraykey + + + + + + + + + + $(BinDir) + + + + $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) + + + + $(ToolsDir)$(TargetName).lib + + + + + + + + + + + + + \ No newline at end of file diff --git a/win/win32/vs2015/notes.txt b/win/win32/vs2015/notes.txt index cdcba3334..5a7d93371 100644 --- a/win/win32/vs2015/notes.txt +++ b/win/win32/vs2015/notes.txt @@ -1,12 +1,6 @@ Changes made to vs2015 build To Do -1. Build other key handler DLLs. -2. Ensure Release build does not have unexpected files after clean build. - -Changes -1. Removed the use of /FS. -2. Allow multi-processor compilation. Questions From b54382ec78e199b8075f3e8925cc676b63f83c9a Mon Sep 17 00:00:00 2001 From: Bart House Date: Thu, 31 Aug 2017 21:29:12 -0700 Subject: [PATCH 19/21] Improvements to Visual Studio 2015 build. --- win/win32/.gitignore | 1 + win/win32/nethack.rc | 99 ++++++++++++++++++++++++++++++- win/win32/nhresource.h | 16 +++++ win/win32/vs2015/NetHack.sln | 6 +- win/win32/vs2015/NetHack.vcxproj | 8 ++- win/win32/vs2015/build.bat | 8 +-- win/win32/vs2015/nh340key.vcxproj | 8 ++- win/win32/vs2015/nhdefkey.vcxproj | 3 - win/win32/vs2015/nhraykey.vcxproj | 8 ++- 9 files changed, 136 insertions(+), 21 deletions(-) create mode 100644 win/win32/nhresource.h diff --git a/win/win32/.gitignore b/win/win32/.gitignore index e4eff42d6..3f210da5d 100644 --- a/win/win32/.gitignore +++ b/win/win32/.gitignore @@ -6,3 +6,4 @@ record *.user *.opendb *.log +*.aps diff --git a/win/win32/nethack.rc b/win/win32/nethack.rc index 0877532d2..72ce4e0df 100644 --- a/win/win32/nethack.rc +++ b/win/win32/nethack.rc @@ -1,6 +1,48 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "nhresource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "nhresource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // @@ -9,6 +51,57 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_NETHACKW ICON DISCARDABLE "NETHACK.ICO" +IDI_ICON1 ICON "nethack.ico" +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 + FILEFLAGSMASK 0x1fL +#ifdef _DEBUG + FILEFLAGS 0x9L +#else + FILEFLAGS 0x8L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NetHack for Windows - TTY Interface" + VALUE "FileVersion", "3.6.1" + VALUE "InternalName", "NetHack" + VALUE "LegalCopyright", "Copyright (C) 1985 - 2017. By Stichting Mathematisch Centrum and M. Stephenson. See license for details." + VALUE "OriginalFilename", "NetHack.exe" + VALUE "ProductName", "NetHack" + VALUE "ProductVersion", "3.6.1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/win/win32/nhresource.h b/win/win32/nhresource.h new file mode 100644 index 000000000..119608c0d --- /dev/null +++ b/win/win32/nhresource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by NetHack.rc +// +#define IDI_ICON1 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/win/win32/vs2015/NetHack.sln b/win/win32/vs2015/NetHack.sln index 63617e5f0..2c2e78230 100755 --- a/win/win32/vs2015/NetHack.sln +++ b/win/win32/vs2015/NetHack.sln @@ -160,10 +160,12 @@ Global {63F9B82B-F589-4082-ABE5-D4F0682050AB}.Release|x64.Build.0 = Release|x64 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|Win32.ActiveCfg = Debug|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|Win32.Build.0 = Debug|Win32 - {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|x64.ActiveCfg = Debug|Win32 + {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|x64.ActiveCfg = Debug|x64 + {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Debug|x64.Build.0 = Debug|x64 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.ActiveCfg = Release|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.Build.0 = Release|Win32 - {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.ActiveCfg = Release|Win32 + {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.ActiveCfg = Release|x64 + {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.Build.0 = Release|x64 {6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.ActiveCfg = Debug|Win32 {6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.Build.0 = Debug|Win32 {6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/win/win32/vs2015/NetHack.vcxproj b/win/win32/vs2015/NetHack.vcxproj index 306f74ae7..3c0ce9911 100755 --- a/win/win32/vs2015/NetHack.vcxproj +++ b/win/win32/vs2015/NetHack.vcxproj @@ -13,11 +13,9 @@ - $(BinDir) - /Gs /Oi- %(AdditionalOptions) @@ -214,9 +212,13 @@ + - + + + + diff --git a/win/win32/vs2015/build.bat b/win/win32/vs2015/build.bat index 512b4f22d..c2798cf1b 100644 --- a/win/win32/vs2015/build.bat +++ b/win/win32/vs2015/build.bat @@ -1,4 +1,4 @@ -msbuild NetHack.sln /t:Build /p:Configuration=Debug;Platform=Win32 -msbuild NetHack.sln /t:Build /p:Configuration=Debug;Platform=x64 -msbuild NetHack.sln /t:Build /p:Configuration=Release;Platform=Win32 -msbuild NetHack.sln /t:Build /p:Configuration=Release;Platform=x64 +msbuild NetHack.sln /t:Clean;Build /p:Configuration=Debug;Platform=Win32 +msbuild NetHack.sln /t:Clean;Build /p:Configuration=Debug;Platform=x64 +msbuild NetHack.sln /t:Clean;Build /p:Configuration=Release;Platform=Win32 +msbuild NetHack.sln /t:Clean;Build /p:Configuration=Release;Platform=x64 diff --git a/win/win32/vs2015/nh340key.vcxproj b/win/win32/vs2015/nh340key.vcxproj index 7b5c06a4f..8b2068662 100644 --- a/win/win32/vs2015/nh340key.vcxproj +++ b/win/win32/vs2015/nh340key.vcxproj @@ -21,12 +21,14 @@ $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) - $(ToolsDir)$(TargetName).lib + + + nh340key.def + + diff --git a/win/win32/vs2015/nhdefkey.vcxproj b/win/win32/vs2015/nhdefkey.vcxproj index 3b0c0f675..84fdf2fd3 100755 --- a/win/win32/vs2015/nhdefkey.vcxproj +++ b/win/win32/vs2015/nhdefkey.vcxproj @@ -21,9 +21,6 @@ $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) - $(ToolsDir)$(TargetName).lib diff --git a/win/win32/vs2015/nhraykey.vcxproj b/win/win32/vs2015/nhraykey.vcxproj index f2e7890b6..0017f4a49 100644 --- a/win/win32/vs2015/nhraykey.vcxproj +++ b/win/win32/vs2015/nhraykey.vcxproj @@ -21,12 +21,14 @@ $(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories) - $(ToolsDir)$(TargetName).lib + + + nhraykey.def + + From ecdebff121bca1111d79f30ddb8829aa9eb15dcc Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 1 Sep 2017 12:20:21 +0300 Subject: [PATCH 20/21] Typofix --- sys/winnt/Install.nt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 12484b05b..71bc67d1a 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -45,9 +45,9 @@ command line, there is also a set of project files and a workspace file that allow you to build the Windows Graphical version from Microsoft Visual C's IDE (Integrated Development Environment.) -/-------------------------------------------------------\ -| Buildig And Running Using Visual Studio 2015 | -\-------------------------------------------------------/ +/--------------------------------------------------------\ +| Building And Running Using Visual Studio 2015 | +\--------------------------------------------------------/ If you are NOT using Visual Studio 2015, proceed to "FIRST STEP - MOVING THINGS AROUND". From 26328d28abaf204ceca05aeee9e03d57f29abf46 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 1 Sep 2017 12:45:28 +0300 Subject: [PATCH 21/21] Default menucolors for Windows --- sys/winnt/defaults.nh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/winnt/defaults.nh b/sys/winnt/defaults.nh index 50e801f03..46f6109fa 100644 --- a/sys/winnt/defaults.nh +++ b/sys/winnt/defaults.nh @@ -44,6 +44,28 @@ OPTIONS=symset:IBMGraphics_2,roguesymset:RogueEpyx #OPTIONS=hilite_status:hitpoints/30%/bright-magenta/normal #OPTIONS=perm_invent + +# Highlight menu lines with different colors. You need to define the colors +# with MENUCOLOR lines. +# Toggle menucolor use on or off +OPTIONS=menucolors +# Define color used for a certain menu line. Format is +# MENUCOLOR="regular expression"=color +# or +# MENUCOLOR="regular expression"=color&attribute +# Show all blessed items in green +MENUCOLOR=" blessed " = green +# Show all holy water in green +MENUCOLOR=" holy " = green +# Show all cursed items in red +MENUCOLOR=" cursed " = red +# Show all unholy water in red +MENUCOLOR=" unholy " = red +# Show all cursed worn items in orange and underlined +MENUCOLOR=" cursed .* (being worn)" = orange&underline + + + # Turn off all status hilites. #OPTIONS=!statushilites #