visual studio project tweaks
This commit is contained in:
@@ -21,37 +21,35 @@ NHV=$(NHV:"=)
|
||||
#LIBSDIR=lib # libraries and external bits
|
||||
#SUBMSDIR=submodules # NetHack git submodules
|
||||
PACKAGESDIR=vspackage # put in vspackage to distinguish
|
||||
ROOTDIR=..\..\..\.. # root of NetHack tree relative to project file
|
||||
PlatformFileName=$(lowercase $(PlatformShortName))
|
||||
ROOTDIR=..\..\..\..\ # root of NetHack tree relative to project file
|
||||
PlatformFileName=$(lowercase $(PSN))
|
||||
|
||||
# Directories we might have to collect things from
|
||||
#
|
||||
INCL = $(ROOTDIR)\include # NetHack include files
|
||||
DAT = $(ROOTDIR)\dat # NetHack data files
|
||||
DOC = $(ROOTDIR)\doc # NetHack documentation files
|
||||
UTIL = $(ROOTDIR)\util # Utility source
|
||||
SRC = $(ROOTDIR)\src # Main source
|
||||
SSYS = $(ROOTDIR)\sys\share # Shared system files
|
||||
MSWSYS = $(ROOTDIR)\sys\windows # MS windows specific files
|
||||
TTY = $(ROOTDIR)\win\tty # window port files (tty)
|
||||
MSWIN = $(ROOTDIR)\win\win32 # window port files (win32)
|
||||
WCURSES = $(ROOTDIR)\win\curses # window port files (curses)
|
||||
WSHR = $(ROOTDIR)\win\share # Tile support files
|
||||
QT = $(ROOTDIR)\win\Qt # QT support files
|
||||
X11 = $(ROOTDIR)\win\X11 # X11 support files
|
||||
LIBDIR = $(ROOTDIR)\lib # libraries and external bits
|
||||
SUBMDIR = $(ROOTDIR)\submodules # NetHack git submodules
|
||||
SndWavDir = $(ROOTDIR)\sound\wav # sound files that get integrated
|
||||
DocDir = $(ROOTDIR)\doc
|
||||
INCL = $(ROOTDIR)include # NetHack include files
|
||||
DAT = $(ROOTDIR)dat # NetHack data files
|
||||
DOC = $(ROOTDIR)doc # NetHack documentation files
|
||||
UTIL = $(ROOTDIR)util # Utility source
|
||||
SRC = $(ROOTDIR)src # Main source
|
||||
SSYS = $(ROOTDIR)sys\share # Shared system files
|
||||
MSWSYS = $(ROOTDIR)sys\windows # MS windows specific files
|
||||
TTY = $(ROOTDIR)win\tty # window port files (tty)
|
||||
MSWIN = $(ROOTDIR)win\win32 # window port files (win32)
|
||||
WCURSES = $(ROOTDIR)win\curses # window port files (curses)
|
||||
WSHR = $(ROOTDIR)win\share # Tile support files
|
||||
QT = $(ROOTDIR)win\Qt # QT support files
|
||||
X11 = $(ROOTDIR)win\X11 # X11 support files
|
||||
LIBDIR = $(ROOTDIR)lib # libraries and external bits
|
||||
SUBMDIR = $(ROOTDIR)submodules # NetHack git submodules
|
||||
SndWavDir = $(ROOTDIR)sound\wav # sound files that get integrated
|
||||
DocDir = $(ROOTDIR)doc
|
||||
|
||||
# Directories we might place collected things
|
||||
#
|
||||
VSBINDIR=$(ROOTDIR)\vsbinary
|
||||
VSPACKAGEDIR = $(ROOTDIR)\vspackage
|
||||
VSBINDIR=$(ROOTDIR)vsbinary
|
||||
VSPACKAGEDIR = $(ROOTDIR)vspackage
|
||||
|
||||
|
||||
|
||||
default: packageall
|
||||
default: showvar packageall
|
||||
|
||||
#===============================================================================
|
||||
# makefile rules
|
||||
@@ -80,7 +78,7 @@ DBGSYMZIP = $(VSPACKAGEDIR)\nethack-$(NHV)-win-$(PlatformFileName)-debugsymbols.
|
||||
|
||||
packageall: packagezip
|
||||
|
||||
packagezip: showvar vsbindir vspackagedir $(FILESTOZIP) $(MAINZIP) $(DBGSYMZIP)
|
||||
packagezip: vsbindir vspackagedir $(FILESTOZIP) $(MAINZIP) $(DBGSYMZIP)
|
||||
@echo NetHack Windows package created: $(MAINZIP)
|
||||
|
||||
$(MAINZIP): $(FILESTOZIP)
|
||||
@@ -90,34 +88,35 @@ $(MAINZIP): $(FILESTOZIP)
|
||||
$(DBGSYMZIP): $(PDBTOZIP)
|
||||
tar -a -cf $(DBGSYMZIP) $(PDBTOZIP)
|
||||
|
||||
$(VSBINDIR)\license: $(BinDir)\license
|
||||
copy /Y $(BinDir)\license $@
|
||||
$(VSBINDIR)\Guidebook.txt: $(BinDir)\Guidebook.txt
|
||||
copy /Y $(DocDir)\Guidebook.txt $@
|
||||
$(VSBINDIR)\NetHack.exe: $(BinDir)\NetHack.exe
|
||||
copy /Y $(BinDir)\NetHack.exe $@
|
||||
$(VSBINDIR)\NetHack.txt: $(BinDir)\NetHack.txt
|
||||
copy /Y $(DocDir)\NetHack.txt $@
|
||||
$(VSBINDIR)\NetHackW.exe: $(BinDir)\NetHackW.exe
|
||||
copy /Y $(BinDir)\NetHackW.exe $@
|
||||
$(VSBINDIR)\opthelp: $(BinDir)\opthelp
|
||||
copy /Y $(BinDir)\opthelp $@
|
||||
$(VSBINDIR)\nhdat$(NHV): $(BinDir)\nhdat$(NHV)
|
||||
$(VSBINDIR)\license: $(BinDir)license
|
||||
copy /Y $(BinDir)license $@
|
||||
$(VSBINDIR)\Guidebook.txt: $(BinDir)Guidebook.txt
|
||||
copy /Y $(DocDir)Guidebook.txt $@
|
||||
$(VSBINDIR)\NetHack.exe: $(BinDir)NetHack.exe
|
||||
copy /Y $(BinDir)NetHack.exe $@
|
||||
$(VSBINDIR)\NetHack.txt: $(BinDir)NetHack.txt
|
||||
copy /Y $(DocDir)NetHack.txt $@
|
||||
$(VSBINDIR)\NetHackW.exe: $(BinDir)NetHackW.exe
|
||||
copy /Y $(BinDir)NetHackW.exe $@
|
||||
$(VSBINDIR)\opthelp: $(BinDir)opthelp
|
||||
copy /Y $(BinDir)opthelp $@
|
||||
$(VSBINDIR)\nhdat$(NHV): $(BinDir)nhdat$(NHV)
|
||||
copy /Y $(BinDir)\nhdat$(NHV) $@
|
||||
$(VSBINDIR)\symbols.template: $(BinDir)\symbols.template
|
||||
copy /Y $(BinDir)\symbols.template $@
|
||||
$(VSBINDIR)\nethackrc.template: $(BinDir)\nethackrc.template
|
||||
copy /Y $(BinDir)\nethackrc.template $@
|
||||
$(VSBINDIR)\sysconf.template: $(BinDir)\sysconf.template
|
||||
copy /Y $(BinDir)\sysconf.template $@
|
||||
$(VSBINDIR)\symbols.template: $(BinDir)symbols.template
|
||||
copy /Y $(BinDir)symbols.template $@
|
||||
$(VSBINDIR)\nethackrc.template: $(BinDir)nethackrc.template
|
||||
copy /Y $(BinDir)nethackrc.template $@
|
||||
$(VSBINDIR)\sysconf.template: $(BinDir)sysconf.template
|
||||
copy /Y $(BinDir)sysconf.template $@
|
||||
$(VSBINDIR)\record:
|
||||
-if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)\record.
|
||||
-if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)record.
|
||||
|
||||
showvar:
|
||||
@echo BinDir=[$(BinDir)]
|
||||
@echo Platform=[$(Platform)]
|
||||
@echo PlatformShortName=[$(PlatformShortName)]
|
||||
@echo PlatformShortName=[$(PSN)]
|
||||
@echo Configuration=[$(Configuration)]
|
||||
@echo Host=[$(Host)]
|
||||
|
||||
vspackagedir:
|
||||
@if not exist $(VSPACKAGEDIR)\*.* echo creating directory $(VSPACKAGEDIR:\=/)
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake BinDir="$(BinDir)\" Platform="$(Platform)" PlatformShortName="$(PlatformShortName)" Configuration="$(Configuration)" NETHACK_VERSION="$(NETHACK_VERSION)" %26%26 popd</NMakeBuildCommandLine>
|
||||
<NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake BinDir="$(BinDir)\" Configuration="$(Configuration)" Platform="$(Platform)" PSN="$(PlatformShortName)" NETHACK_VERSION="$(NETHACK_VERSION)" Host="$(Host)" %26%26 popd</NMakeBuildCommandLine>
|
||||
<NMakeCleanCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake clean %26%26 popd</NMakeCleanCommandLine>
|
||||
<NMakeReBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake rebuild %26%26 popd</NMakeReBuildCommandLine>
|
||||
</PropertyGroup>
|
||||
|
||||
Reference in New Issue
Block a user