hook fontrom 8 and [Win] Git ver

2024-10-07 06:43:29 +00:00 · 2020-04-11 04:07:21 +09:00 · 2020-04-11 04:07:21 +09:00 · 7a5c7f427a
commit 7a5c7f427a
parent 5bfee672c6
7 changed files with 51 additions and 6 deletions
--- a/compiler_base.h
+++ b/compiler_base.h
@ -275,8 +275,8 @@ typedef int  BOOL;
 #define	SNPRINTF                  OEMSNPRINTF
 #define	SPRINTF                   OEMSPRINTF

-#define	OEMSTRCPY(s1, s2) OEMSPRINTF(s1, "%s", s2)
-#define	OEMPRINTFSTR(s)   printf("%s", s)
+#define	OEMSTRCPY(s1, s2) OEMSPRINTF(s1, OEMTEXT("%s"), s2)
+#define	OEMPRINTFSTR(s)   printf(OEMTEXT("%s"), s)

 // future depracted maybe
 #define	OEMCHAR         char
--- a/np2ver.h
+++ b/np2ver.h
@ -8,7 +8,12 @@
 #else
 #define	NP2VER_CORE			"ver.0.86 kai rev.21"
 #endif
+#if defined(_MSC_VER)
+#include "np2_git_version.h"
+#define	NP2VER_GIT			VER_SHASH " " VER_DSTR
+#else
 #define	NP2VER_GIT			GIT_VERSION
+#endif

 // #define	NP2VER_WIN9X
 // #define	NP2VER_MACOSX
--- a/win9x/np21vs2019.vcxproj
+++ b/win9x/np21vs2019.vcxproj
@ -176,6 +176,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@ -198,6 +201,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -229,6 +235,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@ -265,6 +274,9 @@
    <Manifest>
      <EnableDPIAwareness>true</EnableDPIAwareness>
    </Manifest>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseHAXM|Win32'">
    <ClCompile>
@ -297,6 +309,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseHAXM|x64'">
    <ClCompile>
@ -333,6 +348,9 @@
    <Manifest>
      <EnableDPIAwareness>true</EnableDPIAwareness>
    </Manifest>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\bios\bios.c" />
@ -1409,6 +1427,7 @@
    <ClInclude Include="mousemng.h" />
    <ClInclude Include="np2.h" />
    <ClInclude Include="np2arg.h" />
+    <ClInclude Include="np2_git_version.h" />
    <ClInclude Include="oemtext.h" />
    <ClInclude Include="recvideo.h" />
    <ClInclude Include="resource.h" />
@ -1448,4 +1467,4 @@
    <Import Project="x86\vs2019\x86.targets" />
    <Import Project="x64\vs2019\x64.targets" />
  </ImportGroup>
-</Project>
+</Project>
--- a/win9x/np21vs2019.vcxproj.filters
+++ b/win9x/np21vs2019.vcxproj.filters
@ -3314,10 +3314,13 @@
    <ClInclude Include="sstpres.h">
      <Filter>ヘッダー ファイル\win9x</Filter>
    </ClInclude>
+    <ClInclude Include="np2_git_version.h">
+      <Filter>ヘッダー ファイル\win9x</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="resources\932\np2.rc">
      <Filter>リソース ファイル</Filter>
    </ResourceCompile>
  </ItemGroup>
-</Project>
+</Project>
--- a/win9x/np2vs2019.vcxproj
+++ b/win9x/np2vs2019.vcxproj
@ -129,6 +129,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@ -151,6 +154,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -178,6 +184,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@ -206,6 +215,9 @@
    <ResourceCompile>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>powershell.exe -ExecutionPolicy RemoteSigned -File "$(SolutionDir)\version_info.ps1" server "$(ProjectDir)\" "$(SolutionDir)\"</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\bios\bios.c" />
@ -858,6 +870,7 @@
    <ClInclude Include="mousemng.h" />
    <ClInclude Include="np2.h" />
    <ClInclude Include="np2arg.h" />
+    <ClInclude Include="np2_git_version.h" />
    <ClInclude Include="oemtext.h" />
    <ClInclude Include="recvideo.h" />
    <ClInclude Include="resource.h" />
@ -903,4 +916,4 @@
    <Import Project="x86\vs2019\x86.targets" />
    <Import Project="x64\vs2019\x64.targets" />
  </ImportGroup>
-</Project>
+</Project>
--- a/win9x/np2vs2019.vcxproj.filters
+++ b/win9x/np2vs2019.vcxproj.filters
@ -2132,6 +2132,9 @@
    <ClInclude Include="sstpres.h">
      <Filter>ヘッダー ファイル\win9x</Filter>
    </ClInclude>
+    <ClInclude Include="np2_git_version.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="resources\1252\np2.rc">
@ -2152,4 +2155,4 @@
      <Filter>ヘッダー ファイル\i286c</Filter>
    </None>
  </ItemGroup>
-</Project>
+</Project>
--- a/win9x/resources/932/np2jp.rc
+++ b/win9x/resources/932/np2jp.rc
@ -1124,6 +1124,7 @@ BEGIN
    POPUP "その他(&O)"
    BEGIN
        MENUITEM "BMP画面キャプチャ(&B)...",        IDM_BMPSAVE
+        MENUITEM "fomtromをフック",                 IDM_HF_ENABLE
        MENUITEM "テキストVRAM保存(&T)...",         IDM_TXTSAVE
        MENUITEM "S98サウンドログ保存(&S)...",      IDM_S98LOGGING
        MENUITEM "カレンダ設定(&L)...",             IDM_CALENDAR
@ -1137,6 +1138,7 @@ BEGIN
        MENUITEM "ジョイスティックボタン反転(&V)",  IDM_JOYX
        MENUITEM "ジョイスティックボタン連打(&R)",  IDM_RAPID
        MENUITEM "マウスボタン連打(&M)",        IDM_MSRAPID
+        MENUITEM "SSTP出力",                    IDM_SSTP
        MENUITEM "&ITFエミュレーション",        IDM_ITFWORK
        // MENUITEM "タイマー不具合修正(&T)",      IDM_TIMERFIX
        // MENUITEM "16MB超メモリチェック省略(&S)",IDM_SKIP16MEMCHK