From d66554f3fc7cf9cdf2e08f1da8722cc4fb1ec836 Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Mon, 31 Mar 2025 09:40:52 +0200 Subject: [PATCH 1/8] win32 --- include/hack.h | 4 +++- include/ntconf.h | 2 +- include/system.h | 4 +--- sys/autoconf/configure.ac | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hack.h b/include/hack.h index 65726ab34..9383790a5 100644 --- a/include/hack.h +++ b/include/hack.h @@ -363,6 +363,8 @@ typedef struct { #define def_objsyms_explain(i) objexplain[i] #define def_oc_syms_name(i) oclass_names[i] +#include "nhlua.h" + #include "extern.h" #include "winprocs.h" #include "sys.h" @@ -717,4 +719,4 @@ enum optset_restrictions { #define DEVTEAM_EMAIL "bhaak@gmx.net" #define DEVTEAM_URL "https://github.com/unnethack/unnethack" -#endif /* HACK_H */ +#endif /* HACK_H */ \ No newline at end of file diff --git a/include/ntconf.h b/include/ntconf.h index d27619c56..0d624c33c 100644 --- a/include/ntconf.h +++ b/include/ntconf.h @@ -194,4 +194,4 @@ extern int set_win32_option(const char *, const char *); #define MOUSEMASK (LEFTBUTTON | RIGHTBUTTON | MIDBUTTON) #endif /* WIN32CON */ -#endif /* NTCONF_H */ +#endif /* NTCONF_H */ \ No newline at end of file diff --git a/include/system.h b/include/system.h index ffb1a3a84..0c91bbfbf 100644 --- a/include/system.h +++ b/include/system.h @@ -574,6 +574,4 @@ E int atoi(const char *); #endif /* !__cplusplus && !__GO32__ */ -#include "nhlua.h" - -#endif /* SYSTEM_H */ +#endif /* SYSTEM_H */ \ No newline at end of file diff --git a/sys/autoconf/configure.ac b/sys/autoconf/configure.ac index f3b0f26e4..91a25e334 100644 --- a/sys/autoconf/configure.ac +++ b/sys/autoconf/configure.ac @@ -597,4 +597,4 @@ AH_BOTTOM([#endif /* AUTOCONF_H */]) NETHACK_CONFIG_HEADER([include/autoconf.h:sys/autoconf/autoconf.hin]) -AC_OUTPUT +AC_OUTPUT \ No newline at end of file From 89cd3b71f290baac739830f5aa5d7519026e8104 Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Mon, 31 Mar 2025 09:42:04 +0200 Subject: [PATCH 2/8] update.tiles --- win/share/monsters.txt | 32 ++++++------- win/share/objects.txt | 70 +++++++++++++-------------- win/share/other.txt | 37 +++++++++++---- win/share/tile.h | 10 ++-- win/share/tile2bmp.c | 105 +++++++++++++++-------------------------- win/share/tilemap.c | 43 ++++++++--------- win/share/tiletext.c | 43 +++++------------ 7 files changed, 156 insertions(+), 184 deletions(-) diff --git a/win/share/monsters.txt b/win/share/monsters.txt index 1b801720b..d3e38b2c4 100644 --- a/win/share/monsters.txt +++ b/win/share/monsters.txt @@ -7589,23 +7589,23 @@ Z = (195, 195, 195) ...BPPPPPPPE.... ................ } -# tile 365 (Minion of Huhetotl) +# tile 398 (Schliemann) { - ...OP......PO... - ...OODDDDDDOOD.. - ..DLOOCDDCOOLDD. - .DDDLDDDDDDLDDD. - .CCDDDNDDNDDDCC. - CCDKDDDDDDDDJCCC - CDDKKDDIIDDJJCCD - CDDKKKDAADJJDCDD - CCDKDDKKKJDDKCDD - .CCDKKDDDDKKCDDD - .CCDADKDDKDACDD. - .DDDADDDDDDADDD. - ....CCDDDDKKAA.. - ...CDDDAADDDKAA. - ..CDDDAAA.DDDK.. + .......JJ....... + ......KJJJ...... + ....KCKKKJJJ.... + ......ALALA..... + ......LLLLA..... + ......ALLA...... + .....CKAAKK.AAA. + ....CKKKKKKKAAA. + ...KKKKKKKJKKAA. + .U.KKACKKJAKKAA. + U..KA.CKKJAAKA.. + UJJLJJBPPPAALA.. + U.....BPAPAAAA.. + .U....BPAPAAAA.. + .....JJA.JJA.... ................ } # tile 366 (Thoth Amon) diff --git a/win/share/objects.txt b/win/share/objects.txt index 97e9a2776..3c8aa09c3 100644 --- a/win/share/objects.txt +++ b/win/share/objects.txt @@ -5081,24 +5081,24 @@ Z = (195, 195, 195) ................ ................ } -# placeholder 236 (crystal pick) -{ - ABCDEFGHIJKL.NOP - BAAAAAAAAAAAAAAO - CAAANNNNNNAAAAAN - DAANNPPPPNNAAAAA - EAANNPAAANNPAAAL - FAAAPPAAANNPAAAK - GAAAAAAANNPPAAAJ - HAAAAAANNPPAAAAI - IAAAAANNPPAAAAAH - JAAAAANNPAAAAAAG - KAAAAAAPPAAAAAAF - LAAAAANNAAAAAAAE - AAAAAANNPAAAAAAD - NAAAAAAPPAAAAAAC - OAAAAAAAAAAAAAAB - PON.LKJIHGFEDCBA +# tile 236 (crystal pick) +{ + ................ + ................ + ................ + ......MMT....... + .....MZZMT...... + ......ZZZMT..... + .......BZZZT.... + ......BPT.ZZT... + .....BPT...ZT... + ....BPT......... + ...BPT.......... + ..BPT........... + .BPT............ + ..T............. + ................ + ................ } # tile 237 (iron hook / grappling hook) { @@ -10173,24 +10173,24 @@ Z = (195, 195, 195) ................ ................ } -# placeholder 427 (silvery metal / small piece of unrefined mithril) +# tile 427 (silvery metal / small piece of unrefined mithril) { - ABCDEFGHIJKL.NOP - BAAAAAAAAAAAAAAO - CAAANNNNNNAAAAAN - DAANNPPPPNNAAAAA - EAANNPAAANNPAAAL - FAAAPPAAANNPAAAK - GAAAAAAANNPPAAAJ - HAAAAAANNPPAAAAI - IAAAAANNPPAAAAAH - JAAAAANNPAAAAAAG - KAAAAAAPPAAAAAAF - LAAAAANNAAAAAAAE - AAAAAANNPAAAAAAD - NAAAAAAPPAAAAAAC - OAAAAAAAAAAAAAAB - PON.LKJIHGFEDCBA + ................ + ................ + ................ + ................ + ................ + ................ + ......PPP....... + .....PPPPP...... + ....PPMBPPWA.... + ....PPBBPWA..... + ....PPPPPWA..... + .....PPWWAA..... + ......WAAA...... + ................ + ................ + ................ } # tile 428 (rock) { diff --git a/win/share/other.txt b/win/share/other.txt index ff240eda2..8b4f6052a 100644 --- a/win/share/other.txt +++ b/win/share/other.txt @@ -711,6 +711,25 @@ Z = (195, 195, 195) OAAAAAAAAAAAAAAB PON.LKJIHGFEDCBA } +# tile 36 (magic platform) +{ + BBBBBBBBBBBBBBBB + BIIIIIIIIIIIIIIB + BIHH........HHIB + BIH..........HIB + BI............IB + BI............IB + BI............IB + BI.....PP.....IB + BI.....PP.....IB + BI............IB + BI............IB + BI............IB + BIH..........HIB + BIHH........HHIB + BIIIIIIIIIIIIIIB + BBBBBBBBBBBBBBBB +} # tile 33 (molten lava) { DDDDDDCDDDDDDDDD @@ -1357,7 +1376,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 70 (vertical beam) +# tile 71 (vertical beam) { .......NN....... ......NN........ @@ -1623,7 +1642,7 @@ Z = (195, 195, 195) .......FF....... ................ } -# tile 84 (cmap 84) +# tile 84 (swallow top left) { AAAAAAADDDDDDAAA AAAAADDDDDDDDDDD @@ -1642,7 +1661,7 @@ Z = (195, 195, 195) AAAADDDDDD...... AAAADDDDDD...... } -# tile 85 (cmap 85) +# tile 85 (swallow top center) { AAAAAAAAAAAAAAAA DDAAAAAAAAAAAAAA @@ -1661,7 +1680,7 @@ Z = (195, 195, 195) ................ ................ } -# tile 86 (cmap 86) +# tile 86 (swallow top right) { AAAAAAAAAAAAAAAA AAADDDDDAAAAAAAA @@ -1680,7 +1699,7 @@ Z = (195, 195, 195) ....DDDDDDDDDDDD ....DDDDDDDDDDDA } -# tile 87 (cmap 87) +# tile 87 (swallow middle left) { AAAADDDDDD...... AAAADDDDDDD..... @@ -1699,7 +1718,7 @@ Z = (195, 195, 195) DDDDDDD......... DDCCDDD......... } -# tile 88 (cmap 88) +# tile 88 (swallow middle right) { ....DDDDDDDDDDDA ....DDDDDDDDDDDA @@ -1718,7 +1737,7 @@ Z = (195, 195, 195) ......DDDDDDDDAA .......DDDDDDDAA } -# tile 89 (cmap 89) +# tile 89 (swallow bottom left) { DDDCDDD......... DDDCDDD......... @@ -1737,7 +1756,7 @@ Z = (195, 195, 195) AAAAAAAAAAAADDDD AAAAAAAAAAAAAADD } -# tile 90 (cmap 90) +# tile 90 (swallow bottom center) { ................ ................ @@ -1756,7 +1775,7 @@ Z = (195, 195, 195) DDDDDDDDDDDDDDDD DDDDDDDDDDDDDDAA } -# tile 91 (cmap 91) +# tile 91 (swallow bottom right) { ......DDDDDDDDAA ......DDDDDDDDDA diff --git a/win/share/tile.h b/win/share/tile.h index 565c79a72..98db6c5b8 100644 --- a/win/share/tile.h +++ b/win/share/tile.h @@ -33,14 +33,16 @@ extern int colorsinmainmap; extern boolean fopen_text_file(const char *, const char *); extern boolean read_text_tile(pixel (*)[TILE_X]); extern boolean write_text_tile(pixel (*)[TILE_X]); -extern int fclose_text_file(); +extern int fclose_text_file(void); -extern void init_colormap(); -extern void merge_colormap(); +extern void set_grayscale(int); + +extern void init_colormap(void); +extern void merge_colormap(void); #if defined(MICRO) || defined(WIN32) #undef exit # if !defined(MSDOS) && !defined(WIN32) extern void exit(int); # endif -#endif +#endif \ No newline at end of file diff --git a/win/share/tile2bmp.c b/win/share/tile2bmp.c index d683050be..026d3d385 100644 --- a/win/share/tile2bmp.c +++ b/win/share/tile2bmp.c @@ -4,13 +4,11 @@ /* * Edit History: * - * Initial Creation M.Allison 1994/01/11 - * 256 colour bmp and statue support M.Allison 2015/04/19 + * Initial Creation M.Allison 1994/01/11 + * 256 colour bmp and statue support M.Allison 2015/04/19 * */ -/* #pragma warning(4103:disable) */ - #ifndef __GNUC__ #include "win32api.h" #endif @@ -19,45 +17,21 @@ #include "tile.h" #include -#if defined(UINT32_MAX) && defined(INT32_MAX) && defined(UINT16_MAX) -#define UINT8 uint8_t -#define UINT16 uint16_t -#define UINT32 uint32_t -#define INT32 int32_t -#else -# ifdef _MSC_VER -#define UINT8 unsigned char -#define UINT16 unsigned short -#define UINT32 unsigned long -#define INT32 long -# endif -#endif -#if (TILE_X == 32) -#define COLORS_IN_USE 256 +#if defined(_MSC_VER) && defined(_WIN64) +#define UNALIGNED_POINTER __unaligned #else -/* #define COLORS_IN_USE 16 */ /* 16 colors */ -#define COLORS_IN_USE 256 /* 256 colors */ +#define UNALIGNED_POINTER #endif +#define COLORS_IN_USE 256 /* 256 colors */ #define BITCOUNT 8 extern char *tilename(int, int); #define MAGICTILENO (340 + 440 + 231 + 340) - -#if BITCOUNT == 4 -#define MAX_X 320 /* 2 per byte, 4 bits per pixel */ -#define MAX_Y 480 -#else -# if (TILE_X == 32) -#define MAX_X (32 * 40) -#define MAX_Y ((MAGICTILENO * 32) / 40) * 2 -# else #define MAX_X (16 * 40) #define MAX_Y ((MAGICTILENO * 16) / 40) * 2 -# endif -#endif /* GCC fix by Paolo Bonzini 1999/03/28 */ #ifdef __GNUC__ @@ -75,8 +49,8 @@ static short leshort(short x) #endif } -static INT32 -lelong(INT32 x) +static int32_t +lelong(int32_t x) { #ifdef __BIG_ENDIAN__ return ((x & 0xff) << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | ((x >> 24) & 0xff); @@ -87,35 +61,35 @@ lelong(INT32 x) #ifdef __GNUC__ typedef struct tagBMIH { - UINT32 biSize; - INT32 biWidth; - INT32 biHeight; - UINT16 biPlanes; - UINT16 biBitCount; - UINT32 biCompression; - UINT32 biSizeImage; - INT32 biXPelsPerMeter; - INT32 biYPelsPerMeter; - UINT32 biClrUsed; - UINT32 biClrImportant; + uint32_t biSize; + int32_t biWidth; + int32_t biHeight; + uint16_t biPlanes; + uint16_t biBitCount; + uint32_t biCompression; + uint32_t biSizeImage; + int32_t biXPelsPerMeter; + int32_t biYPelsPerMeter; + uint32_t biClrUsed; + uint32_t biClrImportant; } PACK BITMAPINFOHEADER; typedef struct tagBMFH { - UINT16 bfType; - UINT32 bfSize; - UINT16 bfReserved1; - UINT16 bfReserved2; - UINT32 bfOffBits; + uint16_t bfType; + uint32_t bfSize; + uint16_t bfReserved1; + uint16_t bfReserved2; + uint32_t bfOffBits; } PACK BITMAPFILEHEADER; typedef struct tagRGBQ { - UINT8 rgbBlue; - UINT8 rgbGreen; - UINT8 rgbRed; - UINT8 rgbReserved; + uint8_t rgbBlue; + uint8_t rgbGreen; + uint8_t rgbRed; + uint8_t rgbReserved; } PACK RGBQUAD; -#define DWORD UINT32 -#define WORD UINT16 +#define DWORD uint32_t +#define WORD uint16_t #define BI_RGB 0L #define BI_RLE8 1L #define BI_RLE4 2L @@ -181,9 +155,7 @@ char bmpname[128]; FILE *fp; int -main(argc, argv) -int argc; -char *argv[]; +main(int argc, char *argv[]) { int i, j; @@ -269,20 +241,18 @@ char *argv[]; } static void -build_bmfh(pbmfh) -BITMAPFILEHEADER *pbmfh; +build_bmfh(BITMAPFILEHEADER* pbmfh) { pbmfh->bfType = leshort(0x4D42); pbmfh->bfSize = lelong(BMPFILESIZE); - pbmfh->bfReserved1 = (UINT32) 0; - pbmfh->bfReserved2 = (UINT32) 0; + pbmfh->bfReserved1 = (uint32_t) 0; + pbmfh->bfReserved2 = (uint32_t) 0; pbmfh->bfOffBits = lelong(sizeof(bmp.bmfh) + sizeof(bmp.bmih) + (RGBQUAD_COUNT * sizeof(RGBQUAD))); } static void -build_bmih(pbmih) -BITMAPINFOHEADER *pbmih; +build_bmih(UNALIGNED_POINTER BITMAPINFOHEADER* pbmih) { WORD cClrBits; int w,h; @@ -332,8 +302,7 @@ BITMAPINFOHEADER *pbmih; } static void -build_bmptile(pixels) -pixel (*pixels)[TILE_X]; +build_bmptile(pixel(*pixels)[TILE_X]) { int cur_x, cur_y, cur_color, apply_color; int x,y; @@ -361,4 +330,4 @@ pixel (*pixels)[TILE_X]; #endif } } -} +} \ No newline at end of file diff --git a/win/share/tilemap.c b/win/share/tilemap.c index 9ee902b13..6fb18a9c6 100644 --- a/win/share/tilemap.c +++ b/win/share/tilemap.c @@ -624,6 +624,7 @@ struct { { S_pool, "pool", "water" }, { S_ice, "ice", "ice" }, { S_bog, "muddy swamp", "bog" }, + { S_magicplatform, "magic platform", "magic platform" }, { S_lava, "lava", "molten lava" }, { S_vodbridge, "vertical open drawbridge", "lowered drawbridge" }, { S_hodbridge, "horizontal open drawbridge", "lowered drawbridge" }, @@ -658,28 +659,28 @@ struct { { S_ice_trap, "ice trap", "ice trap" }, { S_polymorph_trap, "polymorph trap", "polymorph trap" }, { S_vibrating_square, "vibrating square", "vibrating square" }, - { S_vbeam, "vertical beam", "cmap 70" }, - { S_hbeam, "horizontal beam", "cmap 71" }, - { S_lslant, "left slant beam", "cmap 72" }, - { S_rslant, "right slant beam", "cmap 73" }, - { S_digbeam, "dig beam", "cmap 74" }, - { S_flashbeam, "flash beam", "cmap 75" }, - { S_boomleft, "boom left", "cmap 76" }, - { S_boomright, "boom right", "cmap 77" }, - { S_ss1, "shield1", "cmap 78" }, - { S_ss2, "shield2", "cmap 79" }, - { S_ss3, "shield3", "cmap 80" }, - { S_ss4, "shield4", "cmap 81" }, + { S_vbeam, "vertical beam", "cmap 71" }, + { S_hbeam, "horizontal beam", "cmap 72" }, + { S_lslant, "left slant beam", "cmap 73" }, + { S_rslant, "right slant beam", "cmap 74" }, + { S_digbeam, "dig beam", "cmap 75" }, + { S_flashbeam, "flash beam", "cmap 76" }, + { S_boomleft, "boom left", "cmap 77" }, + { S_boomright, "boom right", "cmap 78" }, + { S_ss1, "shield1", "cmap 79" }, + { S_ss2, "shield2", "cmap 80" }, + { S_ss3, "shield3", "cmap 81" }, + { S_ss4, "shield4", "cmap 82" }, { S_poisoncloud, "poison cloud", "poison cloud" }, { S_goodpos, "valid position", "valid position" }, - { S_sw_tl, "swallow top left", "cmap 84" }, - { S_sw_tc, "swallow top center", "cmap 85" }, - { S_sw_tr, "swallow top right", "cmap 86" }, - { S_sw_ml, "swallow middle left", "cmap 87" }, - { S_sw_mr, "swallow middle right", "cmap 88" }, - { S_sw_bl, "swallow bottom left ", "cmap 89" }, - { S_sw_bc, "swallow bottom center", "cmap 90" }, - { S_sw_br, "swallow bottom right", "cmap 91" }, + { S_sw_tl, "swallow top left", "cmap 85" }, + { S_sw_tc, "swallow top center", "cmap 86" }, + { S_sw_tr, "swallow top right", "cmap 87" }, + { S_sw_ml, "swallow middle left", "cmap 88" }, + { S_sw_mr, "swallow middle right", "cmap 89" }, + { S_sw_bl, "swallow bottom left", "cmap 90" }, + { S_sw_bc, "swallow bottom center", "cmap 91" }, + { S_sw_br, "swallow bottom right", "cmap 92" }, { S_explode1, "explosion top left", "explosion dark 0" }, { S_explode2, "explosion top centre", "explosion dark 1" }, { S_explode3, "explosion top right", "explosion dark 2" }, @@ -779,4 +780,4 @@ int main() return 0; } -#endif +#endif \ No newline at end of file diff --git a/win/share/tiletext.c b/win/share/tiletext.c index 14f06c2d6..c7d11fecd 100644 --- a/win/share/tiletext.c +++ b/win/share/tiletext.c @@ -43,15 +43,13 @@ static const int graymappings[] = { }; void -set_grayscale(g) -int g; +set_grayscale(int gs) { - grayscale = g; + grayscale = gs; } static void -read_text_colormap(txtfile) -FILE *txtfile; +read_text_colormap(FILE *txtfile) { int i, r, g, b; char c[2]; @@ -74,8 +72,7 @@ FILE *txtfile; #undef FORMAT_STRING static boolean -write_text_colormap(txtfile) -FILE *txtfile; +write_text_colormap(FILE *txtfile) { int i; char c; @@ -103,10 +100,9 @@ FILE *txtfile; return TRUE; } +/* read one tile from win/share/{monsters,objects,other}.txt */ static boolean -read_txttile(txtfile, pixels) -FILE *txtfile; -pixel (*pixels)[TILE_X]; +read_txttile(FILE *txtfile, pixel (*pixels)[TILE_X]) { int ph, i, j, k; char buf[BUFSZ], ttype[BUFSZ]; @@ -183,22 +179,11 @@ pixel (*pixels)[TILE_X]; Fprintf(stderr, "didn't find expected '}'\n"); return FALSE; } -#ifdef _DCC - /* DICE again... it doesn't seem to eat whitespace after the } like - * it should, so we have to do so manually. - */ - while ((*c = fgetc(txtfile)) != EOF && isspace((uchar) *c)) { - ; - } - ungetc(*c, txtfile); -#endif return TRUE; } static void -write_txttile(txtfile, pixels) -FILE *txtfile; -pixel (*pixels)[TILE_X]; +write_txttile(FILE *txtfile, pixel (*pixels)[TILE_X]) { const char *p; const char *type; @@ -285,9 +270,7 @@ merge_colormap() } boolean -fopen_text_file(filename, type) -const char *filename; -const char *type; +fopen_text_file(const char *filename, const char *type) { const char *p; int i; @@ -344,26 +327,24 @@ const char *type; } boolean -read_text_tile(pixels) -pixel (*pixels)[TILE_X]; +read_text_tile(pixel (*pixels)[TILE_X]) { return read_txttile(tile_file, pixels); } boolean -write_text_tile(pixels) -pixel (*pixels)[TILE_X]; +write_text_tile(pixel (*pixels)[TILE_X]) { write_txttile(tile_file, pixels); return TRUE; } int -fclose_text_file() +fclose_text_file(void) { int ret; ret = fclose(tile_file); tile_file = (FILE *)0; return ret; -} +} \ No newline at end of file From 1e5adffd6b2c572d5e502f06444a8212578903b2 Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Sun, 6 Apr 2025 13:03:40 +0200 Subject: [PATCH 3/8] pcmain --- include/extern.h | 3 +- include/hack.h | 23 ++ src/allmain.c | 93 ++++- src/files.c | 4 +- src/options.c | 12 +- src/version.c | 29 +- sys/share/pcmain.c | 958 +++++++++++++++++++++++++-------------------- 7 files changed, 683 insertions(+), 439 deletions(-) diff --git a/include/extern.h b/include/extern.h index 958e8d3f6..8944095d6 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1984,6 +1984,7 @@ extern int query_attr(const char *); extern boolean parse_status_color_options(char *); extern void free_status_colors(void); #endif +extern void set_playmode(void); /* ### pager.c ### */ @@ -3283,4 +3284,4 @@ extern int pututf8char(glyph_t); #undef E -#endif /* EXTERN_H */ +#endif /* EXTERN_H */ \ No newline at end of file diff --git a/include/hack.h b/include/hack.h index 9383790a5..ce410bd5a 100644 --- a/include/hack.h +++ b/include/hack.h @@ -138,6 +138,29 @@ enum cost_alteration_types { #define LOOKHERE_PICKED_SOME 1 #define LOOKHERE_SKIP_DFEATURE 2 +enum earlyarg { + ARG_DEBUG, ARG_VERSION, ARG_SHOWPATHS +#ifndef NODUMPENUMS + , ARG_DUMPENUMS +#endif + , ARG_DUMPGLYPHIDS + , ARG_DUMPMONGEN + , ARG_DUMPWEIGHTS +#ifdef WIN32 + , ARG_WINDOWS +#endif +#if defined(CRASHREPORT) + , ARG_BIDSHOW +#endif +}; + +struct early_opt { + enum earlyarg e; + const char *name; + int minlength; + boolean valallowed; +}; + /* game events log */ struct gamelog_line { long turn; /* turn when this happened */ diff --git a/src/allmain.c b/src/allmain.c index e2fca2838..821701aff 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -1123,4 +1123,95 @@ interrupt_multi(const char *points, int current_points, int max_points) } } -/*allmain.c*/ +/* + * Argument processing helpers - for xxmain() to share + * and call. + * + * These should return TRUE if the argument matched, + * whether the processing of the argument was + * successful or not. + * + * Most of these do their thing, then after returning + * to xxmain(), the code exits without starting a game. + * + */ + +static const struct early_opt earlyopts[] = { + { ARG_DEBUG, "debug", 5, TRUE }, + { ARG_VERSION, "version", 4, TRUE }, + { ARG_SHOWPATHS, "showpaths", 8, FALSE }, +#ifndef NODUMPENUMS + { ARG_DUMPENUMS, "dumpenums", 9, FALSE }, +#endif + { ARG_DUMPGLYPHIDS, "dumpglyphids", 12, FALSE }, + { ARG_DUMPMONGEN, "dumpmongen", 10, FALSE }, + { ARG_DUMPWEIGHTS, "dumpweights", 11, FALSE }, +#ifdef WIN32 + { ARG_WINDOWS, "windows", 4, TRUE }, +#endif +#if defined(CRASHREPORT) + { ARG_BIDSHOW, "bidshow", 7, FALSE }, +#endif +}; + +#ifdef WIN32 +extern int windows_early_options(const char *); +#endif + +/* + * Returns: + * 0 = no match + * 1 = found and skip past this argument + * 2 = found and trigger immediate exit + */ +int +argcheck(int argc, char *argv[], enum earlyarg e_arg) +{ + int i, idx; + boolean match = FALSE; + char *userea = (char *) 0; + const char *dashdash = ""; + + for (idx = 0; idx < SIZE(earlyopts); idx++) { + if (earlyopts[idx].e == e_arg) { + break; + } + } + if (idx >= SIZE(earlyopts) || argc < 1) + return 0; + + for (i = 0; i < argc; ++i) { + if (argv[i][0] != '-') + continue; + if (argv[i][1] == '-') { + userea = &argv[i][2]; + dashdash = "-"; + } else { + userea = &argv[i][1]; + } + match = match_optname(userea, earlyopts[idx].name, + earlyopts[idx].minlength, + earlyopts[idx].valallowed); + if (match) { + break; + } + } + + if (match) { + const char *extended_opt = strchr(userea, ':'); + + if (!extended_opt) { + extended_opt = strchr(userea, '='); + } + switch(e_arg) { + case ARG_SHOWPATHS: + return 2; + + default: + break; + } + }; + return 0; +} + +/*allmain.c*/ \ No newline at end of file diff --git a/src/files.c b/src/files.c index 4a5115394..d2d361b54 100644 --- a/src/files.c +++ b/src/files.c @@ -50,7 +50,9 @@ extern int errno; /* ALI: For compatibility */ #ifndef FILE_AREAS #define compress(file) compress_area(NULL, file) +#define nh_compress(file) compress_area(NULL, file) #define uncompress(file) uncompress_area(NULL, file) +#define nh_uncompress(file) uncompress_area(NULL, file) #endif #if defined(MSDOS) || defined(OS2) || defined(TOS) || defined(WIN32) @@ -3193,4 +3195,4 @@ assure_syscf_file(void) # endif /* SYSCF_FILE */ #endif /* SYSCF */ -/*files.c*/ +/*files.c*/ \ No newline at end of file diff --git a/src/options.c b/src/options.c index cd69d2def..4bec1b240 100644 --- a/src/options.c +++ b/src/options.c @@ -6552,6 +6552,16 @@ wc_set_window_colors(char *op) return 1; } +/* set up for wizard mode if player or save file has requested it; + called from port-specific startup code to handle `nethack -D' or + OPTIONS=playmode:debug, or from dorecover()'s restgamestate() if + restoring a game which was saved in wizard mode */ +void +set_playmode(void) +{ + // TODO porting +} + #endif /* OPTION_LISTS_ONLY */ -/*options.c*/ +/*options.c*/ \ No newline at end of file diff --git a/src/version.c b/src/version.c index 4c42a49d3..9c1ab5935 100644 --- a/src/version.c +++ b/src/version.c @@ -220,4 +220,31 @@ get_current_feature_ver(void) return FEATURE_NOTICE_VER(VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL); } -/*version.c*/ +/*ARGUSED*/ +const char * +copyright_banner_line(int indx) +{ +#ifdef COPYRIGHT_BANNER_A + if (indx == 1) { + return COPYRIGHT_BANNER_A; + } +#endif +#ifdef COPYRIGHT_BANNER_B + if (indx == 2) { + return COPYRIGHT_BANNER_B; + } +#endif + + if (indx == 3) { + return COPYRIGHT_BANNER_C; + } + +#ifdef COPYRIGHT_BANNER_D + if (indx == 4) { + return COPYRIGHT_BANNER_D; + } +#endif + return ""; +} + +/*version.c*/ \ No newline at end of file diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c index 9663a7a68..d14507212 100644 --- a/sys/share/pcmain.c +++ b/sys/share/pcmain.c @@ -1,4 +1,3 @@ -/* SCCS Id: @(#)pcmain.c 3.4 2002/08/22 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -93,292 +92,377 @@ pcmain(argc,argv) int argc; char *argv[]; { - - int fd; - char *dir; -#if defined(WIN32) - char fnamebuf[BUFSZ], encodedfnamebuf[BUFSZ]; + NHFILE *nhfp; + char *dir; +#if defined(MSDOS) + char *envp = NULL; + char *sptr = NULL; #endif #ifdef NOCWD_ASSUMPTIONS - char failbuf[BUFSZ]; + char failbuf[BUFSZ]; #endif boolean resuming = FALSE; /* assume new game */ -#if defined(__BORLANDC__) && !defined(_WIN32) - startup(); +#ifdef _MSC_VER +# ifdef DEBUG + /* set these appropriately for VS debugging */ + _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG); + _CrtSetReportMode(_CRT_ERROR, + _CRTDBG_MODE_DEBUG); /* | _CRTDBG_MODE_FILE);*/ + _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG); +/*| _CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW);*/ +/* use STDERR by default +_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); +_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/ +/* Heap Debugging + _CrtSetDbgFlag( _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) + | _CRTDBG_ALLOC_MEM_DF + | _CRTDBG_CHECK_ALWAYS_DF + | _CRTDBG_CHECK_CRT_DF + | _CRTDBG_DELAY_FREE_MEM_DF + | _CRTDBG_LEAK_CHECK_DF); + _CrtSetBreakAlloc(1423); +*/ +# endif +#endif + +#if defined(__BORLANDC__) + startup(); #endif #ifdef TOS - long clock_time; - if (*argv[0]) { /* only a CLI can give us argv[0] */ - hname = argv[0]; - run_from_desktop = FALSE; - } else + long clock_time; + if (*argv[0]) { /* only a CLI can give us argv[0] */ + hname = argv[0]; + run_from_desktop = FALSE; + } else #endif - hname = "UnNetHack"; /* used for syntax messages */ + hname = "UnNetHack"; /* used for syntax messages */ - choose_windows(DEFAULT_WINDOW_SYS); + choose_windows(DEFAULT_WINDOW_SYS); #if !defined(AMIGA) && !defined(GNUDOS) - /* Save current directory and make sure it gets restored when - * the game is exited. - */ - if (getcwd(orgdir, sizeof orgdir) == (char *)0) - error("UnNetHack: current directory path too long"); -# ifndef NO_SIGNAL - signal(SIGINT, (SIG_RET_TYPE) nethack_exit); /* restore original directory */ -# endif + /* Save current directory and make sure it gets restored when + * the game is exited. + */ + if (getcwd(orgdir, sizeof orgdir) == (char *) 0) + error("UnNetHack: current directory path too long"); +#ifndef NO_SIGNAL + signal(SIGINT, + (SIG_RET_TYPE) nethack_exit); /* restore original directory */ +#endif #endif /* !AMIGA && !GNUDOS */ - dir = nh_getenv("NETHACKDIR"); - if (dir == (char *)0) - dir = nh_getenv("HACKDIR"); + dir = nh_getenv("NETHACKDIR"); + if (dir == (char *) 0) + dir = nh_getenv("HACKDIR"); #ifdef EXEPATH - if (dir == (char *)0) - dir = exepath(argv[0]); + if (dir == (char *) 0) + dir = exepath(argv[0]); +#endif +#ifdef _MSC_VER + if (IsDebuggerPresent()) { + static char exepath[_MAX_PATH]; + /* check if we're running under the debugger so we can get to the right folder anyway */ + if (dir != (char *)0) { + char *top = (char *)0; + + if (strlen(dir) < (_MAX_PATH - 1)) + strcpy(exepath, dir); + top = strstr(exepath, "\\build\\.\\Debug"); + if (!top) top = strstr(exepath, "\\build\\.\\Release"); + if (top) { + *top = '\0'; + if (strlen(exepath) < (_MAX_PATH - (strlen("\\binary\\") + 1))) { + Strcat(exepath, "\\binary\\"); + if (strlen(exepath) < (PATHLEN - 1)) { + dir = exepath; + } + } + } + } + } #endif - if (dir != (char *)0) { - (void) strncpy(hackdir, dir, PATHLEN - 1); - hackdir[PATHLEN-1] = '\0'; + if (dir != (char *)0) { + int fd; + boolean have_syscf = FALSE; + + (void) strncpy(hackdir, dir, PATHLEN - 1); + hackdir[PATHLEN - 1] = '\0'; #ifdef NOCWD_ASSUMPTIONS - { - int prefcnt; + { + int prefcnt; + + fqn_prefix[0] = (char *) alloc(strlen(hackdir) + 2); + Strcpy(fqn_prefix[0], hackdir); + append_slash(fqn_prefix[0]); + for (prefcnt = 1; prefcnt < PREFIX_COUNT; prefcnt++) { + fqn_prefix[prefcnt] = fqn_prefix[0]; + } + +#if defined(MSDOS) + /* sysconf should be searched for in this location */ + envp = nh_getenv("COMMONPROGRAMFILES"); + if (envp) { + if ((sptr = strchr(envp, ';')) != 0) { + *sptr = '\0'; + } + if (strlen(envp) > 0) { + fqn_prefix[SYSCONFPREFIX] = + (char *) alloc(strlen(envp) + 10); + Strcpy(gf.fqn_prefix[SYSCONFPREFIX], envp); + append_slash(gf.fqn_prefix[SYSCONFPREFIX]); + Strcat(gf.fqn_prefix[SYSCONFPREFIX], "UnNetHack\\"); + } + } + + /* okay so we have the overriding and definitive location + for sysconf, but only in the event that there is not a + sysconf file there (for whatever reason), check a secondary + location rather than abort. */ + + /* Is there a SYSCF_FILE there? */ + fd = open(fqname(SYSCF_FILE, SYSCONFPREFIX, 0), O_RDONLY); + if (fd >= 0) { + /* readable */ + close(fd); + have_syscf = TRUE; + } + + if (!have_syscf) { + /* No SYSCF_FILE where there should be one, and + without an installer, a user may not be able + to place one there. So, let's try somewhere else... */ + fqn_prefix[SYSCONFPREFIX] = fqn_prefix[0]; + + /* Is there a SYSCF_FILE there? */ + fd = open(fqname(SYSCF_FILE, SYSCONFPREFIX, 0), O_RDONLY); + if (fd >= 0) { + /* readable */ + close(fd); + have_syscf = TRUE; + } + } - fqn_prefix[0] = (char *)alloc(strlen(hackdir)+2); - Strcpy(fqn_prefix[0], hackdir); - append_slash(fqn_prefix[0]); - for (prefcnt = 1; prefcnt < PREFIX_COUNT; prefcnt++) - fqn_prefix[prefcnt] = fqn_prefix[0]; - } + /* user's home directory should default to this - unless + * overridden */ + envp = nh_getenv("USERPROFILE"); + if (envp) { + if ((sptr = strchr(envp, ';')) != 0) + *sptr = '\0'; + if (strlen(envp) > 0) { + gf.fqn_prefix[CONFIGPREFIX] = + (char *) alloc(strlen(envp) + 2); + Strcpy(gf.fqn_prefix[CONFIGPREFIX], envp); + append_slash(gf.fqn_prefix[CONFIGPREFIX]); + } + } #endif -#ifdef CHDIR - chdirx (dir, 1); + } +#endif +#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS) + chdirx(dir, 1); #endif - } + } #ifdef AMIGA -# ifdef CHDIR - /* - * If we're dealing with workbench, change the directory. Otherwise - * we could get "Insert disk in drive 0" messages. (Must be done - * before initoptions()).... - */ - if(argc == 0) - chdirx(HACKDIR, 1); -# endif - ami_wininit_data(); +#ifdef CHDIR + /* + * If we're dealing with workbench, change the directory. Otherwise + * we could get "Insert disk in drive 0" messages. (Must be done + * before initoptions()).... + */ + if (argc == 0) + chdirx(HACKDIR, 1); +#endif + ami_wininit_data(WININIT); #endif - initoptions(); + initoptions(); #ifdef NOCWD_ASSUMPTIONS - if (!validate_prefix_locations(failbuf)) { - raw_printf("Some invalid directory locations were specified:\n\t%s\n", - failbuf); - nethack_exit(EXIT_FAILURE); - } + if (!validate_prefix_locations(failbuf)) { + raw_printf("Some invalid directory locations were specified:\n\t%s\n", + failbuf); + nethack_exit(EXIT_FAILURE); + } #endif -#if defined(TOS) && defined(TEXTCOLOR) - if (iflags.BIOS && iflags.use_color) - set_colors(); +#if defined(TOS) + if (iflags.BIOS && iflags.use_color) + set_colors(); #endif - if (!hackdir[0]) + if (!hackdir[0]) #if !defined(LATTICE) && !defined(AMIGA) - Strcpy(hackdir, orgdir); + Strcpy(hackdir, orgdir); #else - Strcpy(hackdir, HACKDIR); -#endif - if(argc > 1) { - if (!strncmp(argv[1], "-d", 2) && argv[1][2] != 'e') { - /* avoid matching "-dec" for DECgraphics; since the man page - * says -d directory, hope nobody's using -desomething_else - */ - argc--; - argv++; - dir = argv[0]+2; - if(*dir == '=' || *dir == ':') dir++; - if(!*dir && argc > 1) { - argc--; - argv++; - dir = argv[0]; - } - if(!*dir) - error("Flag -d must be followed by a directory name."); - Strcpy(hackdir, dir); - } - if (argc > 1) { - - /* - * Now we know the directory containing 'record' and - * may do a prscore(). - */ - if (!strncmp(argv[1], "-s", 2)) { -#if !defined(MSWIN_GRAPHICS) -# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS) - chdirx(hackdir,0); -# endif - prscore(argc, argv); -#else - raw_printf("-s is not supported for the Graphical Interface\n"); -#endif /*MSWIN_GRAPHICS*/ - nethack_exit(EXIT_SUCCESS); - } - -#ifdef MSWIN_GRAPHICS - if (!strncmpi(argv[1], "-clearreg", 6)) { /* clear registry */ - mswin_destroy_reg(); - nethack_exit(EXIT_SUCCESS); - } -#endif - /* Don't initialize the window system just to print usage */ - if (!strncmp(argv[1], "-?", 2) || !strncmp(argv[1], "/?", 2)) { - nhusage(); - nethack_exit(EXIT_SUCCESS); - } - } - } - - /* - * It seems you really want to play. - */ -#ifdef TOS - if (comp_times((long)time(&clock_time))) - error("Your clock is incorrectly set!"); + Strcpy(hackdir, HACKDIR); #endif - u.uhp = 1; /* prevent RIP on early quits */ - u.ux = 0; /* prevent flush_screen() */ + if (argc > 1) { + if (argcheck(argc, argv, ARG_VERSION) == 2) + nethack_exit(EXIT_SUCCESS); + + if (argcheck(argc, argv, ARG_DEBUG) == 1) { + argc--; + argv++; + } - /* chdir shouldn't be called before this point to keep the - * code parallel to other ports. - */ + if (argc > 1 && !strncmp(argv[1], "-d", 2) && argv[1][2] != 'e') { + /* avoid matching "-dec" for DECgraphics; since the man page + * says -d directory, hope nobody's using -desomething_else + */ + argc--; + argv++; + dir = argv[0] + 2; + if (*dir == '=' || *dir == ':') + dir++; + if (!*dir && argc > 1) { + argc--; + argv++; + dir = argv[0]; + } + if (!*dir) + error("Flag -d must be followed by a directory name."); + Strcpy(hackdir, dir); + } + if (argc > 1) { + /* + * Now we know the directory containing 'record' and + * may do a prscore(). + */ + if (!strncmp(argv[1], "-s", 2)) { #if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS) - chdirx(hackdir,1); + chdirx(hackdir, 0); #endif +#ifdef SYSCF + initoptions(); +#endif + prscore(argc, argv); + nethack_exit(EXIT_SUCCESS); + } -#ifdef MSDOS - process_options(argc, argv); - init_nhwindows(&argc,argv); -#else - init_nhwindows(&argc,argv); - process_options(argc, argv); + /* Don't initialize the window system just to print usage */ + if (!strncmp(argv[1], "-?", 2) || !strncmp(argv[1], "/?", 2)) { + nhusage(); + nethack_exit(EXIT_SUCCESS); + } + } + } +/* + * It seems you really want to play. + */ +#ifdef TOS + if (comp_times((long) time(&clock_time))) + error("Your clock is incorrectly set!"); +#endif + if (!dlb_init()) { + pline( + "%s\n%s\n%s\n%s\n\nNetHack was unable to open the required file " + "\"%s\".%s", + copyright_banner_line(1), copyright_banner_line(2), + copyright_banner_line(3), copyright_banner_line(4), DLBFILE, + ""); + error("dlb_init failure."); + } + + u.uhp = 1; /* prevent RIP on early quits */ + u.ux = 0; /* prevent flush_screen() */ + +/* chdir shouldn't be called before this point to keep the + * code parallel to other ports. + */ +#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS) + chdirx(hackdir, 1); #endif -#ifdef WIN32CON - toggle_mouse_support(); /* must come after process_options */ +#if defined(MSDOS) + /* In 3.6.0, several ports process options before they init + * the window port. This allows settings that impact window + * ports to be specified or read from the sys or user config files. + */ + process_options(argc, argv); + +#endif /* MSDOS */ + +#if defined(MSDOS) + init_nhwindows(&argc, argv); +#else + init_nhwindows(&argc, argv); + process_options(argc, argv); +#endif + + /* strip role,race,&c suffix; calls askname() if plname[] is empty + or holds a generic user name like "player" or "games" */ + plnamesuffix(); + set_playmode(); /* sets plname to "wizard" for wizard mode */ +#if 0 + /* unlike Unix where the game might be invoked with a script + which forces a particular character name for each player + using a shared account, we always allow player to rename + the character during role/race/&c selection */ + iflags.renameallowed = TRUE; +#else + /* until the getlock code is resolved, override askname()'s + setting of renameallowed; when False, player_selection() + won't resent renaming as an option */ + iflags.renameallowed = FALSE; #endif - if (!*plname) - askname(); - plnamesuffix(); /* strip suffix from name; calls askname() */ - /* again if suffix was whole name */ - /* accepts any suffix */ -#ifdef WIZARD - if (wizard) { -# ifdef KR1ED - if(!strcmp(plname, WIZARD_NAME)) -# else - if(!strcmp(plname, WIZARD)) -# endif - Strcpy(plname, "wizard"); - else { - wizard = FALSE; - discover = TRUE; - } - } -#endif /* WIZARD */ #if defined(PC_LOCKING) - /* 3.3.0 added this to support detection of multiple games - * under the same plname on the same machine in a windowed - * or multitasking environment. - * - * That allows user confirmation prior to overwriting the - * level files of a game in progress. - * - * Also prevents an aborted game's level files from being - * overwritten without confirmation when a user starts up - * another game with the same player name. - */ -# if defined(WIN32) - /* Obtain the name of the logged on user and incorporate - * it into the name. */ - Sprintf(fnamebuf, "%s-%s", get_username(0), plname); - (void)fname_encode("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-.", - '%', fnamebuf, encodedfnamebuf, BUFSZ); - Sprintf(lock, "%s",encodedfnamebuf); - /* regularize(lock); */ /* we encode now, rather than substitute */ -# else - Strcpy(lock,plname); - regularize(lock); -# endif - getlock(); -#else /* What follows is !PC_LOCKING */ -# ifdef AMIGA /* We'll put the bones & levels in the user specified directory -jhsa */ - Strcat(lock,plname); - Strcat(lock,".99"); -# else -# ifndef MFLOPPY - /* I'm not sure what, if anything, is left here, but MFLOPPY has - * conflicts with set_lock_and_bones() in files.c. - */ - Strcpy(lock,plname); - Strcat(lock,".99"); - regularize(lock); /* is this necessary? */ - /* not compatible with full path a la AMIGA */ -# endif -# endif -#endif /* PC_LOCKING */ - - /* Set up level 0 file to keep the game state. - */ - fd = create_levelfile(0, (char *)0); - if (fd < 0) { - raw_print("Cannot create lock file"); - } else { -#ifdef WIN32 - hackpid = GetCurrentProcessId(); +/* 3.3.0 added this to support detection of multiple games + * under the same plname on the same machine in a windowed + * or multitasking environment. + * + * That allows user confirmation prior to overwriting the + * level files of a game in progress. + * + * Also prevents an aborted game's level files from being + * overwritten without confirmation when a user starts up + * another game with the same player name. + */ + Strcpy(lock, plname); + regularize(lock); + getlock(); +#else /* What follows is !PC_LOCKING */ +#ifdef AMIGA /* We'll put the bones & levels in the user specified directory \ + -jhsa */ + Strcat(gl.lock, svp.plname); + Strcat(gl.lock, ".99"); #else - hackpid = 1; -#endif - write(fd, (genericptr_t) &hackpid, sizeof(hackpid)); - close(fd); - } -#ifdef MFLOPPY - level_info[0].where = ACTIVE; + /* I'm not sure what, if anything, is left here, but old MFLOPPY had + * conflicts with set_lock_and_bones() in files.c. + */ + Strcpy(gl.lock, svp.plname); + Strcat(gl.lock, ".99"); + regularize(gl.lock); /* is this necessary? */ + /* not compatible with full path a la AMIGA */ #endif +#endif /* PC_LOCKING */ - /* - * Initialisation of the boundaries of the mazes - * Both boundaries have to be even. - */ - - x_maze_max = COLNO-1; - if (x_maze_max % 2) - x_maze_max--; - y_maze_max = ROWNO-1; - if (y_maze_max % 2) - y_maze_max--; - - /* - * Initialize the vision system. This must be before mklev() on a - * new game or before a level restore on a saved game. - */ - vision_init(); - - dlb_init(); + /* Set up level 0 file to keep the game state. + */ + nhfp = create_levelfile(0, (char *) 0); + if (!nhfp) { + raw_print("Cannot create lock file"); + } else { + hackpid = 1; + if (nhfp->structlevel) + write(nhfp->fd, (genericptr_t) &hackpid, sizeof(hackpid)); + close_nhfile(nhfp); + } - display_gamewindows(); -#ifdef WIN32 - getreturn_enabled = TRUE; -#endif + /* + * Initialize the vision system. This must be before mklev() on a + * new game or before a level restore on a saved game. + */ + vision_init(); - if ((fd = restore_saved_game()) >= 0) { -#ifdef WIZARD - /* Since wizard is actually flags.debug, restoring might - * overwrite it. - */ - boolean remember_wiz_mode = wizard; -#endif +/* + * First, try to find and restore a save file for specified character. + * We'll return here if new game player_selection() renames the hero. + */ +attempt_restore: + if ((nhfp = restore_saved_game()) != 0) { #ifndef NO_SIGNAL - (void) signal(SIGINT, (SIG_RET_TYPE) done1); + (void) signal(SIGINT, (SIG_RET_TYPE) done1); #endif #ifdef NEWS if (iflags.news) { @@ -386,46 +470,52 @@ char *argv[]; iflags.news = FALSE; } #endif - pline("Restoring save file..."); - mark_synch(); /* flush output */ + pline("Restoring save file..."); + mark_synch(); /* flush output */ - if(!dorecover(fd)) - goto not_recovered; -#ifdef WIZARD - if(!wizard && remember_wiz_mode) wizard = TRUE; -#endif - check_special_room(FALSE); - if (discover) - You("are in non-scoring discovery mode."); - - if (discover || wizard) { - if (yn("Do you want to keep the save file?") == 'n') { - (void) delete_savefile(); + if (dorecover(nhfp)) { + resuming = TRUE; /* not starting new game */ + if (discover) { + You("are in non-scoring discovery mode."); + } + if (discover || wizard) { + if (yn("Do you want to keep the save file?") == 'n') { + (void) delete_savefile(); + } } } - - flags.move = 0; - resuming = TRUE; - } else { -not_recovered: - player_selection(); - newgame(); - if (discover) - You("are in non-scoring discovery mode."); - - flags.move = 0; - set_wear(); - (void) pickup(1); - read_engr_at(u.ux,u.uy); - } + } + + if (!resuming) { + /* new game: start by choosing role, race, etc; + player might change the hero's name while doing that, + in which case we try to restore under the new name + and skip selection this time if that didn't succeed */ + if (!iflags.renameinprogress) { + player_selection(); + if (iflags.renameinprogress) { +/* player has renamed the hero while selecting role; + discard current lock file and create another for + the new character name */ +#if 0 /* this needs to be reconciled with the getlock mess above... */ + delete_levelfile(0); /* remove empty lock file */ + getlock(); +#endif + goto attempt_restore; + } + } + newgame(); + if (discover) + You("are in non-scoring discovery mode."); + } #ifndef NO_SIGNAL - (void) signal(SIGINT, SIG_IGN); + (void) signal(SIGINT, SIG_IGN); #endif #ifdef OS2 - gettty(); /* somehow ctrl-P gets turned back on during startup ... */ + gettty(); /* somehow ctrl-P gets turned back on during startup ... */ #endif - return resuming; + return resuming; } static void @@ -442,164 +532,164 @@ char *argv[]; argv++; argc--; switch (argv[0][1]) { - case 'a': - if (argv[0][2]) { - if ((i = str2align(&argv[0][2])) >= 0) - flags.initalign = i; - } else if (argc > 1) { - argc--; - argv++; - if ((i = str2align(argv[0])) >= 0) - flags.initalign = i; - } - break; - case 'D': + case 'a': + if (argv[0][2]) { + if ((i = str2align(&argv[0][2])) >= 0) + flags.initalign = i; + } else if (argc > 1) { + argc--; + argv++; + if ((i = str2align(argv[0])) >= 0) + flags.initalign = i; + } + break; + case 'D': #ifdef WIZARD - /* If they don't have a valid wizard name, it'll be - * changed to discover later. Cannot check for - * validity of the name right now--it might have a - * character class suffix, for instance. - */ - wizard = TRUE; - break; -#endif - case 'X': - discover = TRUE; - break; + /* If they don't have a valid wizard name, it'll be + * changed to discover later. Cannot check for + * validity of the name right now--it might have a + * character class suffix, for instance. + */ + wizard = TRUE; + break; +#endif + case 'X': + discover = TRUE; + break; #ifdef NEWS - case 'n': - iflags.news = FALSE; - break; -#endif - case 'u': - if(argv[0][2]) - (void) strncpy(plname, argv[0]+2, sizeof(plname)-1); - else if(argc > 1) { - argc--; - argv++; - (void) strncpy(plname, argv[0], sizeof(plname)-1); - } else - raw_print("Player name expected after -u"); - break; + case 'n': + iflags.news = FALSE; + break; +#endif + case 'u': + if(argv[0][2]) + (void) strncpy(plname, argv[0]+2, sizeof(plname)-1); + else if(argc > 1) { + argc--; + argv++; + (void) strncpy(plname, argv[0], sizeof(plname)-1); + } else + raw_print("Player name expected after -u"); + break; #ifndef AMIGA - case 'I': - case 'i': - if (!strncmpi(argv[0]+1, "IBM", 3)) - switch_graphics(IBM_GRAPHICS); - break; - /* case 'D': */ - case 'd': - if (!strncmpi(argv[0]+1, "DEC", 3)) - switch_graphics(DEC_GRAPHICS); - break; -#endif - case 'g': - if (argv[0][2]) { - if ((i = str2gend(&argv[0][2])) >= 0) - flags.initgend = i; - } else if (argc > 1) { - argc--; - argv++; - if ((i = str2gend(argv[0])) >= 0) - flags.initgend = i; - } - break; - case 'p': /* profession (role) */ - if (argv[0][2]) { - if ((i = str2role(&argv[0][2])) >= 0) - flags.initrole = i; - } else if (argc > 1) { - argc--; - argv++; - if ((i = str2role(argv[0])) >= 0) - flags.initrole = i; - } - break; - case 'r': /* race */ - if (argv[0][2]) { - if ((i = str2race(&argv[0][2])) >= 0) - flags.initrace = i; - } else if (argc > 1) { - argc--; - argv++; - if ((i = str2race(argv[0])) >= 0) - flags.initrace = i; - } - break; + case 'I': + case 'i': + if (!strncmpi(argv[0]+1, "IBM", 3)) + switch_graphics(IBM_GRAPHICS); + break; + /* case 'D': */ + case 'd': + if (!strncmpi(argv[0]+1, "DEC", 3)) + switch_graphics(DEC_GRAPHICS); + break; +#endif + case 'g': + if (argv[0][2]) { + if ((i = str2gend(&argv[0][2])) >= 0) + flags.initgend = i; + } else if (argc > 1) { + argc--; + argv++; + if ((i = str2gend(argv[0])) >= 0) + flags.initgend = i; + } + break; + case 'p': /* profession (role) */ + if (argv[0][2]) { + if ((i = str2role(&argv[0][2])) >= 0) + flags.initrole = i; + } else if (argc > 1) { + argc--; + argv++; + if ((i = str2role(argv[0])) >= 0) + flags.initrole = i; + } + break; + case 'r': /* race */ + if (argv[0][2]) { + if ((i = str2race(&argv[0][2])) >= 0) + flags.initrace = i; + } else if (argc > 1) { + argc--; + argv++; + if ((i = str2race(argv[0])) >= 0) + flags.initrace = i; + } + break; #ifdef MFLOPPY # ifndef AMIGA - /* Player doesn't want to use a RAM disk - */ - case 'R': - ramdisk = FALSE; - break; + /* Player doesn't want to use a RAM disk + */ + case 'R': + ramdisk = FALSE; + break; # endif #endif #ifdef AMIGA - /* interlaced and non-interlaced screens */ - case 'L': - bigscreen = 1; - break; - case 'l': - bigscreen = -1; - break; -#endif - case '@': - flags.randomall = 1; - break; - default: - if ((i = str2role(&argv[0][1])) >= 0) { - flags.initrole = i; - break; - } else raw_printf("\nUnknown switch: %s", argv[0]); - /* FALL THROUGH */ - case '?': - nhusage(); - nethack_exit(EXIT_SUCCESS); - } - } + /* interlaced and non-interlaced screens */ + case 'L': + bigscreen = 1; + break; + case 'l': + bigscreen = -1; + break; +#endif + case '@': + flags.randomall = 1; + break; + default: + if ((i = str2role(&argv[0][1])) >= 0) { + flags.initrole = i; + break; + } else raw_printf("\nUnknown switch: %s", argv[0]); + /* FALL THROUGH */ + case '?': + nhusage(); + nethack_exit(EXIT_SUCCESS); + } + } } static void nhusage() { - char buf1[BUFSZ], buf2[BUFSZ], *bufptr; + char buf1[BUFSZ], buf2[BUFSZ], *bufptr; - buf1[0] = '\0'; - bufptr = buf1; + buf1[0] = '\0'; + bufptr = buf1; #define ADD_USAGE(s) if ((strlen(buf1) + strlen(s)) < (BUFSZ - 1)) Strcat(bufptr, s); - /* -role still works for those cases which aren't already taken, but - * is deprecated and will not be listed here. - */ - (void) Sprintf(buf2, + /* -role still works for those cases which aren't already taken, but + * is deprecated and will not be listed here. + */ + (void) Sprintf(buf2, "\nUsage:\n%s [-d dir] -s [-r race] [-p profession] [maxrank] [name]...\n or", - hname); - ADD_USAGE(buf2); + hname); + ADD_USAGE(buf2); - (void) Sprintf(buf2, - "\n%s [-d dir] [-u name] [-r race] [-p profession] [-[DX]]", - hname); - ADD_USAGE(buf2); + (void) Sprintf(buf2, + "\n%s [-d dir] [-u name] [-r race] [-p profession] [-[DX]]", + hname); + ADD_USAGE(buf2); #ifdef NEWS - ADD_USAGE(" [-n]"); + ADD_USAGE(" [-n]"); #endif #ifndef AMIGA - ADD_USAGE(" [-I] [-i] [-d]"); + ADD_USAGE(" [-I] [-i] [-d]"); #endif #ifdef MFLOPPY # ifndef AMIGA - ADD_USAGE(" [-R]"); + ADD_USAGE(" [-R]"); # endif #endif #ifdef AMIGA - ADD_USAGE(" [-[lL]]"); + ADD_USAGE(" [-[lL]]"); #endif - if (!iflags.window_inited) - raw_printf("%s\n",buf1); - else - (void) printf("%s\n",buf1); + if (!iflags.window_inited) + raw_printf("%s\n",buf1); + else + (void) printf("%s\n",buf1); #undef ADD_USAGE } @@ -610,24 +700,24 @@ char *dir; boolean wr; { # ifdef AMIGA - static char thisdir[] = ""; + static char thisdir[] = ""; # else - static char thisdir[] = "."; + static char thisdir[] = "."; # endif - if(dir && chdir(dir) < 0) { - error("Cannot chdir to %s.", dir); - } + if(dir && chdir(dir) < 0) { + error("Cannot chdir to %s.", dir); + } # ifndef AMIGA - /* Change the default drive as well. - */ - chdrive(dir); + /* Change the default drive as well. + */ + chdrive(dir); # endif - /* warn the player if we can't write the record file */ - /* perhaps we should also test whether . is writable */ - /* unfortunately the access system-call is worthless */ - if (wr) check_recordfile(dir ? dir : thisdir); + /* warn the player if we can't write the record file */ + /* perhaps we should also test whether . is writable */ + /* unfortunately the access system-call is worthless */ + if (wr) check_recordfile(dir ? dir : thisdir); } #endif /* CHDIR */ @@ -655,28 +745,28 @@ char exepathbuf[EXEPATHBUFSZ]; char *exepath(str) char *str; { - char *tmp, *tmp2; - int bsize; + char *tmp, *tmp2; + int bsize; - if (!str) return (char *)0; - bsize = EXEPATHBUFSZ; - tmp = exepathbuf; + if (!str) return (char *)0; + bsize = EXEPATHBUFSZ; + tmp = exepathbuf; # ifndef WIN32 - Strcpy (tmp, str); + Strcpy (tmp, str); # else - #ifdef UNICODE - { - TCHAR wbuf[BUFSZ]; - GetModuleFileName((HANDLE)0, wbuf, BUFSZ); - WideCharToMultiByte(CP_ACP, 0, wbuf, -1, tmp, bsize, NULL, NULL); - } - #else - *(tmp + GetModuleFileName((HANDLE)0, tmp, bsize)) = '\0'; - #endif + #ifdef UNICODE + { + TCHAR wbuf[BUFSZ]; + GetModuleFileName((HANDLE)0, wbuf, BUFSZ); + WideCharToMultiByte(CP_ACP, 0, wbuf, -1, tmp, bsize, NULL, NULL); + } + #else + *(tmp + GetModuleFileName((HANDLE)0, tmp, bsize)) = '\0'; + #endif # endif - tmp2 = strrchr(tmp, PATH_SEPARATOR); - if (tmp2) *tmp2 = '\0'; - return tmp; + tmp2 = strrchr(tmp, PATH_SEPARATOR); + if (tmp2) *tmp2 = '\0'; + return tmp; } #endif /* EXEPATH */ -/*pcmain.c*/ +/*pcmain.c*/ \ No newline at end of file From a36f418d0ad75a1da97411ffbcba21a4aeea8a96 Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Sun, 6 Apr 2025 13:11:30 +0200 Subject: [PATCH 4/8] change references from winnt to windows --- include/global.h | 4 +- include/{ntconf.h => windconf.h} | 7 +- sys/autoconf/Makefile.src | 4 +- sys/unix/Makefile.src | 4 +- sys/unsupported/vms/Makefile.src | 4 +- sys/unsupported/wince/bootstrp.mak | 29 +- sys/{winnt => windows}/Install.nt | 88 +- sys/{winnt => windows}/Makefile.bcc | 99 +- sys/{winnt => windows}/Makefile.gcc | 14 +- sys/{winnt => windows}/Makefile.msc | 118 +- sys/{winnt => windows}/console.rc | 0 sys/{winnt => windows}/cursmake.gcc | 18 +- sys/{winnt => windows}/defaults.nh | 0 sys/{winnt => windows}/mapimail.c | 0 sys/{winnt => windows}/nethack.def | 0 sys/{winnt => windows}/nh340key.c | 0 sys/{winnt => windows}/nhdefkey.c | 0 sys/{winnt => windows}/nhico.uu | 0 sys/{winnt => windows}/nhraykey.c | 0 sys/{winnt => windows}/nhsetup.bat | 0 sys/{winnt => windows}/ntsound.c | 0 sys/{winnt => windows}/nttty.c | 0 sys/{winnt => windows}/porthelp | 0 sys/{winnt => windows}/win32api.h | 0 sys/{winnt => windows}/winnt.c | 0 win/win32/dgncomp.dsp | 594 +++---- win/win32/dgnstuff.dsp | 194 +-- win/win32/dlb_main.dsp | 358 ++--- win/win32/levcomp.dsp | 396 ++--- win/win32/levstuff.dsp | 194 +-- win/win32/makedefs.dsp | 396 ++--- win/win32/nethackw.dsp | 2214 +++++++++++++-------------- win/win32/recover.dsp | 296 ++-- win/win32/tile2bmp.dsp | 292 ++-- win/win32/tilemap.dsp | 562 +++---- win/win32/tiles.dsp | 194 +-- 36 files changed, 3038 insertions(+), 3041 deletions(-) rename include/{ntconf.h => windconf.h} (98%) rename sys/{winnt => windows}/Install.nt (95%) rename sys/{winnt => windows}/Makefile.bcc (97%) rename sys/{winnt => windows}/Makefile.gcc (99%) rename sys/{winnt => windows}/Makefile.msc (97%) rename sys/{winnt => windows}/console.rc (100%) rename sys/{winnt => windows}/cursmake.gcc (99%) rename sys/{winnt => windows}/defaults.nh (100%) rename sys/{winnt => windows}/mapimail.c (100%) rename sys/{winnt => windows}/nethack.def (100%) rename sys/{winnt => windows}/nh340key.c (100%) rename sys/{winnt => windows}/nhdefkey.c (100%) rename sys/{winnt => windows}/nhico.uu (100%) rename sys/{winnt => windows}/nhraykey.c (100%) rename sys/{winnt => windows}/nhsetup.bat (100%) rename sys/{winnt => windows}/ntsound.c (100%) rename sys/{winnt => windows}/nttty.c (100%) rename sys/{winnt => windows}/porthelp (100%) rename sys/{winnt => windows}/win32api.h (100%) rename sys/{winnt => windows}/winnt.c (100%) diff --git a/include/global.h b/include/global.h index bd31d2add..8766ab3c5 100644 --- a/include/global.h +++ b/include/global.h @@ -206,7 +206,7 @@ typedef glyph_t nhsym; #ifdef WIN_CE #include "wceconf.h" #else -#include "ntconf.h" +#include "windconf.h" #endif #endif @@ -519,4 +519,4 @@ typedef enum NHL_pcall_action { NHLpa_impossible } NHL_pcall_action; -#endif /* GLOBAL_H */ +#endif /* GLOBAL_H */ \ No newline at end of file diff --git a/include/ntconf.h b/include/windconf.h similarity index 98% rename from include/ntconf.h rename to include/windconf.h index 0d624c33c..c74ee11a3 100644 --- a/include/ntconf.h +++ b/include/windconf.h @@ -1,9 +1,8 @@ -/* SCCS Id: @(#)ntconf.h 3.4 2002/03/10 */ /* Copyright (c) NetHack PC Development Team 1993, 1994. */ /* NetHack may be freely redistributed. See license for details. */ -#ifndef NTCONF_H -#define NTCONF_H +#ifndef WINDCONF_H +#define WINDCONF_H /* #define SHELL */ /* nt use of pcsys routines caused a hang */ @@ -194,4 +193,4 @@ extern int set_win32_option(const char *, const char *); #define MOUSEMASK (LEFTBUTTON | RIGHTBUTTON | MIDBUTTON) #endif /* WIN32CON */ -#endif /* NTCONF_H */ \ No newline at end of file +#endif /* WINDCONF_H */ \ No newline at end of file diff --git a/sys/autoconf/Makefile.src b/sys/autoconf/Makefile.src index f81bed219..0a34d2e3a 100644 --- a/sys/autoconf/Makefile.src +++ b/sys/autoconf/Makefile.src @@ -487,7 +487,7 @@ $(CONFIG_H): ../include/config.h ../include/config1.h ../include/tradstdc.h \ ../include/system.h ../include/unixconf.h ../include/os2conf.h \ ../include/micro.h ../include/pcconf.h ../include/tosconf.h \ ../include/amiconf.h ../include/macconf.h ../include/beconf.h \ - ../include/wceconf.h ../include/ntconf.h ../include/nhlan.h \ + ../include/wceconf.h ../include/windconf.h ../include/nhlan.h \ ../include/autoconf.h touch $(CONFIG_H) # hack.h timestamp @@ -881,4 +881,4 @@ write.o: $(srcdir)/write.c $(HACK_H) zap.o: $(srcdir)/zap.c $(HACK_H) # DEPENDENCIES MUST END AT END OF FILE # IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above +# see make depend above \ No newline at end of file diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 5662b29b9..bfafa6b9a 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -579,7 +579,7 @@ $(CONFIG_H): ../include/config.h ../include/config1.h ../include/tradstdc.h \ ../include/system.h ../include/unixconf.h ../include/os2conf.h \ ../include/micro.h ../include/pcconf.h ../include/tosconf.h \ ../include/amiconf.h ../include/macconf.h ../include/beconf.h \ - ../include/wceconf.h ../include/ntconf.h ../include/nhlan.h + ../include/wceconf.h ../include/windconf.h ../include/nhlan.h touch $(CONFIG_H) # hack.h timestamp $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/align.h \ @@ -863,4 +863,4 @@ write.o: write.c $(HACK_H) zap.o: zap.c $(HACK_H) # DEPENDENCIES MUST END AT END OF FILE # IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above +# see make depend above \ No newline at end of file diff --git a/sys/unsupported/vms/Makefile.src b/sys/unsupported/vms/Makefile.src index fc96b1b99..9d8d702eb 100644 --- a/sys/unsupported/vms/Makefile.src +++ b/sys/unsupported/vms/Makefile.src @@ -294,7 +294,7 @@ $(CONFIG_H) : $(INC)config.h $(INC)config1.h $(INC)tradstdc.h $(INC)global.h \ $(INC)unixconf.h $(INC)os2conf.h $(INC)micro.h \ $(INC)pcconf.h $(INC)tosconf.h $(INC)amiconf.h \ $(INC)macconf.h $(INC)beconf.h $(INC)wceconf.h \ - $(INC)ntconf.h $(INC)nhlan.h + $(INC)windconf.h $(INC)nhlan.h $(TOUCH) $(CONFIG_H) # hack.h timestamp $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \ @@ -460,4 +460,4 @@ worm.obj : worm.c $(HACK_H) $(INC)lev.h worn.obj : worn.c $(HACK_H) write.obj : write.c $(HACK_H) zap.obj : zap.c $(HACK_H) -# eof +# eof \ No newline at end of file diff --git a/sys/unsupported/wince/bootstrp.mak b/sys/unsupported/wince/bootstrp.mak index f04eac259..92149b15f 100644 --- a/sys/unsupported/wince/bootstrp.mak +++ b/sys/unsupported/wince/bootstrp.mak @@ -1,12 +1,12 @@ # SCCS Id: @(#)bootstrp.mak 3.4 2002/03/24 # Copyright (c) Michael Allison # -# NetHack Windows CE bootstrap file for MS Visual C++ V6.x and +# NetHack Windows CE bootstrap file for MS Visual C++ V6.x and # above and MS NMAKE # # This will: # - build makedefs -# - +# - #============================================================================== # Do not delete the following 3 lines. # @@ -27,7 +27,7 @@ SSYS = ..\sys\share # Shared system files NTSYS = ..\sys\winnt # NT Win32 specific files TTY = ..\win\tty # window port files (tty) WIN32 = ..\win\win32 # window port files (WINCE) -WSHR = ..\win\share # Tile support files +WSHR = ..\win\share # Tile support files SWINCE= ..\wince # wince files WINCE = ..\wince # wince build area OBJ = $(WINCE)\ceobj @@ -186,7 +186,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ $(INCL)\system.h $(INCL)\unixconf.h $(INCL)\os2conf.h \ $(INCL)\micro.h $(INCL)\pcconf.h $(INCL)\tosconf.h \ $(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \ - $(INCL)\ntconf.h $(INCL)\nhlan.h $(INCL)\wceconf.h + $(INCL)\windconf.h $(INCL)\nhlan.h $(INCL)\wceconf.h HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ @@ -282,7 +282,7 @@ $(O)sp_lev.tag: $(DAT)\bigroom.des $(DAT)\castle.des \ # # Utility Targets. # - + #========================================== # Makedefs Stuff #========================================== @@ -332,7 +332,7 @@ $(U)uudecode.exe: $(O)uudecode.o $(O)uudecode.o: $(SSYS)\uudecode.c -$(SWINCE)\NetHack.ico : $(U)uudecode.exe $(SWINCE)\nhico.uu +$(SWINCE)\NetHack.ico : $(U)uudecode.exe $(SWINCE)\nhico.uu chdir $(SWINCE) ..\util\uudecode.exe nhico.uu chdir $(WINCE) @@ -400,7 +400,7 @@ $(O)lev_main.o: $(U)lev_main.c $(HACK_H) $(SP_LEV_H) $(U)lev_yacc.c $(INCL)\lev_comp.h : $(U)lev_comp.y - @echo We will copy the prebuilt lev_yacc.c and + @echo We will copy the prebuilt lev_yacc.c and @echo lev_comp.h from $(SSYS) into $(UTIL) and use them. @copy $(SSYS)\lev_yacc.c $(U)lev_yacc.c >nul @copy $(SSYS)\lev_comp.h $(INCL)\lev_comp.h >nul @@ -408,7 +408,7 @@ $(U)lev_yacc.c $(INCL)\lev_comp.h : $(U)lev_comp.y @echo /**/ >>$(INCL)\lev_comp.h $(U)lev_$(LEX).c: $(U)lev_comp.l - @echo We will copy the prebuilt lev_lex.c + @echo We will copy the prebuilt lev_lex.c @echo from $(SSYS) into $(UTIL) and use it. @copy $(SSYS)\lev_lex.c $@ >nul @echo /**/ >>$@ @@ -435,7 +435,7 @@ $(O)dgn_main.o: $(HACK_H) $(U)dgn_main.c $(CC) $(LEVCFLAGS) -W0 -Fo$@ $(U)dgn_main.c $(U)dgn_yacc.c $(INCL)\dgn_comp.h : $(U)dgn_comp.y - @echo We will copy the prebuilt $(U)dgn_yacc.c and + @echo We will copy the prebuilt $(U)dgn_yacc.c and @echo dgn_comp.h from $(SSYS) into $(UTIL) and use them. @copy $(SSYS)\dgn_yacc.c $(U)dgn_yacc.c >nul @copy $(SSYS)\dgn_comp.h $(INCL)\dgn_comp.h >nul @@ -443,7 +443,7 @@ $(U)dgn_yacc.c $(INCL)\dgn_comp.h : $(U)dgn_comp.y @echo /**/ >>$(INCL)\dgn_comp.h $(U)dgn_$(LEX).c: $(U)dgn_comp.l - @echo We will copy the prebuilt dgn_lex.c + @echo We will copy the prebuilt dgn_lex.c @echo from $(SSYS) into $(UTIL) and use it. @copy $(SSYS)\dgn_lex.c $@ >nul @echo /**/ >>$@ @@ -498,7 +498,7 @@ $(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o $(O)dlb.o: $(O)dlb_main.o $(O)alloc.o $(O)panic.o $(INCL)\dlb.h $(CC) $(CFLAGSU) /Fo$@ $(SRC)\dlb.c - + $(O)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h $(CC) $(CFLAGSU) /Fo$@ $(UTIL)\dlb_main.c @@ -635,7 +635,7 @@ $(DAT)\dungeon: $(UTIL)\makedefs.exe $(DAT)\dungeon.def #$(O)mapimail.o: $(HACK_H) $(INCL)\nhlan.h $(NTSYS)\mapimail.c # $(CC) $(CFLAGSU) -DMAPI_VERBOSE -Fo$@ $(NTSYS)\mapimail.c -# +# # util dependencies # @@ -643,8 +643,8 @@ $(O)panic.o: $(U)panic.c $(CONFIG_H) $(CC) $(CFLAGSU) -Fo$@ $(U)panic.c # -# The rest are stolen from sys/unix/Makefile.src, -# with slashes changed to back-slashes +# The rest are stolen from sys/unix/Makefile.src, +# with slashes changed to back-slashes # and -c (which is included in CFLAGSU) substituted # with -Fo$@ , but otherwise untouched. That # means that there is some irrelevant stuff @@ -879,4 +879,3 @@ $(O)write.o: $(SRC)\write.c $(HACK_H) $(O)zap.o: $(SRC)\zap.c $(HACK_H) # end of file - diff --git a/sys/winnt/Install.nt b/sys/windows/Install.nt similarity index 95% rename from sys/winnt/Install.nt rename to sys/windows/Install.nt index 983f056b1..2ff524985 100644 --- a/sys/winnt/Install.nt +++ b/sys/windows/Install.nt @@ -6,25 +6,25 @@ ============================================================== Last revision: $Date: 2003/10/14 01:31:25 $ -Credit for the porting of NetHack to the Win32 Console Subsystem goes to +Credit for the porting of NetHack to the Win32 Console Subsystem goes to the NT Porting Team started by Michael Allison. Credit for the Win32 Graphical version of NetHack (aka "NetHack for Windows" or NetHackW) goes to Alex Kompel who initially developed and contributed the port. -The PC Windows porting team consisting of Michael Allison, David Cohrs, -Alex Kompel, Dion Nicolaas, Yitzhak Sapir, and Janet Walz maintained the +The PC Windows porting team consisting of Michael Allison, David Cohrs, +Alex Kompel, Dion Nicolaas, Yitzhak Sapir, and Janet Walz maintained the tty and graphical win32 versions of NetHack 3.4.3. -You can build either the TTY version of NetHack or the Windows Graphical +You can build either the TTY version of NetHack or the Windows Graphical 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 + 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 o A copy of Borland C 5.5.1 command line tools. Borland has made a @@ -41,7 +41,7 @@ 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 @@ -51,7 +51,7 @@ 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. +sys\winnt\nhsetup.bat. From the command prompt: cd sys\winnt @@ -63,8 +63,8 @@ From a Windows explorer window: A "binary" directory will be created off the top of the NetHack source tree to house the completed build. -A build subdirectory will also be created off the top of the NetHack -source tree, and many files appropriate for a graphical build will be +A build subdirectory will also be created off the top of the NetHack +source tree, and many files appropriate for a graphical build will be moved there. If you wish to build from the command line, proceed to "BUILDING FROM @@ -90,7 +90,7 @@ and bones files. I. Dispelling the Myths: Compiling NetHack for Win32 is not as easy as it sounds, nor as hard - as it looks, however it will behoove you to read this entire section + as it looks, however it will behoove you to read this entire section through before beginning the task. We have provided a Makefile for each of the following compilers: @@ -99,10 +99,10 @@ I. Dispelling the Myths: o Borland C 5.5.1 o MinGW 2.0 (with GCC 3.2) - The Microsoft Visual C Makefile was created for use with MS NMAKE + The Microsoft Visual C Makefile was created for use with MS NMAKE which is provided with the Microsoft compiler. The supplied Makefile - may work with earlier versions of the Microsoft 32-bit compiler, but - that has not been tested. + may work with earlier versions of the Microsoft 32-bit compiler, but + that has not been tested. The Borland C Makefile was created for use with Borland MAKE which is provided with the Borland compiler. @@ -123,9 +123,9 @@ Setting Up 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 + 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 @@ -141,34 +141,34 @@ Setting Up Graphical NetHack you need win\win32 in addition to these. Other subdirectories may also be included in your distribution, but - they are not necessary for building the TTY version for the Win32 + they are not necessary for building the TTY version for the Win32 console subsystem. You can delete them to save space. Required Directories for a Win32 Console NetHack: top | - ----------------------------------------------------/ /----- + ----------------------------------------------------/ /----- | | | | | | | | util dat doc include src sys win binary | | - ------ ----- - | | | - share winnt tty - + ------ ----- + | | | + share winnt tty + Required Directories for a Win32 Graphical NetHack: top | - ----------------------------------------------------/ /----- + ----------------------------------------------------/ /----- | | | | | | | | util dat doc include src sys win binary | | - ------ ----- + ------ ----- | | | - share winnt win32 - + share winnt win32 + Check the file "Files" in your top level directory for an exact listing of what file is in which directory. In order for the Makefiles to work, all the source files must be in the proper @@ -192,7 +192,7 @@ Setting Up You may include all or as few of the special game features as you wish (they are located last in the file). -4. Edit your Makefile. +4. Edit your Makefile. For building Console NetHack, ensure that GRAPHICAL is set to "N", or commented out. For building Graphical NetHack, set GRAPHICAL to @@ -200,7 +200,7 @@ Setting Up Optional step: If you elected not to use the high-quality BSD random number - routines by commenting out RANDOM in ntconf.h, comment out (or + routines by commenting out RANDOM in windconf.h, comment out (or set equal to nothing) the RANDOM macro in your Makefile. If you are recompiling after patching your sources, or if you got @@ -213,7 +213,7 @@ Compiling 5. Now that everything is set up, change your current directory to src. - For Microsoft compiler: + For Microsoft compiler: nmake install For Borland compiler: @@ -227,7 +227,7 @@ Compiling particular machine of course, but you should be able to go for lunch and return to find everything finished. The less memory, and slower your machine, the longer the lunch you may take. :-) - + In any case, it is likely that the command prompt window where you are doing the compiling will be occupied for a while. If all goes well, you will get an NetHack executable. @@ -238,7 +238,7 @@ Notes: your current directory to src and issue the appropriate command for your compiler: - For Microsoft compiler: + For Microsoft compiler: nmake For Borland compiler: @@ -258,7 +258,7 @@ Notes: 2. The executable produced by the TTY build is a 32-bit, flat-address space, non-overlayed .exe file, which should run on any true Win32 - environment with console I/O support. + environment with console I/O support. The executable built by the graphical built is a 32-bit, flat-address space, non-overlayed .exe file, which should run on any @@ -275,7 +275,7 @@ NetHack, can be built using the Visual C IDE. I. Dispelling the Myths: Compiling NetHack using the Visual C IDE is straightforward, as long - as you have your compiler and tools correctly installed. + 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,16 +309,16 @@ Setting Up top | - -----------------------------------------/ /--------------- + -----------------------------------------/ /--------------- | | | | | | | | | util dat doc include src sys win build binary | | ------ ----- - | | | + | | | share winnt win32 - + Those last two (build and binary) are created during the building - process. They are not disributed as part of the NetHack source + process. They are not disributed as part of the NetHack source distribution. nhsetup.bat creates the build directory and moves a few files into it, including the Visual C project files. The "binary" directory will house everything you need to play the game @@ -381,18 +381,18 @@ Setting Up 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 + This starts the build. It is likely that the IDE message window where you are doing the compiling will be occupied for a while. 6. If all has gone well to this point, you should now have a NetHack executable called NetHackW.exe in the "binary" directory, along with all the support files that it needs. - + RUNNING NETHACK @@ -402,13 +402,13 @@ I. Checking the installation: were copied to the game directory. If not, move them there yourself. - Edit Defaults.nh to reflect your particular setup and personal + Edit Defaults.nh to reflect your particular setup and personal preferences, by following the comments. As with all releases since 3.2.1, HACKDIR defaults to the same directory as that where the NetHack.exe or NetHackW.exe executable resides. You only need to set HACKDIR in defaults.nh if, for some reason, you wish to override that (be careful). - + II. Executing the game 1. Running from the command prompt: @@ -447,4 +447,4 @@ PROBLEMS to the NetHack source code feel free to drop us a line c/o: DevTeam (at) nethack.org - Happy NetHacking! + Happy NetHacking! \ No newline at end of file diff --git a/sys/winnt/Makefile.bcc b/sys/windows/Makefile.bcc similarity index 97% rename from sys/winnt/Makefile.bcc rename to sys/windows/Makefile.bcc index c734afeb3..aa2da0c47 100644 --- a/sys/winnt/Makefile.bcc +++ b/sys/windows/Makefile.bcc @@ -6,7 +6,7 @@ # # # NetHack 3.4.x Makefile for Borland C++ V5.5.1 and above and Borland's MAKE -# +# # Win32 Compilers Tested: # - Borland C++ 5.5.1 for Win32 # @@ -31,7 +31,7 @@ # .l lex (such as flex) # # -# If you have any questions read the sys/winnt/Install.nt file included +# If you have any questions read the sys/winnt/Install.nt file included # with the distribution. # # -- @@ -76,10 +76,10 @@ implib = $(bccbin)\tlib cflags = -c -D_X86_=1 -DWINVER=$(MAKE_WINVER) -q -I$(bccinc) -w-pia -w-rch -w-csu -w-par -w-aus cdebug = -y -v -O2 -cvarsmt = -DWIN32 -D_WIN32 -D_MT -lflags = +cvarsmt = -DWIN32 -D_WIN32 -D_MT +lflags = !IF "$(DEBUG)" == "Y" -linkdebug = /v /m /s +linkdebug = /v /m /s cdebug = -v -y -Q !ELSE linkdebug = /C /Gn @@ -93,10 +93,10 @@ startobjg = $(bcclib)\c0w32.obj verlflags = /Gn /Gz /q -L$(bcclib) /c /ap /Tpe /V$(APPVER) startobjg = $(startobj) !ENDIF -libsmt = $(bcclib)\cw32mt.lib $(bcclib)\import32.lib +libsmt = $(bcclib)\cw32mt.lib $(bcclib)\import32.lib # -# Set the gamedir according to your preference. +# Set the gamedir according to your preference. # It must be present prior to compilation. !IF "$(GRAPHICAL)" == "Y" @@ -119,7 +119,7 @@ SSYS = ..\sys\share # Shared system files NTSYS = ..\sys\winnt # NT Win32 specific files TTY = ..\win\tty # window port files (tty) WIN32 = ..\win\win32 # window port files (Win32) -WSHR = ..\win\share # Tile support files +WSHR = ..\win\share # Tile support files # # Object directory. @@ -132,10 +132,10 @@ OBJ = o #========================================== # Exe File Info. #========================================== - + # Yacc/Lex ... if you got 'em. # -# If you have yacc and lex programs (or work-alike such as bison +# If you have yacc and lex programs (or work-alike such as bison # and flex), uncomment the upper two macros. # @@ -224,7 +224,7 @@ WINPFLAG= -DTILES -DMSWIN_GRAPHICS NHRES = $(O)winhack.res WINPINC = -I$(WIN32) !ELSE -WINPORT = $(O)nttty.o +WINPORT = $(O)nttty.o WINPHDR = WINDLLS = $(GAMEDIR)\nhdefkey.dll $(GAMEDIR)\nh340key.dll $(GAMEDIR)\nhraykey.dll WINPFLAG= -DWIN32CON @@ -273,7 +273,7 @@ LFLAGSU = $(LFLAGSBASE) # - Game build #========================================== -LFLAGSBASE = $(linkdebug) $(conflags) +LFLAGSBASE = $(linkdebug) $(conflags) CFLAGS = $(CFLAGSBASE) $(WINPFLAG) $(DLBFLG) NHLFLAGS1 = /Gn /v /m /s /Gz /q /c lflags = $(LFLAGSBASE) $(NHLFLAGS1) @@ -408,32 +408,32 @@ PPMWRITERS = $(O)ppmwrite.o $(O)alloc.o $(O)panic.o # VOBJ01 = $(O)allmain.o $(O)alloc.o $(O)apply.o $(O)artifact.o -VOBJ02 = $(O)attrib.o $(O)ball.o $(O)bones.o $(O)botl.o -VOBJ03 = $(O)cmd.o $(O)dbridge.o $(O)decl.o $(O)detect.o -VOBJ04 = $(O)dig.o $(O)display.o $(O)do.o $(O)do_name.o -VOBJ05 = $(O)do_wear.o $(O)dog.o $(O)dogmove.o $(O)dokick.o -VOBJ06 = $(O)dothrow.o $(O)drawing.o $(O)dungeon.o $(O)eat.o -VOBJ07 = $(O)end.o $(O)engrave.o $(O)exper.o $(O)explode.o -VOBJ08 = $(O)extralev.o $(O)files.o $(O)fountain.o $(O)hack.o -VOBJ09 = $(O)hacklib.o $(O)invent.o $(O)light.o $(O)lock.o -VOBJ10 = $(O)mail.o $(O)makemon.o $(O)mapglyph.o $(O)mcastu.o -VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o -VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o -VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o -VOBJ14 = $(O)monstr.o $(O)mplayer.o $(O)mthrowu.o $(O)muse.o -VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o -VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o -VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o -VOBJ18 = $(O)quest.o $(O)questpgr.o $(RANDOM) $(O)read.o -VOBJ19 = $(O)rect.o $(O)region.o $(O)restore.o $(O)rip.o -VOBJ20 = $(O)rnd.o $(O)role.o $(O)rumors.o $(O)save.o -VOBJ21 = $(O)shk.o $(O)shknam.o $(O)sit.o $(O)sounds.o -VOBJ22 = $(O)sp_lev.o $(O)spell.o $(O)steal.o $(O)steed.o -VOBJ23 = $(O)teleport.o $(O)timeout.o $(O)topten.o $(O)track.o -VOBJ24 = $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)vault.o -VOBJ25 = $(O)vis_tab.o $(O)vision.o $(O)weapon.o $(O)were.o -VOBJ26 = $(O)wield.o $(O)windows.o $(O)wizard.o $(O)worm.o -VOBJ27 = $(O)worn.o $(O)write.o $(O)zap.o +VOBJ02 = $(O)attrib.o $(O)ball.o $(O)bones.o $(O)botl.o +VOBJ03 = $(O)cmd.o $(O)dbridge.o $(O)decl.o $(O)detect.o +VOBJ04 = $(O)dig.o $(O)display.o $(O)do.o $(O)do_name.o +VOBJ05 = $(O)do_wear.o $(O)dog.o $(O)dogmove.o $(O)dokick.o +VOBJ06 = $(O)dothrow.o $(O)drawing.o $(O)dungeon.o $(O)eat.o +VOBJ07 = $(O)end.o $(O)engrave.o $(O)exper.o $(O)explode.o +VOBJ08 = $(O)extralev.o $(O)files.o $(O)fountain.o $(O)hack.o +VOBJ09 = $(O)hacklib.o $(O)invent.o $(O)light.o $(O)lock.o +VOBJ10 = $(O)mail.o $(O)makemon.o $(O)mapglyph.o $(O)mcastu.o +VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o +VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o +VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o +VOBJ14 = $(O)monstr.o $(O)mplayer.o $(O)mthrowu.o $(O)muse.o +VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o +VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o +VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o +VOBJ18 = $(O)quest.o $(O)questpgr.o $(RANDOM) $(O)read.o +VOBJ19 = $(O)rect.o $(O)region.o $(O)restore.o $(O)rip.o +VOBJ20 = $(O)rnd.o $(O)role.o $(O)rumors.o $(O)save.o +VOBJ21 = $(O)shk.o $(O)shknam.o $(O)sit.o $(O)sounds.o +VOBJ22 = $(O)sp_lev.o $(O)spell.o $(O)steal.o $(O)steed.o +VOBJ23 = $(O)teleport.o $(O)timeout.o $(O)topten.o $(O)track.o +VOBJ24 = $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)vault.o +VOBJ25 = $(O)vis_tab.o $(O)vision.o $(O)weapon.o $(O)were.o +VOBJ26 = $(O)wield.o $(O)windows.o $(O)wizard.o $(O)worm.o +VOBJ27 = $(O)worn.o $(O)write.o $(O)zap.o DLBOBJ = $(O)dlb.o @@ -470,7 +470,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ $(INCL)\system.h $(INCL)\unixconf.h $(INCL)\os2conf.h \ $(INCL)\micro.h $(INCL)\pcconf.h $(INCL)\tosconf.h \ $(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \ - $(INCL)\ntconf.h $(INCL)\nhlan.h + $(INCL)\windconf.h $(INCL)\nhlan.h HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ @@ -697,7 +697,7 @@ $(GAMEDIR)\nhraykey.dll : $(O)nhraykey.o # # Secondary Targets. # - + #========================================== # Makedefs Stuff #========================================== @@ -819,7 +819,7 @@ $(U)lev_yacc.c $(INCL)\lev_comp.h : $(U)lev_comp.y @echo $(U)lev_comp.y has changed. @echo To update $(U)lev_yacc.c and $(INCL)\lev_comp.h run $(YACC). @echo --- - @echo For now, we will copy the prebuilt lev_yacc.c and + @echo For now, we will copy the prebuilt lev_yacc.c and @echo lev_comp.h from $(SSYS) into $(UTIL) and use them. @copy $(SSYS)\lev_yacc.c $(U)lev_yacc.c >nul @copy $(SSYS)\lev_comp.h $(INCL)\lev_comp.h >nul @@ -837,7 +837,7 @@ $(U)lev_$(LEX).c: $(U)lev_comp.l ! ELSE @echo $(U)lev_comp.l has changed. To update $@ run $(LEX). @echo --- - @echo For now, we will copy the prebuilt lev_lex.c + @echo For now, we will copy the prebuilt lev_lex.c @echo from $(SSYS) into $(UTIL) and use it. @copy $(SSYS)\lev_lex.c $@ >nul @echo /**/ >>$@ @@ -872,10 +872,10 @@ $(U)dgn_yacc.c $(INCL)\dgn_comp.h : $(U)dgn_comp.y @del $(YTABH) chdir $(SRC) ! ELSE - @echo $(U)dgn_comp.y has changed. To update dgn_yacc.c and + @echo $(U)dgn_comp.y has changed. To update dgn_yacc.c and @echo $(INCL)\dgn_comp.h run $(YACC). @echo --- - @echo For now, we will copy the prebuilt $(U)dgn_yacc.c and + @echo For now, we will copy the prebuilt $(U)dgn_yacc.c and @echo dgn_comp.h from $(SSYS) into $(UTIL) and use them. @copy $(SSYS)\dgn_yacc.c $(U)dgn_yacc.c >nul @copy $(SSYS)\dgn_comp.h $(INCL)\dgn_comp.h >nul @@ -893,7 +893,7 @@ $(U)dgn_$(LEX).c: $(U)dgn_comp.l ! ELSE @echo $(U)dgn_comp.l has changed. To update $@ run $(LEX). @echo --- - @echo For now, we will copy the prebuilt dgn_lex.c + @echo For now, we will copy the prebuilt dgn_lex.c @echo from $(SSYS) into $(UTIL) and use it. @copy $(SSYS)\dgn_lex.c $@ >nul @echo /**/ >>$@ @@ -922,7 +922,7 @@ $(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o $(SRC)\uuid.lib $(O)dlb.o: $(O)dlb_main.o $(O)alloc.o $(O)panic.o $(INCL)\dlb.h @$(cc) $(CFLAGS) -o$@ $(SRC)\dlb.c - + $(O)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h @$(cc) $(CFLAGS) -o$@ $(UTIL)\dlb_main.c @@ -1127,7 +1127,7 @@ $(O)ntsound.o: $(HACK_H) $(NTSYS)\ntsound.c $(O)mapimail.o: $(HACK_H) $(INCL)\nhlan.h $(NTSYS)\mapimail.c @$(cc) $(CFLAGS) -DMAPI_VERBOSE -o$@ $(NTSYS)\mapimail.c -# +# # util dependencies # @@ -1135,10 +1135,10 @@ $(O)panic.o: $(U)panic.c $(CONFIG_H) @$(cc) $(CFLAGS) -o$@ $(U)panic.c # -# The rest are stolen from sys/unix/Makefile.src, +# The rest are stolen from sys/unix/Makefile.src, # with the following changes: # * ../include changed to $(INCL) -# * slashes changed to back-slashes +# * slashes changed to back-slashes # * -c (which is included in CFLAGS) substituted # with -o$@ # * $(CC) changed to $(cc) @@ -1375,4 +1375,3 @@ $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) # end of file - diff --git a/sys/winnt/Makefile.gcc b/sys/windows/Makefile.gcc similarity index 99% rename from sys/winnt/Makefile.gcc rename to sys/windows/Makefile.gcc index 2d1ac297e..80e19ac6e 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/windows/Makefile.gcc @@ -427,7 +427,7 @@ CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \ $(INCL)/system.h $(INCL)/unixconf.h $(INCL)/os2conf.h \ $(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/tosconf.h \ $(INCL)/amiconf.h $(INCL)/macconf.h $(INCL)/beconf.h \ - $(INCL)/ntconf.h $(INCL)/nhlan.h + $(INCL)/windconf.h $(INCL)/nhlan.h HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h \ $(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \ @@ -578,7 +578,7 @@ $(NHRES): $(TILEBMP16) $(WIN32)/winhack.rc $(WIN32)/mnsel.bmp \ $(WIN32)/splash.bmp @$(rc) -o$@ --include-dir $(WIN32) -i $(WIN32)/winhack.rc else -$(NHRES): $(NTSYS)/console.rc $(NTSYS)/NetHack.ico +$(NHRES): $(NTSYS)/console.rc $(NTSYS)/NetHack.ico @$(rc) -o$@ --include-dir $(NTSYS) -i $(NTSYS)/console.rc endif @@ -602,7 +602,7 @@ endif $(O)nhdefkey.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhdefkey.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhdefkey.c $(GAMEDIR)/nhdefkey.dll : $(O)nhdefkey.o $(O)gamedir.tag @echo Linking $@ @@ -610,7 +610,7 @@ $(GAMEDIR)/nhdefkey.dll : $(O)nhdefkey.o $(O)gamedir.tag -Wl,--add-stdcall-alias -o $@ $< $(O)nh340key.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nh340key.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nh340key.c $(GAMEDIR)/nh340key.dll : $(O)nh340key.o $(O)gamedir.tag @echo Linking $@ @@ -618,7 +618,7 @@ $(GAMEDIR)/nh340key.dll : $(O)nh340key.o $(O)gamedir.tag -Wl,--add-stdcall-alias -o $@ $< $(O)nhraykey.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhraykey.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhraykey.c $(GAMEDIR)/nhraykey.dll : $(O)nhraykey.o $(O)gamedir.tag @echo Linking $@ @@ -1117,7 +1117,7 @@ $(O)panic.o: $(U)panic.c $(CONFIG_H) # with -o$@ # * targets prefixed with $(O) # * $(CC) changed to $(cc) -# but otherwise untouched. +# but otherwise untouched. # That means that there is some irrelevant stuff # in here, but maintenance should be easier. # @@ -1359,4 +1359,4 @@ $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) -# end of file +# end of file \ No newline at end of file diff --git a/sys/winnt/Makefile.msc b/sys/windows/Makefile.msc similarity index 97% rename from sys/winnt/Makefile.msc rename to sys/windows/Makefile.msc index 832b85709..84b1a3c32 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/windows/Makefile.msc @@ -2,7 +2,7 @@ # 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 @@ -21,7 +21,7 @@ # .l lex (such as flex) # # -# If you have any questions read the sys/winnt/Install.nt file included +# If you have any questions read the sys/winnt/Install.nt file included # with the distribution. #============================================================================== # Do not delete the following 3 lines. @@ -35,7 +35,7 @@ APPVER=4.0 #GRAPHICAL = Y -# Set the gamedir according to your preference. +# Set the gamedir according to your preference. # If not present prior to compilation it gets created. !IF "$(GRAPHICAL)" == "Y" @@ -59,7 +59,7 @@ SSYS = ..\sys\share # Shared system files NTSYS = ..\sys\winnt # NT Win32 specific files TTY = ..\win\tty # window port files (tty) WIN32 = ..\win\win32 # window port files (Win32) -WSHR = ..\win\share # Tile support files +WSHR = ..\win\share # Tile support files # # Object directory. @@ -72,11 +72,11 @@ OBJ = o #========================================== # Exe File Info. #========================================== - + # Yacc/Lex ... if you got 'em. # -# If you have yacc and lex programs (or work-alike such as bison -# and flex), comment out the upper two macros and uncomment +# If you have yacc and lex programs (or work-alike such as bison +# and flex), comment out the upper two macros and uncomment # the lower two. # @@ -150,7 +150,7 @@ WINPFLAG= -DTILES -DMSWIN_GRAPHICS NHRES = $(O)winhack.res WINPINC = -I$(WIN32) !ELSE -WINPORT = $(O)nttty.o +WINPORT = $(O)nttty.o WINPHDR = WINDLLS = $(GAMEDIR)\nhdefkey.dll $(GAMEDIR)\nh340key.dll $(GAMEDIR)\nhraykey.dll WINPFLAG= -DWIN32CON @@ -202,7 +202,7 @@ LFLAGSU = $(LFLAGSBASEC) 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 +NHLFLAGS2 = /MAP:"$(GAME).MAP" /MACHINE:$(CPU) -IGNORE:505 !IF ("$(GRAPHICAL)"=="Y") LFLAGS = $(LFLAGSBASEG) $(NHLFLAGS1) $(NHLFLAGS2) !ELSE @@ -344,32 +344,32 @@ PPMWRITERS = $(O)ppmwrite.o $(O)alloc.o $(O)panic.o # VOBJ01 = $(O)allmain.o $(O)alloc.o $(O)apply.o $(O)artifact.o -VOBJ02 = $(O)attrib.o $(O)ball.o $(O)bones.o $(O)botl.o -VOBJ03 = $(O)cmd.o $(O)dbridge.o $(O)decl.o $(O)detect.o -VOBJ04 = $(O)dig.o $(O)display.o $(O)do.o $(O)do_name.o -VOBJ05 = $(O)do_wear.o $(O)dog.o $(O)dogmove.o $(O)dokick.o -VOBJ06 = $(O)dothrow.o $(O)drawing.o $(O)dungeon.o $(O)eat.o -VOBJ07 = $(O)end.o $(O)engrave.o $(O)exper.o $(O)explode.o -VOBJ08 = $(O)extralev.o $(O)files.o $(O)fountain.o $(O)hack.o -VOBJ09 = $(O)hacklib.o $(O)invent.o $(O)light.o $(O)lock.o -VOBJ10 = $(O)mail.o $(O)pcmain.o $(O)makemon.o $(O)mapglyph.o $(O)mcastu.o -VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o -VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o -VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o -VOBJ14 = $(O)monstr.o $(O)mplayer.o $(O)mthrowu.o $(O)muse.o -VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o -VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o -VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o -VOBJ18 = $(O)quest.o $(O)questpgr.o $(RANDOM) $(O)read.o -VOBJ19 = $(O)rect.o $(O)region.o $(O)restore.o $(O)rip.o -VOBJ20 = $(O)rnd.o $(O)role.o $(O)rumors.o $(O)save.o -VOBJ21 = $(O)shk.o $(O)shknam.o $(O)sit.o $(O)sounds.o -VOBJ22 = $(O)sp_lev.o $(O)spell.o $(O)steal.o $(O)steed.o -VOBJ23 = $(O)teleport.o $(O)timeout.o $(O)topten.o $(O)track.o -VOBJ24 = $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)vault.o -VOBJ25 = $(O)vis_tab.o $(O)vision.o $(O)weapon.o $(O)were.o -VOBJ26 = $(O)wield.o $(O)windows.o $(O)wizard.o $(O)worm.o -VOBJ27 = $(O)worn.o $(O)write.o $(O)zap.o +VOBJ02 = $(O)attrib.o $(O)ball.o $(O)bones.o $(O)botl.o +VOBJ03 = $(O)cmd.o $(O)dbridge.o $(O)decl.o $(O)detect.o +VOBJ04 = $(O)dig.o $(O)display.o $(O)do.o $(O)do_name.o +VOBJ05 = $(O)do_wear.o $(O)dog.o $(O)dogmove.o $(O)dokick.o +VOBJ06 = $(O)dothrow.o $(O)drawing.o $(O)dungeon.o $(O)eat.o +VOBJ07 = $(O)end.o $(O)engrave.o $(O)exper.o $(O)explode.o +VOBJ08 = $(O)extralev.o $(O)files.o $(O)fountain.o $(O)hack.o +VOBJ09 = $(O)hacklib.o $(O)invent.o $(O)light.o $(O)lock.o +VOBJ10 = $(O)mail.o $(O)pcmain.o $(O)makemon.o $(O)mapglyph.o $(O)mcastu.o +VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o +VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o +VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o +VOBJ14 = $(O)monstr.o $(O)mplayer.o $(O)mthrowu.o $(O)muse.o +VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o +VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o +VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o +VOBJ18 = $(O)quest.o $(O)questpgr.o $(RANDOM) $(O)read.o +VOBJ19 = $(O)rect.o $(O)region.o $(O)restore.o $(O)rip.o +VOBJ20 = $(O)rnd.o $(O)role.o $(O)rumors.o $(O)save.o +VOBJ21 = $(O)shk.o $(O)shknam.o $(O)sit.o $(O)sounds.o +VOBJ22 = $(O)sp_lev.o $(O)spell.o $(O)steal.o $(O)steed.o +VOBJ23 = $(O)teleport.o $(O)timeout.o $(O)topten.o $(O)track.o +VOBJ24 = $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)vault.o +VOBJ25 = $(O)vis_tab.o $(O)vision.o $(O)weapon.o $(O)were.o +VOBJ26 = $(O)wield.o $(O)windows.o $(O)wizard.o $(O)worm.o +VOBJ27 = $(O)worn.o $(O)write.o $(O)zap.o DLBOBJ = $(O)dlb.o @@ -405,7 +405,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \ $(INCL)\system.h $(INCL)\unixconf.h $(INCL)\os2conf.h \ $(INCL)\micro.h $(INCL)\pcconf.h $(INCL)\tosconf.h \ $(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \ - $(INCL)\ntconf.h $(INCL)\nhlan.h + $(INCL)\windconf.h $(INCL)\nhlan.h HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ @@ -550,26 +550,26 @@ $(NHRES): $(NTSYS)\console.rc $(NTSYS)\NetHack.ico # The main target. #========================================== -# The section for linking the NetHack image looks a little strange at -# first, especially if you are used to UNIX makes, or NDMAKE. It is -# Microsoft nmake specific, and it gets around the problem of the -# link command line being too long for the linker. An "in-line" linker +# The section for linking the NetHack image looks a little strange at +# first, especially if you are used to UNIX makes, or NDMAKE. It is +# Microsoft nmake specific, and it gets around the problem of the +# link command line being too long for the linker. An "in-line" linker # response file is generated temporarily. # # It takes advantage of the following features of nmake: # -# Inline files : +# Inline files : # Specifying the "<<" means to start an inline file. -# Another "<<" at the start of a line closes the +# Another "<<" at the start of a line closes the # inline file. # # Substitution within Macros: # $(mymacro:string1=string2) replaces every -# occurrence of string1 with string2 in the -# macro mymacro. Special ascii key codes may be -# used in the substitution text by preceding it +# occurrence of string1 with string2 in the +# macro mymacro. Special ascii key codes may be +# used in the substitution text by preceding it # with ^ as we have done below. Every occurence -# of a in $(ALLOBJ) is replaced by +# of a in $(ALLOBJ) is replaced by # <+>. # # DO NOT INDENT THE << below! @@ -638,7 +638,7 @@ $(GAMEDIR)\nhraykey.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def # # Secondary Targets. # - + #========================================== # Makedefs Stuff #========================================== @@ -688,12 +688,12 @@ $(U)uudecode.exe: $(O)uudecode.o $(O)uudecode.o: $(SSYS)\uudecode.c -$(NTSYS)\NetHack.ico : $(U)uudecode.exe $(NTSYS)\nhico.uu +$(NTSYS)\NetHack.ico : $(U)uudecode.exe $(NTSYS)\nhico.uu chdir $(NTSYS) ..\..\util\uudecode.exe nhico.uu chdir ..\..\src -$(WIN32)\NetHack.ico : $(U)uudecode.exe $(NTSYS)\nhico.uu +$(WIN32)\NetHack.ico : $(U)uudecode.exe $(NTSYS)\nhico.uu chdir $(WIN32) ..\..\util\uudecode.exe ../../sys/winnt/nhico.uu chdir ..\..\src @@ -766,7 +766,7 @@ $(U)lev_yacc.c $(INCL)\lev_comp.h : $(U)lev_comp.y @echo $(U)lev_comp.y has changed. @echo To update $(U)lev_yacc.c and $(INCL)\lev_comp.h run $(YACC). @echo --- - @echo For now, we will copy the prebuilt lev_yacc.c and + @echo For now, we will copy the prebuilt lev_yacc.c and @echo lev_comp.h from $(SSYS) into $(UTIL) and use them. @copy $(SSYS)\lev_yacc.c $(U)lev_yacc.c >nul @copy $(SSYS)\lev_comp.h $(INCL)\lev_comp.h >nul @@ -784,7 +784,7 @@ $(U)lev_$(LEX).c: $(U)lev_comp.l ! ELSE @echo $(U)lev_comp.l has changed. To update $@ run $(LEX). @echo --- - @echo For now, we will copy the prebuilt lev_lex.c + @echo For now, we will copy the prebuilt lev_lex.c @echo from $(SSYS) into $(UTIL) and use it. @copy $(SSYS)\lev_lex.c $@ >nul @echo /**/ >>$@ @@ -821,10 +821,10 @@ $(U)dgn_yacc.c $(INCL)\dgn_comp.h : $(U)dgn_comp.y @del $(YTABH) chdir $(SRC) ! ELSE - @echo $(U)dgn_comp.y has changed. To update dgn_yacc.c and + @echo $(U)dgn_comp.y has changed. To update dgn_yacc.c and @echo $(INCL)\dgn_comp.h run $(YACC). @echo --- - @echo For now, we will copy the prebuilt $(U)dgn_yacc.c and + @echo For now, we will copy the prebuilt $(U)dgn_yacc.c and @echo dgn_comp.h from $(SSYS) into $(UTIL) and use them. @copy $(SSYS)\dgn_yacc.c $(U)dgn_yacc.c >nul @copy $(SSYS)\dgn_comp.h $(INCL)\dgn_comp.h >nul @@ -842,7 +842,7 @@ $(U)dgn_$(LEX).c: $(U)dgn_comp.l ! ELSE @echo $(U)dgn_comp.l has changed. To update $@ run $(LEX). @echo --- - @echo For now, we will copy the prebuilt dgn_lex.c + @echo For now, we will copy the prebuilt dgn_lex.c @echo from $(SSYS) into $(UTIL) and use it. @copy $(SSYS)\dgn_lex.c $@ >nul @echo /**/ >>$@ @@ -900,7 +900,7 @@ $(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o $(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 @@ -1160,7 +1160,7 @@ $(O)ntsound.o: $(HACK_H) $(NTSYS)\ntsound.c $(O)mapimail.o: $(HACK_H) $(INCL)\nhlan.h $(NTSYS)\mapimail.c @$(CC) $(CFLAGS) -DMAPI_VERBOSE -Fo$@ $(NTSYS)\mapimail.c -# +# # util dependencies # @@ -1168,10 +1168,10 @@ $(O)panic.o: $(U)panic.c $(CONFIG_H) @$(CC) $(CFLAGS) -Fo$@ $(U)panic.c # -# The rest are stolen from sys/unix/Makefile.src, +# The rest are stolen from sys/unix/Makefile.src, # with the following changes: # * ../include changed to $(INCL) -# * slashes changed to back-slashes +# * slashes changed to back-slashes # * -c (which is included in CFLAGS) substituted with -Fo$@ # * targets prefixed with $(O) # but otherwise untouched. @@ -1416,4 +1416,4 @@ $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) -# end of file +# end of file \ No newline at end of file diff --git a/sys/winnt/console.rc b/sys/windows/console.rc similarity index 100% rename from sys/winnt/console.rc rename to sys/windows/console.rc diff --git a/sys/winnt/cursmake.gcc b/sys/windows/cursmake.gcc similarity index 99% rename from sys/winnt/cursmake.gcc rename to sys/windows/cursmake.gcc index 846d00bd2..aaf4c06d5 100644 --- a/sys/winnt/cursmake.gcc +++ b/sys/windows/cursmake.gcc @@ -48,7 +48,7 @@ rc = windres link = gcc cflags = -mms-bitfields -lflags = +lflags = ifeq "$(DEBUG)" "Y" cdebug = -g linkdebug = -g @@ -397,7 +397,7 @@ DLBOBJ = $(O)dlb.o #TTYOBJ = $(O)topl.o $(O)getline.o $(O)wintty.o TTYOBJ = $(O)cursmain.o $(O)curswins.o $(O)cursmisc.o $(O)cursdial.o \ - $(O)cursstat.o $(O)cursinit.o $(O)cursmesg.o + $(O)cursstat.o $(O)cursinit.o $(O)cursmesg.o SOBJ = $(O)winnt.o $(O)pcsys.o $(O)pcunix.o \ $(SOUND) $(O)pcmain.o $(O)mapimail.o $(O)nhlan.o @@ -430,7 +430,7 @@ CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \ $(INCL)/system.h $(INCL)/unixconf.h $(INCL)/os2conf.h \ $(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/tosconf.h \ $(INCL)/amiconf.h $(INCL)/macconf.h $(INCL)/beconf.h \ - $(INCL)/ntconf.h $(INCL)/nhlan.h + $(INCL)/windconf.h $(INCL)/nhlan.h HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h \ $(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \ @@ -575,7 +575,7 @@ $(NHRES): $(TILEBMP16) $(WIN32)/winhack.rc $(WIN32)/mnsel.bmp \ $(WIN32)/splash.bmp @$(rc) -o$@ --include-dir $(WIN32) -i $(WIN32)/winhack.rc else -$(NHRES): $(NTSYS)/console.rc $(NTSYS)/NetHack.ico +$(NHRES): $(NTSYS)/console.rc $(NTSYS)/NetHack.ico @$(rc) -o$@ --include-dir $(NTSYS) -i $(NTSYS)/console.rc endif @@ -600,7 +600,7 @@ endif $(O)nhdefkey.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhdefkey.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhdefkey.c $(GAMEDIR)/nhdefkey.dll : $(O)nhdefkey.o $(O)gamedir.tag @echo Linking $@ @@ -608,7 +608,7 @@ $(GAMEDIR)/nhdefkey.dll : $(O)nhdefkey.o $(O)gamedir.tag -Wl,--add-stdcall-alias -o $@ $< $(O)nh340key.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nh340key.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nh340key.c $(GAMEDIR)/nh340key.dll : $(O)nh340key.o $(O)gamedir.tag @echo Linking $@ @@ -616,7 +616,7 @@ $(GAMEDIR)/nh340key.dll : $(O)nh340key.o $(O)gamedir.tag -Wl,--add-stdcall-alias -o $@ $< $(O)nhraykey.o: - $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhraykey.c + $(cc) $(CFLAGS) -DBUILD_DLL -o$@ $(NTSYS)/nhraykey.c $(GAMEDIR)/nhraykey.dll : $(O)nhraykey.o $(O)gamedir.tag @echo Linking $@ @@ -1115,7 +1115,7 @@ $(O)panic.o: $(U)panic.c $(CONFIG_H) # with -o$@ # * targets prefixed with $(O) # * $(CC) changed to $(cc) -# but otherwise untouched. +# but otherwise untouched. # That means that there is some irrelevant stuff # in here, but maintenance should be easier. # @@ -1357,4 +1357,4 @@ $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) -# end of file +# end of file \ No newline at end of file diff --git a/sys/winnt/defaults.nh b/sys/windows/defaults.nh similarity index 100% rename from sys/winnt/defaults.nh rename to sys/windows/defaults.nh diff --git a/sys/winnt/mapimail.c b/sys/windows/mapimail.c similarity index 100% rename from sys/winnt/mapimail.c rename to sys/windows/mapimail.c diff --git a/sys/winnt/nethack.def b/sys/windows/nethack.def similarity index 100% rename from sys/winnt/nethack.def rename to sys/windows/nethack.def diff --git a/sys/winnt/nh340key.c b/sys/windows/nh340key.c similarity index 100% rename from sys/winnt/nh340key.c rename to sys/windows/nh340key.c diff --git a/sys/winnt/nhdefkey.c b/sys/windows/nhdefkey.c similarity index 100% rename from sys/winnt/nhdefkey.c rename to sys/windows/nhdefkey.c diff --git a/sys/winnt/nhico.uu b/sys/windows/nhico.uu similarity index 100% rename from sys/winnt/nhico.uu rename to sys/windows/nhico.uu diff --git a/sys/winnt/nhraykey.c b/sys/windows/nhraykey.c similarity index 100% rename from sys/winnt/nhraykey.c rename to sys/windows/nhraykey.c diff --git a/sys/winnt/nhsetup.bat b/sys/windows/nhsetup.bat similarity index 100% rename from sys/winnt/nhsetup.bat rename to sys/windows/nhsetup.bat diff --git a/sys/winnt/ntsound.c b/sys/windows/ntsound.c similarity index 100% rename from sys/winnt/ntsound.c rename to sys/windows/ntsound.c diff --git a/sys/winnt/nttty.c b/sys/windows/nttty.c similarity index 100% rename from sys/winnt/nttty.c rename to sys/windows/nttty.c diff --git a/sys/winnt/porthelp b/sys/windows/porthelp similarity index 100% rename from sys/winnt/porthelp rename to sys/windows/porthelp diff --git a/sys/winnt/win32api.h b/sys/windows/win32api.h similarity index 100% rename from sys/winnt/win32api.h rename to sys/windows/win32api.h diff --git a/sys/winnt/winnt.c b/sys/windows/winnt.c similarity index 100% rename from sys/winnt/winnt.c rename to sys/windows/winnt.c diff --git a/win/win32/dgncomp.dsp b/win/win32/dgncomp.dsp index 815384c79..043fa5d5f 100644 --- a/win/win32/dgncomp.dsp +++ b/win/win32/dgncomp.dsp @@ -1,297 +1,297 @@ -# Microsoft Developer Studio Project File - Name="dgncomp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=dgncomp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dgncomp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dgncomp.mak" CFG="dgncomp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dgncomp - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "dgncomp - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dgncomp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\util" -# PROP BASE Intermediate_Dir "dgncomp___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\util" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\dgn_comp.exe" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=dgncomp -PostBuild_Cmds=echo Building dungeon echo chdir ..\dat chdir ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo chdir ..\build chdir ..\build -# End Special Build Tool - -!ELSEIF "$(CFG)" == "dgncomp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "dgncomp___Win32_Debug" -# PROP BASE Intermediate_Dir "dgncomp___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\util" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\util\dgn_comp.exe" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=dgncomp -PostBuild_Cmds=echo Building dungeon echo chdir ..\dat chdir ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo chdir ..\build chdir ..\build -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "dgncomp - Win32 Release" -# Name "dgncomp - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\alloc.c -# End Source File -# Begin Source File - -SOURCE=..\util\dgn_lex.c -# End Source File -# Begin Source File - -SOURCE=..\util\dgn_main.c -# End Source File -# Begin Source File - -SOURCE=..\util\dgn_yacc.c -# End Source File -# Begin Source File - -SOURCE=..\util\panic.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\align.h -# End Source File -# Begin Source File - -SOURCE=..\include\attrib.h -# End Source File -# Begin Source File - -SOURCE=..\include\color.h -# End Source File -# Begin Source File - -SOURCE=..\include\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\config1.h -# End Source File -# Begin Source File - -SOURCE=..\include\coord.h -# End Source File -# Begin Source File - -SOURCE=..\include\decl.h -# End Source File -# Begin Source File - -SOURCE=..\include\dgn_comp.h -# End Source File -# Begin Source File - -SOURCE=..\include\dgn_file.h -# End Source File -# Begin Source File - -SOURCE=..\include\display.h -# End Source File -# Begin Source File - -SOURCE=..\include\dungeon.h -# End Source File -# Begin Source File - -SOURCE=..\include\engrave.h -# End Source File -# Begin Source File - -SOURCE=..\include\flag.h -# End Source File -# Begin Source File - -SOURCE=..\include\global.h -# End Source File -# Begin Source File - -SOURCE=..\include\mkroom.h -# End Source File -# Begin Source File - -SOURCE=..\include\monattk.h -# End Source File -# Begin Source File - -SOURCE=..\include\monst.h -# End Source File -# Begin Source File - -SOURCE=..\include\monsym.h -# End Source File -# Begin Source File - -SOURCE=..\include\nhlan.h -# End Source File -# Begin Source File - -SOURCE=..\include\ntconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\obj.h -# End Source File -# Begin Source File - -SOURCE=..\include\objclass.h -# End Source File -# Begin Source File - -SOURCE=..\include\onames.h -# End Source File -# Begin Source File - -SOURCE=..\include\permonst.h -# End Source File -# Begin Source File - -SOURCE=..\include\pm.h -# End Source File -# Begin Source File - -SOURCE=..\include\prop.h -# End Source File -# Begin Source File - -SOURCE=..\include\quest.h -# End Source File -# Begin Source File - -SOURCE=..\include\rect.h -# End Source File -# Begin Source File - -SOURCE=..\include\region.h -# End Source File -# Begin Source File - -SOURCE=..\include\rm.h -# End Source File -# Begin Source File - -SOURCE=..\include\skills.h -# End Source File -# Begin Source File - -SOURCE=..\include\spell.h -# End Source File -# Begin Source File - -SOURCE=..\include\timeout.h -# End Source File -# Begin Source File - -SOURCE=..\include\tradstdc.h -# End Source File -# Begin Source File - -SOURCE=..\include\trampoli.h -# End Source File -# Begin Source File - -SOURCE=..\include\trap.h -# End Source File -# Begin Source File - -SOURCE=..\include\vision.h -# End Source File -# Begin Source File - -SOURCE=..\include\winprocs.h -# End Source File -# Begin Source File - -SOURCE=..\include\wintty.h -# End Source File -# Begin Source File - -SOURCE=..\include\wintype.h -# End Source File -# Begin Source File - -SOURCE=..\include\you.h -# End Source File -# Begin Source File - -SOURCE=..\include\youprop.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="dgncomp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=dgncomp - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "dgncomp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "dgncomp.mak" CFG="dgncomp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "dgncomp - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "dgncomp - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "dgncomp - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\util" +# PROP BASE Intermediate_Dir "dgncomp___Win32_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\util" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\dgn_comp.exe" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=dgncomp +PostBuild_Cmds=echo Building dungeon echo chdir ..\dat chdir ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo chdir ..\build chdir ..\build +# End Special Build Tool + +!ELSEIF "$(CFG)" == "dgncomp - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "dgncomp___Win32_Debug" +# PROP BASE Intermediate_Dir "dgncomp___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\util" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\util\dgn_comp.exe" /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=dgncomp +PostBuild_Cmds=echo Building dungeon echo chdir ..\dat chdir ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo chdir ..\build chdir ..\build +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "dgncomp - Win32 Release" +# Name "dgncomp - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\alloc.c +# End Source File +# Begin Source File + +SOURCE=..\util\dgn_lex.c +# End Source File +# Begin Source File + +SOURCE=..\util\dgn_main.c +# End Source File +# Begin Source File + +SOURCE=..\util\dgn_yacc.c +# End Source File +# Begin Source File + +SOURCE=..\util\panic.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\align.h +# End Source File +# Begin Source File + +SOURCE=..\include\attrib.h +# End Source File +# Begin Source File + +SOURCE=..\include\color.h +# End Source File +# Begin Source File + +SOURCE=..\include\config.h +# End Source File +# Begin Source File + +SOURCE=..\include\config1.h +# End Source File +# Begin Source File + +SOURCE=..\include\coord.h +# End Source File +# Begin Source File + +SOURCE=..\include\decl.h +# End Source File +# Begin Source File + +SOURCE=..\include\dgn_comp.h +# End Source File +# Begin Source File + +SOURCE=..\include\dgn_file.h +# End Source File +# Begin Source File + +SOURCE=..\include\display.h +# End Source File +# Begin Source File + +SOURCE=..\include\dungeon.h +# End Source File +# Begin Source File + +SOURCE=..\include\engrave.h +# End Source File +# Begin Source File + +SOURCE=..\include\flag.h +# End Source File +# Begin Source File + +SOURCE=..\include\global.h +# End Source File +# Begin Source File + +SOURCE=..\include\mkroom.h +# End Source File +# Begin Source File + +SOURCE=..\include\monattk.h +# End Source File +# Begin Source File + +SOURCE=..\include\monst.h +# End Source File +# Begin Source File + +SOURCE=..\include\monsym.h +# End Source File +# Begin Source File + +SOURCE=..\include\nhlan.h +# End Source File +# Begin Source File + +SOURCE=..\include\windconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\obj.h +# End Source File +# Begin Source File + +SOURCE=..\include\objclass.h +# End Source File +# Begin Source File + +SOURCE=..\include\onames.h +# End Source File +# Begin Source File + +SOURCE=..\include\permonst.h +# End Source File +# Begin Source File + +SOURCE=..\include\pm.h +# End Source File +# Begin Source File + +SOURCE=..\include\prop.h +# End Source File +# Begin Source File + +SOURCE=..\include\quest.h +# End Source File +# Begin Source File + +SOURCE=..\include\rect.h +# End Source File +# Begin Source File + +SOURCE=..\include\region.h +# End Source File +# Begin Source File + +SOURCE=..\include\rm.h +# End Source File +# Begin Source File + +SOURCE=..\include\skills.h +# End Source File +# Begin Source File + +SOURCE=..\include\spell.h +# End Source File +# Begin Source File + +SOURCE=..\include\timeout.h +# End Source File +# Begin Source File + +SOURCE=..\include\tradstdc.h +# End Source File +# Begin Source File + +SOURCE=..\include\trampoli.h +# End Source File +# Begin Source File + +SOURCE=..\include\trap.h +# End Source File +# Begin Source File + +SOURCE=..\include\vision.h +# End Source File +# Begin Source File + +SOURCE=..\include\winprocs.h +# End Source File +# Begin Source File + +SOURCE=..\include\wintty.h +# End Source File +# Begin Source File + +SOURCE=..\include\wintype.h +# End Source File +# Begin Source File + +SOURCE=..\include\you.h +# End Source File +# Begin Source File + +SOURCE=..\include\youprop.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/dgnstuff.dsp b/win/win32/dgnstuff.dsp index ab1e95a10..2967ab5e9 100644 --- a/win/win32/dgnstuff.dsp +++ b/win/win32/dgnstuff.dsp @@ -1,97 +1,97 @@ -# Microsoft Developer Studio Project File - Name="dgnstuff" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=dgnstuff - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dgnstuff.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dgnstuff.mak" CFG="dgnstuff - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dgnstuff - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "dgnstuff - Win32 Debug" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "dgnstuff - Win32 Release" - -# PROP BASE Use_MFC -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f dgnstuff.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "dgnstuff.exe" -# PROP BASE Bsc_Name "dgnstuff.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "nmake /f "dgnstuff.mak"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "..\util\dgncomp.exe" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "dgnstuff - Win32 Debug" - -# PROP BASE Use_MFC -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f dgnstuff.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "dgnstuff.exe" -# PROP BASE Bsc_Name "dgnstuff.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "dgnstuff___Win32_Debug" -# PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "nmake /f "dgnstuff.mak"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "..\util\dgncomp.exe" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "dgnstuff - Win32 Release" -# Name "dgnstuff - Win32 Debug" - -!IF "$(CFG)" == "dgnstuff - Win32 Release" - -!ELSEIF "$(CFG)" == "dgnstuff - Win32 Debug" - -!ENDIF - -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="dgnstuff" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=dgnstuff - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "dgnstuff.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "dgnstuff.mak" CFG="dgnstuff - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "dgnstuff - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "dgnstuff - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "dgnstuff - Win32 Release" + +# PROP BASE Use_MFC +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f dgnstuff.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "dgnstuff.exe" +# PROP BASE Bsc_Name "dgnstuff.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "nmake /f "dgnstuff.mak"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "..\util\dgncomp.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "dgnstuff - Win32 Debug" + +# PROP BASE Use_MFC +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Cmd_Line "NMAKE /f dgnstuff.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "dgnstuff.exe" +# PROP BASE Bsc_Name "dgnstuff.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "dgnstuff___Win32_Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "nmake /f "dgnstuff.mak"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "..\util\dgncomp.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "dgnstuff - Win32 Release" +# Name "dgnstuff - Win32 Debug" + +!IF "$(CFG)" == "dgnstuff - Win32 Release" + +!ELSEIF "$(CFG)" == "dgnstuff - Win32 Debug" + +!ENDIF + +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/dlb_main.dsp b/win/win32/dlb_main.dsp index 8dff70f19..f692f3799 100644 --- a/win/win32/dlb_main.dsp +++ b/win/win32/dlb_main.dsp @@ -1,179 +1,179 @@ -# Microsoft Developer Studio Project File - Name="dlb_main" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=dlb_main - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dlb_main.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dlb_main.mak" CFG="dlb_main - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dlb_main - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "dlb_main - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dlb_main - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DLB" /D "WIN32CON" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\dlb_main.exe" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Packaging via DLB -PostBuild_Cmds=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 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 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "dlb_main - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DLB" /D "WIN32CON" /D "MSWIN_GRAPHICS" /FD /GZ /c -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\util\dlb_main.exe" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Packaging via dlb -PostBuild_Cmds=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 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 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "dlb_main - Win32 Release" -# Name "dlb_main - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\alloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\dlb.c -# End Source File -# Begin Source File - -SOURCE=..\util\dlb_main.c -# End Source File -# Begin Source File - -SOURCE=..\util\panic.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\dlb.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="dlb_main" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=dlb_main - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "dlb_main.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "dlb_main.mak" CFG="dlb_main - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "dlb_main - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "dlb_main - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "dlb_main - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DLB" /D "WIN32CON" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\dlb_main.exe" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Packaging via DLB +PostBuild_Cmds=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 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 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "dlb_main - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DLB" /D "WIN32CON" /D "MSWIN_GRAPHICS" /FD /GZ /c +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\util\dlb_main.exe" /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Packaging via dlb +PostBuild_Cmds=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 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 +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "dlb_main - Win32 Release" +# Name "dlb_main - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\alloc.c +# End Source File +# Begin Source File + +SOURCE=..\src\dlb.c +# End Source File +# Begin Source File + +SOURCE=..\util\dlb_main.c +# End Source File +# Begin Source File + +SOURCE=..\util\panic.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\dlb.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/levcomp.dsp b/win/win32/levcomp.dsp index 7c1486e89..beed27a18 100644 --- a/win/win32/levcomp.dsp +++ b/win/win32/levcomp.dsp @@ -1,198 +1,198 @@ -# Microsoft Developer Studio Project File - Name="levcomp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=levcomp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "levcomp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "levcomp.mak" CFG="levcomp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "levcomp - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "levcomp - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "levcomp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\util" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=levcomp -PostBuild_Cmds=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 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "levcomp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\util" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=levcomp -PostBuild_Cmds=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 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "levcomp - Win32 Release" -# Name "levcomp - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\alloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\decl.c -# End Source File -# Begin Source File - -SOURCE=..\src\drawing.c -# End Source File -# Begin Source File - -SOURCE=..\util\lev_lex.c -# End Source File -# Begin Source File - -SOURCE=..\util\lev_main.c -# End Source File -# Begin Source File - -SOURCE=..\util\lev_yacc.c -# End Source File -# Begin Source File - -SOURCE=..\src\monst.c -# End Source File -# Begin Source File - -SOURCE=..\src\objects.c -# End Source File -# Begin Source File - -SOURCE=..\util\panic.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\lev_comp.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="levcomp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=levcomp - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "levcomp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "levcomp.mak" CFG="levcomp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "levcomp - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "levcomp - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "levcomp - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\util" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=levcomp +PostBuild_Cmds=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 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "levcomp - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\util" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=levcomp +PostBuild_Cmds=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 +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "levcomp - Win32 Release" +# Name "levcomp - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\alloc.c +# End Source File +# Begin Source File + +SOURCE=..\src\decl.c +# End Source File +# Begin Source File + +SOURCE=..\src\drawing.c +# End Source File +# Begin Source File + +SOURCE=..\util\lev_lex.c +# End Source File +# Begin Source File + +SOURCE=..\util\lev_main.c +# End Source File +# Begin Source File + +SOURCE=..\util\lev_yacc.c +# End Source File +# Begin Source File + +SOURCE=..\src\monst.c +# End Source File +# Begin Source File + +SOURCE=..\src\objects.c +# End Source File +# Begin Source File + +SOURCE=..\util\panic.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\lev_comp.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/levstuff.dsp b/win/win32/levstuff.dsp index 276ad8189..2c235d54e 100644 --- a/win/win32/levstuff.dsp +++ b/win/win32/levstuff.dsp @@ -1,97 +1,97 @@ -# Microsoft Developer Studio Project File - Name="levstuff" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=levstuff - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "levstuff.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "levstuff.mak" CFG="levstuff - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "levstuff - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "levstuff - Win32 Debug" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "levstuff - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f levstuff.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "levstuff.exe" -# PROP BASE Bsc_Name "levstuff.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "nmake /f "levstuff.mak"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "..\util\lev_lex.c" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "levstuff - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "levstuff___Win32_Debug0" -# PROP BASE Intermediate_Dir "levstuff___Win32_Debug0" -# PROP BASE Cmd_Line "NMAKE /f levstuff.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "levstuff.exe" -# PROP BASE Bsc_Name "levstuff.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "levstuff___Win32_Debug0" -# PROP Intermediate_Dir "levstuff___Win32_Debug0" -# PROP Cmd_Line "nmake /f "levstuff.mak"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "..\util\lev_lex.c" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "levstuff - Win32 Release" -# Name "levstuff - Win32 Debug" - -!IF "$(CFG)" == "levstuff - Win32 Release" - -!ELSEIF "$(CFG)" == "levstuff - Win32 Debug" - -!ENDIF - -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="levstuff" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=levstuff - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "levstuff.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "levstuff.mak" CFG="levstuff - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "levstuff - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "levstuff - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "levstuff - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f levstuff.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "levstuff.exe" +# PROP BASE Bsc_Name "levstuff.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "nmake /f "levstuff.mak"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "..\util\lev_lex.c" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "levstuff - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "levstuff___Win32_Debug0" +# PROP BASE Intermediate_Dir "levstuff___Win32_Debug0" +# PROP BASE Cmd_Line "NMAKE /f levstuff.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "levstuff.exe" +# PROP BASE Bsc_Name "levstuff.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "levstuff___Win32_Debug0" +# PROP Intermediate_Dir "levstuff___Win32_Debug0" +# PROP Cmd_Line "nmake /f "levstuff.mak"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "..\util\lev_lex.c" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "levstuff - Win32 Release" +# Name "levstuff - Win32 Debug" + +!IF "$(CFG)" == "levstuff - Win32 Release" + +!ELSEIF "$(CFG)" == "levstuff - Win32 Debug" + +!ENDIF + +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/makedefs.dsp b/win/win32/makedefs.dsp index 5ecdc8839..c0fdd35f9 100644 --- a/win/win32/makedefs.dsp +++ b/win/win32/makedefs.dsp @@ -1,198 +1,198 @@ -# Microsoft Developer Studio Project File - Name="makedefs" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=makedefs - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "makedefs.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "makedefs.mak" CFG="makedefs - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "makedefs - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "makedefs - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "makedefs - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\util" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "." /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Running makedefs -PostBuild_Cmds=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 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 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "makedefs - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\util" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Running makedefs -PostBuild_Cmds=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 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 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "makedefs - Win32 Release" -# Name "makedefs - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\util\makedefs.c -# End Source File -# Begin Source File - -SOURCE=..\src\monst.c -# End Source File -# Begin Source File - -SOURCE=..\src\objects.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\config1.h -# End Source File -# Begin Source File - -SOURCE=..\include\coord.h -# End Source File -# Begin Source File - -SOURCE=..\include\global.h -# End Source File -# Begin Source File - -SOURCE=..\include\monattk.h -# End Source File -# Begin Source File - -SOURCE=..\include\monflag.h -# End Source File -# Begin Source File - -SOURCE=..\include\monsym.h -# End Source File -# Begin Source File - -SOURCE=..\include\nhlan.h -# End Source File -# Begin Source File - -SOURCE=..\include\ntconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\objclass.h -# End Source File -# Begin Source File - -SOURCE=..\include\patchlevel.h -# End Source File -# Begin Source File - -SOURCE=..\include\qtext.h -# End Source File -# Begin Source File - -SOURCE=..\include\tradstdc.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="makedefs" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=makedefs - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "makedefs.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "makedefs.mak" CFG="makedefs - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "makedefs - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "makedefs - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "makedefs - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\util" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "." /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Running makedefs +PostBuild_Cmds=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 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 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "makedefs - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\util" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Running makedefs +PostBuild_Cmds=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 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 +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "makedefs - Win32 Release" +# Name "makedefs - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\util\makedefs.c +# End Source File +# Begin Source File + +SOURCE=..\src\monst.c +# End Source File +# Begin Source File + +SOURCE=..\src\objects.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\config.h +# End Source File +# Begin Source File + +SOURCE=..\include\config1.h +# End Source File +# Begin Source File + +SOURCE=..\include\coord.h +# End Source File +# Begin Source File + +SOURCE=..\include\global.h +# End Source File +# Begin Source File + +SOURCE=..\include\monattk.h +# End Source File +# Begin Source File + +SOURCE=..\include\monflag.h +# End Source File +# Begin Source File + +SOURCE=..\include\monsym.h +# End Source File +# Begin Source File + +SOURCE=..\include\nhlan.h +# End Source File +# Begin Source File + +SOURCE=..\include\windconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\objclass.h +# End Source File +# Begin Source File + +SOURCE=..\include\patchlevel.h +# End Source File +# Begin Source File + +SOURCE=..\include\qtext.h +# End Source File +# Begin Source File + +SOURCE=..\include\tradstdc.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/nethackw.dsp b/win/win32/nethackw.dsp index 03521aa19..a8843f084 100644 --- a/win/win32/nethackw.dsp +++ b/win/win32/nethackw.dsp @@ -1,1107 +1,1107 @@ -# Microsoft Developer Studio Project File - Name="NetHackW" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=NetHackW - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "NetHackW.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "NetHackW.mak" CFG="NetHackW - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "NetHackW - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "NetHackW - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "NetHackW - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Og /Oy /Ob1 /Gs /Gf /Gy /Oi- /Ot /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /GX /Og /Oy /Ob1 /Gs /Gf /Gy /Oi- /Ot /I "..\win\win32" /I "..\include" /I "..\sys\winnt" /I "..\sys\share" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /map /debug /machine:I386 /MAPINFO:EXPORTS /MAPINFO:LINES -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -OutDir=.\Release -SOURCE="$(InputPath)" -PostBuild_Desc=Install exe -PostBuild_Cmds=copy $(OutDir)\NetHackW.exe ..\binary \ -copy ..\dat\nhdat ..\binary \ -copy ..\dat\license ..\binary \ -if exist tiles.bmp copy tiles.bmp ..\binary \ -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 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "NetHackW - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\win\win32" /I "..\include" /I "..\sys\winnt" /I "..\sys\share" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -OutDir=.\Debug -SOURCE="$(InputPath)" -PostBuild_Desc=Install exe -PostBuild_Cmds=if NOT exist ..\binary\*.* mkdir ..\binary \ -copy $(OutDir)\NetHackW.exe ..\binary \ -copy ..\dat\nhdat ..\binary \ -copy ..\dat\license ..\binary \ -if exist tiles.bmp copy tiles.bmp ..\binary \ -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 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "NetHackW - Win32 Release" -# Name "NetHackW - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\allmain.c -# End Source File -# Begin Source File - -SOURCE=..\src\alloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\apply.c -# End Source File -# Begin Source File - -SOURCE=..\src\artifact.c -# End Source File -# Begin Source File - -SOURCE=..\src\attrib.c -# End Source File -# Begin Source File - -SOURCE=..\src\ball.c -# End Source File -# Begin Source File - -SOURCE=..\src\bones.c -# End Source File -# Begin Source File - -SOURCE=..\src\botl.c -# End Source File -# Begin Source File - -SOURCE=..\src\cmd.c -# End Source File -# Begin Source File - -SOURCE=..\src\dbridge.c -# End Source File -# Begin Source File - -SOURCE=..\src\decl.c -# End Source File -# Begin Source File - -SOURCE=..\src\detect.c -# End Source File -# Begin Source File - -SOURCE=..\src\dig.c -# End Source File -# Begin Source File - -SOURCE=..\src\display.c -# End Source File -# Begin Source File - -SOURCE=..\src\dlb.c -# End Source File -# Begin Source File - -SOURCE=..\src\do.c -# End Source File -# Begin Source File - -SOURCE=..\src\do_name.c -# End Source File -# Begin Source File - -SOURCE=..\src\do_wear.c -# End Source File -# Begin Source File - -SOURCE=..\src\dog.c -# End Source File -# Begin Source File - -SOURCE=..\src\dogmove.c -# End Source File -# Begin Source File - -SOURCE=..\src\dokick.c -# End Source File -# Begin Source File - -SOURCE=..\src\dothrow.c -# End Source File -# Begin Source File - -SOURCE=..\src\drawing.c -# End Source File -# Begin Source File - -SOURCE=..\src\dungeon.c -# End Source File -# Begin Source File - -SOURCE=..\src\eat.c -# End Source File -# Begin Source File - -SOURCE=..\src\end.c -# End Source File -# Begin Source File - -SOURCE=..\src\engrave.c -# End Source File -# Begin Source File - -SOURCE=..\src\exper.c -# End Source File -# Begin Source File - -SOURCE=..\src\explode.c -# End Source File -# Begin Source File - -SOURCE=..\src\extralev.c -# End Source File -# Begin Source File - -SOURCE=..\src\files.c -# End Source File -# Begin Source File - -SOURCE=..\src\fountain.c -# End Source File -# Begin Source File - -SOURCE=..\win\tty\getline.c -# End Source File -# Begin Source File - -SOURCE=..\src\hack.c -# End Source File -# Begin Source File - -SOURCE=..\src\hacklib.c -# End Source File -# Begin Source File - -SOURCE=..\src\invent.c -# End Source File -# Begin Source File - -SOURCE=..\src\light.c -# End Source File -# Begin Source File - -SOURCE=..\src\lock.c -# End Source File -# Begin Source File - -SOURCE=..\src\mail.c -# End Source File -# Begin Source File - -SOURCE=..\src\makemon.c -# End Source File -# Begin Source File - -SOURCE=..\src\mapglyph.c -# End Source File -# Begin Source File - -SOURCE=..\src\mcastu.c -# End Source File -# Begin Source File - -SOURCE=..\src\mhitm.c -# End Source File -# Begin Source File - -SOURCE=..\src\mhitu.c -# End Source File -# Begin Source File - -SOURCE=..\src\minion.c -# End Source File -# Begin Source File - -SOURCE=..\src\mklev.c -# End Source File -# Begin Source File - -SOURCE=..\src\mkmap.c -# End Source File -# Begin Source File - -SOURCE=..\src\mkmaze.c -# End Source File -# Begin Source File - -SOURCE=..\src\mkobj.c -# End Source File -# Begin Source File - -SOURCE=..\src\mkroom.c -# End Source File -# Begin Source File - -SOURCE=..\src\mon.c -# End Source File -# Begin Source File - -SOURCE=..\src\mondata.c -# End Source File -# Begin Source File - -SOURCE=..\src\monmove.c -# End Source File -# Begin Source File - -SOURCE=..\src\monst.c -# End Source File -# Begin Source File - -SOURCE=..\src\monstr.c -# End Source File -# Begin Source File - -SOURCE=..\src\mplayer.c -# End Source File -# Begin Source File - -SOURCE=..\src\mthrowu.c -# End Source File -# Begin Source File - -SOURCE=..\src\muse.c -# End Source File -# Begin Source File - -SOURCE=..\src\music.c -# End Source File -# Begin Source File - -SOURCE=..\sys\winnt\ntsound.c -# End Source File -# Begin Source File - -SOURCE=..\src\o_init.c -# End Source File -# Begin Source File - -SOURCE=..\src\objects.c -# End Source File -# Begin Source File - -SOURCE=..\src\objnam.c -# End Source File -# Begin Source File - -SOURCE=..\src\options.c -# End Source File -# Begin Source File - -SOURCE=..\src\pager.c -# End Source File -# Begin Source File - -SOURCE=..\sys\share\pcmain.c -# End Source File -# Begin Source File - -SOURCE=..\sys\share\pcsys.c -# End Source File -# Begin Source File - -SOURCE=..\sys\share\pcunix.c -# End Source File -# Begin Source File - -SOURCE=..\src\pickup.c -# End Source File -# Begin Source File - -SOURCE=..\src\pline.c -# End Source File -# Begin Source File - -SOURCE=..\src\polyself.c -# End Source File -# Begin Source File - -SOURCE=..\src\potion.c -# End Source File -# Begin Source File - -SOURCE=..\src\pray.c -# End Source File -# Begin Source File - -SOURCE=..\src\priest.c -# End Source File -# Begin Source File - -SOURCE=..\src\quest.c -# End Source File -# Begin Source File - -SOURCE=..\src\questpgr.c -# End Source File -# Begin Source File - -SOURCE=..\sys\share\random.c -# End Source File -# Begin Source File - -SOURCE=..\src\read.c -# End Source File -# Begin Source File - -SOURCE=..\src\rect.c -# End Source File -# Begin Source File - -SOURCE=..\src\region.c -# End Source File -# Begin Source File - -SOURCE=..\src\restore.c -# End Source File -# Begin Source File - -SOURCE=..\src\rip.c -# End Source File -# Begin Source File - -SOURCE=..\src\rnd.c -# End Source File -# Begin Source File - -SOURCE=..\src\role.c -# End Source File -# Begin Source File - -SOURCE=..\src\rumors.c -# End Source File -# Begin Source File - -SOURCE=..\src\save.c -# End Source File -# Begin Source File - -SOURCE=..\src\shk.c -# End Source File -# Begin Source File - -SOURCE=..\src\shknam.c -# End Source File -# Begin Source File - -SOURCE=..\src\sit.c -# End Source File -# Begin Source File - -SOURCE=..\src\sounds.c -# End Source File -# Begin Source File - -SOURCE=..\src\sp_lev.c -# End Source File -# Begin Source File - -SOURCE=..\src\spell.c -# End Source File -# Begin Source File - -SOURCE=..\src\steal.c -# End Source File -# Begin Source File - -SOURCE=..\src\steed.c -# End Source File -# Begin Source File - -SOURCE=..\src\teleport.c -# End Source File -# Begin Source File - -SOURCE=..\src\tile.c -# End Source File -# Begin Source File - -SOURCE=..\src\timeout.c -# End Source File -# Begin Source File - -SOURCE=..\src\topten.c -# End Source File -# Begin Source File - -SOURCE=..\src\track.c -# End Source File -# Begin Source File - -SOURCE=..\src\trap.c -# End Source File -# Begin Source File - -SOURCE=..\src\u_init.c -# End Source File -# Begin Source File - -SOURCE=..\src\uhitm.c -# End Source File -# Begin Source File - -SOURCE=..\src\vault.c -# End Source File -# Begin Source File - -SOURCE=..\src\version.c -# End Source File -# Begin Source File - -SOURCE=..\src\vision.c -# End Source File -# Begin Source File - -SOURCE=..\src\weapon.c -# End Source File -# Begin Source File - -SOURCE=..\src\were.c -# End Source File -# Begin Source File - -SOURCE=..\src\wield.c -# End Source File -# Begin Source File - -SOURCE=..\src\windows.c -# End Source File -# Begin Source File - -SOURCE=..\sys\winnt\winnt.c -# End Source File -# Begin Source File - -SOURCE=..\win\tty\wintty.c -# End Source File -# Begin Source File - -SOURCE=..\src\wizard.c -# End Source File -# Begin Source File - -SOURCE=..\src\worm.c -# End Source File -# Begin Source File - -SOURCE=..\src\worn.c -# End Source File -# Begin Source File - -SOURCE=..\src\write.c -# End Source File -# Begin Source File - -SOURCE=..\src\zap.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\align.h -# End Source File -# Begin Source File - -SOURCE=..\include\amiconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\artifact.h -# End Source File -# Begin Source File - -SOURCE=..\include\artilist.h -# End Source File -# Begin Source File - -SOURCE=..\include\attrib.h -# End Source File -# Begin Source File - -SOURCE=..\include\beconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\bitmfile.h -# End Source File -# Begin Source File - -SOURCE=..\include\color.h -# End Source File -# Begin Source File - -SOURCE=..\include\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\config1.h -# End Source File -# Begin Source File - -SOURCE=..\include\coord.h -# End Source File -# Begin Source File - -SOURCE=..\include\decl.h -# End Source File -# Begin Source File - -SOURCE=..\include\def_os2.h -# End Source File -# Begin Source File - -SOURCE=..\include\dgn_file.h -# End Source File -# Begin Source File - -SOURCE=..\include\display.h -# End Source File -# Begin Source File - -SOURCE=..\include\dlb.h -# End Source File -# Begin Source File - -SOURCE=..\include\dungeon.h -# End Source File -# Begin Source File - -SOURCE=..\include\edog.h -# End Source File -# Begin Source File - -SOURCE=..\include\emin.h -# End Source File -# Begin Source File - -SOURCE=..\include\engrave.h -# End Source File -# Begin Source File - -SOURCE=..\include\epri.h -# End Source File -# Begin Source File - -SOURCE=..\include\eshk.h -# End Source File -# Begin Source File - -SOURCE=..\include\extern.h -# End Source File -# Begin Source File - -SOURCE=..\include\flag.h -# End Source File -# Begin Source File - -SOURCE=..\include\func_tab.h -# End Source File -# Begin Source File - -SOURCE=..\include\gem_rsc.h -# End Source File -# Begin Source File - -SOURCE=..\include\global.h -# End Source File -# Begin Source File - -SOURCE=..\include\hack.h -# End Source File -# Begin Source File - -SOURCE=..\include\lev.h -# End Source File -# Begin Source File - -SOURCE=..\include\load_img.h -# End Source File -# Begin Source File - -SOURCE=..\include\macconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\macpopup.h -# End Source File -# Begin Source File - -SOURCE=..\include\mactty.h -# End Source File -# Begin Source File - -SOURCE=..\include\macwin.h -# End Source File -# Begin Source File - -SOURCE=..\include\mail.h -# End Source File -# Begin Source File - -SOURCE=..\include\mfndpos.h -# End Source File -# Begin Source File - -SOURCE=..\include\micro.h -# End Source File -# Begin Source File - -SOURCE=..\include\mkroom.h -# End Source File -# Begin Source File - -SOURCE=..\include\monattk.h -# End Source File -# Begin Source File - -SOURCE=..\include\mondata.h -# End Source File -# Begin Source File - -SOURCE=..\include\monflag.h -# End Source File -# Begin Source File - -SOURCE=..\include\monst.h -# End Source File -# Begin Source File - -SOURCE=..\include\monsym.h -# End Source File -# Begin Source File - -SOURCE=..\include\mttypriv.h -# End Source File -# Begin Source File - -SOURCE=..\include\nhlan.h -# End Source File -# Begin Source File - -SOURCE=..\include\ntconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\obj.h -# End Source File -# Begin Source File - -SOURCE=..\include\objclass.h -# End Source File -# Begin Source File - -SOURCE=..\include\os2conf.h -# End Source File -# Begin Source File - -SOURCE=..\include\patchlevel.h -# End Source File -# Begin Source File - -SOURCE=..\include\pcconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\permonst.h -# End Source File -# Begin Source File - -SOURCE=..\include\prop.h -# End Source File -# Begin Source File - -SOURCE=..\include\qt_clust.h -# End Source File -# Begin Source File - -SOURCE=..\include\qt_kde0.h -# End Source File -# Begin Source File - -SOURCE=..\include\qt_win.h -# End Source File -# Begin Source File - -SOURCE=..\include\qt_xpms.h -# End Source File -# Begin Source File - -SOURCE=..\include\qtext.h -# End Source File -# Begin Source File - -SOURCE=..\include\quest.h -# End Source File -# Begin Source File - -SOURCE=..\include\rect.h -# End Source File -# Begin Source File - -SOURCE=..\include\region.h -# End Source File -# Begin Source File - -SOURCE=..\include\rm.h -# End Source File -# Begin Source File - -SOURCE=..\include\skills.h -# End Source File -# Begin Source File - -SOURCE=..\include\sp_lev.h -# End Source File -# Begin Source File - -SOURCE=..\include\spell.h -# End Source File -# Begin Source File - -SOURCE=..\include\system.h -# End Source File -# Begin Source File - -SOURCE=..\include\tcap.h -# End Source File -# Begin Source File - -SOURCE=..\include\tile2x11.h -# End Source File -# Begin Source File - -SOURCE=..\include\timeout.h -# End Source File -# Begin Source File - -SOURCE=..\include\tosconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\tradstdc.h -# End Source File -# Begin Source File - -SOURCE=..\include\trampoli.h -# End Source File -# Begin Source File - -SOURCE=..\include\trap.h -# End Source File -# Begin Source File - -SOURCE=..\include\unixconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\vault.h -# End Source File -# Begin Source File - -SOURCE=..\include\vision.h -# End Source File -# Begin Source File - -SOURCE=..\include\vmsconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\winami.h -# End Source File -# Begin Source File - -SOURCE=..\include\wingem.h -# End Source File -# Begin Source File - -SOURCE=..\include\winGnome.h -# End Source File -# Begin Source File - -SOURCE=..\include\winprocs.h -# End Source File -# Begin Source File - -SOURCE=..\include\wintty.h -# End Source File -# Begin Source File - -SOURCE=..\include\wintype.h -# End Source File -# Begin Source File - -SOURCE=..\include\winX.h -# End Source File -# Begin Source File - -SOURCE=..\include\xwindow.h -# End Source File -# Begin Source File - -SOURCE=..\include\xwindowp.h -# End Source File -# Begin Source File - -SOURCE=..\include\you.h -# End Source File -# Begin Source File - -SOURCE=..\include\youprop.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=..\win\win32\bitmap1.bmp -# End Source File -# Begin Source File - -SOURCE=..\win\win32\bitmap2.bmp -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mnsel.bmp -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mnunsel.bmp -# End Source File -# Begin Source File - -SOURCE=..\win\win32\NETHACK.ICO -# End Source File -# Begin Source File - -SOURCE=..\win\win32\small.ico -# End Source File -# Begin Source File - -SOURCE=..\win\win32\tiles.bmp -# End Source File -# Begin Source File - -SOURCE=..\win\win32\winhack.ico -# End Source File -# End Group -# Begin Group "wnd" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\win\win32\mhaskyn.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhaskyn.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhdlg.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhdlg.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhfont.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhfont.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhinput.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhinput.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmain.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmain.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmap.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmap.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmenu.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmenu.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmsg.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmsgwnd.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhmsgwnd.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhsplash.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhrip.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhsplash.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhrip.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhstatus.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhstatus.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhtext.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mhtext.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\mswproc.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\resource.h -# End Source File -# Begin Source File - -SOURCE=..\win\win32\winhack.c -# End Source File -# Begin Source File - -SOURCE=..\win\win32\winhack.rc -# End Source File -# Begin Source File - -SOURCE=..\win\win32\winMS.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\win\win32\ReadMe.txt -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="NetHackW" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=NetHackW - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "NetHackW.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "NetHackW.mak" CFG="NetHackW - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "NetHackW - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "NetHackW - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "NetHackW - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Og /Oy /Ob1 /Gs /Gf /Gy /Oi- /Ot /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /W3 /GX /Og /Oy /Ob1 /Gs /Gf /Gy /Oi- /Ot /I "..\win\win32" /I "..\include" /I "..\sys\winnt" /I "..\sys\share" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /map /debug /machine:I386 /MAPINFO:EXPORTS /MAPINFO:LINES +# SUBTRACT LINK32 /pdb:none +# Begin Special Build Tool +OutDir=.\Release +SOURCE="$(InputPath)" +PostBuild_Desc=Install exe +PostBuild_Cmds=copy $(OutDir)\NetHackW.exe ..\binary \ +copy ..\dat\nhdat ..\binary \ +copy ..\dat\license ..\binary \ +if exist tiles.bmp copy tiles.bmp ..\binary \ +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 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "NetHackW - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\win\win32" /I "..\include" /I "..\sys\winnt" /I "..\sys\share" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +OutDir=.\Debug +SOURCE="$(InputPath)" +PostBuild_Desc=Install exe +PostBuild_Cmds=if NOT exist ..\binary\*.* mkdir ..\binary \ +copy $(OutDir)\NetHackW.exe ..\binary \ +copy ..\dat\nhdat ..\binary \ +copy ..\dat\license ..\binary \ +if exist tiles.bmp copy tiles.bmp ..\binary \ +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 +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "NetHackW - Win32 Release" +# Name "NetHackW - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\allmain.c +# End Source File +# Begin Source File + +SOURCE=..\src\alloc.c +# End Source File +# Begin Source File + +SOURCE=..\src\apply.c +# End Source File +# Begin Source File + +SOURCE=..\src\artifact.c +# End Source File +# Begin Source File + +SOURCE=..\src\attrib.c +# End Source File +# Begin Source File + +SOURCE=..\src\ball.c +# End Source File +# Begin Source File + +SOURCE=..\src\bones.c +# End Source File +# Begin Source File + +SOURCE=..\src\botl.c +# End Source File +# Begin Source File + +SOURCE=..\src\cmd.c +# End Source File +# Begin Source File + +SOURCE=..\src\dbridge.c +# End Source File +# Begin Source File + +SOURCE=..\src\decl.c +# End Source File +# Begin Source File + +SOURCE=..\src\detect.c +# End Source File +# Begin Source File + +SOURCE=..\src\dig.c +# End Source File +# Begin Source File + +SOURCE=..\src\display.c +# End Source File +# Begin Source File + +SOURCE=..\src\dlb.c +# End Source File +# Begin Source File + +SOURCE=..\src\do.c +# End Source File +# Begin Source File + +SOURCE=..\src\do_name.c +# End Source File +# Begin Source File + +SOURCE=..\src\do_wear.c +# End Source File +# Begin Source File + +SOURCE=..\src\dog.c +# End Source File +# Begin Source File + +SOURCE=..\src\dogmove.c +# End Source File +# Begin Source File + +SOURCE=..\src\dokick.c +# End Source File +# Begin Source File + +SOURCE=..\src\dothrow.c +# End Source File +# Begin Source File + +SOURCE=..\src\drawing.c +# End Source File +# Begin Source File + +SOURCE=..\src\dungeon.c +# End Source File +# Begin Source File + +SOURCE=..\src\eat.c +# End Source File +# Begin Source File + +SOURCE=..\src\end.c +# End Source File +# Begin Source File + +SOURCE=..\src\engrave.c +# End Source File +# Begin Source File + +SOURCE=..\src\exper.c +# End Source File +# Begin Source File + +SOURCE=..\src\explode.c +# End Source File +# Begin Source File + +SOURCE=..\src\extralev.c +# End Source File +# Begin Source File + +SOURCE=..\src\files.c +# End Source File +# Begin Source File + +SOURCE=..\src\fountain.c +# End Source File +# Begin Source File + +SOURCE=..\win\tty\getline.c +# End Source File +# Begin Source File + +SOURCE=..\src\hack.c +# End Source File +# Begin Source File + +SOURCE=..\src\hacklib.c +# End Source File +# Begin Source File + +SOURCE=..\src\invent.c +# End Source File +# Begin Source File + +SOURCE=..\src\light.c +# End Source File +# Begin Source File + +SOURCE=..\src\lock.c +# End Source File +# Begin Source File + +SOURCE=..\src\mail.c +# End Source File +# Begin Source File + +SOURCE=..\src\makemon.c +# End Source File +# Begin Source File + +SOURCE=..\src\mapglyph.c +# End Source File +# Begin Source File + +SOURCE=..\src\mcastu.c +# End Source File +# Begin Source File + +SOURCE=..\src\mhitm.c +# End Source File +# Begin Source File + +SOURCE=..\src\mhitu.c +# End Source File +# Begin Source File + +SOURCE=..\src\minion.c +# End Source File +# Begin Source File + +SOURCE=..\src\mklev.c +# End Source File +# Begin Source File + +SOURCE=..\src\mkmap.c +# End Source File +# Begin Source File + +SOURCE=..\src\mkmaze.c +# End Source File +# Begin Source File + +SOURCE=..\src\mkobj.c +# End Source File +# Begin Source File + +SOURCE=..\src\mkroom.c +# End Source File +# Begin Source File + +SOURCE=..\src\mon.c +# End Source File +# Begin Source File + +SOURCE=..\src\mondata.c +# End Source File +# Begin Source File + +SOURCE=..\src\monmove.c +# End Source File +# Begin Source File + +SOURCE=..\src\monst.c +# End Source File +# Begin Source File + +SOURCE=..\src\monstr.c +# End Source File +# Begin Source File + +SOURCE=..\src\mplayer.c +# End Source File +# Begin Source File + +SOURCE=..\src\mthrowu.c +# End Source File +# Begin Source File + +SOURCE=..\src\muse.c +# End Source File +# Begin Source File + +SOURCE=..\src\music.c +# End Source File +# Begin Source File + +SOURCE=..\sys\winnt\ntsound.c +# End Source File +# Begin Source File + +SOURCE=..\src\o_init.c +# End Source File +# Begin Source File + +SOURCE=..\src\objects.c +# End Source File +# Begin Source File + +SOURCE=..\src\objnam.c +# End Source File +# Begin Source File + +SOURCE=..\src\options.c +# End Source File +# Begin Source File + +SOURCE=..\src\pager.c +# End Source File +# Begin Source File + +SOURCE=..\sys\share\pcmain.c +# End Source File +# Begin Source File + +SOURCE=..\sys\share\pcsys.c +# End Source File +# Begin Source File + +SOURCE=..\sys\share\pcunix.c +# End Source File +# Begin Source File + +SOURCE=..\src\pickup.c +# End Source File +# Begin Source File + +SOURCE=..\src\pline.c +# End Source File +# Begin Source File + +SOURCE=..\src\polyself.c +# End Source File +# Begin Source File + +SOURCE=..\src\potion.c +# End Source File +# Begin Source File + +SOURCE=..\src\pray.c +# End Source File +# Begin Source File + +SOURCE=..\src\priest.c +# End Source File +# Begin Source File + +SOURCE=..\src\quest.c +# End Source File +# Begin Source File + +SOURCE=..\src\questpgr.c +# End Source File +# Begin Source File + +SOURCE=..\sys\share\random.c +# End Source File +# Begin Source File + +SOURCE=..\src\read.c +# End Source File +# Begin Source File + +SOURCE=..\src\rect.c +# End Source File +# Begin Source File + +SOURCE=..\src\region.c +# End Source File +# Begin Source File + +SOURCE=..\src\restore.c +# End Source File +# Begin Source File + +SOURCE=..\src\rip.c +# End Source File +# Begin Source File + +SOURCE=..\src\rnd.c +# End Source File +# Begin Source File + +SOURCE=..\src\role.c +# End Source File +# Begin Source File + +SOURCE=..\src\rumors.c +# End Source File +# Begin Source File + +SOURCE=..\src\save.c +# End Source File +# Begin Source File + +SOURCE=..\src\shk.c +# End Source File +# Begin Source File + +SOURCE=..\src\shknam.c +# End Source File +# Begin Source File + +SOURCE=..\src\sit.c +# End Source File +# Begin Source File + +SOURCE=..\src\sounds.c +# End Source File +# Begin Source File + +SOURCE=..\src\sp_lev.c +# End Source File +# Begin Source File + +SOURCE=..\src\spell.c +# End Source File +# Begin Source File + +SOURCE=..\src\steal.c +# End Source File +# Begin Source File + +SOURCE=..\src\steed.c +# End Source File +# Begin Source File + +SOURCE=..\src\teleport.c +# End Source File +# Begin Source File + +SOURCE=..\src\tile.c +# End Source File +# Begin Source File + +SOURCE=..\src\timeout.c +# End Source File +# Begin Source File + +SOURCE=..\src\topten.c +# End Source File +# Begin Source File + +SOURCE=..\src\track.c +# End Source File +# Begin Source File + +SOURCE=..\src\trap.c +# End Source File +# Begin Source File + +SOURCE=..\src\u_init.c +# End Source File +# Begin Source File + +SOURCE=..\src\uhitm.c +# End Source File +# Begin Source File + +SOURCE=..\src\vault.c +# End Source File +# Begin Source File + +SOURCE=..\src\version.c +# End Source File +# Begin Source File + +SOURCE=..\src\vision.c +# End Source File +# Begin Source File + +SOURCE=..\src\weapon.c +# End Source File +# Begin Source File + +SOURCE=..\src\were.c +# End Source File +# Begin Source File + +SOURCE=..\src\wield.c +# End Source File +# Begin Source File + +SOURCE=..\src\windows.c +# End Source File +# Begin Source File + +SOURCE=..\sys\winnt\winnt.c +# End Source File +# Begin Source File + +SOURCE=..\win\tty\wintty.c +# End Source File +# Begin Source File + +SOURCE=..\src\wizard.c +# End Source File +# Begin Source File + +SOURCE=..\src\worm.c +# End Source File +# Begin Source File + +SOURCE=..\src\worn.c +# End Source File +# Begin Source File + +SOURCE=..\src\write.c +# End Source File +# Begin Source File + +SOURCE=..\src\zap.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\align.h +# End Source File +# Begin Source File + +SOURCE=..\include\amiconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\artifact.h +# End Source File +# Begin Source File + +SOURCE=..\include\artilist.h +# End Source File +# Begin Source File + +SOURCE=..\include\attrib.h +# End Source File +# Begin Source File + +SOURCE=..\include\beconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\bitmfile.h +# End Source File +# Begin Source File + +SOURCE=..\include\color.h +# End Source File +# Begin Source File + +SOURCE=..\include\config.h +# End Source File +# Begin Source File + +SOURCE=..\include\config1.h +# End Source File +# Begin Source File + +SOURCE=..\include\coord.h +# End Source File +# Begin Source File + +SOURCE=..\include\decl.h +# End Source File +# Begin Source File + +SOURCE=..\include\def_os2.h +# End Source File +# Begin Source File + +SOURCE=..\include\dgn_file.h +# End Source File +# Begin Source File + +SOURCE=..\include\display.h +# End Source File +# Begin Source File + +SOURCE=..\include\dlb.h +# End Source File +# Begin Source File + +SOURCE=..\include\dungeon.h +# End Source File +# Begin Source File + +SOURCE=..\include\edog.h +# End Source File +# Begin Source File + +SOURCE=..\include\emin.h +# End Source File +# Begin Source File + +SOURCE=..\include\engrave.h +# End Source File +# Begin Source File + +SOURCE=..\include\epri.h +# End Source File +# Begin Source File + +SOURCE=..\include\eshk.h +# End Source File +# Begin Source File + +SOURCE=..\include\extern.h +# End Source File +# Begin Source File + +SOURCE=..\include\flag.h +# End Source File +# Begin Source File + +SOURCE=..\include\func_tab.h +# End Source File +# Begin Source File + +SOURCE=..\include\gem_rsc.h +# End Source File +# Begin Source File + +SOURCE=..\include\global.h +# End Source File +# Begin Source File + +SOURCE=..\include\hack.h +# End Source File +# Begin Source File + +SOURCE=..\include\lev.h +# End Source File +# Begin Source File + +SOURCE=..\include\load_img.h +# End Source File +# Begin Source File + +SOURCE=..\include\macconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\macpopup.h +# End Source File +# Begin Source File + +SOURCE=..\include\mactty.h +# End Source File +# Begin Source File + +SOURCE=..\include\macwin.h +# End Source File +# Begin Source File + +SOURCE=..\include\mail.h +# End Source File +# Begin Source File + +SOURCE=..\include\mfndpos.h +# End Source File +# Begin Source File + +SOURCE=..\include\micro.h +# End Source File +# Begin Source File + +SOURCE=..\include\mkroom.h +# End Source File +# Begin Source File + +SOURCE=..\include\monattk.h +# End Source File +# Begin Source File + +SOURCE=..\include\mondata.h +# End Source File +# Begin Source File + +SOURCE=..\include\monflag.h +# End Source File +# Begin Source File + +SOURCE=..\include\monst.h +# End Source File +# Begin Source File + +SOURCE=..\include\monsym.h +# End Source File +# Begin Source File + +SOURCE=..\include\mttypriv.h +# End Source File +# Begin Source File + +SOURCE=..\include\nhlan.h +# End Source File +# Begin Source File + +SOURCE=..\include\windconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\obj.h +# End Source File +# Begin Source File + +SOURCE=..\include\objclass.h +# End Source File +# Begin Source File + +SOURCE=..\include\os2conf.h +# End Source File +# Begin Source File + +SOURCE=..\include\patchlevel.h +# End Source File +# Begin Source File + +SOURCE=..\include\pcconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\permonst.h +# End Source File +# Begin Source File + +SOURCE=..\include\prop.h +# End Source File +# Begin Source File + +SOURCE=..\include\qt_clust.h +# End Source File +# Begin Source File + +SOURCE=..\include\qt_kde0.h +# End Source File +# Begin Source File + +SOURCE=..\include\qt_win.h +# End Source File +# Begin Source File + +SOURCE=..\include\qt_xpms.h +# End Source File +# Begin Source File + +SOURCE=..\include\qtext.h +# End Source File +# Begin Source File + +SOURCE=..\include\quest.h +# End Source File +# Begin Source File + +SOURCE=..\include\rect.h +# End Source File +# Begin Source File + +SOURCE=..\include\region.h +# End Source File +# Begin Source File + +SOURCE=..\include\rm.h +# End Source File +# Begin Source File + +SOURCE=..\include\skills.h +# End Source File +# Begin Source File + +SOURCE=..\include\sp_lev.h +# End Source File +# Begin Source File + +SOURCE=..\include\spell.h +# End Source File +# Begin Source File + +SOURCE=..\include\system.h +# End Source File +# Begin Source File + +SOURCE=..\include\tcap.h +# End Source File +# Begin Source File + +SOURCE=..\include\tile2x11.h +# End Source File +# Begin Source File + +SOURCE=..\include\timeout.h +# End Source File +# Begin Source File + +SOURCE=..\include\tosconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\tradstdc.h +# End Source File +# Begin Source File + +SOURCE=..\include\trampoli.h +# End Source File +# Begin Source File + +SOURCE=..\include\trap.h +# End Source File +# Begin Source File + +SOURCE=..\include\unixconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\vault.h +# End Source File +# Begin Source File + +SOURCE=..\include\vision.h +# End Source File +# Begin Source File + +SOURCE=..\include\vmsconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\winami.h +# End Source File +# Begin Source File + +SOURCE=..\include\wingem.h +# End Source File +# Begin Source File + +SOURCE=..\include\winGnome.h +# End Source File +# Begin Source File + +SOURCE=..\include\winprocs.h +# End Source File +# Begin Source File + +SOURCE=..\include\wintty.h +# End Source File +# Begin Source File + +SOURCE=..\include\wintype.h +# End Source File +# Begin Source File + +SOURCE=..\include\winX.h +# End Source File +# Begin Source File + +SOURCE=..\include\xwindow.h +# End Source File +# Begin Source File + +SOURCE=..\include\xwindowp.h +# End Source File +# Begin Source File + +SOURCE=..\include\you.h +# End Source File +# Begin Source File + +SOURCE=..\include\youprop.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=..\win\win32\bitmap1.bmp +# End Source File +# Begin Source File + +SOURCE=..\win\win32\bitmap2.bmp +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mnsel.bmp +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mnunsel.bmp +# End Source File +# Begin Source File + +SOURCE=..\win\win32\NETHACK.ICO +# End Source File +# Begin Source File + +SOURCE=..\win\win32\small.ico +# End Source File +# Begin Source File + +SOURCE=..\win\win32\tiles.bmp +# End Source File +# Begin Source File + +SOURCE=..\win\win32\winhack.ico +# End Source File +# End Group +# Begin Group "wnd" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\win\win32\mhaskyn.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhaskyn.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhdlg.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhdlg.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhfont.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhfont.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhinput.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhinput.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmain.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmain.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmap.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmap.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmenu.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmenu.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmsg.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmsgwnd.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhmsgwnd.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhsplash.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhrip.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhsplash.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhrip.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhstatus.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhstatus.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhtext.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mhtext.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\mswproc.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\resource.h +# End Source File +# Begin Source File + +SOURCE=..\win\win32\winhack.c +# End Source File +# Begin Source File + +SOURCE=..\win\win32\winhack.rc +# End Source File +# Begin Source File + +SOURCE=..\win\win32\winMS.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\win\win32\ReadMe.txt +# End Source File +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/recover.dsp b/win/win32/recover.dsp index 7052afaf0..a4720e635 100644 --- a/win/win32/recover.dsp +++ b/win/win32/recover.dsp @@ -1,148 +1,148 @@ -# Microsoft Developer Studio Project File - Name="recover" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=recover - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "recover.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "recover.mak" CFG="recover - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "recover - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "recover - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "recover - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -OutDir=.\Release -SOURCE="$(InputPath)" -PostBuild_Cmds=copy $(OutDir)\recover.exe ..\binary \ -if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt -# End Special Build Tool - -!ELSEIF "$(CFG)" == "recover - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -OutDir=.\Debug -SOURCE="$(InputPath)" -PostBuild_Desc=install exe -PostBuild_Cmds=copy $(OutDir)\recover.exe ..\binary \ -if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "recover - Win32 Release" -# Name "recover - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\util\recover.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\config1.h -# End Source File -# Begin Source File - -SOURCE=..\include\coord.h -# End Source File -# Begin Source File - -SOURCE=..\include\global.h -# End Source File -# Begin Source File - -SOURCE=..\include\nhlan.h -# End Source File -# Begin Source File - -SOURCE=..\include\ntconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\tradstdc.h -# End Source File -# Begin Source File - -SOURCE=..\sys\winnt\win32api.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="recover" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=recover - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "recover.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "recover.mak" CFG="recover - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "recover - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "recover - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "recover - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +OutDir=.\Release +SOURCE="$(InputPath)" +PostBuild_Cmds=copy $(OutDir)\recover.exe ..\binary \ +if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt +# End Special Build Tool + +!ELSEIF "$(CFG)" == "recover - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\sys\winnt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +OutDir=.\Debug +SOURCE="$(InputPath)" +PostBuild_Desc=install exe +PostBuild_Cmds=copy $(OutDir)\recover.exe ..\binary \ +if exist ..\doc\recover.txt copy ..\doc\recover.txt ..\binary\recover.txt +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "recover - Win32 Release" +# Name "recover - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\util\recover.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\config.h +# End Source File +# Begin Source File + +SOURCE=..\include\config1.h +# End Source File +# Begin Source File + +SOURCE=..\include\coord.h +# End Source File +# Begin Source File + +SOURCE=..\include\global.h +# End Source File +# Begin Source File + +SOURCE=..\include\nhlan.h +# End Source File +# Begin Source File + +SOURCE=..\include\windconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\tradstdc.h +# End Source File +# Begin Source File + +SOURCE=..\sys\winnt\win32api.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/tile2bmp.dsp b/win/win32/tile2bmp.dsp index 5a534e2a8..3ac23b8d5 100644 --- a/win/win32/tile2bmp.dsp +++ b/win/win32/tile2bmp.dsp @@ -1,146 +1,146 @@ -# Microsoft Developer Studio Project File - Name="tile2bmp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=tile2bmp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "tile2bmp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "tile2bmp.mak" CFG="tile2bmp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "tile2bmp - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "tile2bmp - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "tile2bmp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\tile2bmp.exe" - -!ELSEIF "$(CFG)" == "tile2bmp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\util\tile2bmp.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "tile2bmp - Win32 Release" -# Name "tile2bmp - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\decl.c -# End Source File -# Begin Source File - -SOURCE=..\src\drawing.c -# End Source File -# Begin Source File - -SOURCE=..\src\monst.c -# End Source File -# Begin Source File - -SOURCE=..\src\objects.c -# End Source File -# Begin Source File - -SOURCE=..\win\share\tile2bmp.c - -!IF "$(CFG)" == "tile2bmp - Win32 Release" - -!ELSEIF "$(CFG)" == "tile2bmp - Win32 Debug" - -# ADD CPP /D "PACKED_FILE" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\win\share\tiletext.c - -!IF "$(CFG)" == "tile2bmp - Win32 Release" - -!ELSEIF "$(CFG)" == "tile2bmp - Win32 Debug" - -# ADD CPP /Zi - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\win\share\tiletxt.c -# ADD CPP /D "TILETEXT" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="tile2bmp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=tile2bmp - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "tile2bmp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "tile2bmp.mak" CFG="tile2bmp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "tile2bmp - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "tile2bmp - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "tile2bmp - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\tile2bmp.exe" + +!ELSEIF "$(CFG)" == "tile2bmp - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\util\tile2bmp.exe" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "tile2bmp - Win32 Release" +# Name "tile2bmp - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\decl.c +# End Source File +# Begin Source File + +SOURCE=..\src\drawing.c +# End Source File +# Begin Source File + +SOURCE=..\src\monst.c +# End Source File +# Begin Source File + +SOURCE=..\src\objects.c +# End Source File +# Begin Source File + +SOURCE=..\win\share\tile2bmp.c + +!IF "$(CFG)" == "tile2bmp - Win32 Release" + +!ELSEIF "$(CFG)" == "tile2bmp - Win32 Debug" + +# ADD CPP /D "PACKED_FILE" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\win\share\tiletext.c + +!IF "$(CFG)" == "tile2bmp - Win32 Release" + +!ELSEIF "$(CFG)" == "tile2bmp - Win32 Debug" + +# ADD CPP /Zi + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\win\share\tiletxt.c +# ADD CPP /D "TILETEXT" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/tilemap.dsp b/win/win32/tilemap.dsp index 37d71ef11..abb512629 100644 --- a/win/win32/tilemap.dsp +++ b/win/win32/tilemap.dsp @@ -1,281 +1,281 @@ -# Microsoft Developer Studio Project File - Name="tilemap" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=tilemap - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "tilemap.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "tilemap.mak" CFG="tilemap - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "tilemap - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "tilemap - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "tilemap - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt\include" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\tilemap.exe" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Generating src\tile.c -PostBuild_Cmds=echo chdir ..\src chdir ..\src ..\util\tilemap.exe echo chdir ..\build chdir ..\build -# End Special Build Tool - -!ELSEIF "$(CFG)" == "tilemap - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt\include" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\util\tilemap.exe" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Generating src\tile.c -PostBuild_Cmds=echo chdir ..\src chdir ..\src ..\util\tilemap.exe echo chdir ..\build chdir ..\build -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "tilemap - Win32 Release" -# Name "tilemap - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\win\share\tilemap.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\align.h -# End Source File -# Begin Source File - -SOURCE=..\include\attrib.h -# End Source File -# Begin Source File - -SOURCE=..\include\color.h -# End Source File -# Begin Source File - -SOURCE=..\include\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\config1.h -# End Source File -# Begin Source File - -SOURCE=..\include\coord.h -# End Source File -# Begin Source File - -SOURCE=..\include\decl.h -# End Source File -# Begin Source File - -SOURCE=..\include\dgn_comp.h -# End Source File -# Begin Source File - -SOURCE=..\include\dgn_file.h -# End Source File -# Begin Source File - -SOURCE=..\include\display.h -# End Source File -# Begin Source File - -SOURCE=..\include\dungeon.h -# End Source File -# Begin Source File - -SOURCE=..\include\engrave.h -# End Source File -# Begin Source File - -SOURCE=..\include\flag.h -# End Source File -# Begin Source File - -SOURCE=..\include\global.h -# End Source File -# Begin Source File - -SOURCE=..\include\mkroom.h -# End Source File -# Begin Source File - -SOURCE=..\include\monattk.h -# End Source File -# Begin Source File - -SOURCE=..\include\monst.h -# End Source File -# Begin Source File - -SOURCE=..\include\monsym.h -# End Source File -# Begin Source File - -SOURCE=..\include\nhlan.h -# End Source File -# Begin Source File - -SOURCE=..\include\ntconf.h -# End Source File -# Begin Source File - -SOURCE=..\include\obj.h -# End Source File -# Begin Source File - -SOURCE=..\include\objclass.h -# End Source File -# Begin Source File - -SOURCE=..\include\onames.h -# End Source File -# Begin Source File - -SOURCE=..\include\permonst.h -# End Source File -# Begin Source File - -SOURCE=..\include\pm.h -# End Source File -# Begin Source File - -SOURCE=..\include\prop.h -# End Source File -# Begin Source File - -SOURCE=..\include\quest.h -# End Source File -# Begin Source File - -SOURCE=..\include\rect.h -# End Source File -# Begin Source File - -SOURCE=..\include\region.h -# End Source File -# Begin Source File - -SOURCE=..\include\rm.h -# End Source File -# Begin Source File - -SOURCE=..\include\skills.h -# End Source File -# Begin Source File - -SOURCE=..\include\spell.h -# End Source File -# Begin Source File - -SOURCE=..\include\timeout.h -# End Source File -# Begin Source File - -SOURCE=..\include\tradstdc.h -# End Source File -# Begin Source File - -SOURCE=..\include\trampoli.h -# End Source File -# Begin Source File - -SOURCE=..\include\trap.h -# End Source File -# Begin Source File - -SOURCE=..\include\vision.h -# End Source File -# Begin Source File - -SOURCE=..\include\winprocs.h -# End Source File -# Begin Source File - -SOURCE=..\include\wintty.h -# End Source File -# Begin Source File - -SOURCE=..\include\wintype.h -# End Source File -# Begin Source File - -SOURCE=..\include\you.h -# End Source File -# Begin Source File - -SOURCE=..\include\youprop.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="tilemap" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=tilemap - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "tilemap.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "tilemap.mak" CFG="tilemap - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "tilemap - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "tilemap - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "tilemap - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sys\winnt\include" /I "..\win\share" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\tilemap.exe" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Generating src\tile.c +PostBuild_Cmds=echo chdir ..\src chdir ..\src ..\util\tilemap.exe echo chdir ..\build chdir ..\build +# End Special Build Tool + +!ELSEIF "$(CFG)" == "tilemap - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\sys\winnt\include" /I "..\win\share" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32CON" /D "DLB" /D "MSWIN_GRAPHICS" /FD /GZ /c +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\util\tilemap.exe" /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Generating src\tile.c +PostBuild_Cmds=echo chdir ..\src chdir ..\src ..\util\tilemap.exe echo chdir ..\build chdir ..\build +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "tilemap - Win32 Release" +# Name "tilemap - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\win\share\tilemap.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\align.h +# End Source File +# Begin Source File + +SOURCE=..\include\attrib.h +# End Source File +# Begin Source File + +SOURCE=..\include\color.h +# End Source File +# Begin Source File + +SOURCE=..\include\config.h +# End Source File +# Begin Source File + +SOURCE=..\include\config1.h +# End Source File +# Begin Source File + +SOURCE=..\include\coord.h +# End Source File +# Begin Source File + +SOURCE=..\include\decl.h +# End Source File +# Begin Source File + +SOURCE=..\include\dgn_comp.h +# End Source File +# Begin Source File + +SOURCE=..\include\dgn_file.h +# End Source File +# Begin Source File + +SOURCE=..\include\display.h +# End Source File +# Begin Source File + +SOURCE=..\include\dungeon.h +# End Source File +# Begin Source File + +SOURCE=..\include\engrave.h +# End Source File +# Begin Source File + +SOURCE=..\include\flag.h +# End Source File +# Begin Source File + +SOURCE=..\include\global.h +# End Source File +# Begin Source File + +SOURCE=..\include\mkroom.h +# End Source File +# Begin Source File + +SOURCE=..\include\monattk.h +# End Source File +# Begin Source File + +SOURCE=..\include\monst.h +# End Source File +# Begin Source File + +SOURCE=..\include\monsym.h +# End Source File +# Begin Source File + +SOURCE=..\include\nhlan.h +# End Source File +# Begin Source File + +SOURCE=..\include\windconf.h +# End Source File +# Begin Source File + +SOURCE=..\include\obj.h +# End Source File +# Begin Source File + +SOURCE=..\include\objclass.h +# End Source File +# Begin Source File + +SOURCE=..\include\onames.h +# End Source File +# Begin Source File + +SOURCE=..\include\permonst.h +# End Source File +# Begin Source File + +SOURCE=..\include\pm.h +# End Source File +# Begin Source File + +SOURCE=..\include\prop.h +# End Source File +# Begin Source File + +SOURCE=..\include\quest.h +# End Source File +# Begin Source File + +SOURCE=..\include\rect.h +# End Source File +# Begin Source File + +SOURCE=..\include\region.h +# End Source File +# Begin Source File + +SOURCE=..\include\rm.h +# End Source File +# Begin Source File + +SOURCE=..\include\skills.h +# End Source File +# Begin Source File + +SOURCE=..\include\spell.h +# End Source File +# Begin Source File + +SOURCE=..\include\timeout.h +# End Source File +# Begin Source File + +SOURCE=..\include\tradstdc.h +# End Source File +# Begin Source File + +SOURCE=..\include\trampoli.h +# End Source File +# Begin Source File + +SOURCE=..\include\trap.h +# End Source File +# Begin Source File + +SOURCE=..\include\vision.h +# End Source File +# Begin Source File + +SOURCE=..\include\winprocs.h +# End Source File +# Begin Source File + +SOURCE=..\include\wintty.h +# End Source File +# Begin Source File + +SOURCE=..\include\wintype.h +# End Source File +# Begin Source File + +SOURCE=..\include\you.h +# End Source File +# Begin Source File + +SOURCE=..\include\youprop.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file diff --git a/win/win32/tiles.dsp b/win/win32/tiles.dsp index ab2207a90..73ce62e55 100644 --- a/win/win32/tiles.dsp +++ b/win/win32/tiles.dsp @@ -1,97 +1,97 @@ -# Microsoft Developer Studio Project File - Name="tiles" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=tiles - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "tiles.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "tiles.mak" CFG="tiles - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "tiles - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "tiles - Win32 Debug" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "tiles - Win32 Release" - -# PROP BASE Use_MFC -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f tiles.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "tiles.exe" -# PROP BASE Bsc_Name "tiles.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "nmake /f "tiles.mak"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "..\win\win32\tiles.bmp" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "tiles - Win32 Debug" - -# PROP BASE Use_MFC -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f tiles.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "tiles.exe" -# PROP BASE Bsc_Name "tiles.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "nmake /f "tiles.mak"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "..\win\win32\tiles.bmp" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "tiles - Win32 Release" -# Name "tiles - Win32 Debug" - -!IF "$(CFG)" == "tiles - Win32 Release" - -!ELSEIF "$(CFG)" == "tiles - Win32 Debug" - -!ENDIF - -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="tiles" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=tiles - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "tiles.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "tiles.mak" CFG="tiles - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "tiles - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "tiles - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "tiles - Win32 Release" + +# PROP BASE Use_MFC +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f tiles.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "tiles.exe" +# PROP BASE Bsc_Name "tiles.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "nmake /f "tiles.mak"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "..\win\win32\tiles.bmp" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "tiles - Win32 Debug" + +# PROP BASE Use_MFC +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Cmd_Line "NMAKE /f tiles.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "tiles.exe" +# PROP BASE Bsc_Name "tiles.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "nmake /f "tiles.mak"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "..\win\win32\tiles.bmp" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "tiles - Win32 Release" +# Name "tiles - Win32 Debug" + +!IF "$(CFG)" == "tiles - Win32 Release" + +!ELSEIF "$(CFG)" == "tiles - Win32 Debug" + +!ENDIF + +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project \ No newline at end of file From efd33daf79a2f6072f93db4599c1472e6779f7ac Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Sun, 6 Apr 2025 13:37:25 +0200 Subject: [PATCH 5/8] winnt -> windows --- configure | 7 +++--- sys/autoconf/Makefile.dat | 4 ++-- sys/autoconf/Makefile.src | 38 +++++++++++++++--------------- sys/autoconf/Makefile.top | 2 +- sys/autoconf/autoconf.hin | 18 +++++++------- sys/autoconf/config.sub | 4 ++-- sys/autoconf/configure.ac | 4 ++-- sys/windows/{winnt.c => windsys.c} | 0 8 files changed, 38 insertions(+), 39 deletions(-) rename sys/windows/{winnt.c => windsys.c} (100%) diff --git a/configure b/configure index 3399b6fc5..6ce8e9ab5 100755 --- a/configure +++ b/configure @@ -4686,7 +4686,7 @@ printf "%s\n" "#define WIN32 /**/" >>confdefs.h HOST_UNIX=# - SYSTEM="Syswinnt" + SYSTEM="Sysmswin" SYSSRC="\${SYSMSWINSRC}" SYSOBJ="\${SYSMSWINOBJ}" ;; @@ -9249,8 +9249,8 @@ if test ! -f dat/opthelp -o ${srcdir}/dat/opthelp -nt dat/opthelp ; then if test ! -f dat/wizhelp -o ${srcdir}/dat/wizhelp -nt dat/wizhelp ; then NETHACK_LINKS="${NETHACK_LINKS} dat/wizhelp:dat/wizhelp" fi -if test ! -f include/win32api.h -o ${srcdir}/sys/winnt/win32api.h -nt include/win32api.h ; then - NETHACK_LINKS="${NETHACK_LINKS} include/win32api.h:sys/winnt/win32api.h" +if test ! -f include/win32api.h -o ${srcdir}/sys/windows/win32api.h -nt include/win32api.h ; then + NETHACK_LINKS="${NETHACK_LINKS} include/win32api.h:sys/windows/win32api.h" fi ac_config_links="$ac_config_links ${NETHACK_LINKS}" @@ -10587,4 +10587,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/sys/autoconf/Makefile.dat b/sys/autoconf/Makefile.dat index 073786e8e..5ccc47311 100644 --- a/sys/autoconf/Makefile.dat +++ b/sys/autoconf/Makefile.dat @@ -224,8 +224,8 @@ rip.bmp: ../util/uudecode$(EXEEXT) $(srcdir)/../win/win32/rip.uu petmark.bmp: ../util/uudecode$(EXEEXT) $(srcdir)/../win/win32/petmark.uu ../util/uudecode$(EXEEXT) $(srcdir)/../win/win32/petmark.uu -UnNetHack.ico: ../util/uudecode$(EXEEXT) $(srcdir)/../sys/winnt/nhico.uu - ../util/uudecode$(EXEEXT) $(srcdir)/../sys/winnt/nhico.uu +UnNetHack.ico: ../util/uudecode$(EXEEXT) $(srcdir)/../sys/windows/nhico.uu + ../util/uudecode$(EXEEXT) $(srcdir)/../sys/windows/nhico.uu splash.bmp: ../util/uudecode$(EXEEXT) $(srcdir)/../win/win32/splash.uu ../util/uudecode$(EXEEXT) $(srcdir)/../win/win32/splash.uu diff --git a/sys/autoconf/Makefile.src b/sys/autoconf/Makefile.src index 0a34d2e3a..3892a33ff 100644 --- a/sys/autoconf/Makefile.src +++ b/sys/autoconf/Makefile.src @@ -18,11 +18,11 @@ SYSUNIXSRC = $(srcdir)/../sys/share/ioctl.c $(srcdir)/../sys/share/unixtty.c \ $(srcdir)/../sys/unix/unixres.c SYSUNIXOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o recover.o # for Microsoft Window systems -SYSMSWINSRC = $(srcdir)/../sys/winnt/nttty.c $(srcdir)/../sys/winnt/winnt.c \ +SYSMSWINSRC = $(srcdir)/../sys/windows/nttty.c $(srcdir)/../sys/windows/windsys.c \ $(srcdir)/../sys/share/pcsys.c $(srcdir)/../sys/share/pcunix.c \ $(srcdir)/../sys/share/pcmain.c $(srcdir)/../sys/share/random.c \ - $(srcdir)/../sys/share/nhlan.c $(srcdir)/../sys/winnt/ntsound.c -SYSMSWINOBJ = nttty.o winnt.o pcsys.o pcunix.o pcmain.o random.o nhlan.o ntsound.o + $(srcdir)/../sys/share/nhlan.c $(srcdir)/../sys/windows/ntsound.c +SYSMSWINOBJ = nttty.o windsys.o pcsys.o pcunix.o pcmain.o random.o nhlan.o ntsound.o # SYSSRC=@SYSSRC@ SYSOBJ=@SYSOBJ@ @@ -224,8 +224,8 @@ SYSCSRC = $(srcdir)/../sys/share/nhlan.c $(srcdir)/../sys/share/ioctl.c \ $(srcdir)/../sys/share/random.c $(srcdir)/../sys/share/unixtty.c \ $(srcdir)/../sys/atari/tos.c $(srcdir)/../sys/be/bemain.c \ $(srcdir)/../sys/unix/unixmain.c $(srcdir)/../sys/unix/unixres.c \ - $(srcdir)/../sys/unix/unixunix.c $(srcdir)/../sys/winnt/nttty.c \ - $(srcdir)/../sys/winnt/winnt.c + $(srcdir)/../sys/unix/unixunix.c $(srcdir)/../sys/windows/nttty.c \ + $(srcdir)/../sys/windows/windsys.c # generated source files (tile.c is handled separately) GENCSRC = monstr.c vis_tab.c #tile.c @@ -293,10 +293,10 @@ Sysunix: $(HOBJ) Makefile $(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) @touch Sysunix -Syswinnt: $(HOBJ) @EXTRA_UNSHARE@ Makefile +Sysmswin: $(HOBJ) @EXTRA_UNSHARE@ Makefile @echo "Loading ..." @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) - @touch Syswinnt + @touch Sysmswin Sys3B2: $(HOBJ) Makefile @echo "Loading ..." @@ -351,14 +351,14 @@ DUMB.Setup: ../include/extern.h @NHKEYDLL_GCC@$(CC) $(LFLAGS) -shared -Wl,--export-all-symbols \ @NHKEYDLL_GCC@ -Wl,--add-stdcall-alias -o $@ $< -nhdefkey.o: $(srcdir)/../sys/winnt/nhdefkey.c - $(CC) $(CFLAGS) -DBUILD_DLL -c $(srcdir)/../sys/winnt/nhdefkey.c +nhdefkey.o: $(srcdir)/../sys/windows/nhdefkey.c + $(CC) $(CFLAGS) -DBUILD_DLL -c $(srcdir)/../sys/windows/nhdefkey.c -nh340key.o: $(srcdir)/../sys/winnt/nh340key.c - $(CC) $(CFLAGS) -DBUILD_DLL -c $(srcdir)/../sys/winnt/nh340key.c +nh340key.o: $(srcdir)/../sys/windows/nh340key.c + $(CC) $(CFLAGS) -DBUILD_DLL -c $(srcdir)/../sys/windows/nh340key.c -nhraykey.o: $(srcdir)/../sys/winnt/nhraykey.c - $(CC) $(CFLAGS) -DBUILD_DLL -c $(srcdir)/../sys/winnt/nhraykey.c +nhraykey.o: $(srcdir)/../sys/windows/nhraykey.c + $(CC) $(CFLAGS) -DBUILD_DLL -c $(srcdir)/../sys/windows/nhraykey.c all: $(GAME) @@ -538,12 +538,12 @@ unixunix.o: $(srcdir)/../sys/unix/unixunix.c $(HACK_H) $(CC) $(CFLAGS) -c $(srcdir)/../sys/unix/unixunix.c unixres.o: $(srcdir)/../sys/unix/unixres.c $(CONFIG_H) $(CC) $(CFLAGS) -c $(srcdir)/../sys/unix/unixres.c -ntsound.o: $(srcdir)/../sys/winnt/ntsound.c $(HACK_H) #../include/win32api.h - $(CC) $(CFLAGS) -c $(srcdir)/../sys/winnt/ntsound.c -nttty.o: $(srcdir)/../sys/winnt/nttty.c $(HACK_H) #../include/win32api.h - $(CC) $(CFLAGS) -c $(srcdir)/../sys/winnt/nttty.c -winnt.o: $(srcdir)/../sys/winnt/winnt.c $(HACK_H) #../include/win32api.h - $(CC) $(CFLAGS) -c $(srcdir)/../sys/winnt/winnt.c +ntsound.o: $(srcdir)/../sys/windows/ntsound.c $(HACK_H) #../include/win32api.h + $(CC) $(CFLAGS) -c $(srcdir)/../sys/windows/ntsound.c +nttty.o: $(srcdir)/../sys/windows/nttty.c $(HACK_H) #../include/win32api.h + $(CC) $(CFLAGS) -c $(srcdir)/../sys/windows/nttty.c +windsys.o: $(srcdir)/../sys/windows/windsys.c $(HACK_H) #../include/win32api.h + $(CC) $(CFLAGS) -c $(srcdir)/../sys/windows/windsys.c getline.o: $(srcdir)/../win/tty/getline.c $(HACK_H) ../include/func_tab.h $(CC) $(CFLAGS) -c $(srcdir)/../win/tty/getline.c termcap.o: $(srcdir)/../win/tty/termcap.c $(HACK_H) ../include/tcap.h diff --git a/sys/autoconf/Makefile.top b/sys/autoconf/Makefile.top index c02fdf9c0..d9ee3952c 100644 --- a/sys/autoconf/Makefile.top +++ b/sys/autoconf/Makefile.top @@ -248,7 +248,7 @@ dofiles: -e '$$s/.*/nodlb/p' < dat/@OPTIONS_FILE@` ; \ $(MAKE) dofiles-$${target-nodlb} (cd src; cp $(GAME) @EXTRA_UNSHARE@ $(DESTDIR)$(FILE_AREA_UNSHARE)) - @HOST_MSWIN@cp $(srcdir)/sys/winnt/defaults.nh $(DESTDIR)$(FILE_AREA_UNSHARE) + @HOST_MSWIN@cp $(srcdir)/sys/windows/defaults.nh $(DESTDIR)$(FILE_AREA_UNSHARE) @HOST_UNIX@cp $(srcdir)/sys/unix/defaults.nh $(DESTDIR)$(FILE_AREA_UNSHARE)/unnethackrc.default cp util/recover$(EXEEXT) $(DESTDIR)$(FILE_AREA_UNSHARE) if test -f $(srcdir)/doc/Guidebook.txt ; then \ diff --git a/sys/autoconf/autoconf.hin b/sys/autoconf/autoconf.hin index 624d6727e..fccd2289f 100644 --- a/sys/autoconf/autoconf.hin +++ b/sys/autoconf/autoconf.hin @@ -105,15 +105,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CURSES_H -/* Define to 1 if you have the declaration of 'strncmpi', and to 0 if you +/* Define to 1 if you have the declaration of `strncmpi', and to 0 if you don't. */ #undef HAVE_DECL_STRNCMPI -/* Define to 1 if you have the declaration of 'strnicmp', and to 0 if you +/* Define to 1 if you have the declaration of `strnicmp', and to 0 if you don't. */ #undef HAVE_DECL_STRNICMP -/* Define to 1 if you have the 'fcntl' function. */ +/* Define to 1 if you have the `fcntl' function. */ #undef HAVE_FCNTL /* Define to 1 if you have the header file. */ @@ -254,13 +254,13 @@ /* simple mail dgamelaunch support */ #undef SIMPLE_MAIL -/* The size of 'unsigned int', as computed by sizeof. */ +/* The size of `unsigned int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_INT -/* The size of 'unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG -/* The size of 'unsigned long long', as computed by sizeof. */ +/* The size of `unsigned long long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG_LONG /* Sort item lists alphabetically by description. */ @@ -269,7 +269,7 @@ /* TTY graphics status color */ #undef STATUS_COLORS -/* Define to 1 if all of the C89 standard headers exist (not just the ones +/* Define to 1 if all of the C90 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -316,8 +316,8 @@ /* More verbose logfile */ #undef XLOGFILE -/* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a - 'char[]'. */ +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ #undef YYTEXT_POINTER /* If not already defined, then define as a datatype of *exactly* 32 bits. */ diff --git a/sys/autoconf/config.sub b/sys/autoconf/config.sub index 8b2c57a6e..87352a021 100644 --- a/sys/autoconf/config.sub +++ b/sys/autoconf/config.sub @@ -211,7 +211,7 @@ case $os in basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + os=`echo $os | sed -e 's/windowsnt/windsys/'` ;; -psos*) os=-psos @@ -1574,4 +1574,4 @@ exit # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" -# End: +# End: \ No newline at end of file diff --git a/sys/autoconf/configure.ac b/sys/autoconf/configure.ac index 91a25e334..fe7403836 100644 --- a/sys/autoconf/configure.ac +++ b/sys/autoconf/configure.ac @@ -53,7 +53,7 @@ case $host_os in mingw32 ) AC_DEFINE(WIN32,[],[An MS-Windows system]) AC_SUBST(HOST_MSWIN,[]) AC_SUBST(HOST_UNIX,[#]) - SYSTEM="Syswinnt" + SYSTEM="Sysmswin" SYSSRC="\${SYSMSWINSRC}" SYSOBJ="\${SYSMSWINOBJ}" ;; @@ -579,7 +579,7 @@ NETHACK_LINKS_ADD([dat/cmdhelp]) NETHACK_LINKS_ADD([dat/history]) NETHACK_LINKS_ADD([dat/opthelp]) NETHACK_LINKS_ADD([dat/wizhelp]) -NETHACK_LINKS_ADD([include/win32api.h:sys/winnt/win32api.h]) +NETHACK_LINKS_ADD([include/win32api.h:sys/windows/win32api.h]) AC_CONFIG_LINKS(${NETHACK_LINKS}) diff --git a/sys/windows/winnt.c b/sys/windows/windsys.c similarity index 100% rename from sys/windows/winnt.c rename to sys/windows/windsys.c From 826037909281dcd905be00cb8d64d423ee8ed6d3 Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Sun, 6 Apr 2025 16:34:04 +0200 Subject: [PATCH 6/8] winhack -> NetHackW --- sys/autoconf/Makefile.src | 12 ++++++------ sys/windows/Makefile.bcc | 8 ++++---- win/win32/{winhack.c => NetHackW.c} | 2 +- win/win32/{winhack.rc => NetHackW.rc} | 0 win/win32/resource.h | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename win/win32/{winhack.c => NetHackW.c} (99%) rename win/win32/{winhack.rc => NetHackW.rc} (100%) diff --git a/sys/autoconf/Makefile.src b/sys/autoconf/Makefile.src index 3892a33ff..d7be13570 100644 --- a/sys/autoconf/Makefile.src +++ b/sys/autoconf/Makefile.src @@ -112,14 +112,14 @@ WINBEOBJ = # # files for a native MS-Windows port # (tile.c is included in the defn. for WINCSRC, below) -WINMSSRC = $(srcdir)/../win/win32/mswproc.c $(srcdir)/../win/win32/winhack.c \ +WINMSSRC = $(srcdir)/../win/win32/mswproc.c $(srcdir)/../win/win32/NetHackW.c \ $(srcdir)/../win/win32/mhdlg.c $(srcdir)/../win/win32/mhaskyn.c \ $(srcdir)/../win/win32/mhfont.c $(srcdir)/../win/win32/mhinput.c \ $(srcdir)/../win/win32/mhmain.c $(srcdir)/../win/win32/mhmsgwnd.c \ $(srcdir)/../win/win32/mhsplash.c $(srcdir)/../win/win32/mhstatus.c \ $(srcdir)/../win/win32/mhtext.c $(srcdir)/../win/win32/mhmenu.c \ $(srcdir)/../win/win32/mhmap.c $(srcdir)/../win/win32/mhrip.c -WINMSOBJ = mswproc.o winhack.o mhdlg.o mhaskyn.o mhfont.o mhinput.o mhmain.o \ +WINMSOBJ = mswproc.o NetHackW.o mhdlg.o mhaskyn.o mhfont.o mhinput.o mhmain.o \ mhmsgwnd.o mhsplash.o mhstatus.o mhtext.o mhmenu.o mhmap.o mhrip.o \ winres.o nhwin.a WINMSCFLAGS=-I$(srcdir)/../win/win32 -D_WIN32_IE=0x0400 @@ -391,12 +391,12 @@ qttableview.moc: ../include/qttableview.h (cd ../util; make tile2bmp$(EXEEXT)) (cd ../dat; $(MAKE) tiles.bmp) -winres.o: $(srcdir)/../win/win32/winhack.rc ../dat/tiles.bmp +winres.o: $(srcdir)/../win/win32/NetHackW.rc ../dat/tiles.bmp (cd ../util; make uudecode$(EXEEXT)) (cd ../dat; $(MAKE) mnsel.bmp mnselcnt.bmp mnunsel.bmp rip.bmp) (cd ../dat; $(MAKE) petmark.bmp UnNetHack.ico splash.bmp) $(WINDRES) -o$@ --include-dir=../dat -DNODEBUG -i \ - $(srcdir)/../win/win32/winhack.rc + $(srcdir)/../win/win32/NetHackW.rc # UnNetHack windows library for modules needed by more than one windows # interface. @@ -674,10 +674,10 @@ mswproc.o: $(srcdir)/../win/win32/mswproc.c $(HACK_H) ../include/dlb.h \ ../win/win32/mhrip.h ../win/win32/mhmain.h \ ../win/win32/mhfont.h ../win/win32/resource.h $(CC) $(CFLAGS) $(WINMSCFLAGS) -c $(srcdir)/../win/win32/mswproc.c -winhack.o: $(srcdir)/../win/win32/winhack.c ../win/win32/winMS.h $(HACK_H) \ +NetHackW.o: $(srcdir)/../win/win32/NetHackW.c ../win/win32/winMS.h $(HACK_H) \ ../include/dlb.h ../win/win32/resource.h ../win/win32/mhmain.h \ ../win/win32/mhmap.h - $(CC) $(CFLAGS) $(WINMSCFLAGS) -c $(srcdir)/../win/win32/winhack.c + $(CC) $(CFLAGS) $(WINMSCFLAGS) -c $(srcdir)/../win/win32/NetHackW.c mhdlg.o: $(srcdir)/../win/win32/mhdlg.c ../win/win32/winMS.h $(HACK_H) \ ../include/func_tab.h ../win/win32/resource.h \ ../win/win32/mhdlg.h diff --git a/sys/windows/Makefile.bcc b/sys/windows/Makefile.bcc index aa2da0c47..17d04d2b0 100644 --- a/sys/windows/Makefile.bcc +++ b/sys/windows/Makefile.bcc @@ -214,14 +214,14 @@ PRECOMPHEAD = N # set to Y if you want to use precomp. headers WINPORT = $(O)tile.o $(O)mhaskyn.o $(O)mhdlg.o \ $(O)mhfont.o $(O)mhinput.o $(O)mhmain.o $(O)mhmap.o \ $(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o $(O)mhsplash.o \ - $(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o + $(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)NetHackW.o WINPHDR = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \ $(WIN32)\mhinput.h $(WIN32)\mhmain.h $(WIN32)\mhmap.h $(WIN32)\mhmenu.h \ $(WIN32)\mhmsg.h $(WIN32)\mhmsgwnd.h $(WIN32)\mhrip.h $(WIN32)\mhstatus.h \ $(WIN32)\mhtext.h $(WIN32)\resource.h $(WIN32)\winMS.h WINDLLS = WINPFLAG= -DTILES -DMSWIN_GRAPHICS -NHRES = $(O)winhack.res +NHRES = $(O)NetHackW.res WINPINC = -I$(WIN32) !ELSE WINPORT = $(O)nttty.o @@ -601,11 +601,11 @@ tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe @echo Optional tile development utilities are up to date. !IF "$(GRAPHICAL)"=="Y" -$(NHRES): $(TILEBMP16) $(WIN32)\winhack.rc $(WIN32)\mnsel.bmp \ +$(NHRES): $(TILEBMP16) $(WIN32)\NetHackW.rc $(WIN32)\mnsel.bmp \ $(WIN32)\mnselcnt.bmp $(WIN32)\mnunsel.bmp \ $(WIN32)\petmark.bmp $(WIN32)\NetHack.ico $(WIN32)\rip.bmp \ $(WIN32)\splash.bmp - @$(rc) -r -fo$@ -i$(WIN32) -i$(bccinc) -dNDEBUG $(WIN32)\winhack.rc + @$(rc) -r -fo$@ -i$(WIN32) -i$(bccinc) -dNDEBUG $(WIN32)\NetHackW.rc !ELSE $(NHRES): $(NTSYS)\console.rc $(NTSYS)\NetHack.ico @$(rc) -r -fo$@ -i$(NTSYS) -i$(bccinc) -dNDEBUG $(NTSYS)\console.rc diff --git a/win/win32/winhack.c b/win/win32/NetHackW.c similarity index 99% rename from win/win32/winhack.c rename to win/win32/NetHackW.c index 9c467c36a..7639c4ea5 100644 --- a/win/win32/winhack.c +++ b/win/win32/NetHackW.c @@ -1,7 +1,7 @@ /* Copyright (C) 2001 by Alex Kompel */ /* NetHack may be freely redistributed. See license for details. */ -// winhack.cpp : Defines the entry point for the application. +// NetHackW.c : Defines the entry point for the application. // #include diff --git a/win/win32/winhack.rc b/win/win32/NetHackW.rc similarity index 100% rename from win/win32/winhack.rc rename to win/win32/NetHackW.rc diff --git a/win/win32/resource.h b/win/win32/resource.h index 00a29a664..5bcf12744 100644 --- a/win/win32/resource.h +++ b/win/win32/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by winhack.rc +// Used by NetHackW.rc // #define IDC_MYICON 2 #define IDD_WINHACK_DIALOG 102 @@ -140,7 +140,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 145 From 6f9553cc0f93a8aeb23f545681d39fabf28cdfce Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Thu, 16 May 2024 11:36:34 +0200 Subject: [PATCH 7/8] Reenable win32 CI build --- .github/workflows/unnethack.yml | 1 - configure | 4 ++-- include/extern.h | 2 ++ sys/autoconf/build_win32.sh | 15 +++++++++++++++ sys/autoconf/m4/ax_lua.m4 | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unnethack.yml b/.github/workflows/unnethack.yml index 7dc4a2f21..be81bd838 100644 --- a/.github/workflows/unnethack.yml +++ b/.github/workflows/unnethack.yml @@ -61,7 +61,6 @@ jobs: run: make all windows: - if: false # deactivate until lua.dll is build runs-on: ubuntu-latest steps: diff --git a/configure b/configure index 6ce8e9ab5..9429b0e18 100755 --- a/configure +++ b/configure @@ -5842,7 +5842,7 @@ printf %s "checking if $LUA is a Lua interpreter... " >&6; } return n * fact(n-1) end end - print("fact(5) is " .. fact(5))'` + print("fact(5) is " .. fact(5))' | tr -d '[:cntrl:]'` if test "$_ax_lua_factorial" = 'fact(5) is 120' then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -5875,7 +5875,7 @@ printf %s "checking $_ax_check_text... " >&6; } print("yes") else print("no") - end'` + end' | tr -d '[:cntrl:]'` if test "x$_ax_lua_good_version" = "xyes" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 diff --git a/include/extern.h b/include/extern.h index 8944095d6..5eeac2f5e 100644 --- a/include/extern.h +++ b/include/extern.h @@ -6,6 +6,8 @@ #define E extern +#include "nhlua.h" + /* ### alloc.c ### */ #if 0 diff --git a/sys/autoconf/build_win32.sh b/sys/autoconf/build_win32.sh index 844d04877..88b95f188 100755 --- a/sys/autoconf/build_win32.sh +++ b/sys/autoconf/build_win32.sh @@ -7,6 +7,21 @@ # Arch: # mingw-w64-gcc wine imagemagick + +if [ ! -d "liblua" ]; then + git clone -b v5.4 --depth 1 https://github.com/lua/lua.git liblua + + cd liblua + sed -i -e 's/ -DLUA_USE_LINUX -DLUA_USE_READLINE//' makefile + sed -i -e 's/^MYLIBS=.*/MYLIBS=/' makefile + make AR='i686-w64-mingw32-ar rc' CC=i686-w64-mingw32-gcc RANLIB=i686-w64-mingw32-ranlib + cd .. +fi + +export LUA=`pwd`/liblua/lua.exe +export LUA_INCLUDE=-I`pwd`/liblua +export LUA_LIB="`pwd`/liblua/liblua.a -lm" + INSTALL=/tmp/unnethack_win32 DESTDIR=/tmp/unnethack_destdir mkdir -p $DESTDIR $INSTALL diff --git a/sys/autoconf/m4/ax_lua.m4 b/sys/autoconf/m4/ax_lua.m4 index ddbb9dd6d..3dd7631ae 100644 --- a/sys/autoconf/m4/ax_lua.m4 +++ b/sys/autoconf/m4/ax_lua.m4 @@ -268,7 +268,7 @@ AC_DEFUN([AX_PROG_LUA], ax_cv_lua_version=[`$LUA -e ' -- return a version number in X.Y format local _, _, ver = string.find(_VERSION, "^Lua (%d+%.%d+)") - print(ver)'`] + print(ver)' | tr -d '[:cntrl:]'`] ]) AS_IF([test "x$ax_cv_lua_version" = 'x'], [AC_MSG_ERROR([invalid Lua version number])]) @@ -372,7 +372,7 @@ AC_DEFUN([_AX_LUA_CHK_IS_INTRP], return n * fact(n-1) end end - print("fact(5) is " .. fact(5))'`] + print("fact(5) is " .. fact(5))' | tr -d '[:cntrl:]'`] AS_IF([test "$_ax_lua_factorial" = 'fact(5) is 120'], [$2], [$3]) ]) From fa75cac1b9e9c3924565312d005875f1a127d064 Mon Sep 17 00:00:00 2001 From: Patric Mueller Date: Mon, 21 Apr 2025 10:29:02 +0200 Subject: [PATCH 8/8] Downgrade windows CI build to ubuntu-22.04 There's currently a problem with Ubuntu 24 when installing the wine-development package. --- .github/workflows/unnethack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unnethack.yml b/.github/workflows/unnethack.yml index be81bd838..d9642b95d 100644 --- a/.github/workflows/unnethack.yml +++ b/.github/workflows/unnethack.yml @@ -61,7 +61,7 @@ jobs: run: make all windows: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3