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

Includes:

Browse Source 
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
This commit is contained in:
nethack.allison
2002-02-15 13:26:27 +00:00
parent f0b8d8fec5
commit a62d0a25bc
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Files
+3 -3
View File
@@ -171,9 +171,9 @@ vmsmisc.c vmstty.c vmsunix.c
sys/winnt: sys/winnt:
(files for Windows 9x, NT and Windows2000 version) (files for Windows 9x, NT and Windows2000 version)
defaults.nh Install.nt Makefile.bcc Makefile.nt mapimail.c console.rc defaults.nh Install.nt Makefile.bcc Makefile.nt
nethack.def nhico.uu nhsetup.bat ntsound.c nttty.c mapimail.c nethack.def nhico.uu nhsetup.bat ntsound.c
win32api.h winnt.c nttty.c win32api.h winnt.c
util: util:
(files for all versions) (files for all versions)
sys/winnt/Makefile.bcc
+5 -2
View File
@@ -196,7 +196,7 @@ TILEGAME = $(O)tile.o $(O)mhaskyn.o $(O)mhdlg.o \
$(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o \ $(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o \
$(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o $(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o
TILEDEF = -DTILES -DMSWIN_GRAPHICS TILEDEF = -DTILES -DMSWIN_GRAPHICS
TILERES = $(O)winhack.res TILERES = $(O)winhack.res
TILEINCL = -I$(WIN32) TILEINCL = -I$(WIN32)
TILEHDR = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \ TILEHDR = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \
$(WIN32)\mhinput.h $(WIN32)\mhmain.h $(WIN32)\mhmap.h $(WIN32)\mhmenu.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 TILEGAME = $(O)nttty.o
TILEDEF = -DWIN32CON TILEDEF = -DWIN32CON
TILEHDR = TILEHDR =
TILERES = TILERES = $(O)console.res
TILEINCL = TILEINCL =
!ENDIF !ENDIF
@@ -576,6 +576,9 @@ tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
!IF "$(GRAPHICAL)"=="Y" !IF "$(GRAPHICAL)"=="Y"
$(TILERES): $(TILEBMP) $(WIN32)\winhack.rc $(TILERES): $(TILEBMP) $(WIN32)\winhack.rc
@$(rc) -r -fo$@ -i$(WIN32) -dNDEBUG $(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 !ENDIF
#========================================== #==========================================
sys/winnt/Makefile.nt
+5 -7
View File
@@ -142,7 +142,7 @@ TILEGAME = $(O)tile.o $(O)mhaskyn.o $(O)mhdlg.o \
$(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o \ $(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o \
$(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o $(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o
TILEDEF = -DTILES -DMSWIN_GRAPHICS TILEDEF = -DTILES -DMSWIN_GRAPHICS
TILERES = $(O)winhack.res TILERES = $(O)winhack.res
TILEINCL = -I$(WIN32) TILEINCL = -I$(WIN32)
TILEHDR = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \ TILEHDR = $(WIN32)\mhaskyn.h $(WIN32)\mhdlg.h $(WIN32)\mhfont.h \
$(WIN32)\mhinput.h $(WIN32)\mhmain.h $(WIN32)\mhmap.h $(WIN32)\mhmenu.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 TILEGAME = $(O)nttty.o
TILEDEF = -DWIN32CON TILEDEF = -DWIN32CON
TILEHDR = TILEHDR =
TILERES = TILERES = $(O)console.res
TILEINCL = TILEINCL =
!ENDIF !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 @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 $(NTSYS)\defaults.nh $(GAMEDIR)\defaults.nh
copy $(U)recover.exe $(GAMEDIR) copy $(U)recover.exe $(GAMEDIR)
! IF ("$(TILEDEF)"!="")
if exist $(TILEBMP) copy $(TILEBMP) $(GAMEDIR)
! ENDIF
echo install done > $@ echo install done > $@
# copy $(NTSYS)\winnt.hlp $(GAMEDIR) # copy $(NTSYS)\winnt.hlp $(GAMEDIR)
@@ -525,6 +522,9 @@ tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
!IF "$(GRAPHICAL)"=="Y" !IF "$(GRAPHICAL)"=="Y"
$(TILERES): $(TILEBMP) $(WIN32)\winhack.rc $(TILERES): $(TILEBMP) $(WIN32)\winhack.rc
@$(rc) -r -fo$@ -i$(WIN32) -dNDEBUG $(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 !ENDIF
#========================================== #==========================================
@@ -566,8 +566,6 @@ $(GAMEFILE) : $(ALLOBJ) $(TILERES)
@if exist $(O)install.tag del $(O)install.tag @if exist $(O)install.tag del $(O)install.tag
@if exist $(GAMEDIR)\$(GAME).bak del $(GAMEDIR)\$(GAME).bak @if exist $(GAMEDIR)\$(GAME).bak del $(GAMEDIR)\$(GAME).bak
$(GAME)_.ico : $(NTSYS)\$(GAME).ico
@copy $(NTSYS)\$(GAME).ico $@
# #
# Secondary Targets. # Secondary Targets.
# #
win/win32/nethackw.dsp
+2 -2
View File
@@ -42,8 +42,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /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 /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 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 # SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32