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

more Makefile.nt

Browse Source 
- Fix the tty build so it wasn't trying to link with GUI switches.
- Don't make graphical the default for the Makefile. It is for the
  IDE projects.
- Be explicit about compiler versions required/tested.
This commit is contained in:
nethack.allison
2002-01-25 23:07:52 +00:00
parent adc35f0537
commit e3e4c3b0cf
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/winnt/Makefile.nt
+21 -10
View File
@@ -1,10 +1,9 @@
# SCCS Id: @(#)Makefile.nt 3.3 2002/01/22 # SCCS Id: @(#)Makefile.nt 3.3 2002/01/25
# Copyright (c) NetHack PC Development Team 1993-2001 # Copyright (c) NetHack PC Development Team 1993-2002
# #
# NetHack 3.3.x Makefile for MS Visual C++ V6.x and above and MS NMAKE # NetHack 3.3.x Makefile for MS Visual C++ V6.x (SP3 and above) and MS NMAKE
# #
# Win32 Compilers Tested: # Win32 Compilers Tested:
# - Microsoft 32 bit Visual C++ V4.x
# - Microsoft 32 bit Visual C++ V6.0 SP3, SP4 # - Microsoft 32 bit Visual C++ V6.0 SP3, SP4
# #
# This is used for building a TTY version of NetHack using WIN32 Console # This is used for building a TTY version of NetHack using WIN32 Console
@@ -32,7 +31,7 @@ APPVER=4.0
# Graphical interface # Graphical interface
# Set to Y for a graphical version # Set to Y for a graphical version
GRAPHICAL = Y #GRAPHICAL = Y
# #
# Set the gamedir according to your preference. # Set the gamedir according to your preference.
@@ -62,7 +61,6 @@ WSHR = ..\win\share # Tile support files
OBJ = o OBJ = o
# #
#========================================== #==========================================
# Exe File Info. # Exe File Info.
@@ -196,10 +194,16 @@ LFLAGSU = $(LFLAGSBASEC)
#========================================== #==========================================
LFLAGSBASE = $(linkdebug) $(conflags) $(conlibsmt) LFLAGSBASE = $(linkdebug) $(conflags) $(conlibsmt)
CFLAGS = $(CFLAGSBASE) $(TILEDEF) $(DLBFLG) CFLAGSC = $(CFLAGSBASE) $(TILEDEF) $(DLBFLG) /DWIN32CON
CFLAGSU = $(CFLAGSBASE) $(TILEDEF) $(DLBFLG)
NHLFLAGS1 = /NODEFAULTLIB /INCREMENTAL:NO /PDB:"$(GAME).PDB" /RELEASE /NOLOGO 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) LFLAGS = $(LFLAGSBASEG) $(NHLFLAGS1) $(NHLFLAGS2)
!ELSE
LFLAGS = $(LFLAGSBASEC) $(NHLFLAGS1) $(NHLFLAGS2)
!ENDIF
GAMEFILE = $(GAMEDIR)\$(GAME).exe # whole thing GAMEFILE = $(GAMEDIR)\$(GAME).exe # whole thing
@@ -465,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)\winnt.cnf $(GAMEDIR)\defaults.nh -copy $(NTSYS)\winnt.cnf $(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)
@@ -548,6 +549,7 @@ tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
# DO NOT INDENT THE << below! # DO NOT INDENT THE << below!
# #
!IF "$(GRAPHICAL)"=="Y"
$(GAMEFILE) : $(ALLOBJ) $(TILERES) $(GAMEFILE) : $(ALLOBJ) $(TILERES)
@if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR)
@echo Linking.... @echo Linking....
@@ -555,6 +557,15 @@ $(GAMEFILE) : $(ALLOBJ) $(TILERES)
$(ALLOBJ:^ =^ $(ALLOBJ:^ =^
) $(TILERES) ) $(TILERES)
<< <<
!ELSE
$(GAMEFILE) : $(ALLOBJ)
@if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR)
@echo Linking....
@$(link) $(LFLAGS) -out:$@ @<<$(GAME).lnk
$(ALLOBJ:^ =^
)
<<
!ENDIF
@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