[VM][General] Apply Upstream 2018-10-07.Still WIP.

[csp-qt/common_source_project-fm7.git] / source / vc++2013 / fm7.vcxproj

diff --git a/source/vc++2013/fm7.vcxproj b/source/vc++2013/fm7.vcxproj
index 81b358b..3d17c99 100644 (file)
--- a/source/vc++2013/fm7.vcxproj
+++ b/source/vc++2013/fm7.vcxproj
@@ -46,15 +46,15 @@
     <OutDir>.\Debug\</OutDir>
     <IntDir>.\Debug\</IntDir>
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(VCInstallDir)DirectX 9.0 SDK\Include;</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);$(VCInstallDir)DirectX 9.0 SDK\Lib\x86;</LibraryPath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(DXSDK_DIR)Include</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(DXSDK_DIR)Lib\x86</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>.\Release\</OutDir>
     <IntDir>.\Release\</IntDir>
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(VCInstallDir)DirectX 9.0 SDK\Include;</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);$(VCInstallDir)DirectX 9.0 SDK\Lib\x86;</LibraryPath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(DXSDK_DIR)Include</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(DXSDK_DIR)Lib\x86</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -95,11 +95,15 @@
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <IgnoreSpecificDefaultLibraries>Libcmtd.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>.\Debug/fm7.bsc</OutputFile>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>..\src\res\vista.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -145,6 +149,9 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>.\Release/fm7.bsc</OutputFile>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>..\src\res\vista.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\common.cpp" />
@@ -159,12 +166,17 @@
     <ClCompile Include="..\src\win32\osd_screen.cpp" />
     <ClCompile Include="..\src\win32\osd_sound.cpp" />
     <ClCompile Include="..\src\win32\winmain.cpp" />
+    <ClCompile Include="..\src\vm\and.cpp" />
+    <ClCompile Include="..\src\vm\ay_3_891x.cpp" />
     <ClCompile Include="..\src\vm\datarec.cpp" />
     <ClCompile Include="..\src\vm\disk.cpp" />
     <ClCompile Include="..\src\vm\event.cpp" />
+    <ClCompile Include="..\src\vm\i8251.cpp" />
     <ClCompile Include="..\src\vm\mb8877.cpp" />
     <ClCompile Include="..\src\vm\mc6809.cpp" />
+    <ClCompile Include="..\src\vm\mc6809_base.cpp" />
     <ClCompile Include="..\src\vm\memory.cpp" />
+    <ClCompile Include="..\src\vm\noise.cpp" />
     <ClCompile Include="..\src\vm\pcm1bit.cpp" />
     <ClCompile Include="..\src\vm\prnfile.cpp" />
     <ClCompile Include="..\src\vm\ym2203.cpp" />
@@ -179,9 +191,15 @@
     <ClCompile Include="..\src\vm\fm7\fm7.cpp" />
     <ClCompile Include="..\src\vm\fm7\fm7_mainio.cpp" />
     <ClCompile Include="..\src\vm\fm7\fm7_mainmem.cpp" />
+    <ClCompile Include="..\src\vm\fm7\jcommcard.cpp" />
     <ClCompile Include="..\src\vm\fm7\joystick.cpp" />
     <ClCompile Include="..\src\vm\fm7\kanjirom.cpp" />
     <ClCompile Include="..\src\vm\fm7\keyboard.cpp" />
+    <ClCompile Include="..\src\vm\fm7\mainmem_mmr.cpp" />
+    <ClCompile Include="..\src\vm\fm7\mainmem_page2.cpp" />
+    <ClCompile Include="..\src\vm\fm7\mainmem_readseq.cpp" />
+    <ClCompile Include="..\src\vm\fm7\mainmem_utils.cpp" />
+    <ClCompile Include="..\src\vm\fm7\mainmem_writeseq.cpp" />
     <ClCompile Include="..\src\vm\fm7\sound.cpp" />
     <ClCompile Include="..\src\vm\fm7\vram.cpp" />
   </ItemGroup>
@@ -192,17 +210,22 @@
     <ClInclude Include="..\src\fileio.h" />
     <ClInclude Include="..\src\emu.h" />
     <ClInclude Include="..\src\win32\osd.h" />
+    <ClInclude Include="..\src\vm\and.h" />
+    <ClInclude Include="..\src\vm\ay_3_891x.h" />
     <ClInclude Include="..\src\vm\datarec.h" />
     <ClInclude Include="..\src\vm\debugger.h" />
     <ClInclude Include="..\src\vm\device.h" />
     <ClInclude Include="..\src\vm\disk.h" />
     <ClInclude Include="..\src\vm\event.h" />
+    <ClInclude Include="..\src\vm\i8251.h" />
     <ClInclude Include="..\src\vm\mb8877.h" />
     <ClInclude Include="..\src\vm\mc6809.h" />
     <ClInclude Include="..\src\vm\memory.h" />
+    <ClInclude Include="..\src\vm\noise.h" />
     <ClInclude Include="..\src\vm\pcm1bit.h" />
     <ClInclude Include="..\src\vm\prnfile.h" />
     <ClInclude Include="..\src\vm\vm.h" />
+    <ClInclude Include="..\src\vm\vm_template.h" />
     <ClInclude Include="..\src\vm\ym2203.h" />
     <ClInclude Include="..\src\vm\z80.h" />
     <ClInclude Include="..\src\vm\fmgen\diag.h" />
@@ -220,12 +243,15 @@
     <ClInclude Include="..\src\vm\fm7\fm7_keyboard.h" />
     <ClInclude Include="..\src\vm\fm7\fm7_mainio.h" />
     <ClInclude Include="..\src\vm\fm7\fm7_mainmem.h" />
+    <ClInclude Include="..\src\vm\fm7\jcommcard.h" />
     <ClInclude Include="..\src\vm\fm7\joystick.h" />
     <ClInclude Include="..\src\vm\fm7\keyboard_tables.h" />
     <ClInclude Include="..\src\res\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\src\res\fm7.ico" />
+    <Image Include="..\src\res\indicator\access_off.bmp" />
+    <Image Include="..\src\res\indicator\access_on.bmp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\src\res\fm7.rc">