From 5905a17242839c918bff101b4af51dc0f0b1ecfc Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 12 Apr 2015 10:58:13 -0400 Subject: [PATCH] visual studio mods for tribute, sysconf Changes to be committed: modified: win/win32/mhmenu.h modified: win/win32/vs2013/NetHack.vcxproj modified: win/win32/vs2013/NetHackW.vcxproj modified: win/win32/vs2013/dlb_main.vcxproj --- win/win32/mhmenu.h | 1 + win/win32/vs2013/NetHack.vcxproj | 6 +- win/win32/vs2013/NetHackW.vcxproj | 70 +++++----- win/win32/vs2013/dlb_main.vcxproj | 212 +++++++++++++++--------------- 4 files changed, 151 insertions(+), 138 deletions(-) diff --git a/win/win32/mhmenu.h b/win/win32/mhmenu.h index 658a94a5b..e2fa3f3f3 100644 --- a/win/win32/mhmenu.h +++ b/win/win32/mhmenu.h @@ -14,6 +14,7 @@ #define MENU_TYPE_TEXT 1 #define MENU_TYPE_MENU 2 +extern COLORREF nhcolor_to_RGB (int c); HWND mswin_init_menu_window ( int type ); int mswin_menu_window_select_menu (HWND hwnd, int how, MENU_ITEM_P ** selected, BOOL activate); void mswin_menu_window_size (HWND hwnd, LPSIZE sz); diff --git a/win/win32/vs2013/NetHack.vcxproj b/win/win32/vs2013/NetHack.vcxproj index cdf4406f7..81fcb2382 100644 --- a/win/win32/vs2013/NetHack.vcxproj +++ b/win/win32/vs2013/NetHack.vcxproj @@ -136,6 +136,7 @@ copy ..\dat\nhdat ..\binary copy ..\dat\license ..\binary if exist tiles.bmp copy tiles.bmp ..\binary + if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -192,6 +193,7 @@ copy ..\dat\nhdat ..\binary copy ..\dat\license ..\binary if exist tiles.bmp copy tiles.bmp ..\binary + if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -241,6 +243,7 @@ copy ..\dat\license ..\binary copy ..\dat\symbols ..\binary if exist tiles.bmp copy tiles.bmp ..\binary + if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -290,6 +293,7 @@ copy ..\dat\license ..\binary copy ..\dat\symbols ..\binary if exist tiles.bmp copy tiles.bmp ..\binary + if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -478,4 +482,4 @@ - \ No newline at end of file + diff --git a/win/win32/vs2013/NetHackW.vcxproj b/win/win32/vs2013/NetHackW.vcxproj index 346c86f45..ae9c1d42f 100644 --- a/win/win32/vs2013/NetHackW.vcxproj +++ b/win/win32/vs2013/NetHackW.vcxproj @@ -135,13 +135,14 @@ Install exe - copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -if exist tiles.bmp copy tiles.bmp ..\binary -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + copy $(OutDir)NetHackW.exe ..\binary +copy ..\dat\nhdat ..\binary +copy ..\dat\license ..\binary +if exist tiles.bmp copy tiles.bmp ..\binary +if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf +if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt +copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -196,13 +197,14 @@ copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh Install exe - copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -if exist tiles.bmp copy tiles.bmp ..\binary -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + copy $(OutDir)NetHackW.exe ..\binary +copy ..\dat\nhdat ..\binary +copy ..\dat\license ..\binary +if exist tiles.bmp copy tiles.bmp ..\binary +if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf +if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt +copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -255,15 +257,16 @@ copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh Install exe - if NOT exist ..\binary\*.* mkdir ..\binary -copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -copy ..\dat\symbols ..\binary -if exist tiles.bmp copy tiles.bmp ..\binary -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + if NOT exist ..\binary\*.* mkdir ..\binary +copy $(OutDir)NetHackW.exe ..\binary +copy ..\dat\nhdat ..\binary +copy ..\dat\license ..\binary +copy ..\dat\symbols ..\binary +if exist tiles.bmp copy tiles.bmp ..\binary +if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf +if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt +copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -313,15 +316,16 @@ copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh Install exe - if NOT exist ..\binary\*.* mkdir ..\binary -copy $(OutDir)NetHackW.exe ..\binary -copy ..\dat\nhdat ..\binary -copy ..\dat\license ..\binary -copy ..\dat\symbols ..\binary -if exist tiles.bmp copy tiles.bmp ..\binary -if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt -if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt -copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + if NOT exist ..\binary\*.* mkdir ..\binary +copy $(OutDir)NetHackW.exe ..\binary +copy ..\dat\nhdat ..\binary +copy ..\dat\license ..\binary +copy ..\dat\symbols ..\binary +if exist tiles.bmp copy tiles.bmp ..\binary +if NOT exist ..\binary\sysconf copy ..\sys\winnt\sysconf ..\binary\sysconf +if exist ..\doc\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if exist ..\doc\nethack.txt copy ..\doc\nethack.txt ..\binary\NetHack.txt +copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh @@ -1786,4 +1790,4 @@ copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh - \ No newline at end of file + diff --git a/win/win32/vs2013/dlb_main.vcxproj b/win/win32/vs2013/dlb_main.vcxproj index 2bdaa7902..3d52cae32 100644 --- a/win/win32/vs2013/dlb_main.vcxproj +++ b/win/win32/vs2013/dlb_main.vcxproj @@ -123,32 +123,33 @@ Packaging via DLB - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary + echo chdir ..\dat +chdir ..\dat +chdir +echo data >dlb.lst +echo oracles >>dlb.lst +if exist options echo options >>dlb.lst +if exist ttyoptions echo ttyoptions >>dlb.lst +if exist guioptions echo guioptions >>dlb.lst +if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp +if exist porthelp echo porthelp >>dlb.lst +echo quest.dat >>dlb.lst +echo rumors >>dlb.lst +echo tribute >>dlb.lst +echo help >>dlb.lst +echo hh >>dlb.lst +echo cmdhelp >>dlb.lst +echo history >>dlb.lst +echo opthelp >>dlb.lst +echo wizhelp >>dlb.lst +echo dungeon >>dlb.lst +echo license >>dlb.lst +for %%N in (*.lev) do echo %%N >>dlb.lst +..\util\dlb_main.exe cIf dlb.lst nhdat +echo chdir ..\build +chdir ..\build +echo if NOT exist ..\binary\*.* mkdir ..\binary +if NOT exist ..\binary\*.* mkdir ..\binary @@ -193,32 +194,33 @@ if NOT exist ..\binary\*.* mkdir ..\binary Packaging via DLB - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary + echo chdir ..\dat +chdir ..\dat +chdir +echo data >dlb.lst +echo oracles >>dlb.lst +if exist options echo options >>dlb.lst +if exist ttyoptions echo ttyoptions >>dlb.lst +if exist guioptions echo guioptions >>dlb.lst +if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp +if exist porthelp echo porthelp >>dlb.lst +echo quest.dat >>dlb.lst +echo rumors >>dlb.lst +echo tribute >>dlb.lst +echo help >>dlb.lst +echo hh >>dlb.lst +echo cmdhelp >>dlb.lst +echo history >>dlb.lst +echo opthelp >>dlb.lst +echo wizhelp >>dlb.lst +echo dungeon >>dlb.lst +echo license >>dlb.lst +for %%N in (*.lev) do echo %%N >>dlb.lst +..\util\dlb_main.exe cIf dlb.lst nhdat +echo chdir ..\build +chdir ..\build +echo if NOT exist ..\binary\*.* mkdir ..\binary +if NOT exist ..\binary\*.* mkdir ..\binary @@ -266,32 +268,33 @@ if NOT exist ..\binary\*.* mkdir ..\binary Packaging via dlb - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary + echo chdir ..\dat +chdir ..\dat +chdir +echo data >dlb.lst +echo oracles >>dlb.lst +if exist options echo options >>dlb.lst +if exist ttyoptions echo ttyoptions >>dlb.lst +if exist guioptions echo guioptions >>dlb.lst +if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp +if exist porthelp echo porthelp >>dlb.lst +echo quest.dat >>dlb.lst +echo rumors >>dlb.lst +echo tribute >>dlb.lst +echo help >>dlb.lst +echo hh >>dlb.lst +echo cmdhelp >>dlb.lst +echo history >>dlb.lst +echo opthelp >>dlb.lst +echo wizhelp >>dlb.lst +echo dungeon >>dlb.lst +echo license >>dlb.lst +for %%N in (*.lev) do echo %%N >>dlb.lst +..\util\dlb_main.exe cIf dlb.lst nhdat +echo chdir ..\build +chdir ..\build +echo if NOT exist ..\binary\*.* mkdir ..\binary +if NOT exist ..\binary\*.* mkdir ..\binary @@ -337,32 +340,33 @@ if NOT exist ..\binary\*.* mkdir ..\binary Packaging via dlb - echo chdir ..\dat -chdir ..\dat -chdir -echo data >dlb.lst -echo oracles >>dlb.lst -if exist options echo options >>dlb.lst -if exist ttyoptions echo ttyoptions >>dlb.lst -if exist guioptions echo guioptions >>dlb.lst -if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp -if exist porthelp echo porthelp >>dlb.lst -echo quest.dat >>dlb.lst -echo rumors >>dlb.lst -echo help >>dlb.lst -echo hh >>dlb.lst -echo cmdhelp >>dlb.lst -echo history >>dlb.lst -echo opthelp >>dlb.lst -echo wizhelp >>dlb.lst -echo dungeon >>dlb.lst -echo license >>dlb.lst -for %%N in (*.lev) do echo %%N >>dlb.lst -..\util\dlb_main.exe cIf dlb.lst nhdat -echo chdir ..\build -chdir ..\build -echo if NOT exist ..\binary\*.* mkdir ..\binary -if NOT exist ..\binary\*.* mkdir ..\binary + echo chdir ..\dat +chdir ..\dat +chdir +echo data >dlb.lst +echo oracles >>dlb.lst +if exist options echo options >>dlb.lst +if exist ttyoptions echo ttyoptions >>dlb.lst +if exist guioptions echo guioptions >>dlb.lst +if NOT exist porthelp copy ..\sys\winnt\porthelp porthelp +if exist porthelp echo porthelp >>dlb.lst +echo quest.dat >>dlb.lst +echo rumors >>dlb.lst +echo tribute >>dlb.lst +echo help >>dlb.lst +echo hh >>dlb.lst +echo cmdhelp >>dlb.lst +echo history >>dlb.lst +echo opthelp >>dlb.lst +echo wizhelp >>dlb.lst +echo dungeon >>dlb.lst +echo license >>dlb.lst +for %%N in (*.lev) do echo %%N >>dlb.lst +..\util\dlb_main.exe cIf dlb.lst nhdat +echo chdir ..\build +chdir ..\build +echo if NOT exist ..\binary\*.* mkdir ..\binary +if NOT exist ..\binary\*.* mkdir ..\binary