2007/12/109 10:00 vs2008.txt Source patch for building NetHack 3.4.3 with MS Visual C++ 2008 Express Edition. Apply this from the top of the NetHack source tree. After application of this patch, change your default to sys\winnt and re-run sys\winnt\nhsetup.bat prior to attempting the build. The compiler is available for download from the vendor (at the time of this writing) here: http://www.microsoft.com/express/vc/Default.aspx *** ../nethack-3.4.3/include/config1.h Sun Dec 09 08:46:13 2007 --- include/config1.h Sun Dec 09 09:29:40 2007 *************** *** 115,120 **** --- 115,124 ---- # endif #endif + #if defined(_WIN32) && !defined(WIN32) + #define WIN32 + #endif + #ifdef WIN32 # undef UNIX # undef MSDOS *** ../nethack-3.4.3/include/ntconf.h Sun Dec 09 08:46:13 2007 --- include/ntconf.h Sun Dec 09 09:29:40 2007 *************** *** 65,70 **** --- 65,98 ---- extern void FDECL(interject_assistance, (int,int,genericptr_t,genericptr_t)); extern void FDECL(interject, (int)); + /* + *=============================================== + * Compiler-specific adjustments + *=============================================== + */ + #ifdef _MSC_VER + /* Visual C 8 warning elimination */ + # ifndef _CRT_SECURE_NO_DEPRECATE + #define _CRT_SECURE_NO_DEPRECATE + # endif + # ifndef _SCL_SECURE_NO_DEPRECATE + #define _SCL_SECURE_NO_DEPRECATE + # endif + # ifndef _CRT_NONSTDC_NO_DEPRECATE + #define _CRT_NONSTDC_NO_DEPRECATE + # endif + #pragma warning(disable:4761) /* integral size mismatch in arg; conv supp*/ + # ifdef YYPREFIX + #pragma warning(disable:4102) /* unreferenced label */ + # endif + #pragma warning(disable:4996) /* VC8 deprecation warnings */ + #pragma warning(disable:4142) /* benign redefinition */ + # if 0 + #pragma warning(disable:4018) /* signed/unsigned mismatch */ + #pragma warning(disable:4305) /* init, conv from 'const int' to 'char' */ + # endif + #endif + /* The following is needed for prototypes of certain functions */ #if defined(_MSC_VER) #include /* Provides prototypes of exit(), spawn() */ *************** *** 94,104 **** # endif #endif - #define NO_SIGNAL #define index strchr #define rindex strrchr #include #define USE_STDARG #ifdef RANDOM /* Use the high quality random number routines. */ --- 122,134 ---- # endif #endif #define NO_SIGNAL #define index strchr #define rindex strrchr + + /* Time stuff */ #include + #define USE_STDARG #ifdef RANDOM /* Use the high quality random number routines. */ *************** *** 107,113 **** #define Rand() rand() #endif ! #define FCMASK 0660 /* file creation mask */ #define regularize nt_regularize #define HLOCK "NHPERM" --- 137,144 ---- #define Rand() rand() #endif ! #include ! #define FCMASK (_S_IREAD|_S_IWRITE) /* file creation mask */ #define regularize nt_regularize #define HLOCK "NHPERM" *************** *** 177,193 **** #ifndef REDO #undef Getchar #define Getchar nhgetch - #endif - - #ifdef _MSC_VER - #if 0 - #pragma warning(disable:4018) /* signed/unsigned mismatch */ - #pragma warning(disable:4305) /* init, conv from 'const int' to 'char' */ - #endif - #pragma warning(disable:4761) /* integral size mismatch in arg; conv supp*/ - #ifdef YYPREFIX - #pragma warning(disable:4102) /* unreferenced label */ - #endif #endif extern int FDECL(set_win32_option, (const char *, const char *)); --- 208,213 ---- *** ../nethack-3.4.3/include/tradstdc.h Sun Dec 09 08:46:13 2007 --- include/tradstdc.h Sun Dec 09 09:29:40 2007 *************** *** 183,188 **** --- 183,194 ---- #endif /* NHSTDC */ + /* + * Used for definitions of functions which take no arguments to force + * an explicit match with the NDECL prototype. Needed in some cases + * (MS Visual C 2005) for functions called through pointers. + */ + #define VOID_ARGS void #ifndef genericptr_t typedef genericptr genericptr_t; /* (void *) or (char *) */ *** ../nethack-3.4.3/src/cmd.c Sun Dec 09 08:46:13 2007 --- src/cmd.c Sun Dec 09 10:06:25 2007 *************** *** 160,173 **** #ifdef OVL1 STATIC_PTR int ! doprev_message() { return nh_doprev_message(); } /* Count down by decrementing multi */ STATIC_PTR int ! timed_occupation() { (*timed_occ_fn)(); if (multi > 0) --- 160,173 ---- #ifdef OVL1 STATIC_PTR int ! doprev_message(VOID_ARGS) { return nh_doprev_message(); } /* Count down by decrementing multi */ STATIC_PTR int ! timed_occupation(VOID_ARGS) { (*timed_occ_fn)(); if (multi > 0) *************** *** 284,290 **** #ifdef OVLB STATIC_PTR int ! doextcmd() /* here after # - now read a full-word command */ { int idx, retval; --- 284,290 ---- #ifdef OVLB STATIC_PTR int ! doextcmd(VOID_ARGS) /* here after # - now read a full-word command */ { int idx, retval; *************** *** 300,306 **** } int ! doextlist() /* here after #? - now list all full-word commands */ { register const struct ext_func_tab *efp; char buf[BUFSZ]; --- 300,306 ---- } int ! doextlist(VOID_ARGS) /* here after #? - now list all full-word commands */ { register const struct ext_func_tab *efp; char buf[BUFSZ]; *************** *** 446,452 **** /* #monster command - use special monster ability while polymorphed */ STATIC_PTR int ! domonability() { if (can_breathe(youmonst.data)) return dobreathe(); else if (attacktype(youmonst.data, AT_SPIT)) return dospit(); --- 446,452 ---- /* #monster command - use special monster ability while polymorphed */ STATIC_PTR int ! domonability(VOID_ARGS) { if (can_breathe(youmonst.data)) return dobreathe(); else if (attacktype(youmonst.data, AT_SPIT)) return dospit(); *************** *** 476,482 **** } STATIC_PTR int ! enter_explore_mode() { if(!discover && !wizard) { pline("Beware! From explore mode there will be no return to normal game."); --- 476,482 ---- } STATIC_PTR int ! enter_explore_mode(VOID_ARGS) { if(!discover && !wizard) { pline("Beware! From explore mode there will be no return to normal game."); *************** *** 497,503 **** /* ^W command - wish for something */ STATIC_PTR int ! wiz_wish() /* Unlimited wishes for debug mode by Paul Polderman */ { if (wizard) { boolean save_verbose = flags.verbose; --- 497,503 ---- /* ^W command - wish for something */ STATIC_PTR int ! wiz_wish(VOID_ARGS) /* Unlimited wishes for debug mode by Paul Polderman */ { if (wizard) { boolean save_verbose = flags.verbose; *************** *** 513,519 **** /* ^I command - identify hero's inventory */ STATIC_PTR int ! wiz_identify() { if (wizard) identify_pack(0); else pline("Unavailable command '^I'."); --- 513,519 ---- /* ^I command - identify hero's inventory */ STATIC_PTR int ! wiz_identify(VOID_ARGS) { if (wizard) identify_pack(0); else pline("Unavailable command '^I'."); *************** *** 522,528 **** /* ^F command - reveal the level map and any traps on it */ STATIC_PTR int ! wiz_map() { if (wizard) { struct trap *t; --- 522,528 ---- /* ^F command - reveal the level map and any traps on it */ STATIC_PTR int ! wiz_map(VOID_ARGS) { if (wizard) { struct trap *t; *************** *** 544,550 **** /* ^G command - generate monster(s); a count prefix will be honored */ STATIC_PTR int ! wiz_genesis() { if (wizard) (void) create_particular(); else pline("Unavailable command '^G'."); --- 544,550 ---- /* ^G command - generate monster(s); a count prefix will be honored */ STATIC_PTR int ! wiz_genesis(VOID_ARGS) { if (wizard) (void) create_particular(); else pline("Unavailable command '^G'."); *************** *** 553,559 **** /* ^O command - display dungeon layout */ STATIC_PTR int ! wiz_where() { if (wizard) (void) print_dungeon(FALSE, (schar *)0, (xchar *)0); else pline("Unavailable command '^O'."); --- 553,559 ---- /* ^O command - display dungeon layout */ STATIC_PTR int ! wiz_where(VOID_ARGS) { if (wizard) (void) print_dungeon(FALSE, (schar *)0, (xchar *)0); else pline("Unavailable command '^O'."); *************** *** 562,568 **** /* ^E command - detect unseen (secret doors, traps, hidden monsters) */ STATIC_PTR int ! wiz_detect() { if(wizard) (void) findit(); else pline("Unavailable command '^E'."); --- 562,568 ---- /* ^E command - detect unseen (secret doors, traps, hidden monsters) */ STATIC_PTR int ! wiz_detect(VOID_ARGS) { if(wizard) (void) findit(); else pline("Unavailable command '^E'."); *************** *** 571,577 **** /* ^V command - level teleport */ STATIC_PTR int ! wiz_level_tele() { if (wizard) level_tele(); else pline("Unavailable command '^V'."); --- 571,577 ---- /* ^V command - level teleport */ STATIC_PTR int ! wiz_level_tele(VOID_ARGS) { if (wizard) level_tele(); else pline("Unavailable command '^V'."); *************** *** 580,586 **** /* #monpolycontrol command - choose new form for shapechangers, polymorphees */ STATIC_PTR int ! wiz_mon_polycontrol() { iflags.mon_polycontrol = !iflags.mon_polycontrol; pline("Monster polymorph control is %s.", --- 580,586 ---- /* #monpolycontrol command - choose new form for shapechangers, polymorphees */ STATIC_PTR int ! wiz_mon_polycontrol(VOID_ARGS) { iflags.mon_polycontrol = !iflags.mon_polycontrol; pline("Monster polymorph control is %s.", *************** *** 590,596 **** /* #levelchange command - adjust hero's experience level */ STATIC_PTR int ! wiz_level_change() { char buf[BUFSZ]; int newlevel; --- 590,596 ---- /* #levelchange command - adjust hero's experience level */ STATIC_PTR int ! wiz_level_change(VOID_ARGS) { char buf[BUFSZ]; int newlevel; *************** *** 630,636 **** /* #panic command - test program's panic handling */ STATIC_PTR int ! wiz_panic() { if (yn("Do you want to call panic() and end your game?") == 'y') panic("crash test."); --- 630,636 ---- /* #panic command - test program's panic handling */ STATIC_PTR int ! wiz_panic(VOID_ARGS) { if (yn("Do you want to call panic() and end your game?") == 'y') panic("crash test."); *************** *** 639,645 **** /* #polyself command - change hero's form */ STATIC_PTR int ! wiz_polyself() { polyself(TRUE); return 0; --- 639,645 ---- /* #polyself command - change hero's form */ STATIC_PTR int ! wiz_polyself(VOID_ARGS) { polyself(TRUE); return 0; *************** *** 647,653 **** /* #seenv command */ STATIC_PTR int ! wiz_show_seenv() { winid win; int x, y, v, startx, stopx, curx; --- 647,653 ---- /* #seenv command */ STATIC_PTR int ! wiz_show_seenv(VOID_ARGS) { winid win; int x, y, v, startx, stopx, curx; *************** *** 689,695 **** /* #vision command */ STATIC_PTR int ! wiz_show_vision() { winid win; int x, y, v; --- 689,695 ---- /* #vision command */ STATIC_PTR int ! wiz_show_vision(VOID_ARGS) { winid win; int x, y, v; *************** *** 726,732 **** /* #wmode command */ STATIC_PTR int ! wiz_show_wmodes() { winid win; int x,y; --- 726,732 ---- /* #wmode command */ STATIC_PTR int ! wiz_show_wmodes(VOID_ARGS) { winid win; int x,y; *************** *** 1231,1237 **** } STATIC_PTR int ! doattributes() { if (!minimal_enlightenment()) return 0; --- 1231,1237 ---- } STATIC_PTR int ! doattributes(VOID_ARGS) { if (!minimal_enlightenment()) return 0; *************** *** 1244,1250 **** * (shares enlightenment's tense handling) */ STATIC_PTR int ! doconduct() { show_conduct(0); return 0; --- 1244,1250 ---- * (shares enlightenment's tense handling) */ STATIC_PTR int ! doconduct(VOID_ARGS) { show_conduct(0); return 0; *************** *** 1982,1990 **** if (*cmd >= 040 && *cmd < 0177) { *cp++ = *cmd++; } else if (*cmd & 0200) { *cp++ = 'M'; *cp++ = '-'; ! *cp++ = *cmd++ &= ~0200; } else { *cp++ = '^'; *cp++ = *cmd++ ^ 0100; --- 1982,1991 ---- if (*cmd >= 040 && *cmd < 0177) { *cp++ = *cmd++; } else if (*cmd & 0200) { + char c = *cmd++; *cp++ = 'M'; *cp++ = '-'; ! *cp++ = c & ~0200; } else { *cp++ = '^'; *cp++ = *cmd++ ^ 0100; *************** *** 2447,2453 **** } STATIC_PTR int ! dotravel() { /* Keyboard travel command */ static char cmd[2]; --- 2448,2454 ---- } STATIC_PTR int ! dotravel(VOID_ARGS) { /* Keyboard travel command */ static char cmd[2]; *** ../nethack-3.4.3/src/dig.c Sun Dec 09 08:46:13 2007 --- src/dig.c Sun Dec 09 09:29:40 2007 *************** *** 207,213 **** } STATIC_OVL int ! dig() { register struct rm *lev; register xchar dpx = digging.pos.x, dpy = digging.pos.y; --- 207,213 ---- } STATIC_OVL int ! dig(VOID_ARGS) { register struct rm *lev; register xchar dpx = digging.pos.x, dpy = digging.pos.y; *** ../nethack-3.4.3/src/dlb.c Sun Dec 09 08:46:13 2007 --- src/dlb.c Sun Dec 09 09:29:40 2007 *************** *** 229,235 **** * keep track of the file position. */ static boolean ! lib_dlb_init() { /* zero out array */ (void) memset((char *)&dlb_libs[0], 0, sizeof(dlb_libs)); --- 229,235 ---- * keep track of the file position. */ static boolean ! lib_dlb_init(VOID_ARGS) { /* zero out array */ (void) memset((char *)&dlb_libs[0], 0, sizeof(dlb_libs)); *************** *** 246,252 **** } static void ! lib_dlb_cleanup() { int i; --- 246,252 ---- } static void ! lib_dlb_cleanup(VOID_ARGS) { int i; *** ../nethack-3.4.3/src/do.c Sun Dec 09 08:46:13 2007 --- src/do.c Sun Dec 09 09:29:40 2007 *************** *** 1597,1603 **** #ifdef OVLB STATIC_PTR int ! wipeoff() { if(u.ucreamed < 4) u.ucreamed = 0; else u.ucreamed -= 4; --- 1597,1603 ---- #ifdef OVLB STATIC_PTR int ! wipeoff(VOID_ARGS) { if(u.ucreamed < 4) u.ucreamed = 0; else u.ucreamed -= 4; *** ../nethack-3.4.3/src/do_wear.c Sun Dec 09 08:46:13 2007 --- src/do_wear.c Sun Dec 09 09:29:40 2007 *************** *** 92,98 **** STATIC_PTR int ! Boots_on() { long oldprop = u.uprops[objects[uarmf->otyp].oc_oprop].extrinsic & ~WORN_BOOTS; --- 92,98 ---- STATIC_PTR int ! Boots_on(VOID_ARGS) { long oldprop = u.uprops[objects[uarmf->otyp].oc_oprop].extrinsic & ~WORN_BOOTS; *************** *** 139,145 **** } int ! Boots_off() { int otyp = uarmf->otyp; long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_BOOTS; --- 139,145 ---- } int ! Boots_off(VOID_ARGS) { int otyp = uarmf->otyp; long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_BOOTS; *************** *** 193,200 **** return 0; } ! STATIC_OVL int ! Cloak_on() { long oldprop = u.uprops[objects[uarmc->otyp].oc_oprop].extrinsic & ~WORN_CLOAK; --- 193,200 ---- return 0; } ! STATIC_PTR int ! Cloak_on(VOID_ARGS) { long oldprop = u.uprops[objects[uarmc->otyp].oc_oprop].extrinsic & ~WORN_CLOAK; *************** *** 243,249 **** } int ! Cloak_off() { int otyp = uarmc->otyp; long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_CLOAK; --- 243,249 ---- } int ! Cloak_off(VOID_ARGS) { int otyp = uarmc->otyp; long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_CLOAK; *************** *** 290,296 **** STATIC_PTR int ! Helmet_on() { switch(uarmh->otyp) { case FEDORA: --- 290,296 ---- STATIC_PTR int ! Helmet_on(VOID_ARGS) { switch(uarmh->otyp) { case FEDORA: *************** *** 347,353 **** } int ! Helmet_off() { takeoff_mask &= ~W_ARMH; --- 347,353 ---- } int ! Helmet_off(VOID_ARGS) { takeoff_mask &= ~W_ARMH; *************** *** 390,396 **** STATIC_PTR int ! Gloves_on() { long oldprop = u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES; --- 390,396 ---- STATIC_PTR int ! Gloves_on(VOID_ARGS) { long oldprop = u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES; *************** *** 415,421 **** } int ! Gloves_off() { long oldprop = u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES; --- 415,421 ---- } int ! Gloves_off(VOID_ARGS) { long oldprop = u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES; *************** *** 470,477 **** return 0; } ! STATIC_OVL int ! Shield_on() { /* switch (uarms->otyp) { --- 470,477 ---- return 0; } ! STATIC_PTR int ! Shield_on(VOID_ARGS) { /* switch (uarms->otyp) { *************** *** 490,496 **** } int ! Shield_off() { takeoff_mask &= ~W_ARMS; /* --- 490,496 ---- } int ! Shield_off(VOID_ARGS) { takeoff_mask &= ~W_ARMS; /* *************** *** 511,518 **** } #ifdef TOURIST ! STATIC_OVL int ! Shirt_on() { /* switch (uarmu->otyp) { --- 511,518 ---- } #ifdef TOURIST ! STATIC_PTR int ! Shirt_on(VOID_ARGS) { /* switch (uarmu->otyp) { *************** *** 526,532 **** } int ! Shirt_off() { takeoff_mask &= ~W_ARMU; /* --- 526,532 ---- } int ! Shirt_off(VOID_ARGS) { takeoff_mask &= ~W_ARMU; /* *************** *** 548,560 **** */ STATIC_PTR int ! Armor_on() { return 0; } int ! Armor_off() { takeoff_mask &= ~W_ARM; setworn((struct obj *)0, W_ARM); --- 548,560 ---- */ STATIC_PTR int ! Armor_on(VOID_ARGS) { return 0; } int ! Armor_off(VOID_ARGS) { takeoff_mask &= ~W_ARM; setworn((struct obj *)0, W_ARM); *************** *** 1929,1935 **** STATIC_PTR int ! take_off() { register int i; register struct obj *otmp; --- 1929,1935 ---- STATIC_PTR int ! take_off(VOID_ARGS) { register int i; register struct obj *otmp; *** ../nethack-3.4.3/src/eat.c Sun Dec 09 08:46:13 2007 --- src/eat.c Sun Dec 09 09:29:41 2007 *************** *** 178,184 **** STATIC_PTR int ! eatmdone() /* called after mimicing is over */ { /* release `eatmbuf' */ if (eatmbuf) { --- 178,184 ---- STATIC_PTR int ! eatmdone(VOID_ARGS) /* called after mimicing is over */ { /* release `eatmbuf' */ if (eatmbuf) { *************** *** 395,401 **** STATIC_PTR int ! eatfood() /* called each move during eating process */ { if(!victual.piece || (!carried(victual.piece) && !obj_here(victual.piece, u.ux, u.uy))) { --- 395,401 ---- STATIC_PTR int ! eatfood(VOID_ARGS) /* called each move during eating process */ { if(!victual.piece || (!carried(victual.piece) && !obj_here(victual.piece, u.ux, u.uy))) { *************** *** 1013,1019 **** STATIC_PTR int ! opentin() /* called during each move whilst opening a tin */ { register int r; const char *what; --- 1013,1019 ---- STATIC_PTR int ! opentin(VOID_ARGS) /* called during each move whilst opening a tin */ { register int r; const char *what; *************** *** 1189,1195 **** } int ! Hear_again() /* called when waking up after fainting */ { flags.soundok = 1; return 0; --- 1189,1195 ---- } int ! Hear_again(VOID_ARGS) /* called when waking up after fainting */ { flags.soundok = 1; return 0; *************** *** 2222,2228 **** STATIC_PTR int ! unfaint() { (void) Hear_again(); if(u.uhs > FAINTING) --- 2222,2228 ---- STATIC_PTR int ! unfaint(VOID_ARGS) { (void) Hear_again(); if(u.uhs > FAINTING) *** ../nethack-3.4.3/src/lock.c Sun Dec 09 08:46:13 2007 --- src/lock.c Sun Dec 09 09:29:41 2007 *************** *** 73,79 **** STATIC_PTR int ! picklock() /* try to open/close a lock */ { if (xlock.box) { --- 73,79 ---- STATIC_PTR int ! picklock(VOID_ARGS) /* try to open/close a lock */ { if (xlock.box) { *************** *** 128,134 **** STATIC_PTR int ! forcelock() /* try to force a locked chest */ { register struct obj *otmp; --- 128,134 ---- STATIC_PTR int ! forcelock(VOID_ARGS) /* try to force a locked chest */ { register struct obj *otmp; *** ../nethack-3.4.3/src/region.c Sun Dec 09 08:46:14 2007 --- src/region.c Sun Dec 09 09:45:00 2007 *************** *** 714,720 **** /* check for expired region */ if (regions[i]->ttl >= 0) regions[i]->ttl = ! (regions[i]->ttl > tmstamp) ? regions[i]->ttl - tmstamp : 0; mread(fd, (genericptr_t) ®ions[i]->expire_f, sizeof (short)); mread(fd, (genericptr_t) ®ions[i]->can_enter_f, sizeof (short)); mread(fd, (genericptr_t) ®ions[i]->enter_f, sizeof (short)); --- 714,720 ---- /* check for expired region */ if (regions[i]->ttl >= 0) regions[i]->ttl = ! (regions[i]->ttl > tmstamp) ? regions[i]->ttl - (short)tmstamp : 0; mread(fd, (genericptr_t) ®ions[i]->expire_f, sizeof (short)); mread(fd, (genericptr_t) ®ions[i]->can_enter_f, sizeof (short)); mread(fd, (genericptr_t) ®ions[i]->enter_f, sizeof (short)); *** ../nethack-3.4.3/src/spell.c Sun Dec 09 08:46:14 2007 --- src/spell.c Sun Dec 09 09:29:41 2007 *************** *** 313,319 **** } STATIC_PTR int ! learn() { int i; short booktype; --- 313,319 ---- } STATIC_PTR int ! learn(VOID_ARGS) { int i; short booktype; *** ../nethack-3.4.3/src/steal.c Sun Dec 09 08:46:14 2007 --- src/steal.c Sun Dec 09 09:29:41 2007 *************** *** 143,149 **** unsigned int stealmid; /* monster doing the stealing */ STATIC_PTR int ! stealarm() { register struct monst *mtmp; register struct obj *otmp; --- 143,149 ---- unsigned int stealmid; /* monster doing the stealing */ STATIC_PTR int ! stealarm(VOID_ARGS) { register struct monst *mtmp; register struct obj *otmp; *** ../nethack-3.4.3/sys/share/uudecode.c Sun Dec 09 08:46:18 2007 --- sys/share/uudecode.c Sun Dec 09 10:06:25 2007 *************** *** 37,42 **** --- 37,46 ---- * appear to be stripping trailing blanks. * * Modified 28 February 2002 for use on WIN32 systems with Microsoft C. + * + * Modified 08 July 2006 to cast strlen() result to int to suppress a + * warning on platforms where size_t > sizeof(int). + * */ #ifndef lint *************** *** 192,198 **** /* Calculate expected # of chars and pad if necessary */ expected = ((n+2)/3)<<2; ! for (i = strlen(buf)-1; i <= expected; i++) buf[i] = ' '; bp = &buf[1]; while (n > 0) { --- 196,202 ---- /* Calculate expected # of chars and pad if necessary */ expected = ((n+2)/3)<<2; ! for (i = (int)strlen(buf)-1; i <= expected; i++) buf[i] = ' '; bp = &buf[1]; while (n > 0) { *** ../nethack-3.4.3/sys/winnt/Install.nt Sun Dec 09 08:46:20 2007 --- sys/winnt/install.nt Sun Dec 09 11:03:45 2007 *************** *** 1,10 **** ! Copyright (c) NetHack Development Team 1990-2002 NetHack may be freely redistributed. See license for details. ============================================================== Instructions for compiling and installing ! NetHack 3.4 on a Windows 9x, NT, 2000, or XP system ============================================================== ! Last revision: $Date: 2007/12/09 10:00:00 $ Credit for the porting of NetHack to the Win32 Console Subsystem goes to the NT Porting Team started by Michael Allison. --- 1,10 ---- ! Copyright (c) NetHack Development Team 1990-2007 NetHack may be freely redistributed. See license for details. ============================================================== Instructions for compiling and installing ! NetHack 3.4 on a Windows 200x, or XP system ============================================================== ! Last revision: $Date: 2007/12/09 10:00:00 $ Credit for the porting of NetHack to the Win32 Console Subsystem goes to the NT Porting Team started by Michael Allison. *************** *** 21,29 **** version. In either case you can use one of the following build environments: ! o A copy of Microsoft Visual C V6.0 SP3 or later. Things may work with ! an earlier version of the compiler, but the current code has not ! been tested with an earlier version. OR --- 21,31 ---- version. In either case you can use one of the following build environments: ! o A copy of Microsoft Visual Studio 2008 Visual C++ Express Edition. ! (Earlier versions of Visual Studio Express Edition require that you ! also download the MS Platform SDK in order to build native win32 ! applications such as NetHack. The current NetHack code has not been ! tested with earlier versions of the compiler.) OR *************** *** 34,43 **** OR ! o A copy of MinGW 2.0. MinGW is a collection of header files and import ! libraries with which native Windows32 programs can be made; the ! MinGW 2.0 distribution contains the GNU Compiler Collection. ! You can download MinGW at http://www.mingw.org/ Earlier versions of MinGW will not allow you to build the Windows Graphical version. --- 36,45 ---- OR ! o A copy of MinGW 2.0 or later. MinGW is a collection of header ! files and import libraries with which native Windows32 programs ! can be built; the MinGW 2.0 distribution contains the GNU Compiler ! Collection. You can download MinGW at http://www.mingw.org/ Earlier versions of MinGW will not allow you to build the Windows Graphical version. *************** *** 48,57 **** Visual C's IDE (Integrated Development Environment.) ! FIRST STEP The first step in building either version of NetHack is to execute ! sys\winnt\nhsetup.bat. From the command prompt: cd sys\winnt --- 50,61 ---- Visual C's IDE (Integrated Development Environment.) ! /-----------------------------------\ ! | FIRST STEP - MOVING THINGS AROUND | ! \-----------------------------------/ The first step in building either version of NetHack is to execute ! sys\winnt\nhsetup.bat to move some files to their required locations. From the command prompt: cd sys\winnt *************** *** 69,79 **** If you wish to build from the command line, proceed to "BUILDING FROM THE COMMAND LINE." If you wish to build using Visual C's IDE, proceed now to "BUILDING USING VISUAL C'S IDE." ! ! BUILDING FROM THE COMMAND LINE You can built two different versions of NetHack for Win32 from the command line: --- 73,85 ---- If you wish to build from the command line, proceed to "BUILDING FROM THE COMMAND LINE." + If you wish to build using Visual C's IDE, proceed now to "BUILDING USING VISUAL C'S IDE." ! /--------------------------------\ ! | BUILDING FROM THE COMMAND LINE | ! \--------------------------------/ You can built two different versions of NetHack for Win32 from the command line: *************** *** 95,101 **** We have provided a Makefile for each of the following compilers: ! o Microsoft Visual C++ V6.0 SP3 or greater o Borland C 5.5.1 o MinGW 2.0 (with GCC 3.2) --- 101,107 ---- We have provided a Makefile for each of the following compilers: ! o Microsoft Visual C++ V6.0 SP3 or Visual Studio 2008 Express Edition o Borland C 5.5.1 o MinGW 2.0 (with GCC 3.2) *************** *** 119,135 **** Setting Up ! 1. It almost goes without saying that you should make sure that your tools are set up and running correctly. That includes ensuring that all the necessary environment variables for the compiler environment ! are set correctly. (Examples: For the Microsoft compiler by ! executing vcvars32.bat, which is probably in the bin directory of ! your compilers directory tree. For the Borland Makefile, you can ! simply invoke the Make utility from the Makefile's directory (For ! the standard Borland compiler installation you can just use the ! explicit path "c:\borland\bcc55\bin\make /f Makefile.bcc". For the ! GCC Makefile, add \bin to your path, where is your ! MinGW root directory.) 2. Make sure all the NetHack files are in the appropriate directory structure. You should have a main directory with subdirectories --- 125,168 ---- Setting Up ! 1. It almost goes without saying that you should make sure that your tools are set up and running correctly. That includes ensuring that all the necessary environment variables for the compiler environment ! are set correctly. ! ! For Visual C++ 6.x, you need to execute ! vcvars32.bat ! which is probably in the bin directory of your compilers directory tree. ! ! For Visual Studio 2008 Express Edition, no Windows SDK integration ! should be necessary. ! ! For earlier Visual Studio Express Editions, such as Visual Studio 2005, ! you will need to download and install the MS Platform SDK (Windows SDK) ! as well. ! ! The Platform SDK is required for building native WIN32 applications, ! such as NetHack. The two must be integrated to work together once. ! At the time of this writing, there were instructions available from ! the manufacturer at the following URL: ! http://msdn2.microsoft.com/en-us/library/ms235626(VS.80).aspx ! ! Once you have the old Visual Studio Express Edition and the Platform SDK ! properly integrated with each other, you need to execute ! vcvarsall.bat ! which is probably in the bin directory of your VSINSTALLDIR. ! Then for the Platform SDK, you need to execute ! SetEnv.cmd ! from the Platform SDK install directory. ! ! For the GCC Makefile, add \bin to your path, where ! is your MinGW root directory.). ! ! For the Borland Makefile, you can simply invoke the Make utility ! from the Makefile's directory (For the standard Borland compiler ! installation you can just use the explicit path ! "c:\borland\bcc55\bin\make /f Makefile.bcc". ! 2. Make sure all the NetHack files are in the appropriate directory structure. You should have a main directory with subdirectories *************** *** 266,273 **** To run NetHack, proceed to RUNNING NETHACK. ! ! BUILDING USING VISUAL C'S IDE Only the Win32 native port built on the Windows API, or Graphical NetHack, can be built using the Visual C IDE. --- 299,307 ---- To run NetHack, proceed to RUNNING NETHACK. ! /--------------------------------\ ! | BUILDING USING VISUAL C's IDE | ! \--------------------------------/ Only the Win32 native port built on the Windows API, or Graphical NetHack, can be built using the Visual C IDE. *************** *** 275,281 **** I. Dispelling the Myths: Compiling NetHack using the Visual C IDE is straightforward, as long ! as you have your compiler and tools correctly installed. It is again assumed that you already changed your directory to sys\winnt and executed: --- 309,315 ---- I. Dispelling the Myths: Compiling NetHack using the Visual C IDE is straightforward, as long ! as you have your compiler and tools correctly installed. It is again assumed that you already changed your directory to sys\winnt and executed: *************** *** 291,297 **** 1. It almost goes without saying that you should make sure that your tools are set up and running correctly. (For the Microsoft Visual C IDE it should correctly fire up when you choose it in your Start | ! Programs menus.) 2. Make sure all the NetHack files are in the appropriate directory structure. You should have a main directory with subdirectories --- 325,343 ---- 1. It almost goes without saying that you should make sure that your tools are set up and running correctly. (For the Microsoft Visual C IDE it should correctly fire up when you choose it in your Start | ! Programs menus.) ! ! Note: If you are using an older version of Visual C++ Express Edition ! prior to Visual Studio 2008 Express Edition (such as Visual ! Studio 2005 Express Edition), then you must also install ! the Platform SDK. That isn't necessary for Visual Studio 2008 Express ! Editions. After installing an older Visual C++ Express Edition, you ! will need to install the Platform (Windows) SDK and integrate it with ! the older Visual C++ Express Edition in order to be able to build native ! WIN32 applications. At the time of this writing, there was some ! assistance on how to integrate the two products at the following URL: ! http://msdn2.microsoft.com/en-us/library/ms235626(VS.80).aspx ! Again, that is not necessary with Visual Studio 2008 Express Editions. 2. Make sure all the NetHack files are in the appropriate directory structure. You should have a main directory with subdirectories *************** *** 332,390 **** If you downloaded or ftp'd the sources from a UNIX system, the lines will probably end in UNIX-style newlines, instead of the carriage ! return and line feed pairs used by Windows. Visual C project files ! and workspace files (dsp and dsw files) in particular need to have ! their lines end in carriage-return-line-feed or they won't work ! properly. 3. Ready your tool. Note: It's possible to build a graphical version using the Makefile, as explained above. However, the IDE build has full game ! functionality and is the officially released build. ! Start the Visual C IDE. In the Visual C IDE menus, choose: ! File | Open Workspace 4. Set up for the build. ! In the Visual C "Open Workspace" dialog box, navigate to the top of your NetHack source directory. ! In there, highlight "nethack.dsw" and click on Open. ! Once the workspace has been opened, you should see the following ! list in the Visual C selection window: ! + dgncomp files ! + dgnstuff files ! + dlb_main files ! + levcomp files ! + levstuff files ! + makedefs files ! + nethackw files ! + recover files ! + tile2bmp files ! + tilemap files ! + uudecode files ! ! On the Visual C menus, choose: ! Project | Set Active Project | NetHackW ! ! On the Visual C menus again, choose either: ! Build | Set Active Configuration | NetHackW - Win32 Release ! or ! Build | Set Active Configuration | NetHackW - Win32 Debug ! ! The first will create the Release build of NetHackW which does not ! contain all the debugging information and is smaller, and runs ! quicker. The second will create the Debug build of NetHackW and ! will spend a lot of time writing debug information to the disk as ! the game is played. Unless you are debugging or enhancing NetHack ! for Windows, choose the Release build. Building 5. Start your build. ! On the Visual C menus once again, choose: Build | Build NetHackW.exe This starts the build. It is likely that the IDE message window where you are doing the compiling will be occupied for a while. --- 378,436 ---- If you downloaded or ftp'd the sources from a UNIX system, the lines will probably end in UNIX-style newlines, instead of the carriage ! return and line feed pairs used by Windows. Visual Studio Express ! Edition project files and solution files (.vcproj and .sln files) ! in particular need to have their lines end in carriage-return-line-feed ! or they won't work properly. 3. Ready your tool. Note: It's possible to build a graphical version using the Makefile, as explained above. However, the IDE build has full game ! functionality. ! Start the Visual C++ IDE. ! In the Visual C++ 2008 Express Edition IDE menus, choose: ! File | Open Project/Solution ! 4. Set up for the build. ! In the Visual C++ Express Edition dialog box, navigate to the top of your NetHack source directory. ! In there, highlight "NetHack.sln" and click on Open. ! Once the solution has been opened, you should see ! the following list in the Visual Studio Express Edition selection left pane: ! + dgncomp ! + dgnstuff ! + dlb_main ! + levcomp ! + levstuff ! + makedefs ! + nethackw ! + recover ! + tile2bmp ! + tilemap ! + uudecode ! ! On the Visual Studio 2008 Express Edition, highlight 'nethackw' and choose: ! Project | Set as Startup Project ! ! In Visual C++ 2008 Express Edition, you can just choose "Debug" or ! "Release" right on the menu in the "solutions configuration" box. ! ! The Release build of NetHackW which does not contain all the ! debugging information and is smaller, and runs slightly quicker. ! The Debug build of NetHackW will spend time writing debug information ! to the disk as the game is played. Unless you are debugging or ! enhancing NetHack for Windows, you probably will want to choose the ! Release build. Building 5. Start your build. ! On the Visual Studioe Express Edition menus once again, choose: Build | Build NetHackW.exe This starts the build. It is likely that the IDE message window where you are doing the compiling will be occupied for a while. *************** *** 394,400 **** all the support files that it needs. ! RUNNING NETHACK I. Checking the installation: Make sure all of the support files -- Guidebook.txt, license, --- 440,448 ---- all the support files that it needs. ! /-----------------\ ! | RUNNING NETHACK | ! \-----------------/ I. Checking the installation: Make sure all of the support files -- Guidebook.txt, license, *** ../nethack-3.4.3/sys/winnt/Makefile.msc Sun Dec 09 08:46:20 2007 --- sys/winnt/Makefile.msc Sun Dec 09 09:29:41 2007 *************** *** 1,9 **** ! # SCCS Id: @(#)Makefile.msc 3.4 $Date: 2007/12/09 16:20:25 $ ! # Copyright (c) NetHack PC Development Team 1993-2003 # ! # NetHack 3.4.x Makefile for MS Visual C++ V6.x and above and MS NMAKE # # Win32 Compilers Tested: # - Microsoft 32 bit Visual C++ V4.x # - Microsoft 32 bit Visual C++ V6.0 SP3, SP4 # --- 1,10 ---- ! # SCCS Id: @(#)Makefile.msc 3.4 $Date: 2007/12/09 16:20:25 $ ! # Copyright (c) NetHack PC Development Team 1993-2007 # ! # NetHack 3.4.x Makefile for MS Visual C++ # # Win32 Compilers Tested: + # - Microsoft Visual Studio 2005 Express, with the Windows SDK # - Microsoft 32 bit Visual C++ V4.x # - Microsoft 32 bit Visual C++ V6.0 SP3, SP4 # *************** *** 114,125 **** #RANDOM = # ! # Leave the next two lines uncommented _ONLY_ if you do NOT want any # debug capability in the object files, or in the NetHack executable. # Comment them if you want debug capability. #cdebug = - #linkdebug = # # Compiler and Linker flags --- 115,126 ---- #RANDOM = # ! # Uncomment the next 2 lines _ONLY_ if you DO NOT want any # debug capability in the object files, or in the NetHack executable. # Comment them if you want debug capability. + #ldebug = #cdebug = # # Compiler and Linker flags *************** *** 181,212 **** ! ENDIF #========================================== # Setting up the compiler and linker - # macros. All builds include the base ones. #========================================== ! CFLAGSBASE = -c $(cflags) $(cvarsmt) -I$(INCL) -nologo $(cdebug) $(WINPINC) ! LFLAGSBASEC = $(linkdebug) /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console,4.0 $(conlibsmt) ! LFLAGSBASEG = $(linkdebug) $(guiflags) $(guilibsmt) comctl32.lib #========================================== # Util builds #========================================== ! CFLAGSU = $(CFLAGSBASE) $(WINPFLAG) ! LFLAGSU = $(LFLAGSBASEC) #========================================== # - Game build #========================================== ! LFLAGSBASE = $(linkdebug) /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console,4.0 $(conlibsmt) ! CFLAGS = $(CFLAGSBASE) $(WINPFLAG) $(DLBFLG) ! NHLFLAGS1 = /NODEFAULTLIB /INCREMENTAL:NO /PDB:"$(GAME).PDB" /RELEASE /NOLOGO ! NHLFLAGS2 = /MAP:"$(GAME).MAP" /MACHINE:$(CPU) -IGNORE:505 !IF ("$(GRAPHICAL)"=="Y") ! LFLAGS = $(LFLAGSBASEG) $(NHLFLAGS1) $(NHLFLAGS2) !ELSE ! LFLAGS = $(LFLAGSBASEC) $(NHLFLAGS1) $(NHLFLAGS2) !ENDIF GAMEFILE = $(GAMEDIR)\$(GAME).exe # whole thing --- 182,237 ---- ! ENDIF #========================================== + #========================================== # Setting up the compiler and linker #========================================== + #========================================== + + PDBFILE= /PDB:"$(O)$(GAME).PDB" + MAPFILE= /MAP:"$(O)$(GAME).MAP" + INCLDIR= /I..\include + + !IF ("$(ldebug)" != "") + !IF ("$(ldebug)" != "/RELEASE") + ldebug = /DEBUG + !ENDIF + !ENDIF ! !IF ("$(cdebug)" != "") ! !IF ("$(cdebug)" != "-Ox -DNDEBUG") ! cdebug = -Zi -Od ! !ENDIF ! !ENDIF #========================================== # Util builds #========================================== ! cflagsUtil = $(cdebug) $(cflags) /D_USE_32BIT_TIME_T $(INCLDIR) \ ! $(WINPFLAG) $(DLBFLG) ! lflagsUtil = $(ldebug) $(lflags) $(conlibs) ! #========================================== # - Game build #========================================== ! ! GAMEPDBFILE= /PDB:"$(O)$(GAME).PDB" ! GAMEMAPFILE= /MAP:"$(O)$(GAME).MAP" ! LIBS= user32.lib winmm.lib $(ZLIB) ! !IF ("$(GRAPHICAL)"=="Y") ! ! cflagsGame = $(cdebug) $(cflags) /D_USE_32BIT_TIME_T $(guiflags) $(INCLDIR) \ ! $(WINPFLAG) $(DLBFLG) $(GAMEPDBFILE) $(GAMEMAPFILE) ! lflagsGame = $(ldebug) $(lflags) $(guilibs) ! !ELSE ! ! cflagsGame = $(cdebug) $(cflags) /D_USE_32BIT_TIME_T $(conflags) $(INCLDIR) \ ! $(WINPFLAG) $(DLBFLG) $(GAMEPDBFILE) $(GAMEMAPFILE) ! lflagsGame = $(ldebug) $(lflags) $(conlibs) ! !ENDIF GAMEFILE = $(GAMEDIR)\$(GAME).exe # whole thing *************** *** 228,251 **** #========================================== .c{$(OBJ)}.o: ! @$(cc) $(CFLAGS) -Fo$@ $< {$(SRC)}.c{$(OBJ)}.o: ! @$(CC) $(CFLAGS) -Fo$@ $< #========================================== # Rules for files in sys\share #========================================== {$(SSYS)}.c{$(OBJ)}.o: ! @$(CC) $(CFLAGS) -Fo$@ $< #========================================== # Rules for files in sys\winnt #========================================== {$(NTSYS)}.c{$(OBJ)}.o: ! @$(CC) $(CFLAGS) -Fo$@ $< {$(NTSYS)}.h{$(INCL)}.h: @copy $< $@ --- 253,276 ---- #========================================== .c{$(OBJ)}.o: ! @$(cc) $(cflagsUtil) -Fo$@ $< {$(SRC)}.c{$(OBJ)}.o: ! @$(CC) $(cflagsUtil) -Fo$@ $< #========================================== # Rules for files in sys\share #========================================== {$(SSYS)}.c{$(OBJ)}.o: ! @$(CC) $(cflagsUtil) -Fo$@ $< #========================================== # Rules for files in sys\winnt #========================================== {$(NTSYS)}.c{$(OBJ)}.o: ! @$(CC) $(cflagsUtil) -Fo$@ $< {$(NTSYS)}.h{$(INCL)}.h: @copy $< $@ *************** *** 255,268 **** #========================================== {$(UTIL)}.c{$(OBJ)}.o: ! @$(CC) $(CFLAGSU) -Fo$@ $< #========================================== # Rules for files in win\share #========================================== {$(WSHR)}.c{$(OBJ)}.o: ! @$(CC) $(CFLAGS) -Fo$@ $< {$(WSHR)}.h{$(INCL)}.h: @copy $< $@ --- 280,293 ---- #========================================== {$(UTIL)}.c{$(OBJ)}.o: ! @$(CC) $(cflagsUtil) -Fo$@ $< #========================================== # Rules for files in win\share #========================================== {$(WSHR)}.c{$(OBJ)}.o: ! @$(CC) $(cflagsUtil) -Fo$@ $< {$(WSHR)}.h{$(INCL)}.h: @copy $< $@ *************** *** 275,281 **** #========================================== {$(TTY)}.c{$(OBJ)}.o: ! @$(CC) $(CFLAGS) -Fo$@ $< #========================================== --- 300,306 ---- #========================================== {$(TTY)}.c{$(OBJ)}.o: ! @$(CC) $(cflagsUtil) -Fo$@ $< #========================================== *************** *** 283,289 **** #========================================== {$(WIN32)}.c{$(OBJ)}.o: ! @$(cc) $(CFLAGS) -Fo$@ $< #========================================== #================ MACROS ================== --- 308,314 ---- #========================================== {$(WIN32)}.c{$(OBJ)}.o: ! @$(cc) $(cflagsUtil) -Fo$@ $< #========================================== #================ MACROS ================== *************** *** 478,484 **** ! ENDIF if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt ! @if exist $(SRC)\$(GAME).PDB copy $(SRC)\$(GAME).pdb $(GAMEDIR)\$(GAME).pdb @if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space -copy $(NTSYS)\defaults.nh $(GAMEDIR)\defaults.nh echo install done > $@ --- 503,509 ---- ! ENDIF if exist $(DOC)\guidebook.txt copy $(DOC)\guidebook.txt $(GAMEDIR)\Guidebook.txt if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt ! @if exist $(O)$(GAME).PDB copy $(O)$(GAME).pdb $(GAMEDIR)\$(GAME).pdb @if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space -copy $(NTSYS)\defaults.nh $(GAMEDIR)\defaults.nh echo install done > $@ *************** *** 578,584 **** $(GAMEFILE) : $(ALLOBJ) $(NHRES) $(O)gamedir.tag $(WINDLLS) @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) @echo Linking.... ! $(link) $(LFLAGS) user32.lib winmm.lib -out:$@ @<<$(GAME).lnk $(ALLOBJ:^ =^ ) $(NHRES) << --- 603,609 ---- $(GAMEFILE) : $(ALLOBJ) $(NHRES) $(O)gamedir.tag $(WINDLLS) @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) @echo Linking.... ! $(link) $(lflagsGame) /STACK:2048 $(LIBS) -out:$@ @<<$(GAME).lnk $(ALLOBJ:^ =^ ) $(NHRES) << *************** *** 601,608 **** $(GAMEDIR)\nhdefkey.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def @echo Linking $@ ! @$(link) -debug:full -debugtype:cv /RELEASE /NOLOGO /DLL user32.lib \ ! /PDB:"$(@B).PDB" /MAP:"$(@B).map" /DEF:$(O)$(@B).def \ /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o $(O)nh340key.def: --- 626,633 ---- $(GAMEDIR)\nhdefkey.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def @echo Linking $@ ! @$(link) $(ldebug) /RELEASE /DLL user32.lib \ ! /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).map" /DEF:$(O)$(@B).def \ /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o $(O)nh340key.def: *************** *** 616,623 **** $(GAMEDIR)\nh340key.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def @echo Linking $@ ! @$(link) -debug:full -debugtype:cv /RELEASE /NOLOGO /DLL user32.lib \ ! /PDB:"$(@B).PDB" /MAP:"$(@B).map" /DEF:$(O)$(@B).def \ /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o $(O)nhraykey.def: --- 641,648 ---- $(GAMEDIR)\nh340key.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def @echo Linking $@ ! @$(link) $(ldebug) /RELEASE /NOLOGO /DLL user32.lib \ ! /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).map" /DEF:$(O)$(@B).def \ /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o $(O)nhraykey.def: *************** *** 631,638 **** $(GAMEDIR)\nhraykey.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def @echo Linking $@ ! @$(link) -debug:full -debugtype:cv /RELEASE /NOLOGO /DLL user32.lib \ ! /PDB:"$(@B).PDB" /MAP:"$(@B).map" /DEF:$(O)$(@B).def \ /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o # --- 656,663 ---- $(GAMEDIR)\nhraykey.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def @echo Linking $@ ! @$(link) $(ldebug) /RELEASE /NOLOGO /DLL user32.lib \ ! /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).map" /DEF:$(O)$(@B).def \ /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o # *************** *** 644,657 **** #========================================== $(U)makedefs.exe: $(MAKEOBJS) ! @$(link) $(LFLAGSU) -out:$@ $(MAKEOBJS) $(O)makedefs.o: $(CONFIG_H) $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\objclass.h \ $(INCL)\monsym.h $(INCL)\qtext.h $(INCL)\patchlevel.h \ $(U)makedefs.c @if not exist $(OBJ)\*.* echo creating directory $(OBJ) @if not exist $(OBJ)\*.* mkdir $(OBJ) ! @$(CC) $(CFLAGSU) -Fo$@ $(U)makedefs.c # # date.h should be remade every time any of the source or include --- 669,682 ---- #========================================== $(U)makedefs.exe: $(MAKEOBJS) ! $(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(MAKEOBJS) $(O)makedefs.o: $(CONFIG_H) $(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\objclass.h \ $(INCL)\monsym.h $(INCL)\qtext.h $(INCL)\patchlevel.h \ $(U)makedefs.c @if not exist $(OBJ)\*.* echo creating directory $(OBJ) @if not exist $(OBJ)\*.* mkdir $(OBJ) ! @$(CC) $(cflagsUtil) -Fo$@ $(U)makedefs.c # # date.h should be remade every time any of the source or include *************** *** 684,692 **** #========================================== $(U)uudecode.exe: $(O)uudecode.o ! @$(link) $(LFLAGSU) -out:$@ $(O)uudecode.o $(O)uudecode.o: $(SSYS)\uudecode.c $(NTSYS)\NetHack.ico : $(U)uudecode.exe $(NTSYS)\nhico.uu chdir $(NTSYS) --- 709,718 ---- #========================================== $(U)uudecode.exe: $(O)uudecode.o ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(O)uudecode.o $(O)uudecode.o: $(SSYS)\uudecode.c + @$(CC) $(cflagsUtil) /D_CRT_SECURE_NO_DEPRECATE -Fo$@ $(SSYS)\uudecode.c $(NTSYS)\NetHack.ico : $(U)uudecode.exe $(NTSYS)\nhico.uu chdir $(NTSYS) *************** *** 737,743 **** $(U)lev_comp.exe: $(SPLEVOBJS) @echo Linking $@... ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(SPLEVOBJS:^ =^ ) << --- 763,769 ---- $(U)lev_comp.exe: $(SPLEVOBJS) @echo Linking $@... ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(SPLEVOBJS:^ =^ ) << *************** *** 796,802 **** $(U)dgn_comp.exe: $(DGNCOMPOBJS) @echo Linking $@... ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(DGNCOMPOBJS:^ =^ ) << --- 822,828 ---- $(U)dgn_comp.exe: $(DGNCOMPOBJS) @echo Linking $@... ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(DGNCOMPOBJS:^ =^ ) << *************** *** 891,897 **** #========================================== $(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(O)dlb_main.o $(O)dlb.o $(O)alloc.o --- 917,923 ---- #========================================== $(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(O)dlb_main.o $(O)dlb.o $(O)alloc.o *************** *** 899,908 **** << $(O)dlb.o: $(O)dlb_main.o $(O)alloc.o $(O)panic.o $(INCL)\dlb.h ! @$(CC) $(CFLAGS) /Fo$@ $(SRC)\dlb.c $(O)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h ! @$(CC) $(CFLAGS) /Fo$@ $(UTIL)\dlb_main.c $(DAT)\porthelp: $(NTSYS)\porthelp @copy $(NTSYS)\porthelp $@ >nul --- 925,934 ---- << $(O)dlb.o: $(O)dlb_main.o $(O)alloc.o $(O)panic.o $(INCL)\dlb.h ! @$(CC) $(cflagsUtil) /Fo$@ $(SRC)\dlb.c $(O)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h ! @$(CC) $(cflagsUtil) /Fo$@ $(UTIL)\dlb_main.c $(DAT)\porthelp: $(NTSYS)\porthelp @copy $(NTSYS)\porthelp $@ >nul *************** *** 937,946 **** #========================================== $(U)recover.exe: $(RECOVOBJS) ! $(link) $(LFLAGSU) -out:$@ $(RECOVOBJS) $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h ! $(CC) $(CFLAGSU) -Fo$@ $(U)recover.c #========================================== # Tile Mapping --- 963,972 ---- #========================================== $(U)recover.exe: $(RECOVOBJS) ! $(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(RECOVOBJS) $(O)recover.o: $(CONFIG_H) $(U)recover.c $(INCL)\win32api.h ! $(CC) $(cflagsUtil) -Fo$@ $(U)recover.c #========================================== # Tile Mapping *************** *** 951,981 **** @$(U)tilemap $(U)tilemap.exe: $(O)tilemap.o ! @$(link) $(LFLAGSU) -out:$@ $(O)tilemap.o $(O)tilemap.o: $(WSHR)\tilemap.c $(HACK_H) ! @$(CC) $(CFLAGSU) -Fo$@ $(WSHR)\tilemap.c $(O)tiletx32.o: $(WSHR)\tilemap.c $(HACK_H) ! @$(CC) $(CFLAGS) /DTILETEXT /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tilemap.c $(O)tiletxt.o: $(WSHR)\tilemap.c $(HACK_H) ! @$(CC) $(CFLAGS) /DTILETEXT -Fo$@ $(WSHR)\tilemap.c $(O)gifread.o: $(WSHR)\gifread.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(CFLAGS) -I$(WSHR) -Fo$@ $(WSHR)\gifread.c $(O)gifrd32.o: $(WSHR)\gifread.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(CFLAGS) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\gifread.c $(O)ppmwrite.o: $(WSHR)\ppmwrite.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(CFLAGS) -I$(WSHR) -Fo$@ $(WSHR)\ppmwrite.c $(O)tiletext.o: $(WSHR)\tiletext.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(CFLAGS) -I$(WSHR) -Fo$@ $(WSHR)\tiletext.c $(O)tilete32.o: $(WSHR)\tiletext.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(CFLAGS) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tiletext.c #========================================== # Optional Tile Utilities --- 977,1007 ---- @$(U)tilemap $(U)tilemap.exe: $(O)tilemap.o ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(O)tilemap.o $(O)tilemap.o: $(WSHR)\tilemap.c $(HACK_H) ! @$(CC) $(cflagsUtil) -Fo$@ $(WSHR)\tilemap.c $(O)tiletx32.o: $(WSHR)\tilemap.c $(HACK_H) ! @$(CC) $(cflagsUtil) /DTILETEXT /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tilemap.c $(O)tiletxt.o: $(WSHR)\tilemap.c $(HACK_H) ! @$(CC) $(cflagsUtil) /DTILETEXT -Fo$@ $(WSHR)\tilemap.c $(O)gifread.o: $(WSHR)\gifread.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(cflagsUtil) -I$(WSHR) -Fo$@ $(WSHR)\gifread.c $(O)gifrd32.o: $(WSHR)\gifread.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(cflagsUtil) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\gifread.c $(O)ppmwrite.o: $(WSHR)\ppmwrite.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(cflagsUtil) -I$(WSHR) -Fo$@ $(WSHR)\ppmwrite.c $(O)tiletext.o: $(WSHR)\tiletext.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(cflagsUtil) -I$(WSHR) -Fo$@ $(WSHR)\tiletext.c $(O)tilete32.o: $(WSHR)\tiletext.c $(CONFIG_H) $(TILE_H) ! @$(CC) $(cflagsUtil) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tiletext.c #========================================== # Optional Tile Utilities *************** *** 983,989 **** $(U)gif2txt.exe: $(GIFREADERS) $(TEXT_IO) @echo Linking $@... ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(GIFREADERS:^ =^ ) $(TEXT_IO:^ =^ --- 1009,1015 ---- $(U)gif2txt.exe: $(GIFREADERS) $(TEXT_IO) @echo Linking $@... ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(GIFREADERS:^ =^ ) $(TEXT_IO:^ =^ *************** *** 992,998 **** $(U)gif2tx32.exe: $(GIFREADERS32) $(TEXT_IO32) @echo Linking $@... ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(GIFREADERS32:^ =^ ) $(TEXT_IO32:^ =^ --- 1018,1024 ---- $(U)gif2tx32.exe: $(GIFREADERS32) $(TEXT_IO32) @echo Linking $@... ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(GIFREADERS32:^ =^ ) $(TEXT_IO32:^ =^ *************** *** 1001,1007 **** $(U)txt2ppm.exe: $(PPMWRITERS) $(TEXT_IO) @echo Linking $@... ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(PPMWRITERS:^ =^ ) $(TEXT_IO:^ =^ --- 1027,1033 ---- $(U)txt2ppm.exe: $(PPMWRITERS) $(TEXT_IO) @echo Linking $@... ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(PPMWRITERS:^ =^ ) $(TEXT_IO:^ =^ *************** *** 1023,1029 **** $(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXT_IO) @echo Linking $@... ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(O)tile2bmp.o $(TEXT_IO:^ =^ ) --- 1049,1055 ---- $(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXT_IO) @echo Linking $@... ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(O)tile2bmp.o $(TEXT_IO:^ =^ ) *************** *** 1031,1047 **** $(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32) @echo Linking $@... ! @$(link) $(LFLAGSU) -out:$@ @<<$(@B).lnk $(O)til2bm32.o $(TEXT_IO32:^ =^ ) << $(O)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h ! @$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)\tile2bmp.c $(O)til2bm32.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h ! @$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)\tile2bmp.c #========================================== # Housekeeping --- 1057,1073 ---- $(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32) @echo Linking $@... ! @$(link) $(lflagsUtil) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk $(O)til2bm32.o $(TEXT_IO32:^ =^ ) << $(O)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h ! @$(CC) $(cflagsUtil) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)\tile2bmp.c $(O)til2bm32.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h ! @$(CC) $(cflagsUtil) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)\tile2bmp.c #========================================== # Housekeeping *************** *** 1069,1075 **** if exist $(DAT)\asmodeus.lev del $(DAT)\asmodeus.lev if exist $(DAT)\astral.lev del $(DAT)\astral.lev if exist $(DAT)\baalz.lev del $(DAT)\baalz.lev ! if exist $(DAT)\bigroom.lev del $(DAT)\bigroom.lev if exist $(DAT)\castle.lev del $(DAT)\castle.lev if exist $(DAT)\data del $(DAT)\data if exist $(DAT)\dungeon del $(DAT)\dungeon --- 1095,1101 ---- if exist $(DAT)\asmodeus.lev del $(DAT)\asmodeus.lev if exist $(DAT)\astral.lev del $(DAT)\astral.lev if exist $(DAT)\baalz.lev del $(DAT)\baalz.lev ! if exist $(DAT)\bigrm-*.lev del $(DAT)\bigrm-*.lev if exist $(DAT)\castle.lev del $(DAT)\castle.lev if exist $(DAT)\data del $(DAT)\data if exist $(DAT)\dungeon del $(DAT)\dungeon *************** *** 1095,1100 **** --- 1121,1127 ---- if exist $(DAT)\valley.lev del $(DAT)\valley.lev if exist $(DAT)\water.lev del $(DAT)\water.lev if exist $(DAT)\wizard?.lev del $(DAT)\wizard?.lev + if exist $(DAT)\dlb.lst del $(DAT)\dlb.lst if exist $(O)sp_lev.tag del $(O)sp_lev.tag if exist $(SRC)\monstr.c del $(SRC)\monstr.c if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c *************** *** 1104,1110 **** if exist $(O)gamedir.tag del $(O)gamedir.tag if exist $(O)nh*key.lib del $(O)nh*key.lib if exist $(O)nh*key.exp del $(O)nh*key.exp - clean: if exist $(O)*.o del $(O)*.o if exist $(O)utility.tag del $(O)utility.tag --- 1131,1136 ---- *************** *** 1150,1171 **** # $(O)nttty.o: $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\nttty.c ! @$(CC) $(CFLAGS) -I$(WSHR) -Fo$@ $(NTSYS)\nttty.c $(O)nhkeys.o: $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\nhkeys.c ! @$(CC) $(CFLAGS) -I$(WSHR) -Fo$@ $(NTSYS)\nhkeys.c $(O)winnt.o: $(HACK_H) $(INCL)\win32api.h $(NTSYS)\winnt.c ! @$(CC) $(CFLAGS) -Fo$@ $(NTSYS)\winnt.c $(O)ntsound.o: $(HACK_H) $(NTSYS)\ntsound.c ! @$(CC) $(CFLAGS) -Fo$@ $(NTSYS)\ntsound.c $(O)mapimail.o: $(HACK_H) $(INCL)\nhlan.h $(NTSYS)\mapimail.c ! @$(CC) $(CFLAGS) -DMAPI_VERBOSE -Fo$@ $(NTSYS)\mapimail.c # # util dependencies # $(O)panic.o: $(U)panic.c $(CONFIG_H) ! @$(CC) $(CFLAGS) -Fo$@ $(U)panic.c # # The rest are stolen from sys/unix/Makefile.src, --- 1176,1197 ---- # $(O)nttty.o: $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\nttty.c ! @$(CC) $(cflagsUtil) -I$(WSHR) -Fo$@ $(NTSYS)\nttty.c $(O)nhkeys.o: $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\nhkeys.c ! @$(CC) $(cflagsUtil) -I$(WSHR) -Fo$@ $(NTSYS)\nhkeys.c $(O)winnt.o: $(HACK_H) $(INCL)\win32api.h $(NTSYS)\winnt.c ! @$(CC) $(cflagsUtil) -Fo$@ $(NTSYS)\winnt.c $(O)ntsound.o: $(HACK_H) $(NTSYS)\ntsound.c ! @$(CC) $(cflagsUtil) -Fo$@ $(NTSYS)\ntsound.c $(O)mapimail.o: $(HACK_H) $(INCL)\nhlan.h $(NTSYS)\mapimail.c ! @$(CC) $(cflagsUtil) -DMAPI_VERBOSE -Fo$@ $(NTSYS)\mapimail.c # # util dependencies # $(O)panic.o: $(U)panic.c $(CONFIG_H) ! @$(CC) $(cflagsUtil) -Fo$@ $(U)panic.c # # The rest are stolen from sys/unix/Makefile.src, *************** *** 1179,1294 **** # in here, but maintenance should be easier. # $(O)tos.o: ..\sys\atari\tos.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\atari\tos.c $(O)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h \ $(INCL)\win32api.h ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcmain.c $(O)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcsys.c $(O)pctty.o: ..\sys\share\pctty.c $(HACK_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pctty.c $(O)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\pcunix.c $(O)random.o: ..\sys\share\random.c $(HACK_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\random.c $(O)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\ioctl.c $(O)unixtty.o: ..\sys\share\unixtty.c $(HACK_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\share\unixtty.c $(O)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)\dlb.h ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixmain.c $(O)unixunix.o: ..\sys\unix\unixunix.c $(HACK_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixunix.c $(O)unixres.o: ..\sys\unix\unixres.c $(CONFIG_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\unix\unixres.c $(O)bemain.o: ..\sys\be\bemain.c $(HACK_H) $(INCL)\dlb.h ! @$(CC) $(CFLAGS) -Fo$@ ..\sys\be\bemain.c $(O)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)\func_tab.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\getline.c $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\termcap.c $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\topl.c $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ $(INCL)\patchlevel.h $(INCL)\tcap.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\tty\wintty.c $(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \ $(CONFIG_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\Window.c $(O)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\dialogs.c $(O)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)\winX.h $(INCL)\dlb.h \ $(INCL)\patchlevel.h ..\win\X11\nh72icon \ ..\win\X11\nh56icon ..\win\X11\nh32icon ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winX.c $(O)winmap.o: ..\win\X11\winmap.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\dlb.h \ $(INCL)\winX.h $(INCL)\tile2x11.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmap.c $(O)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)\winX.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmenu.c $(O)winmesg.o: ..\win\X11\winmesg.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\winX.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmesg.c $(O)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)\func_tab.h \ $(INCL)\winX.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winmisc.c $(O)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)\winX.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winstat.c $(O)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)\winX.h $(INCL)\xwindow.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\wintext.c $(O)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)\winX.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\X11\winval.c $(O)tile.o: $(SRC)\tile.c $(HACK_H) $(O)gnaskstr.o: ..\win\gnome\gnaskstr.c ..\win\gnome\gnaskstr.h \ ..\win\gnome\gnmain.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnaskstr.c $(O)gnbind.o: ..\win\gnome\gnbind.c ..\win\gnome\gnbind.h ..\win\gnome\gnmain.h \ ..\win\gnome\gnaskstr.h ..\win\gnome\gnyesno.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnbind.c $(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h $(INCL)\tile2x11.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnglyph.c $(O)gnmain.o: ..\win\gnome\gnmain.c ..\win\gnome\gnmain.h ..\win\gnome\gnsignal.h \ ..\win\gnome\gnbind.h ..\win\gnome\gnopts.h $(HACK_H) \ $(INCL)\date.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmain.c $(O)gnmap.o: ..\win\gnome\gnmap.c ..\win\gnome\gnmap.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnsignal.h $(HACK_H) ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmap.c $(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h ..\win\gnome\gnmain.h \ ..\win\gnome\gnbind.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmenu.c $(O)gnmesg.o: ..\win\gnome\gnmesg.c ..\win\gnome\gnmesg.h ..\win\gnome\gnsignal.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmesg.c $(O)gnopts.o: ..\win\gnome\gnopts.c ..\win\gnome\gnopts.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h $(HACK_H) ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnopts.c $(O)gnplayer.o: ..\win\gnome\gnplayer.c ..\win\gnome\gnplayer.h \ ..\win\gnome\gnmain.h $(HACK_H) ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnplayer.c $(O)gnsignal.o: ..\win\gnome\gnsignal.c ..\win\gnome\gnsignal.h \ ..\win\gnome\gnmain.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnsignal.c $(O)gnstatus.o: ..\win\gnome\gnstatus.c ..\win\gnome\gnstatus.h \ ..\win\gnome\gnsignal.h ..\win\gnome\gn_xpms.h \ ..\win\gnome\gnomeprv.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnstatus.c $(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h ..\win\gnome\gnmain.h \ ..\win\gnome\gn_rip.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gntext.c $(O)gnworn.o: ..\win\gnome\gnworn.c ..\win\gnome\gnworn.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnworn.c $(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h ..\win\gnome\gnyesno.h ! @$(CC) $(CFLAGS) $(GNOMEINC) -Fo$@ ..\win\gnome\gnyesno.c $(O)wingem.o: ..\win\gem\wingem.c $(HACK_H) $(INCL)\func_tab.h $(INCL)\dlb.h \ $(INCL)\patchlevel.h $(INCL)\wingem.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\wingem.c $(O)wingem1.o: ..\win\gem\wingem1.c $(INCL)\gem_rsc.h $(INCL)\load_img.h \ $(INCL)\gr_rect.h $(INCL)\wintype.h $(INCL)\wingem.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\wingem1.c $(O)load_img.o: ..\win\gem\load_img.c $(INCL)\load_img.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\load_img.c $(O)gr_rect.o: ..\win\gem\gr_rect.c $(INCL)\gr_rect.h ! @$(CC) $(CFLAGS) -Fo$@ ..\win\gem\gr_rect.c $(O)tile.o: tile.c $(HACK_H) $(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(INCL)\func_tab.h \ $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\tile2x11.h \ --- 1205,1320 ---- # in here, but maintenance should be easier. # $(O)tos.o: ..\sys\atari\tos.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\atari\tos.c $(O)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h \ $(INCL)\win32api.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\share\pcmain.c $(O)pcsys.o: ..\sys\share\pcsys.c $(HACK_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\share\pcsys.c $(O)pctty.o: ..\sys\share\pctty.c $(HACK_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\share\pctty.c $(O)pcunix.o: ..\sys\share\pcunix.c $(HACK_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\share\pcunix.c $(O)random.o: ..\sys\share\random.c $(HACK_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\share\random.c $(O)ioctl.o: ..\sys\share\ioctl.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\share\ioctl.c $(O)unixtty.o: ..\sys\share\unixtty.c $(HACK_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\share\unixtty.c $(O)unixmain.o: ..\sys\unix\unixmain.c $(HACK_H) $(INCL)\dlb.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\unix\unixmain.c $(O)unixunix.o: ..\sys\unix\unixunix.c $(HACK_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\unix\unixunix.c $(O)unixres.o: ..\sys\unix\unixres.c $(CONFIG_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\unix\unixres.c $(O)bemain.o: ..\sys\be\bemain.c $(HACK_H) $(INCL)\dlb.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\sys\be\bemain.c $(O)getline.o: ..\win\tty\getline.c $(HACK_H) $(INCL)\func_tab.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\getline.c $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\termcap.c $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\topl.c $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ $(INCL)\patchlevel.h $(INCL)\tcap.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\wintty.c $(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \ $(CONFIG_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\Window.c $(O)dialogs.o: ..\win\X11\dialogs.c $(CONFIG_H) ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\dialogs.c $(O)winX.o: ..\win\X11\winX.c $(HACK_H) $(INCL)\winX.h $(INCL)\dlb.h \ $(INCL)\patchlevel.h ..\win\X11\nh72icon \ ..\win\X11\nh56icon ..\win\X11\nh32icon ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\winX.c $(O)winmap.o: ..\win\X11\winmap.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\dlb.h \ $(INCL)\winX.h $(INCL)\tile2x11.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\winmap.c $(O)winmenu.o: ..\win\X11\winmenu.c $(HACK_H) $(INCL)\winX.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\winmenu.c $(O)winmesg.o: ..\win\X11\winmesg.c $(INCL)\xwindow.h $(HACK_H) $(INCL)\winX.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\winmesg.c $(O)winmisc.o: ..\win\X11\winmisc.c $(HACK_H) $(INCL)\func_tab.h \ $(INCL)\winX.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\winmisc.c $(O)winstat.o: ..\win\X11\winstat.c $(HACK_H) $(INCL)\winX.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\winstat.c $(O)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)\winX.h $(INCL)\xwindow.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\wintext.c $(O)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)\winX.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\X11\winval.c $(O)tile.o: $(SRC)\tile.c $(HACK_H) $(O)gnaskstr.o: ..\win\gnome\gnaskstr.c ..\win\gnome\gnaskstr.h \ ..\win\gnome\gnmain.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnaskstr.c $(O)gnbind.o: ..\win\gnome\gnbind.c ..\win\gnome\gnbind.h ..\win\gnome\gnmain.h \ ..\win\gnome\gnaskstr.h ..\win\gnome\gnyesno.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnbind.c $(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h $(INCL)\tile2x11.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnglyph.c $(O)gnmain.o: ..\win\gnome\gnmain.c ..\win\gnome\gnmain.h ..\win\gnome\gnsignal.h \ ..\win\gnome\gnbind.h ..\win\gnome\gnopts.h $(HACK_H) \ $(INCL)\date.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmain.c $(O)gnmap.o: ..\win\gnome\gnmap.c ..\win\gnome\gnmap.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnsignal.h $(HACK_H) ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmap.c $(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h ..\win\gnome\gnmain.h \ ..\win\gnome\gnbind.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmenu.c $(O)gnmesg.o: ..\win\gnome\gnmesg.c ..\win\gnome\gnmesg.h ..\win\gnome\gnsignal.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnmesg.c $(O)gnopts.o: ..\win\gnome\gnopts.c ..\win\gnome\gnopts.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h $(HACK_H) ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnopts.c $(O)gnplayer.o: ..\win\gnome\gnplayer.c ..\win\gnome\gnplayer.h \ ..\win\gnome\gnmain.h $(HACK_H) ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnplayer.c $(O)gnsignal.o: ..\win\gnome\gnsignal.c ..\win\gnome\gnsignal.h \ ..\win\gnome\gnmain.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnsignal.c $(O)gnstatus.o: ..\win\gnome\gnstatus.c ..\win\gnome\gnstatus.h \ ..\win\gnome\gnsignal.h ..\win\gnome\gn_xpms.h \ ..\win\gnome\gnomeprv.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnstatus.c $(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h ..\win\gnome\gnmain.h \ ..\win\gnome\gn_rip.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gntext.c $(O)gnworn.o: ..\win\gnome\gnworn.c ..\win\gnome\gnworn.h ..\win\gnome\gnglyph.h \ ..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnworn.c $(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h ..\win\gnome\gnyesno.h ! @$(CC) $(cflagsUtil) $(GNOMEINC) -Fo$@ ..\win\gnome\gnyesno.c $(O)wingem.o: ..\win\gem\wingem.c $(HACK_H) $(INCL)\func_tab.h $(INCL)\dlb.h \ $(INCL)\patchlevel.h $(INCL)\wingem.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\gem\wingem.c $(O)wingem1.o: ..\win\gem\wingem1.c $(INCL)\gem_rsc.h $(INCL)\load_img.h \ $(INCL)\gr_rect.h $(INCL)\wintype.h $(INCL)\wingem.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\gem\wingem1.c $(O)load_img.o: ..\win\gem\load_img.c $(INCL)\load_img.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\gem\load_img.c $(O)gr_rect.o: ..\win\gem\gr_rect.c $(INCL)\gr_rect.h ! @$(CC) $(cflagsUtil) -Fo$@ ..\win\gem\gr_rect.c $(O)tile.o: tile.c $(HACK_H) $(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) $(INCL)\func_tab.h \ $(INCL)\dlb.h $(INCL)\patchlevel.h $(INCL)\tile2x11.h \ *** ../nethack-3.4.3/sys/winnt/nhsetup.bat Sun Dec 09 08:46:20 2007 --- sys/winnt/nhsetup.bat Sun Dec 09 10:19:54 2007 *************** *** 1,5 **** @REM SCCS Id: @(#)nhsetup.bat 3.4 $Date: 2007/12/09 16:20:25 $ ! @REM Copyright (c) NetHack PC Development Team 1993, 1996, 2002 @REM NetHack may be freely redistributed. See license for details. @REM Win32 setup batch file, see Install.nt for details @REM --- 1,5 ---- @REM SCCS Id: @(#)nhsetup.bat 3.4 $Date: 2007/12/09 16:20:25 $ ! @REM Copyright (c) NetHack PC Development Team 1993-2007 @REM NetHack may be freely redistributed. See license for details. @REM Win32 setup batch file, see Install.nt for details @REM *************** *** 54,83 **** :do_win if not exist ..\..\win\win32\nethack.dsw goto :err_win echo. ! echo Copying Visual C project files to ..\..\build directory echo Copying ..\..\win\win32\nethack.dsw ..\..\nethack.dsw copy ..\..\win\win32\nethack.dsw ..\.. >nul if NOT exist ..\..\binary\*.* echo Creating ..\..\binary directory if NOT exist ..\..\binary\*.* mkdir ..\..\binary if NOT exist ..\..\binary\license copy ..\..\dat\license ..\..\binary\license >nul ! if NOT exist ..\..\build\*.* echo Creating ..\..\build directory ! if NOT exist ..\..\build\*.* mkdir ..\..\build copy ..\..\win\win32\dgncomp.dsp ..\..\build >nul copy ..\..\win\win32\dgnstuff.dsp ..\..\build >nul - copy ..\..\win\win32\dgnstuff.mak ..\..\build >nul copy ..\..\win\win32\dlb_main.dsp ..\..\build >nul copy ..\..\win\win32\levcomp.dsp ..\..\build >nul copy ..\..\win\win32\levstuff.dsp ..\..\build >nul - copy ..\..\win\win32\levstuff.mak ..\..\build >nul copy ..\..\win\win32\makedefs.dsp ..\..\build >nul copy ..\..\win\win32\recover.dsp ..\..\build >nul copy ..\..\win\win32\tile2bmp.dsp ..\..\build >nul copy ..\..\win\win32\tiles.dsp ..\..\build >nul - copy ..\..\win\win32\tiles.mak ..\..\build >nul copy ..\..\win\win32\tilemap.dsp ..\..\build >nul copy ..\..\win\win32\uudecode.dsp ..\..\build >nul copy ..\..\win\win32\nethackw.dsp ..\..\build >nul goto :done --- 54,121 ---- :do_win if not exist ..\..\win\win32\nethack.dsw goto :err_win + echo. ! if exist ..\..\build\*.* goto projectcopy ! ! echo Creating ..\..\build directory ! mkdir ..\..\build ! ! :projectcopy ! echo Copying Visual C solution files to top level directory ! @REM Visual Studio 6 workspace echo Copying ..\..\win\win32\nethack.dsw ..\..\nethack.dsw copy ..\..\win\win32\nethack.dsw ..\.. >nul + + @REM Visual Studio 2008 Express solution file + if NOT exist ..\..\win\win32\NetHack.sln goto skipsoln + echo Copying ..\..\win\win32\NetHack.sln ..\..\NetHack.sln + copy ..\..\win\win32\NetHack.sln ..\.. >nul + :skipsoln + if NOT exist ..\..\binary\*.* echo Creating ..\..\binary directory if NOT exist ..\..\binary\*.* mkdir ..\..\binary if NOT exist ..\..\binary\license copy ..\..\dat\license ..\..\binary\license >nul ! ! echo Copying Visual C project files to ..\..\build directory ! ! copy ..\..\win\win32\dgnstuff.mak ..\..\build >nul ! copy ..\..\win\win32\levstuff.mak ..\..\build >nul ! copy ..\..\win\win32\tiles.mak ..\..\build >nul ! ! @REM Visual C++ 6 project files copy ..\..\win\win32\dgncomp.dsp ..\..\build >nul copy ..\..\win\win32\dgnstuff.dsp ..\..\build >nul copy ..\..\win\win32\dlb_main.dsp ..\..\build >nul copy ..\..\win\win32\levcomp.dsp ..\..\build >nul copy ..\..\win\win32\levstuff.dsp ..\..\build >nul copy ..\..\win\win32\makedefs.dsp ..\..\build >nul copy ..\..\win\win32\recover.dsp ..\..\build >nul copy ..\..\win\win32\tile2bmp.dsp ..\..\build >nul copy ..\..\win\win32\tiles.dsp ..\..\build >nul copy ..\..\win\win32\tilemap.dsp ..\..\build >nul copy ..\..\win\win32\uudecode.dsp ..\..\build >nul copy ..\..\win\win32\nethackw.dsp ..\..\build >nul + + @REM Visual C++ 2008 Express project files + if NOT exist ..\..\win\win32\makedefs.vcproj goto skipVC2008 + if NOT exist ..\..\win\win32\uudecode.vcproj goto skipVC2008 + if NOT exist ..\..\win\win32\dgncomp.vcproj goto skipVC2008 + if NOT exist ..\..\win\win32\dlb_main.vcproj goto skipVC2008 + if NOT exist ..\..\win\win32\nethackw.vcproj goto skipVC2008 + copy ..\..\win\win32\dgncomp.vcproj ..\..\build >nul + copy ..\..\win\win32\dgnstuff.vcproj ..\..\build >nul + copy ..\..\win\win32\dlb_main.vcproj ..\..\build >nul + copy ..\..\win\win32\levcomp.vcproj ..\..\build >nul + copy ..\..\win\win32\levstuff.vcproj ..\..\build >nul + copy ..\..\win\win32\makedefs.vcproj ..\..\build >nul + copy ..\..\win\win32\recover.vcproj ..\..\build >nul + copy ..\..\win\win32\tile2bmp.vcproj ..\..\build >nul + copy ..\..\win\win32\tiles.vcproj ..\..\build >nul + copy ..\..\win\win32\tilemap.vcproj ..\..\build >nul + copy ..\..\win\win32\uudecode.vcproj ..\..\build >nul + copy ..\..\win\win32\nethackw.vcproj ..\..\build >nul + :skipVC2008 goto :done *** ../nethack-3.4.3/util/makedefs.c Sun Dec 09 08:46:20 2007 --- util/makedefs.c Sun Dec 09 09:29:41 2007 *************** *** 543,549 **** --- 543,553 ---- void do_date() { + #ifdef KR1ED long clocktim = 0; + #else + time_t clocktim = 0; + #endif char *c, cbuf[60], buf[BUFSZ]; const char *ul_sfx; *************** *** 559,575 **** Fprintf(ofp,"/*\tSCCS Id: @(#)date.h\t3.4\t2002/02/03 */\n\n"); Fprintf(ofp,Dont_Edit_Code); - #ifdef KR1ED (void) time(&clocktim); Strcpy(cbuf, ctime(&clocktim)); ! #else ! (void) time((time_t *)&clocktim); ! Strcpy(cbuf, ctime((time_t *)&clocktim)); ! #endif for (c = cbuf; *c; c++) if (*c == '\n') break; *c = '\0'; /* strip off the '\n' */ Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf); ! Fprintf(ofp,"#define BUILD_TIME (%ldL)\n", clocktim); Fprintf(ofp,"\n"); #ifdef NHSTDC ul_sfx = "UL"; --- 563,575 ---- Fprintf(ofp,"/*\tSCCS Id: @(#)date.h\t3.4\t2002/02/03 */\n\n"); Fprintf(ofp,Dont_Edit_Code); (void) time(&clocktim); Strcpy(cbuf, ctime(&clocktim)); ! for (c = cbuf; *c; c++) if (*c == '\n') break; *c = '\0'; /* strip off the '\n' */ Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf); ! Fprintf(ofp,"#define BUILD_TIME (%ldL)\n", (long)clocktim); Fprintf(ofp,"\n"); #ifdef NHSTDC ul_sfx = "UL"; *** ../nethack-3.4.3/win/win32/winMS.h Sun Dec 09 08:46:23 2007 --- win/win32/winms.h Sun Dec 09 09:29:41 2007 *************** *** 4,9 **** --- 4,27 ---- #ifndef WINMS_H #define WINMS_H + #ifdef _MSC_VER + # if _MSC_VER >= 1400 + /* Visual C 8 warning elimination */ + # ifndef _CRT_SECURE_NO_DEPRECATE + #define _CRT_SECURE_NO_DEPRECATE + # endif + # ifndef _CRT_SECURE_NO_DEPRECATE + #define _CRT_SECURE_NO_DEPRECATE + # endif + # ifndef _SCL_SECURE_NO_DEPRECATE + #define _SCL_SECURE_NO_DEPRECATE + # endif + # ifndef _CRT_NONSTDC_NO_DEPRECATE + #define _CRT_NONSTDC_NO_DEPRECATE + # endif + # endif + #endif + #define WIN32_LEAN_AND_MEAN #include #include *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/NetHack.sln Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,119 ---- +  + Microsoft Visual Studio Solution File, Format Version 10.00 + # Visual Studio 2008 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcproj", "{BB934916-7969-40B1-9019-991D06B85236}" + ProjectSection(ProjectDependencies) = postProject + {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1} = {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1} + {80329A67-7DCB-4522-A61B-D8220A655F4A} = {80329A67-7DCB-4522-A61B-D8220A655F4A} + {26DBBB78-4FA4-4981-847C-AB10E76E7573} = {26DBBB78-4FA4-4981-847C-AB10E76E7573} + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} = {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} + {B49AEEBA-76FC-4763-8E12-0C6DB3E2FEA6} = {B49AEEBA-76FC-4763-8E12-0C6DB3E2FEA6} + {EBBB1625-A3B8-4239-B022-E38AF68F1291} = {EBBB1625-A3B8-4239-B022-E38AF68F1291} + {217BA6AF-F3AF-4345-B3AB-8358D642502E} = {217BA6AF-F3AF-4345-B3AB-8358D642502E} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "build\dgncomp.vcproj", "{E0FA16D4-3380-433B-AD70-A4E79D1A7AC1}" + ProjectSection(ProjectDependencies) = postProject + {BBE363D3-B6FC-4142-80BA-1F192260C5C3} = {BBE363D3-B6FC-4142-80BA-1F192260C5C3} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgnstuff", "build\dgnstuff.vcproj", "{BBE363D3-B6FC-4142-80BA-1F192260C5C3}" + ProjectSection(ProjectDependencies) = postProject + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} = {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb_main", "build\dlb_main.vcproj", "{80329A67-7DCB-4522-A61B-D8220A655F4A}" + ProjectSection(ProjectDependencies) = postProject + {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1} = {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1} + {26DBBB78-4FA4-4981-847C-AB10E76E7573} = {26DBBB78-4FA4-4981-847C-AB10E76E7573} + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} = {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vcproj", "{26DBBB78-4FA4-4981-847C-AB10E76E7573}" + ProjectSection(ProjectDependencies) = postProject + {433B72D6-5A0B-49EB-883F-078FE8A1C519} = {433B72D6-5A0B-49EB-883F-078FE8A1C519} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levstuff", "build\levstuff.vcproj", "{433B72D6-5A0B-49EB-883F-078FE8A1C519}" + ProjectSection(ProjectDependencies) = postProject + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} = {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcproj", "{B4D3C3D4-E31E-4D82-9064-A32E86BFC03D}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "build\recover.vcproj", "{B18361AD-E6E0-4AA3-8FAB-A225B40CC58A}" + ProjectSection(ProjectDependencies) = postProject + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} = {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D} + {80329A67-7DCB-4522-A61B-D8220A655F4A} = {80329A67-7DCB-4522-A61B-D8220A655F4A} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "build\tile2bmp.vcproj", "{9AE37BAE-C760-4B74-860B-D511CA767741}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "build\tilemap.vcproj", "{B49AEEBA-76FC-4763-8E12-0C6DB3E2FEA6}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiles", "build\tiles.vcproj", "{EBBB1625-A3B8-4239-B022-E38AF68F1291}" + ProjectSection(ProjectDependencies) = postProject + {9AE37BAE-C760-4B74-860B-D511CA767741} = {9AE37BAE-C760-4B74-860B-D511CA767741} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "build\uudecode.vcproj", "{217BA6AF-F3AF-4345-B3AB-8358D642502E}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BB934916-7969-40B1-9019-991D06B85236}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB934916-7969-40B1-9019-991D06B85236}.Debug|Win32.Build.0 = Debug|Win32 + {BB934916-7969-40B1-9019-991D06B85236}.Release|Win32.ActiveCfg = Release|Win32 + {BB934916-7969-40B1-9019-991D06B85236}.Release|Win32.Build.0 = Release|Win32 + {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1}.Debug|Win32.Build.0 = Debug|Win32 + {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1}.Release|Win32.ActiveCfg = Release|Win32 + {E0FA16D4-3380-433B-AD70-A4E79D1A7AC1}.Release|Win32.Build.0 = Release|Win32 + {BBE363D3-B6FC-4142-80BA-1F192260C5C3}.Debug|Win32.ActiveCfg = Debug|Win32 + {BBE363D3-B6FC-4142-80BA-1F192260C5C3}.Debug|Win32.Build.0 = Debug|Win32 + {BBE363D3-B6FC-4142-80BA-1F192260C5C3}.Release|Win32.ActiveCfg = Release|Win32 + {BBE363D3-B6FC-4142-80BA-1F192260C5C3}.Release|Win32.Build.0 = Release|Win32 + {80329A67-7DCB-4522-A61B-D8220A655F4A}.Debug|Win32.ActiveCfg = Debug|Win32 + {80329A67-7DCB-4522-A61B-D8220A655F4A}.Debug|Win32.Build.0 = Debug|Win32 + {80329A67-7DCB-4522-A61B-D8220A655F4A}.Release|Win32.ActiveCfg = Release|Win32 + {80329A67-7DCB-4522-A61B-D8220A655F4A}.Release|Win32.Build.0 = Release|Win32 + {26DBBB78-4FA4-4981-847C-AB10E76E7573}.Debug|Win32.ActiveCfg = Debug|Win32 + {26DBBB78-4FA4-4981-847C-AB10E76E7573}.Debug|Win32.Build.0 = Debug|Win32 + {26DBBB78-4FA4-4981-847C-AB10E76E7573}.Release|Win32.ActiveCfg = Release|Win32 + {26DBBB78-4FA4-4981-847C-AB10E76E7573}.Release|Win32.Build.0 = Release|Win32 + {433B72D6-5A0B-49EB-883F-078FE8A1C519}.Debug|Win32.ActiveCfg = Debug|Win32 + {433B72D6-5A0B-49EB-883F-078FE8A1C519}.Debug|Win32.Build.0 = Debug|Win32 + {433B72D6-5A0B-49EB-883F-078FE8A1C519}.Release|Win32.ActiveCfg = Release|Win32 + {433B72D6-5A0B-49EB-883F-078FE8A1C519}.Release|Win32.Build.0 = Release|Win32 + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D}.Debug|Win32.ActiveCfg = Debug|Win32 + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D}.Debug|Win32.Build.0 = Debug|Win32 + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D}.Release|Win32.ActiveCfg = Release|Win32 + {B4D3C3D4-E31E-4D82-9064-A32E86BFC03D}.Release|Win32.Build.0 = Release|Win32 + {B18361AD-E6E0-4AA3-8FAB-A225B40CC58A}.Debug|Win32.ActiveCfg = Debug|Win32 + {B18361AD-E6E0-4AA3-8FAB-A225B40CC58A}.Debug|Win32.Build.0 = Debug|Win32 + {B18361AD-E6E0-4AA3-8FAB-A225B40CC58A}.Release|Win32.ActiveCfg = Release|Win32 + {B18361AD-E6E0-4AA3-8FAB-A225B40CC58A}.Release|Win32.Build.0 = Release|Win32 + {9AE37BAE-C760-4B74-860B-D511CA767741}.Debug|Win32.ActiveCfg = Debug|Win32 + {9AE37BAE-C760-4B74-860B-D511CA767741}.Debug|Win32.Build.0 = Debug|Win32 + {9AE37BAE-C760-4B74-860B-D511CA767741}.Release|Win32.ActiveCfg = Release|Win32 + {9AE37BAE-C760-4B74-860B-D511CA767741}.Release|Win32.Build.0 = Release|Win32 + {B49AEEBA-76FC-4763-8E12-0C6DB3E2FEA6}.Debug|Win32.ActiveCfg = Debug|Win32 + {B49AEEBA-76FC-4763-8E12-0C6DB3E2FEA6}.Debug|Win32.Build.0 = Debug|Win32 + {B49AEEBA-76FC-4763-8E12-0C6DB3E2FEA6}.Release|Win32.ActiveCfg = Release|Win32 + {B49AEEBA-76FC-4763-8E12-0C6DB3E2FEA6}.Release|Win32.Build.0 = Release|Win32 + {EBBB1625-A3B8-4239-B022-E38AF68F1291}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBBB1625-A3B8-4239-B022-E38AF68F1291}.Debug|Win32.Build.0 = Debug|Win32 + {EBBB1625-A3B8-4239-B022-E38AF68F1291}.Release|Win32.ActiveCfg = Release|Win32 + {EBBB1625-A3B8-4239-B022-E38AF68F1291}.Release|Win32.Build.0 = Release|Win32 + {217BA6AF-F3AF-4345-B3AB-8358D642502E}.Debug|Win32.ActiveCfg = Debug|Win32 + {217BA6AF-F3AF-4345-B3AB-8358D642502E}.Debug|Win32.Build.0 = Debug|Win32 + {217BA6AF-F3AF-4345-B3AB-8358D642502E}.Release|Win32.ActiveCfg = Release|Win32 + {217BA6AF-F3AF-4345-B3AB-8358D642502E}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + EndGlobal *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/dgncomp.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,500 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/dgnstuff.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,86 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/dlb_main.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,314 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/levcomp.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,424 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/levstuff.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,86 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/makedefs.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,340 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/NetHackW.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,3572 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/recover.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,275 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/tile2bmp.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,372 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/tilemap.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,412 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/tiles.vcproj Sun Dec 09 09:33:38 2007 *************** *** 0 **** --- 1,86 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + *** /dev/null Sun Dec 09 11:08:41 2007 --- win/win32/uudecode.vcproj Sun Dec 09 10:06:25 2007 *************** *** 0 **** --- 1,238 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +