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

more pilemark and win32 changes

Browse Source 
Changes to be committed:
	modified:   Files
	deleted:    sys/winnt/Makefile.bcc
	modified:   sys/winnt/Makefile.gcc
	modified:   win/win32/winMS.h

Since borland Makefile isn't operational, remove it for
this release as recommended.

Changes to install.nt pending.
This commit is contained in:
nhmall
2015-06-20 08:50:32 -04:00
parent d07e92f882
commit 4a9953ae0d
4 changed files with 13 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Files
View File

@@ -209,10 +209,10 @@ stat.h
sys/winnt: sys/winnt:
(files for Windows 9x, NT and Windows2000 version) (files for Windows 9x, NT and Windows2000 version)
Install.nt Makefile.bcc Makefile.gcc Makefile.msc console.rc Install.nt Makefile.gcc Makefile.msc console.rc defaults.nh
defaults.nh nethack.def nh340key.c nhdefkey.c nhico.uu nethack.def nh340key.c nhdefkey.c nhico.uu nhraykey.c
nhraykey.c nhsetup.bat ntsound.c nttty.c porthelp nhsetup.bat ntsound.c nttty.c porthelp win32api.h
win32api.h winnt.c winnt.c
util: util:
(files for all versions) (files for all versions)

1458
sys/winnt/Makefile.bcc
View File

File diff suppressed because it is too large Load Diff

9
sys/winnt/Makefile.gcc
View File

@@ -1,4 +1,4 @@
# NetHack 3.6 Makefile.gcc $NHDT-Date: 1432512793 2015/05/25 00:13:13 $ $NHDT-Branch: master $:$NHDT-Revision: 1.52 $ # NetHack 3.6 Makefile.gcc $NHDT-Date: 1434804544 2015/06/20 12:49:04 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.53 $
# #
#============================================================================== #==============================================================================
# #
@@ -547,7 +547,7 @@ tileutil: $(U)gif2txt.exe $(U)gif2tx32.exe $(U)txt2ppm.exe
$(O)winres.o: $(TILEBMP16) $(MSWIN)/winhack.rc $(MSWIN)/mnsel.bmp \ $(O)winres.o: $(TILEBMP16) $(MSWIN)/winhack.rc $(MSWIN)/mnsel.bmp \
$(MSWIN)/mnselcnt.bmp $(MSWIN)/mnunsel.bmp \ $(MSWIN)/mnselcnt.bmp $(MSWIN)/mnunsel.bmp \
$(MSWIN)/petmark.bmp $(MSWIN)/NetHack.ico $(MSWIN)/rip.bmp \ $(MSWIN)/petmark.bmp $(MSWIN)/pilemark.bmp $(MSWIN)/NetHack.ico $(MSWIN)/rip.bmp \
$(MSWIN)/splash.bmp $(MSWIN)/splash.bmp
@$(rc) -o$@ --include-dir $(MSWIN) -i $(MSWIN)/winhack.rc @$(rc) -o$@ --include-dir $(MSWIN) -i $(MSWIN)/winhack.rc
@@ -703,6 +703,11 @@ $(MSWIN)/petmark.bmp: $(U)uudecode.exe $(MSWIN)/petmark.uu
$(subst /,\,copy petmark.bmp $@) $(subst /,\,copy petmark.bmp $@)
del petmark.bmp del petmark.bmp
$(MSWIN)/pilemark.bmp: $(U)uudecode.exe $(MSWIN)/pilemark.uu
$(subst /,\,$(U)uudecode.exe $(MSWIN)/pilemark.uu)
$(subst /,\,copy pilemark.bmp $@)
del pilemark.bmp
$(MSWIN)/rip.bmp: $(U)uudecode.exe $(MSWIN)/rip.uu $(MSWIN)/rip.bmp: $(U)uudecode.exe $(MSWIN)/rip.uu
$(subst /,\,$(U)uudecode.exe $(MSWIN)/rip.uu) $(subst /,\,$(U)uudecode.exe $(MSWIN)/rip.uu)
$(subst /,\,copy rip.bmp $@) $(subst /,\,copy rip.bmp $@)

3
win/win32/winMS.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 winMS.h $NHDT-Date: 1434803624 2015/06/20 12:33:44 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.40 $ */ /* NetHack 3.6 winMS.h $NHDT-Date: 1434804346 2015/06/20 12:45:46 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.41 $ */
/* Copyright (C) 2001 by Alex Kompel */ /* Copyright (C) 2001 by Alex Kompel */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -51,6 +51,7 @@
#define NHFONT_SIZE_MAX 20 #define NHFONT_SIZE_MAX 20
#define MAX_LOADSTRING 100 #define MAX_LOADSTRING 100
#define USE_PILEMARK
typedef struct mswin_nhwindow_data { typedef struct mswin_nhwindow_data {
HWND win; HWND win;