From: nethack.allison <nethack.allison>
Date: Fri, 15 Feb 2002 13:26:27 +0000 (+0000)
Subject: Includes:
X-Git-Tag: MOVE2GIT~3168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a62d0a25bc43d2a1789e4d5188533e5b17b0c981;p=nethack

Includes:
1) Removal of bmp placement in binary directory in NT
2) No use of "intrinsic function" optimization in dsp
3) Compilation of resource file for NT Console

Untested on Borland yet.  Tested on console/graphical/ide Microsoft C 6.0
---

diff --git a/Files b/Files
index 86c73b0ab..61d20f691 100644
--- a/Files
+++ b/Files
@@ -171,9 +171,9 @@ vmsmisc.c       vmstty.c        vmsunix.c
 
 sys/winnt:
 (files for Windows 9x, NT and Windows2000 version)
-defaults.nh     Install.nt      Makefile.bcc    Makefile.nt     mapimail.c
-nethack.def     nhico.uu        nhsetup.bat     ntsound.c       nttty.c
-win32api.h      winnt.c
+console.rc      defaults.nh     Install.nt      Makefile.bcc    Makefile.nt
+mapimail.c      nethack.def     nhico.uu        nhsetup.bat     ntsound.c
+nttty.c         win32api.h      winnt.c
 
 util:
 (files for all versions)
diff --git a/sys/winnt/Makefile.bcc b/sys/winnt/Makefile.bcc
index 5ecad2402..50a4d8510 100644
--- a/sys/winnt/Makefile.bcc
+++ b/sys/winnt/Makefile.bcc
@@ -196,7 +196,7 @@ TILEGAME  = $(O)tile.o $(O)mhaskyn.o $(O)mhdlg.o \
 	$(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o \
 	$(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o
 TILEDEF   = -DTILES -DMSWIN_GRAPHICS
-TILERES	  = $(O)winhack.res
+TILERES   = $(O)winhack.res
 TILEINCL  = -I$(WIN32)
 TILEHDR   = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \
 	$(WIN32)\mhinput.h $(WIN32)\mhmain.h $(WIN32)\mhmap.h $(WIN32)\mhmenu.h \
@@ -206,7 +206,7 @@ TILEHDR   = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \
 TILEGAME  = $(O)nttty.o    
 TILEDEF   = -DWIN32CON
 TILEHDR   =
-TILERES   =
+TILERES   = $(O)console.res
 TILEINCL  =
 !ENDIF
 
@@ -576,6 +576,9 @@ tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
 !IF "$(GRAPHICAL)"=="Y"
 $(TILERES): $(TILEBMP) $(WIN32)\winhack.rc
 	@$(rc) -r -fo$@ -i$(WIN32) -dNDEBUG $(WIN32)\winhack.rc
+!ELSE
+$(TILERES): $(NTSYS)\console.rc
+	@$(rc) -r -fo$@ -i$(NTSYS) -dNDEBUG $(NTSYS)\console.rc
 !ENDIF
 
 #==========================================
diff --git a/sys/winnt/Makefile.nt b/sys/winnt/Makefile.nt
index a46b0d2fe..e2f79782d 100644
--- a/sys/winnt/Makefile.nt
+++ b/sys/winnt/Makefile.nt
@@ -142,7 +142,7 @@ TILEGAME  = $(O)tile.o $(O)mhaskyn.o $(O)mhdlg.o \
 	$(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o \
 	$(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o
 TILEDEF   = -DTILES -DMSWIN_GRAPHICS
-TILERES	  = $(O)winhack.res
+TILERES   = $(O)winhack.res
 TILEINCL  = -I$(WIN32)
 TILEHDR   = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \
 	$(WIN32)\mhinput.h $(WIN32)\mhmain.h $(WIN32)\mhmap.h $(WIN32)\mhmenu.h \
@@ -152,7 +152,7 @@ TILEHDR   = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \
 TILEGAME  = $(O)nttty.o    
 TILEDEF   = -DWIN32CON
 TILEHDR   =
-TILERES   =
+TILERES   = $(O)console.res
 TILEINCL  =
 !ENDIF
 
@@ -469,9 +469,6 @@ $(O)install.tag: 	$(DAT)\data	$(DAT)\rumors	 $(DAT)\dungeon \
 	@if exist $(GAMEDIR)\$(GAME).PDB echo NOTE: You may want to remove $(GAMEDIR)\$(GAME).pdb to conserve space
 	-copy $(NTSYS)\defaults.nh   $(GAMEDIR)\defaults.nh
 	copy $(U)recover.exe  $(GAMEDIR)
-! IF ("$(TILEDEF)"!="")
-        if exist $(TILEBMP) copy $(TILEBMP) $(GAMEDIR)
-! ENDIF
 	echo install done > $@
 
 #	copy $(NTSYS)\winnt.hlp    $(GAMEDIR)
@@ -525,6 +522,9 @@ tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
 !IF "$(GRAPHICAL)"=="Y"
 $(TILERES): $(TILEBMP) $(WIN32)\winhack.rc
 	@$(rc) -r -fo$@ -i$(WIN32) -dNDEBUG $(WIN32)\winhack.rc
+!ELSE
+$(TILERES): $(NTSYS)\console.rc
+	@$(rc) -r -fo$@ -i$(NTSYS) -dNDEBUG $(NTSYS)\console.rc
 !ENDIF
 
 #==========================================
@@ -566,8 +566,6 @@ $(GAMEFILE) : $(ALLOBJ) $(TILERES)
 	@if exist $(O)install.tag del $(O)install.tag
 	@if exist $(GAMEDIR)\$(GAME).bak del $(GAMEDIR)\$(GAME).bak
 
-$(GAME)_.ico : $(NTSYS)\$(GAME).ico
-	@copy $(NTSYS)\$(GAME).ico $@
 #
 #  Secondary Targets.
 #
diff --git a/win/win32/nethackw.dsp b/win/win32/nethackw.dsp
index e91133f79..91fb03fa5 100644
--- a/win/win32/nethackw.dsp
+++ b/win/win32/nethackw.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /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
+# 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