Skip to content

Commit 1f634e8

Browse files
ejaquayejaquay
authored
Merge pull request #208 from ejaquay/multi
Move to VS2022
2 parents 2ce9e02 + 5d6b29a commit 1f634e8

File tree

19 files changed

+1398
-135
lines changed

19 files changed

+1398
-135
lines changed

‎Build.bat‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@echo off
2+
:: Build VCC
3+
4+
set VCC_CONFIG=Release
5+
if exist "%VSINSTALLDIR%\MSBuild\Current\Bin\MSBuild.exe" (
6+
msbuild vcc.sln /m /p:Configuration=%VCC_CONFIG% /p:Platform=x86
7+
if errorlevel 0 (
8+
echo Find Vcc.exe in %cd%\__obj\Win32\%VCC_CONFIG%\vcc\out\vcc.exe
9+
echo Find [name].dll in %cd%\__obj\Win32\%VCC_CONFIG%\[name]\out\[name].dll
10+
)
11+
) else (
12+
echo Build must be run from Developer Command Prompt for VS 2022
13+
)

‎BuildClean.bat‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@echo off
2+
:: Clean Build VCC
3+
4+
set VCC_CONFIG=Release
5+
if exist "%VSINSTALLDIR%\MSBuild\Current\Bin\MSBuild.exe" (
6+
msbuild vcc.sln /t:Clean /p:Configuration=%VCC_CONFIG% /p:Platform=x86
7+
call Build.bat
8+
) else (
9+
echo Build must be run from Developer Command Prompt for VS 2022
10+
)

‎DirectDrawInterface.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ bool CreateDDWindow(SystemState *CWState)
183183
ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; // Try to create back buffer in System RAM
184184
hr = g_pDD->CreateSurface(&ddsd, &g_pDDSBack, NULL);
185185
if (hr) return FALSE; //Giving Up
186-
MessageBox(0,"Creating Back Buffer in System Ram!\nThis will be slower","Performance Warning",0);
186+
MessageBox(0,"Creating Back Buffer in System Ram\n","Performance Warning",0);
187187
}
188188

189189
hr= g_pDD->GetDisplayMode(&ddsd);
@@ -395,7 +395,7 @@ unsigned char LockScreen(SystemState *LSState)
395395
LSState->BitDepth=1;
396396
break;
397397
case 24:
398-
MessageBox(0,"24 Bit color is currnetly unsupported","Ok",0);
398+
MessageBox(0,"24 Bit color is currently unsupported","Ok",0);
399399
exit(0);
400400
LSState->SurfacePitch=ddsd.lPitch;
401401
LSState->BitDepth=2;

‎FD502/fd502.vcxproj‎

Lines changed: 142 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
711
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Legacy|Win32">
13+
<Configuration>Legacy</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|ARM">
17+
<Configuration>Release</Configuration>
18+
<Platform>ARM</Platform>
19+
</ProjectConfiguration>
820
<ProjectConfiguration Include="Release|Win32">
921
<Configuration>Release</Configuration>
1022
<Platform>Win32</Platform>
1123
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Template|ARM">
25+
<Configuration>Template</Configuration>
26+
<Platform>ARM</Platform>
27+
</ProjectConfiguration>
1228
<ProjectConfiguration Include="Template|Win32">
1329
<Configuration>Template</Configuration>
1430
<Platform>Win32</Platform>
@@ -18,31 +34,52 @@
1834
<SccProjectName />
1935
<SccLocalPath />
2036
<ProjectGuid>{F4DC9499-4FF1-4A56-83DD-6499062972AA}</ProjectGuid>
21-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
37+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2238
</PropertyGroup>
2339
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2440
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
2541
<ConfigurationType>Application</ConfigurationType>
26-
<PlatformToolset>v141</PlatformToolset>
42+
<PlatformToolset>v143</PlatformToolset>
2743
</PropertyGroup>
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
44+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Legacy|Win32'" Label="Configuration">
2945
<ConfigurationType>DynamicLibrary</ConfigurationType>
3046
<UseOfMfc>false</UseOfMfc>
3147
<CharacterSet>MultiByte</CharacterSet>
3248
<PlatformToolset>v140_xp</PlatformToolset>
3349
</PropertyGroup>
50+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
51+
<ConfigurationType>DynamicLibrary</ConfigurationType>
52+
<UseOfMfc>false</UseOfMfc>
53+
<CharacterSet>MultiByte</CharacterSet>
54+
<PlatformToolset>v143</PlatformToolset>
55+
</PropertyGroup>
3456
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3557
<ConfigurationType>DynamicLibrary</ConfigurationType>
3658
<UseOfMfc>false</UseOfMfc>
3759
<CharacterSet>MultiByte</CharacterSet>
38-
<PlatformToolset>v140</PlatformToolset>
60+
<PlatformToolset>v143</PlatformToolset>
61+
</PropertyGroup>
62+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
63+
<PlatformToolset>v143</PlatformToolset>
64+
<ConfigurationType>DynamicLibrary</ConfigurationType>
65+
</PropertyGroup>
66+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
67+
<PlatformToolset>v143</PlatformToolset>
68+
<ConfigurationType>DynamicLibrary</ConfigurationType>
69+
</PropertyGroup>
70+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|ARM'">
71+
<PlatformToolset>v143</PlatformToolset>
3972
</PropertyGroup>
4073
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4174
<ImportGroup Label="ExtensionSettings">
4275
</ImportGroup>
4376
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
4477
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4578
</ImportGroup>
79+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Legacy|Win32'" Label="PropertySheets">
80+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
81+
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
82+
</ImportGroup>
4683
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
4784
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4885
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
@@ -57,16 +94,35 @@
5794
<IntDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\int\</IntDir>
5895
<LinkIncremental>true</LinkIncremental>
5996
</PropertyGroup>
60-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
97+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Legacy|Win32'">
6198
<OutDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\out\</OutDir>
6299
<IntDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\int\</IntDir>
63100
<LinkIncremental>false</LinkIncremental>
64101
<LibraryPath>C:\Program Files %28x86%29\Windows Kits\8.1\Lib\winv6.3\um\x86;$(LibraryPath)</LibraryPath>
65102
</PropertyGroup>
103+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
104+
<OutDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\out\</OutDir>
105+
<IntDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\int\</IntDir>
106+
<LinkIncremental>false</LinkIncremental>
107+
</PropertyGroup>
66108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
67109
<OutDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\out\</OutDir>
68110
<IntDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\int\</IntDir>
69111
</PropertyGroup>
112+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
113+
<OutDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\out\</OutDir>
114+
<IntDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\int\</IntDir>
115+
<LinkIncremental>false</LinkIncremental>
116+
</PropertyGroup>
117+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
118+
<OutDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\out\</OutDir>
119+
<IntDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\int\</IntDir>
120+
<LinkIncremental>true</LinkIncremental>
121+
</PropertyGroup>
122+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|ARM'">
123+
<OutDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\out\</OutDir>
124+
<IntDir>$(SolutionDir)__obj\$(Platform)\$(Configuration)\$(ProjectName)\int\</IntDir>
125+
</PropertyGroup>
70126
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
71127
<ClCompile>
72128
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -75,7 +131,6 @@
75131
<Optimization>Disabled</Optimization>
76132
<SuppressStartupBanner>true</SuppressStartupBanner>
77133
<WarningLevel>Level3</WarningLevel>
78-
<MinimalRebuild>true</MinimalRebuild>
79134
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
80135
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;fd502_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81136
<AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
@@ -107,10 +162,50 @@
107162
<SubSystem>Console</SubSystem>
108163
<OutputFile>$(OutDir)fd502.dll</OutputFile>
109164
<ImportLibrary>$(OutDir)fd502.lib</ImportLibrary>
110-
<AdditionalDependencies>odbc32.lib;odbccp32.lib;dinput8.lib;dxguid.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
111165
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
112166
</Link>
113167
</ItemDefinitionGroup>
168+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Legacy|Win32'">
169+
<ClCompile>
170+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
171+
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
172+
<StringPooling>true</StringPooling>
173+
<FunctionLevelLinking>true</FunctionLevelLinking>
174+
<Optimization>MaxSpeed</Optimization>
175+
<SuppressStartupBanner>true</SuppressStartupBanner>
176+
<WarningLevel>Level3</WarningLevel>
177+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;fd502_EXPORTS;_LEGACY_VCC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178+
<AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
179+
<BrowseInformation>true</BrowseInformation>
180+
<PrecompiledHeaderOutputFile>$(OutDir)fd502.pch</PrecompiledHeaderOutputFile>
181+
<ObjectFileName>$(OutDir)</ObjectFileName>
182+
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
183+
<CompileAs>CompileAsCpp</CompileAs>
184+
<AdditionalOptions>/arch:SSE</AdditionalOptions>
185+
</ClCompile>
186+
<Midl>
187+
<SuppressStartupBanner>true</SuppressStartupBanner>
188+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189+
<TypeLibraryName>.\Legacy\fd502.tlb</TypeLibraryName>
190+
<MkTypLibCompatible>true</MkTypLibCompatible>
191+
<TargetEnvironment>Win32</TargetEnvironment>
192+
</Midl>
193+
<ResourceCompile>
194+
<Culture>0x0409</Culture>
195+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196+
</ResourceCompile>
197+
<Bscmake>
198+
<SuppressStartupBanner>true</SuppressStartupBanner>
199+
<OutputFile>$(OutDir)fd502.bsc</OutputFile>
200+
</Bscmake>
201+
<Link>
202+
<SuppressStartupBanner>true</SuppressStartupBanner>
203+
<LinkDLL>true</LinkDLL>
204+
<SubSystem>Console</SubSystem>
205+
<OutputFile>$(OutDir)fd502.dll</OutputFile>
206+
<ImportLibrary>$(OutDir)fd502.lib</ImportLibrary>
207+
</Link>
208+
</ItemDefinitionGroup>
114209
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
115210
<ClCompile>
116211
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -129,6 +224,46 @@
129224
<CompileAs>CompileAsCpp</CompileAs>
130225
<AdditionalOptions>/arch:SSE</AdditionalOptions>
131226
</ClCompile>
227+
<Midl>
228+
<SuppressStartupBanner>true</SuppressStartupBanner>
229+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
230+
<TypeLibraryName>.\Legacy\fd502.tlb</TypeLibraryName>
231+
<MkTypLibCompatible>true</MkTypLibCompatible>
232+
<TargetEnvironment>Win32</TargetEnvironment>
233+
</Midl>
234+
<ResourceCompile>
235+
<Culture>0x0409</Culture>
236+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
237+
</ResourceCompile>
238+
<Bscmake>
239+
<SuppressStartupBanner>true</SuppressStartupBanner>
240+
<OutputFile>$(OutDir)fd502.bsc</OutputFile>
241+
</Bscmake>
242+
<Link>
243+
<SuppressStartupBanner>true</SuppressStartupBanner>
244+
<LinkDLL>true</LinkDLL>
245+
<SubSystem>Console</SubSystem>
246+
<OutputFile>$(OutDir)fd502.dll</OutputFile>
247+
<ImportLibrary>$(OutDir)fd502.lib</ImportLibrary>
248+
</Link>
249+
</ItemDefinitionGroup>
250+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
251+
<ClCompile>
252+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
253+
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
254+
<StringPooling>true</StringPooling>
255+
<FunctionLevelLinking>true</FunctionLevelLinking>
256+
<Optimization>MaxSpeed</Optimization>
257+
<SuppressStartupBanner>true</SuppressStartupBanner>
258+
<WarningLevel>Level3</WarningLevel>
259+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;fd502_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
260+
<AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
261+
<BrowseInformation>true</BrowseInformation>
262+
<PrecompiledHeaderOutputFile>$(OutDir)fd502.pch</PrecompiledHeaderOutputFile>
263+
<ObjectFileName>$(OutDir)</ObjectFileName>
264+
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
265+
<CompileAs>CompileAsCpp</CompileAs>
266+
</ClCompile>
132267
<Midl>
133268
<SuppressStartupBanner>true</SuppressStartupBanner>
134269
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -150,7 +285,6 @@
150285
<SubSystem>Console</SubSystem>
151286
<OutputFile>$(OutDir)fd502.dll</OutputFile>
152287
<ImportLibrary>$(OutDir)fd502.lib</ImportLibrary>
153-
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
154288
</Link>
155289
</ItemDefinitionGroup>
156290
<ItemGroup>

0 commit comments

Comments
 (0)