Removes x64 from the platform options, and fixes the filters for a couple of files.
This commit is contained in:
parent
ab602bebb5
commit
43ba227505
4 changed files with 18 additions and 61 deletions
|
@ -9,14 +9,6 @@
|
||||||
<Configuration>Release</Configuration>
|
<Configuration>Release</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
<ProjectConfiguration Include="Debug|x64">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|x64">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<VCProjectVersion>15.0</VCProjectVersion>
|
<VCProjectVersion>15.0</VCProjectVersion>
|
||||||
|
@ -42,19 +34,6 @@
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v141</PlatformToolset>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v141</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
<ImportGroup Label="ExtensionSettings">
|
<ImportGroup Label="ExtensionSettings">
|
||||||
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
|
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
|
||||||
|
@ -67,12 +46,6 @@
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<OutDir>..\bin\$(PlatformName)\</OutDir>
|
<OutDir>..\bin\$(PlatformName)\</OutDir>
|
||||||
|
@ -139,28 +112,6 @@
|
||||||
<DataExecutionPrevention>false</DataExecutionPrevention>
|
<DataExecutionPrevention>false</DataExecutionPrevention>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<SDLCheck>true</SDLCheck>
|
|
||||||
<ConformanceMode>true</ConformanceMode>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="2KEYFRAM.CPP" />
|
<ClCompile Include="2KEYFRAM.CPP" />
|
||||||
<ClCompile Include="AADATA.CPP" />
|
<ClCompile Include="AADATA.CPP" />
|
||||||
|
@ -595,6 +546,7 @@
|
||||||
<ClInclude Include="MOVIE.H" />
|
<ClInclude Include="MOVIE.H" />
|
||||||
<ClInclude Include="MP.H" />
|
<ClInclude Include="MP.H" />
|
||||||
<ClInclude Include="MPGSET.H" />
|
<ClInclude Include="MPGSET.H" />
|
||||||
|
<ClInclude Include="MPMGRD.H" />
|
||||||
<ClInclude Include="MPMGRW.H" />
|
<ClInclude Include="MPMGRW.H" />
|
||||||
<ClInclude Include="MPU.H" />
|
<ClInclude Include="MPU.H" />
|
||||||
<ClInclude Include="MSGBOX.H" />
|
<ClInclude Include="MSGBOX.H" />
|
||||||
|
@ -746,6 +698,7 @@
|
||||||
<ClInclude Include="WWFILE.H" />
|
<ClInclude Include="WWFILE.H" />
|
||||||
<ClInclude Include="XPIPE.H" />
|
<ClInclude Include="XPIPE.H" />
|
||||||
<ClInclude Include="XSTRAW.H" />
|
<ClInclude Include="XSTRAW.H" />
|
||||||
|
<ClInclude Include="_WSPROTO.H" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<MASM Include="LCWCOMP.ASM" />
|
<MASM Include="LCWCOMP.ASM" />
|
||||||
|
|
|
@ -5,14 +5,6 @@
|
||||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter Include="Header Files">
|
|
||||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
|
||||||
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Resource Files">
|
|
||||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\win32lib">
|
<Filter Include="Source Files\win32lib">
|
||||||
<UniqueIdentifier>{fd6d77c9-ab70-415f-80a5-2f3e9fafc730}</UniqueIdentifier>
|
<UniqueIdentifier>{fd6d77c9-ab70-415f-80a5-2f3e9fafc730}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
|
@ -1601,9 +1593,6 @@
|
||||||
<ClInclude Include="XSTRAW.H">
|
<ClInclude Include="XSTRAW.H">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="COORDA.h">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="Win32Lib\AUDIO.H">
|
<ClInclude Include="Win32Lib\AUDIO.H">
|
||||||
<Filter>Source Files\win32lib</Filter>
|
<Filter>Source Files\win32lib</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
@ -1769,6 +1758,15 @@
|
||||||
<ClInclude Include="DLLInterfaceVersion.h">
|
<ClInclude Include="DLLInterfaceVersion.h">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="_WSPROTO.H">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="COORDA.h">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="MPMGRD.H">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="COORDA.ASM">
|
<None Include="COORDA.ASM">
|
||||||
|
|
|
@ -197,6 +197,7 @@
|
||||||
<ClInclude Include="CONNMGR.H" />
|
<ClInclude Include="CONNMGR.H" />
|
||||||
<ClInclude Include="CONQUER.H" />
|
<ClInclude Include="CONQUER.H" />
|
||||||
<ClInclude Include="CONTROL.H" />
|
<ClInclude Include="CONTROL.H" />
|
||||||
|
<ClInclude Include="COORDA.h" />
|
||||||
<ClInclude Include="CREDITS.H" />
|
<ClInclude Include="CREDITS.H" />
|
||||||
<ClInclude Include="CREW.H" />
|
<ClInclude Include="CREW.H" />
|
||||||
<ClInclude Include="DDE.H" />
|
<ClInclude Include="DDE.H" />
|
||||||
|
|
|
@ -630,6 +630,9 @@
|
||||||
<ClInclude Include="DLLInterfaceVersion.h">
|
<ClInclude Include="DLLInterfaceVersion.h">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="COORDA.h">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="AADATA.CPP">
|
<ClCompile Include="AADATA.CPP">
|
||||||
|
@ -1205,10 +1208,12 @@
|
||||||
<ClCompile Include="TURRET.CPP">
|
<ClCompile Include="TURRET.CPP">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="DLLInterfaceEditor.cpp" />
|
|
||||||
<ClCompile Include="RULES.CPP">
|
<ClCompile Include="RULES.CPP">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="DLLInterfaceEditor.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<MASM Include="win32lib\FACINGFF.ASM">
|
<MASM Include="win32lib\FACINGFF.ASM">
|
||||||
|
|
Reference in a new issue