From: nethack.allison <nethack.allison>
Date: Fri, 25 Jan 2002 23:07:52 +0000 (+0000)
Subject: more Makefile.nt
X-Git-Tag: MOVE2GIT~3346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3e4c3b0cfaf344ab9818c5b4026b54c2a1183b3;p=nethack

more Makefile.nt
- 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.
---

diff --git a/sys/winnt/Makefile.nt b/sys/winnt/Makefile.nt
index c9f1f0f66..179c96801 100644
--- a/sys/winnt/Makefile.nt
+++ b/sys/winnt/Makefile.nt
@@ -1,10 +1,9 @@
-#       SCCS Id: @(#)Makefile.nt       3.3     2002/01/22
-#       Copyright (c) NetHack PC Development Team 1993-2001
+#       SCCS Id: @(#)Makefile.nt       3.3     2002/01/25
+#       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:
-#                              - Microsoft 32 bit Visual C++ V4.x
 #                              - Microsoft 32 bit Visual C++ V6.0 SP3, SP4
 #
 #	This is used for building a TTY version of NetHack using WIN32 Console
@@ -32,7 +31,7 @@ APPVER=4.0
 # Graphical interface
 # Set to Y for a graphical version
 
-GRAPHICAL = Y
+#GRAPHICAL = Y
 
 #
 #  Set the gamedir according to your preference.  
@@ -62,7 +61,6 @@ WSHR  = ..\win\share # Tile support files
 
 OBJ     = o
 
-
 #
 #==========================================
 # Exe File Info.
@@ -196,10 +194,16 @@ LFLAGSU	= $(LFLAGSBASEC)
 #==========================================
 
 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
 NHLFLAGS2 = /MAP:"$(GAME).MAP" /MACHINE:$(CPU) -IGNORE:505 
+
+!IF "$(GRAPHICAL)"=="Y"
 LFLAGS	= $(LFLAGSBASEG) $(NHLFLAGS1) $(NHLFLAGS2)
+!ELSE
+LFLAGS	= $(LFLAGSBASEC) $(NHLFLAGS1) $(NHLFLAGS2)
+!ENDIF
 
 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
 	-copy $(NTSYS)\winnt.cnf   $(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)
@@ -548,6 +549,7 @@ tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
 #  DO NOT INDENT THE << below!
 #
 
+!IF "$(GRAPHICAL)"=="Y"
 $(GAMEFILE) : $(ALLOBJ) $(TILERES)
 	@if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR)
 	@echo Linking....
@@ -555,6 +557,15 @@ $(GAMEFILE) : $(ALLOBJ) $(TILERES)
 		$(ALLOBJ:^	=^
 		) $(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 $(GAMEDIR)\$(GAME).bak del $(GAMEDIR)\$(GAME).bak