merge
This commit is contained in:
1
win/Qt/.gitattributes
vendored
1
win/Qt/.gitattributes
vendored
@@ -1,3 +1,4 @@
|
||||
Install.Qt NHSUBST
|
||||
qpe-nethack.control NH_header=no
|
||||
knethack.lnk NH_header=no
|
||||
* NH_filestag=(file%s_for_the_Qt_3_widget_library_-_X11,_Windows,_Mac_OS_X,_or_Qtopia)
|
||||
|
||||
1
win/Qt4/.gitattributes
vendored
Normal file
1
win/Qt4/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* NH_filestag=(file%s_for_the_Qt_4_widget_library_-_X11,_Windows,_Mac_OS_X)
|
||||
1
win/X11/.gitattributes
vendored
1
win/X11/.gitattributes
vendored
@@ -4,3 +4,4 @@ Install.X11 NHSUBST
|
||||
nethack.rc NHSUBST
|
||||
*.bdf NH_header=no
|
||||
*.xbm NH_header=no
|
||||
* NH_filestag=(file%s_for_X_versions)
|
||||
|
||||
1
win/chain/.gitattributes
vendored
Normal file
1
win/chain/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* NH_filestag=(file%s_for_stacking_window_systems)
|
||||
1
win/gem/.gitattributes
vendored
Normal file
1
win/gem/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* NH_filestag=(file%s_for_GEM_versions_-_untested_for_3.6.2)
|
||||
1
win/gnome/.gitattributes
vendored
Normal file
1
win/gnome/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* NH_filestag=(file%s_for_GNOME_versions_-_untested_for_3.6.2)
|
||||
1
win/macosx/.gitattributes
vendored
1
win/macosx/.gitattributes
vendored
@@ -1 +1,2 @@
|
||||
*.applescript NHSUBST
|
||||
* NH_filestag=(file%s_for_macosx_versions)
|
||||
|
||||
1
win/share/.gitattributes
vendored
1
win/share/.gitattributes
vendored
@@ -1 +1,2 @@
|
||||
tile.doc NHSUBST
|
||||
* NH_filestag=(file%s_for_versions_using_optional_tiles)
|
||||
|
||||
1
win/tty/.gitattributes
vendored
Normal file
1
win/tty/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* NH_filestag=(file%s_for_tty_versions)
|
||||
1
win/win32/.gitattributes
vendored
1
win/win32/.gitattributes
vendored
@@ -8,3 +8,4 @@
|
||||
*.props NH_header=no
|
||||
resource.h NH_header=no
|
||||
nhresource.h NH_header=no
|
||||
* NH_filestag=(file%s_for_Windows_versions_-_tested_up_to_Windows_10)
|
||||
|
||||
1
win/win32/vs2017/.gitattributes
vendored
Normal file
1
win/win32/vs2017/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* NH_filestag=(file%s_for_Visual_Studio_2017_Community_Edition_builds)
|
||||
18
win/win32/vs2017/NetHackW.exe.manifest
Normal file
18
win/win32/vs2017/NetHackW.exe.manifest
Normal file
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">unaware</dpiAwareness>
|
||||
<!-- <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness> -->
|
||||
<!-- <gdiScaling xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling> -->
|
||||
</windowsSettings>
|
||||
</application>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- Windows 7 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- Windows 8 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- Windows 8.1 -->
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <!-- Windows 10 -->
|
||||
</application>
|
||||
</compatibility>
|
||||
</assembly>
|
||||
@@ -30,6 +30,9 @@
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>NethackW.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
</Manifest>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="$(SrcDir)allmain.c" />
|
||||
@@ -152,6 +155,7 @@
|
||||
<PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(SysWinntDir)winnt.c" />
|
||||
<ClCompile Include="$(SysWinntDir)win10.c" />
|
||||
<ClCompile Include="$(WinWin32Dir)mhaskyn.c" />
|
||||
<ClCompile Include="$(WinWin32Dir)mhdlg.c" />
|
||||
<ClCompile Include="$(WinWin32Dir)mhfont.c" />
|
||||
@@ -180,4 +184,4 @@
|
||||
<Target Name="AfterRebuild">
|
||||
<MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "resource.h"
|
||||
#include "mhmain.h"
|
||||
#include "mhmap.h"
|
||||
#include "win10.h"
|
||||
|
||||
/* Borland and MinGW redefine "boolean" in shlwapi.h,
|
||||
so just use the little bit we need */
|
||||
@@ -88,18 +89,18 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
|
||||
UNREFERENCED_PARAMETER(lpCmdLine);
|
||||
UNREFERENCED_PARAMETER(nCmdShow);
|
||||
|
||||
//
|
||||
/* We must initialize state sufficiently to support calls to panic */
|
||||
// We need to support DPI awareness.
|
||||
//
|
||||
// BOOL result = SetProcessDpiAwarenessContext(
|
||||
// DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
|
||||
//
|
||||
|
||||
/* We must initialize state sufficiently to support calls to panic */
|
||||
windowprocs.win_raw_print = mswin_raw_print;
|
||||
windowprocs.win_raw_print_bold = mswin_raw_print_bold;
|
||||
windowprocs.win_wait_synch = mswin_wait_synch;
|
||||
|
||||
win10_init();
|
||||
|
||||
sys_early_init();
|
||||
|
||||
/* init applicatio structure */
|
||||
|
||||
Reference in New Issue
Block a user