From 848f37207d78e08e737736a7a1d538760285ebc4 Mon Sep 17 00:00:00 2001 From: Bart House Date: Sat, 10 Oct 2020 14:17:58 -0700 Subject: [PATCH 1/6] Add text mentioning that LUA sources must be copied into tree. --- sys/winnt/Install.nt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 22c9f4484..98bd029d4 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -51,11 +51,16 @@ version. You can use one of the following build environments: | vs2017 - /--------------------------------------------------------\ | Building And Running Using Visual Studio 2017 | \--------------------------------------------------------/ +Before proceeding, please obtain the lua-5.4.0 sources and copy them to +the new directory lib\lua-5.4.0\src. This source can be obtain either from +http://www.lua.org/ftp/lua-5.4.0.tar.gz or from the git hub mirror +https://github.com/lua/lua.git using the tag 'v5.4.0'. The build expects +to find lua files such as 'lua.h' at 'lib\lua-5.4.0\src\lua.h'. + If you are NOT using Visual Studio 2017 IDE, or you prefer to build using a Make utility and a Makefile proceed to "Building Using Make". From bb04a9b04183f8706a59aa04496909689cd3d6a5 Mon Sep 17 00:00:00 2001 From: Bart House Date: Sat, 10 Oct 2020 15:15:59 -0700 Subject: [PATCH 2/6] Support both VS 2017 and VS 2019 without making changes to project files. Renamed 'vs2017' folder to 'vs'. --- .travis.yml | 2 +- Files | 6 ++--- sys/winnt/Install.nt | 22 ++++++------------ sys/winnt/Makefile.msc | 2 +- win/win32/{vs2017 => vs}/.gitattributes | 0 win/win32/{vs2017 => vs}/.gitignore | 0 .../Images/BadgeLogo.scale-100.png | Bin .../Images/BadgeLogo.scale-125.png | Bin .../Images/BadgeLogo.scale-150.png | Bin .../Images/BadgeLogo.scale-200.png | Bin .../Images/BadgeLogo.scale-400.png | Bin .../Images/LargeTile.scale-100.png | Bin .../Images/LargeTile.scale-125.png | Bin .../Images/LargeTile.scale-150.png | Bin .../Images/LargeTile.scale-200.png | Bin .../Images/LargeTile.scale-400.png | Bin .../Images/LockScreenLogo.scale-200.png | Bin .../Images/SmallTile.scale-100.png | Bin .../Images/SmallTile.scale-125.png | Bin .../Images/SmallTile.scale-150.png | Bin .../Images/SmallTile.scale-200.png | Bin .../Images/SmallTile.scale-400.png | Bin .../Images/SplashScreen.scale-100.png | Bin .../Images/SplashScreen.scale-125.png | Bin .../Images/SplashScreen.scale-150.png | Bin .../Images/SplashScreen.scale-200.png | Bin .../Images/SplashScreen.scale-400.png | Bin .../Images/Square150x150Logo.scale-100.png | Bin .../Images/Square150x150Logo.scale-125.png | Bin .../Images/Square150x150Logo.scale-150.png | Bin .../Images/Square150x150Logo.scale-200.png | Bin .../Images/Square150x150Logo.scale-400.png | Bin ...x44Logo.altform-unplated_targetsize-16.png | Bin ...44Logo.altform-unplated_targetsize-256.png | Bin ...x44Logo.altform-unplated_targetsize-32.png | Bin ...x44Logo.altform-unplated_targetsize-48.png | Bin .../Images/Square44x44Logo.scale-100.png | Bin .../Images/Square44x44Logo.scale-125.png | Bin .../Images/Square44x44Logo.scale-150.png | Bin .../Images/Square44x44Logo.scale-200.png | Bin .../Images/Square44x44Logo.scale-400.png | Bin .../Images/Square44x44Logo.targetsize-16.png | Bin .../Images/Square44x44Logo.targetsize-24.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../Images/Square44x44Logo.targetsize-256.png | Bin .../Images/Square44x44Logo.targetsize-32.png | Bin .../Images/Square44x44Logo.targetsize-48.png | Bin .../Images/StoreLogo.backup.png | Bin .../Images/StoreLogo.scale-100.png | Bin .../Images/StoreLogo.scale-125.png | Bin .../Images/StoreLogo.scale-150.png | Bin .../Images/StoreLogo.scale-200.png | Bin .../Images/StoreLogo.scale-400.png | Bin .../Images/Wide310x150Logo.scale-100.png | Bin .../Images/Wide310x150Logo.scale-125.png | Bin .../Images/Wide310x150Logo.scale-150.png | Bin .../Images/Wide310x150Logo.scale-200.png | Bin .../Images/Wide310x150Logo.scale-400.png | Bin win/win32/{vs2017 => vs}/NetHack.sln | 0 win/win32/{vs2017 => vs}/NetHack.vcxproj | 0 .../NetHackPackage.appxmanifest | 0 .../{vs2017 => vs}/NetHackPackage.wapproj | 0 .../{vs2017 => vs}/NetHackProperties.props | 0 win/win32/{vs2017 => vs}/NetHackW.vcxproj | 0 win/win32/{vs2017 => vs}/PDCurses.vcxproj | 0 .../Package.StoreAssociation.xml | 0 win/win32/{vs2017 => vs}/ScreenShot.PNG | Bin win/win32/{vs2017 => vs}/afterdlb.proj | 0 win/win32/{vs2017 => vs}/aftermakedefs.proj | 0 win/win32/{vs2017 => vs}/afternethack.proj | 0 win/win32/{vs2017 => vs}/afterrecover.proj | 0 win/win32/{vs2017 => vs}/aftertile2bmp.proj | 0 win/win32/{vs2017 => vs}/aftertilemap.proj | 0 win/win32/{vs2017 => vs}/afteruudecode.proj | 0 win/win32/{vs2017 => vs}/build.bat | 0 win/win32/{vs2017 => vs}/common.props | 0 win/win32/{vs2017 => vs}/config.props | 0 win/win32/{vs2017 => vs}/console.props | 0 win/win32/{vs2017 => vs}/default.props | 3 +-- win/win32/{vs2017 => vs}/default_dll.props | 2 +- win/win32/{vs2017 => vs}/default_lib.props | 2 +- win/win32/{vs2017 => vs}/dirs.props | 0 win/win32/{vs2017 => vs}/dlb.vcxproj | 0 win/win32/{vs2017 => vs}/dll.props | 0 win/win32/{vs2017 => vs}/files.props | 0 win/win32/{vs2017 => vs}/makedefs.vcxproj | 0 win/win32/{vs2017 => vs}/nh340key.def | 0 win/win32/{vs2017 => vs}/nh340key.vcxproj | 0 win/win32/{vs2017 => vs}/nhdefkey.def | 0 win/win32/{vs2017 => vs}/nhdefkey.vcxproj | 0 win/win32/{vs2017 => vs}/nhraykey.def | 0 win/win32/{vs2017 => vs}/nhraykey.vcxproj | 0 win/win32/{vs2017 => vs}/recover.vcxproj | 0 win/win32/{vs2017 => vs}/tile2bmp.vcxproj | 0 win/win32/{vs2017 => vs}/tilemap.vcxproj | 0 win/win32/{vs2017 => vs}/tiles.vcxproj | 0 win/win32/{vs2017 => vs}/travisci.sh | 0 win/win32/{vs2017 => vs}/uudecode.vcxproj | 0 98 files changed, 15 insertions(+), 24 deletions(-) rename win/win32/{vs2017 => vs}/.gitattributes (100%) rename win/win32/{vs2017 => vs}/.gitignore (100%) rename win/win32/{vs2017 => vs}/Images/BadgeLogo.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/BadgeLogo.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/BadgeLogo.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/BadgeLogo.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/BadgeLogo.scale-400.png (100%) rename win/win32/{vs2017 => vs}/Images/LargeTile.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/LargeTile.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/LargeTile.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/LargeTile.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/LargeTile.scale-400.png (100%) rename win/win32/{vs2017 => vs}/Images/LockScreenLogo.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/SmallTile.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/SmallTile.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/SmallTile.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/SmallTile.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/SmallTile.scale-400.png (100%) rename win/win32/{vs2017 => vs}/Images/SplashScreen.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/SplashScreen.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/SplashScreen.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/SplashScreen.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/SplashScreen.scale-400.png (100%) rename win/win32/{vs2017 => vs}/Images/Square150x150Logo.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/Square150x150Logo.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/Square150x150Logo.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/Square150x150Logo.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/Square150x150Logo.scale-400.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.altform-unplated_targetsize-16.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.altform-unplated_targetsize-256.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.altform-unplated_targetsize-32.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.altform-unplated_targetsize-48.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.scale-400.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.targetsize-16.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.targetsize-24.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.targetsize-256.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.targetsize-32.png (100%) rename win/win32/{vs2017 => vs}/Images/Square44x44Logo.targetsize-48.png (100%) rename win/win32/{vs2017 => vs}/Images/StoreLogo.backup.png (100%) rename win/win32/{vs2017 => vs}/Images/StoreLogo.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/StoreLogo.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/StoreLogo.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/StoreLogo.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/StoreLogo.scale-400.png (100%) rename win/win32/{vs2017 => vs}/Images/Wide310x150Logo.scale-100.png (100%) rename win/win32/{vs2017 => vs}/Images/Wide310x150Logo.scale-125.png (100%) rename win/win32/{vs2017 => vs}/Images/Wide310x150Logo.scale-150.png (100%) rename win/win32/{vs2017 => vs}/Images/Wide310x150Logo.scale-200.png (100%) rename win/win32/{vs2017 => vs}/Images/Wide310x150Logo.scale-400.png (100%) rename win/win32/{vs2017 => vs}/NetHack.sln (100%) rename win/win32/{vs2017 => vs}/NetHack.vcxproj (100%) rename win/win32/{vs2017 => vs}/NetHackPackage.appxmanifest (100%) rename win/win32/{vs2017 => vs}/NetHackPackage.wapproj (100%) rename win/win32/{vs2017 => vs}/NetHackProperties.props (100%) rename win/win32/{vs2017 => vs}/NetHackW.vcxproj (100%) rename win/win32/{vs2017 => vs}/PDCurses.vcxproj (100%) rename win/win32/{vs2017 => vs}/Package.StoreAssociation.xml (100%) rename win/win32/{vs2017 => vs}/ScreenShot.PNG (100%) rename win/win32/{vs2017 => vs}/afterdlb.proj (100%) rename win/win32/{vs2017 => vs}/aftermakedefs.proj (100%) rename win/win32/{vs2017 => vs}/afternethack.proj (100%) rename win/win32/{vs2017 => vs}/afterrecover.proj (100%) rename win/win32/{vs2017 => vs}/aftertile2bmp.proj (100%) rename win/win32/{vs2017 => vs}/aftertilemap.proj (100%) rename win/win32/{vs2017 => vs}/afteruudecode.proj (100%) rename win/win32/{vs2017 => vs}/build.bat (100%) rename win/win32/{vs2017 => vs}/common.props (100%) rename win/win32/{vs2017 => vs}/config.props (100%) rename win/win32/{vs2017 => vs}/console.props (100%) rename win/win32/{vs2017 => vs}/default.props (91%) rename win/win32/{vs2017 => vs}/default_dll.props (90%) rename win/win32/{vs2017 => vs}/default_lib.props (90%) rename win/win32/{vs2017 => vs}/dirs.props (100%) rename win/win32/{vs2017 => vs}/dlb.vcxproj (100%) rename win/win32/{vs2017 => vs}/dll.props (100%) rename win/win32/{vs2017 => vs}/files.props (100%) rename win/win32/{vs2017 => vs}/makedefs.vcxproj (100%) rename win/win32/{vs2017 => vs}/nh340key.def (100%) rename win/win32/{vs2017 => vs}/nh340key.vcxproj (100%) rename win/win32/{vs2017 => vs}/nhdefkey.def (100%) rename win/win32/{vs2017 => vs}/nhdefkey.vcxproj (100%) rename win/win32/{vs2017 => vs}/nhraykey.def (100%) rename win/win32/{vs2017 => vs}/nhraykey.vcxproj (100%) rename win/win32/{vs2017 => vs}/recover.vcxproj (100%) rename win/win32/{vs2017 => vs}/tile2bmp.vcxproj (100%) rename win/win32/{vs2017 => vs}/tilemap.vcxproj (100%) rename win/win32/{vs2017 => vs}/tiles.vcxproj (100%) rename win/win32/{vs2017 => vs}/travisci.sh (100%) rename win/win32/{vs2017 => vs}/uudecode.vcxproj (100%) diff --git a/.travis.yml b/.travis.yml index 0b1e388a0..ceba99f72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,7 +122,7 @@ matrix: os: windows language: shell script: - - ./win/win32/vs2017/travisci.sh + - ./win/win32/vs/travisci.sh - name: windows-mingw os: windows # install: choco install mingw diff --git a/Files b/Files index 9aedfce0c..5eb31b35a 100644 --- a/Files +++ b/Files @@ -429,8 +429,8 @@ record.uu resource.h rip.uu splash.uu tiles-mingw32.mak tiles.mak winMS.h -win/win32/vs2017: -(files for Visual Studio 2017 Community Edition builds) +win/win32/vs: +(files for Visual Studio 2017 or 2019 Community Edition builds) NetHack.sln NetHack.vcxproj NetHackPackage.appxmanifest NetHackPackage.wapproj NetHackProperties.props NetHackW.vcxproj @@ -452,7 +452,7 @@ recover.vcxproj tile2bmp.vcxproj tilemap.vcxproj tiles.vcxproj travisci.sh uudecode.vcxproj -win/win32/vs2017/Images: +win/win32/vs/Images: (files for Visual Studio 2017 Community Edition builds) BadgeLogo.scale-100.png BadgeLogo.scale-125.png diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 98bd029d4..5deb4dccb 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -49,10 +49,10 @@ version. You can use one of the following build environments: | | | | | | share winnt tty win32 Lua-5.4.0 pdcurses | - vs2017 + vs /--------------------------------------------------------\ -| Building And Running Using Visual Studio 2017 | +| Building And Running Using Visual Studio 2017 or 2019 | \--------------------------------------------------------/ Before proceeding, please obtain the lua-5.4.0 sources and copy them to @@ -61,23 +61,15 @@ http://www.lua.org/ftp/lua-5.4.0.tar.gz or from the git hub mirror https://github.com/lua/lua.git using the tag 'v5.4.0'. The build expects to find lua files such as 'lua.h' at 'lib\lua-5.4.0\src\lua.h'. -If you are NOT using Visual Studio 2017 IDE, or you prefer to build +If you are NOT using Visual Studio 2017 or 2019 IDE, or you prefer to build using a Make utility and a Makefile proceed to "Building Using Make". -When using either Visual Studio 2017, you simply need to load the +When using either Visual Studio 2017 or 2019, you simply need to load the solution file within the IDE, build the solution and run the version of NetHack you wish to run. -The Visual Studio 2017 NetHack solution file can be found here: - win\win32\vs2017\NetHack.sln - -You can use that same win\win32\vs2017\NetHack.sln with Visual Studio 2019, -but you may have to retarget the projects: - Windows SDK Version: 10.0.17763.0 [ There have been some reports of - difficulties if you instead choose - "10.0 (latest installed version)" ] - Platform Toolset: Upgrade to v142 - +The Visual Studio NetHack solution file can be found here: + win\win32\vs\NetHack.sln Before executing the steps to build listed in the next paragraph, decide if you want to include optional curses window-port. See @@ -94,7 +86,7 @@ You can also build all the projects for all platforms and configurations using a "build.bat" batch file found in the same directory as the solution. Open a developer command prompt for the version of Visual Studio you are -using. Change to the directory win\win32\vs2017 and run "build.bat". +using. Change to the directory win\win32\vs and run "build.bat". * Optional curses window-port support * diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 546d346e4..d079e64db 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -593,7 +593,7 @@ VSVER=2999 #untested future version !include ! ENDIF -#These will be in the environment variables with one of the VS2017 +#These will be in the environment variables with one of the Visual Studio #developer command prompts. #VSCMD_ARG_HOST_ARCH=x64 #VSCMD_ARG_TGT_ARCH=x86 diff --git a/win/win32/vs2017/.gitattributes b/win/win32/vs/.gitattributes similarity index 100% rename from win/win32/vs2017/.gitattributes rename to win/win32/vs/.gitattributes diff --git a/win/win32/vs2017/.gitignore b/win/win32/vs/.gitignore similarity index 100% rename from win/win32/vs2017/.gitignore rename to win/win32/vs/.gitignore diff --git a/win/win32/vs2017/Images/BadgeLogo.scale-100.png b/win/win32/vs/Images/BadgeLogo.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/BadgeLogo.scale-100.png rename to win/win32/vs/Images/BadgeLogo.scale-100.png diff --git a/win/win32/vs2017/Images/BadgeLogo.scale-125.png b/win/win32/vs/Images/BadgeLogo.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/BadgeLogo.scale-125.png rename to win/win32/vs/Images/BadgeLogo.scale-125.png diff --git a/win/win32/vs2017/Images/BadgeLogo.scale-150.png b/win/win32/vs/Images/BadgeLogo.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/BadgeLogo.scale-150.png rename to win/win32/vs/Images/BadgeLogo.scale-150.png diff --git a/win/win32/vs2017/Images/BadgeLogo.scale-200.png b/win/win32/vs/Images/BadgeLogo.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/BadgeLogo.scale-200.png rename to win/win32/vs/Images/BadgeLogo.scale-200.png diff --git a/win/win32/vs2017/Images/BadgeLogo.scale-400.png b/win/win32/vs/Images/BadgeLogo.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/BadgeLogo.scale-400.png rename to win/win32/vs/Images/BadgeLogo.scale-400.png diff --git a/win/win32/vs2017/Images/LargeTile.scale-100.png b/win/win32/vs/Images/LargeTile.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/LargeTile.scale-100.png rename to win/win32/vs/Images/LargeTile.scale-100.png diff --git a/win/win32/vs2017/Images/LargeTile.scale-125.png b/win/win32/vs/Images/LargeTile.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/LargeTile.scale-125.png rename to win/win32/vs/Images/LargeTile.scale-125.png diff --git a/win/win32/vs2017/Images/LargeTile.scale-150.png b/win/win32/vs/Images/LargeTile.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/LargeTile.scale-150.png rename to win/win32/vs/Images/LargeTile.scale-150.png diff --git a/win/win32/vs2017/Images/LargeTile.scale-200.png b/win/win32/vs/Images/LargeTile.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/LargeTile.scale-200.png rename to win/win32/vs/Images/LargeTile.scale-200.png diff --git a/win/win32/vs2017/Images/LargeTile.scale-400.png b/win/win32/vs/Images/LargeTile.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/LargeTile.scale-400.png rename to win/win32/vs/Images/LargeTile.scale-400.png diff --git a/win/win32/vs2017/Images/LockScreenLogo.scale-200.png b/win/win32/vs/Images/LockScreenLogo.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/LockScreenLogo.scale-200.png rename to win/win32/vs/Images/LockScreenLogo.scale-200.png diff --git a/win/win32/vs2017/Images/SmallTile.scale-100.png b/win/win32/vs/Images/SmallTile.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/SmallTile.scale-100.png rename to win/win32/vs/Images/SmallTile.scale-100.png diff --git a/win/win32/vs2017/Images/SmallTile.scale-125.png b/win/win32/vs/Images/SmallTile.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/SmallTile.scale-125.png rename to win/win32/vs/Images/SmallTile.scale-125.png diff --git a/win/win32/vs2017/Images/SmallTile.scale-150.png b/win/win32/vs/Images/SmallTile.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/SmallTile.scale-150.png rename to win/win32/vs/Images/SmallTile.scale-150.png diff --git a/win/win32/vs2017/Images/SmallTile.scale-200.png b/win/win32/vs/Images/SmallTile.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/SmallTile.scale-200.png rename to win/win32/vs/Images/SmallTile.scale-200.png diff --git a/win/win32/vs2017/Images/SmallTile.scale-400.png b/win/win32/vs/Images/SmallTile.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/SmallTile.scale-400.png rename to win/win32/vs/Images/SmallTile.scale-400.png diff --git a/win/win32/vs2017/Images/SplashScreen.scale-100.png b/win/win32/vs/Images/SplashScreen.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/SplashScreen.scale-100.png rename to win/win32/vs/Images/SplashScreen.scale-100.png diff --git a/win/win32/vs2017/Images/SplashScreen.scale-125.png b/win/win32/vs/Images/SplashScreen.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/SplashScreen.scale-125.png rename to win/win32/vs/Images/SplashScreen.scale-125.png diff --git a/win/win32/vs2017/Images/SplashScreen.scale-150.png b/win/win32/vs/Images/SplashScreen.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/SplashScreen.scale-150.png rename to win/win32/vs/Images/SplashScreen.scale-150.png diff --git a/win/win32/vs2017/Images/SplashScreen.scale-200.png b/win/win32/vs/Images/SplashScreen.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/SplashScreen.scale-200.png rename to win/win32/vs/Images/SplashScreen.scale-200.png diff --git a/win/win32/vs2017/Images/SplashScreen.scale-400.png b/win/win32/vs/Images/SplashScreen.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/SplashScreen.scale-400.png rename to win/win32/vs/Images/SplashScreen.scale-400.png diff --git a/win/win32/vs2017/Images/Square150x150Logo.scale-100.png b/win/win32/vs/Images/Square150x150Logo.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/Square150x150Logo.scale-100.png rename to win/win32/vs/Images/Square150x150Logo.scale-100.png diff --git a/win/win32/vs2017/Images/Square150x150Logo.scale-125.png b/win/win32/vs/Images/Square150x150Logo.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/Square150x150Logo.scale-125.png rename to win/win32/vs/Images/Square150x150Logo.scale-125.png diff --git a/win/win32/vs2017/Images/Square150x150Logo.scale-150.png b/win/win32/vs/Images/Square150x150Logo.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/Square150x150Logo.scale-150.png rename to win/win32/vs/Images/Square150x150Logo.scale-150.png diff --git a/win/win32/vs2017/Images/Square150x150Logo.scale-200.png b/win/win32/vs/Images/Square150x150Logo.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/Square150x150Logo.scale-200.png rename to win/win32/vs/Images/Square150x150Logo.scale-200.png diff --git a/win/win32/vs2017/Images/Square150x150Logo.scale-400.png b/win/win32/vs/Images/Square150x150Logo.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/Square150x150Logo.scale-400.png rename to win/win32/vs/Images/Square150x150Logo.scale-400.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-16.png rename to win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-256.png rename to win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-32.png rename to win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-48.png rename to win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.scale-100.png b/win/win32/vs/Images/Square44x44Logo.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.scale-100.png rename to win/win32/vs/Images/Square44x44Logo.scale-100.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.scale-125.png b/win/win32/vs/Images/Square44x44Logo.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.scale-125.png rename to win/win32/vs/Images/Square44x44Logo.scale-125.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.scale-150.png b/win/win32/vs/Images/Square44x44Logo.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.scale-150.png rename to win/win32/vs/Images/Square44x44Logo.scale-150.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.scale-200.png b/win/win32/vs/Images/Square44x44Logo.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.scale-200.png rename to win/win32/vs/Images/Square44x44Logo.scale-200.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.scale-400.png b/win/win32/vs/Images/Square44x44Logo.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.scale-400.png rename to win/win32/vs/Images/Square44x44Logo.scale-400.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.targetsize-16.png b/win/win32/vs/Images/Square44x44Logo.targetsize-16.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.targetsize-16.png rename to win/win32/vs/Images/Square44x44Logo.targetsize-16.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.targetsize-24.png b/win/win32/vs/Images/Square44x44Logo.targetsize-24.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.targetsize-24.png rename to win/win32/vs/Images/Square44x44Logo.targetsize-24.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/win/win32/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.targetsize-24_altform-unplated.png rename to win/win32/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.targetsize-256.png b/win/win32/vs/Images/Square44x44Logo.targetsize-256.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.targetsize-256.png rename to win/win32/vs/Images/Square44x44Logo.targetsize-256.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.targetsize-32.png b/win/win32/vs/Images/Square44x44Logo.targetsize-32.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.targetsize-32.png rename to win/win32/vs/Images/Square44x44Logo.targetsize-32.png diff --git a/win/win32/vs2017/Images/Square44x44Logo.targetsize-48.png b/win/win32/vs/Images/Square44x44Logo.targetsize-48.png similarity index 100% rename from win/win32/vs2017/Images/Square44x44Logo.targetsize-48.png rename to win/win32/vs/Images/Square44x44Logo.targetsize-48.png diff --git a/win/win32/vs2017/Images/StoreLogo.backup.png b/win/win32/vs/Images/StoreLogo.backup.png similarity index 100% rename from win/win32/vs2017/Images/StoreLogo.backup.png rename to win/win32/vs/Images/StoreLogo.backup.png diff --git a/win/win32/vs2017/Images/StoreLogo.scale-100.png b/win/win32/vs/Images/StoreLogo.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/StoreLogo.scale-100.png rename to win/win32/vs/Images/StoreLogo.scale-100.png diff --git a/win/win32/vs2017/Images/StoreLogo.scale-125.png b/win/win32/vs/Images/StoreLogo.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/StoreLogo.scale-125.png rename to win/win32/vs/Images/StoreLogo.scale-125.png diff --git a/win/win32/vs2017/Images/StoreLogo.scale-150.png b/win/win32/vs/Images/StoreLogo.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/StoreLogo.scale-150.png rename to win/win32/vs/Images/StoreLogo.scale-150.png diff --git a/win/win32/vs2017/Images/StoreLogo.scale-200.png b/win/win32/vs/Images/StoreLogo.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/StoreLogo.scale-200.png rename to win/win32/vs/Images/StoreLogo.scale-200.png diff --git a/win/win32/vs2017/Images/StoreLogo.scale-400.png b/win/win32/vs/Images/StoreLogo.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/StoreLogo.scale-400.png rename to win/win32/vs/Images/StoreLogo.scale-400.png diff --git a/win/win32/vs2017/Images/Wide310x150Logo.scale-100.png b/win/win32/vs/Images/Wide310x150Logo.scale-100.png similarity index 100% rename from win/win32/vs2017/Images/Wide310x150Logo.scale-100.png rename to win/win32/vs/Images/Wide310x150Logo.scale-100.png diff --git a/win/win32/vs2017/Images/Wide310x150Logo.scale-125.png b/win/win32/vs/Images/Wide310x150Logo.scale-125.png similarity index 100% rename from win/win32/vs2017/Images/Wide310x150Logo.scale-125.png rename to win/win32/vs/Images/Wide310x150Logo.scale-125.png diff --git a/win/win32/vs2017/Images/Wide310x150Logo.scale-150.png b/win/win32/vs/Images/Wide310x150Logo.scale-150.png similarity index 100% rename from win/win32/vs2017/Images/Wide310x150Logo.scale-150.png rename to win/win32/vs/Images/Wide310x150Logo.scale-150.png diff --git a/win/win32/vs2017/Images/Wide310x150Logo.scale-200.png b/win/win32/vs/Images/Wide310x150Logo.scale-200.png similarity index 100% rename from win/win32/vs2017/Images/Wide310x150Logo.scale-200.png rename to win/win32/vs/Images/Wide310x150Logo.scale-200.png diff --git a/win/win32/vs2017/Images/Wide310x150Logo.scale-400.png b/win/win32/vs/Images/Wide310x150Logo.scale-400.png similarity index 100% rename from win/win32/vs2017/Images/Wide310x150Logo.scale-400.png rename to win/win32/vs/Images/Wide310x150Logo.scale-400.png diff --git a/win/win32/vs2017/NetHack.sln b/win/win32/vs/NetHack.sln similarity index 100% rename from win/win32/vs2017/NetHack.sln rename to win/win32/vs/NetHack.sln diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs/NetHack.vcxproj similarity index 100% rename from win/win32/vs2017/NetHack.vcxproj rename to win/win32/vs/NetHack.vcxproj diff --git a/win/win32/vs2017/NetHackPackage.appxmanifest b/win/win32/vs/NetHackPackage.appxmanifest similarity index 100% rename from win/win32/vs2017/NetHackPackage.appxmanifest rename to win/win32/vs/NetHackPackage.appxmanifest diff --git a/win/win32/vs2017/NetHackPackage.wapproj b/win/win32/vs/NetHackPackage.wapproj similarity index 100% rename from win/win32/vs2017/NetHackPackage.wapproj rename to win/win32/vs/NetHackPackage.wapproj diff --git a/win/win32/vs2017/NetHackProperties.props b/win/win32/vs/NetHackProperties.props similarity index 100% rename from win/win32/vs2017/NetHackProperties.props rename to win/win32/vs/NetHackProperties.props diff --git a/win/win32/vs2017/NetHackW.vcxproj b/win/win32/vs/NetHackW.vcxproj similarity index 100% rename from win/win32/vs2017/NetHackW.vcxproj rename to win/win32/vs/NetHackW.vcxproj diff --git a/win/win32/vs2017/PDCurses.vcxproj b/win/win32/vs/PDCurses.vcxproj similarity index 100% rename from win/win32/vs2017/PDCurses.vcxproj rename to win/win32/vs/PDCurses.vcxproj diff --git a/win/win32/vs2017/Package.StoreAssociation.xml b/win/win32/vs/Package.StoreAssociation.xml similarity index 100% rename from win/win32/vs2017/Package.StoreAssociation.xml rename to win/win32/vs/Package.StoreAssociation.xml diff --git a/win/win32/vs2017/ScreenShot.PNG b/win/win32/vs/ScreenShot.PNG similarity index 100% rename from win/win32/vs2017/ScreenShot.PNG rename to win/win32/vs/ScreenShot.PNG diff --git a/win/win32/vs2017/afterdlb.proj b/win/win32/vs/afterdlb.proj similarity index 100% rename from win/win32/vs2017/afterdlb.proj rename to win/win32/vs/afterdlb.proj diff --git a/win/win32/vs2017/aftermakedefs.proj b/win/win32/vs/aftermakedefs.proj similarity index 100% rename from win/win32/vs2017/aftermakedefs.proj rename to win/win32/vs/aftermakedefs.proj diff --git a/win/win32/vs2017/afternethack.proj b/win/win32/vs/afternethack.proj similarity index 100% rename from win/win32/vs2017/afternethack.proj rename to win/win32/vs/afternethack.proj diff --git a/win/win32/vs2017/afterrecover.proj b/win/win32/vs/afterrecover.proj similarity index 100% rename from win/win32/vs2017/afterrecover.proj rename to win/win32/vs/afterrecover.proj diff --git a/win/win32/vs2017/aftertile2bmp.proj b/win/win32/vs/aftertile2bmp.proj similarity index 100% rename from win/win32/vs2017/aftertile2bmp.proj rename to win/win32/vs/aftertile2bmp.proj diff --git a/win/win32/vs2017/aftertilemap.proj b/win/win32/vs/aftertilemap.proj similarity index 100% rename from win/win32/vs2017/aftertilemap.proj rename to win/win32/vs/aftertilemap.proj diff --git a/win/win32/vs2017/afteruudecode.proj b/win/win32/vs/afteruudecode.proj similarity index 100% rename from win/win32/vs2017/afteruudecode.proj rename to win/win32/vs/afteruudecode.proj diff --git a/win/win32/vs2017/build.bat b/win/win32/vs/build.bat similarity index 100% rename from win/win32/vs2017/build.bat rename to win/win32/vs/build.bat diff --git a/win/win32/vs2017/common.props b/win/win32/vs/common.props similarity index 100% rename from win/win32/vs2017/common.props rename to win/win32/vs/common.props diff --git a/win/win32/vs2017/config.props b/win/win32/vs/config.props similarity index 100% rename from win/win32/vs2017/config.props rename to win/win32/vs/config.props diff --git a/win/win32/vs2017/console.props b/win/win32/vs/console.props similarity index 100% rename from win/win32/vs2017/console.props rename to win/win32/vs/console.props diff --git a/win/win32/vs2017/default.props b/win/win32/vs/default.props similarity index 91% rename from win/win32/vs2017/default.props rename to win/win32/vs/default.props index e0bc58136..a8b166609 100644 --- a/win/win32/vs2017/default.props +++ b/win/win32/vs/default.props @@ -4,7 +4,7 @@ Application false MultiByte - v141 + $(DefaultPlatformToolset) $(BinDir) @@ -14,5 +14,4 @@ false true - diff --git a/win/win32/vs2017/default_dll.props b/win/win32/vs/default_dll.props similarity index 90% rename from win/win32/vs2017/default_dll.props rename to win/win32/vs/default_dll.props index 51d90a3ee..cf1306958 100644 --- a/win/win32/vs2017/default_dll.props +++ b/win/win32/vs/default_dll.props @@ -4,7 +4,7 @@ DynamicLibrary false MultiByte - v141 + $(DefaultPlatformToolset) true diff --git a/win/win32/vs2017/default_lib.props b/win/win32/vs/default_lib.props similarity index 90% rename from win/win32/vs2017/default_lib.props rename to win/win32/vs/default_lib.props index 61bf2ecaa..ce33f4abc 100644 --- a/win/win32/vs2017/default_lib.props +++ b/win/win32/vs/default_lib.props @@ -4,7 +4,7 @@ StaticLibrary false MultiByte - v141 + $(DefaultPlatformToolset) true diff --git a/win/win32/vs2017/dirs.props b/win/win32/vs/dirs.props similarity index 100% rename from win/win32/vs2017/dirs.props rename to win/win32/vs/dirs.props diff --git a/win/win32/vs2017/dlb.vcxproj b/win/win32/vs/dlb.vcxproj similarity index 100% rename from win/win32/vs2017/dlb.vcxproj rename to win/win32/vs/dlb.vcxproj diff --git a/win/win32/vs2017/dll.props b/win/win32/vs/dll.props similarity index 100% rename from win/win32/vs2017/dll.props rename to win/win32/vs/dll.props diff --git a/win/win32/vs2017/files.props b/win/win32/vs/files.props similarity index 100% rename from win/win32/vs2017/files.props rename to win/win32/vs/files.props diff --git a/win/win32/vs2017/makedefs.vcxproj b/win/win32/vs/makedefs.vcxproj similarity index 100% rename from win/win32/vs2017/makedefs.vcxproj rename to win/win32/vs/makedefs.vcxproj diff --git a/win/win32/vs2017/nh340key.def b/win/win32/vs/nh340key.def similarity index 100% rename from win/win32/vs2017/nh340key.def rename to win/win32/vs/nh340key.def diff --git a/win/win32/vs2017/nh340key.vcxproj b/win/win32/vs/nh340key.vcxproj similarity index 100% rename from win/win32/vs2017/nh340key.vcxproj rename to win/win32/vs/nh340key.vcxproj diff --git a/win/win32/vs2017/nhdefkey.def b/win/win32/vs/nhdefkey.def similarity index 100% rename from win/win32/vs2017/nhdefkey.def rename to win/win32/vs/nhdefkey.def diff --git a/win/win32/vs2017/nhdefkey.vcxproj b/win/win32/vs/nhdefkey.vcxproj similarity index 100% rename from win/win32/vs2017/nhdefkey.vcxproj rename to win/win32/vs/nhdefkey.vcxproj diff --git a/win/win32/vs2017/nhraykey.def b/win/win32/vs/nhraykey.def similarity index 100% rename from win/win32/vs2017/nhraykey.def rename to win/win32/vs/nhraykey.def diff --git a/win/win32/vs2017/nhraykey.vcxproj b/win/win32/vs/nhraykey.vcxproj similarity index 100% rename from win/win32/vs2017/nhraykey.vcxproj rename to win/win32/vs/nhraykey.vcxproj diff --git a/win/win32/vs2017/recover.vcxproj b/win/win32/vs/recover.vcxproj similarity index 100% rename from win/win32/vs2017/recover.vcxproj rename to win/win32/vs/recover.vcxproj diff --git a/win/win32/vs2017/tile2bmp.vcxproj b/win/win32/vs/tile2bmp.vcxproj similarity index 100% rename from win/win32/vs2017/tile2bmp.vcxproj rename to win/win32/vs/tile2bmp.vcxproj diff --git a/win/win32/vs2017/tilemap.vcxproj b/win/win32/vs/tilemap.vcxproj similarity index 100% rename from win/win32/vs2017/tilemap.vcxproj rename to win/win32/vs/tilemap.vcxproj diff --git a/win/win32/vs2017/tiles.vcxproj b/win/win32/vs/tiles.vcxproj similarity index 100% rename from win/win32/vs2017/tiles.vcxproj rename to win/win32/vs/tiles.vcxproj diff --git a/win/win32/vs2017/travisci.sh b/win/win32/vs/travisci.sh similarity index 100% rename from win/win32/vs2017/travisci.sh rename to win/win32/vs/travisci.sh diff --git a/win/win32/vs2017/uudecode.vcxproj b/win/win32/vs/uudecode.vcxproj similarity index 100% rename from win/win32/vs2017/uudecode.vcxproj rename to win/win32/vs/uudecode.vcxproj From c5c43ad00abae1bdd62d0cda4cab69b746a2dbd9 Mon Sep 17 00:00:00 2001 From: nhw_cron Date: Sat, 10 Oct 2020 18:24:07 -0400 Subject: [PATCH 3/6] This is cron-daily v1-Jan-20-2020. files updated: Files --- Files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Files b/Files index 5eb31b35a..4b1474fbd 100644 --- a/Files +++ b/Files @@ -430,7 +430,7 @@ splash.uu tiles-mingw32.mak tiles.mak winMS.h win/win32/vs: -(files for Visual Studio 2017 or 2019 Community Edition builds) +(files for Visual Studio 2017 Community Edition builds) NetHack.sln NetHack.vcxproj NetHackPackage.appxmanifest NetHackPackage.wapproj NetHackProperties.props NetHackW.vcxproj From 9599fa27df62d113d9ef96074dd671b033547a65 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 10 Oct 2020 18:38:25 -0400 Subject: [PATCH 4/6] update win/win32/vs/.gitattributes text --- win/win32/vs/.gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/win32/vs/.gitattributes b/win/win32/vs/.gitattributes index 041653ea8..f9d4fff5d 100644 --- a/win/win32/vs/.gitattributes +++ b/win/win32/vs/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_Visual_Studio_2017_Community_Edition_builds) +* NH_filestag=(file%s_for_Visual_Studio_2017_or_2019_Community_Edition_builds) From cc50aa036df44b4e329554933be0958d66290f24 Mon Sep 17 00:00:00 2001 From: Bart House Date: Sat, 10 Oct 2020 16:28:41 -0700 Subject: [PATCH 5/6] Update files heading to reflect that we support VS 2017 and 2019. --- win/win32/vs/.gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/win32/vs/.gitattributes b/win/win32/vs/.gitattributes index 041653ea8..f9d4fff5d 100644 --- a/win/win32/vs/.gitattributes +++ b/win/win32/vs/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_Visual_Studio_2017_Community_Edition_builds) +* NH_filestag=(file%s_for_Visual_Studio_2017_or_2019_Community_Edition_builds) From d6719ea0db723c5b2d4b3713eb0a3f474955f2b6 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 10 Oct 2020 19:36:36 -0400 Subject: [PATCH 6/6] cron daily Files update --- Files | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Files b/Files index 4b1474fbd..f12e09304 100644 --- a/Files +++ b/Files @@ -430,7 +430,7 @@ splash.uu tiles-mingw32.mak tiles.mak winMS.h win/win32/vs: -(files for Visual Studio 2017 Community Edition builds) +(files for Visual Studio 2017 or 2019 Community Edition builds) NetHack.sln NetHack.vcxproj NetHackPackage.appxmanifest NetHackPackage.wapproj NetHackProperties.props NetHackW.vcxproj @@ -453,7 +453,7 @@ tilemap.vcxproj tiles.vcxproj travisci.sh uudecode.vcxproj win/win32/vs/Images: -(files for Visual Studio 2017 Community Edition builds) +(files for Visual Studio 2017 or 2019 Community Edition builds) BadgeLogo.scale-100.png BadgeLogo.scale-125.png BadgeLogo.scale-150.png