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
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

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)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
#==========================================

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)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.
#