Skip to content

Commit 5f172c9

Browse files
Xottab-DUTYXottab-DUTY
authored
Merge pull request #2 from intorr/debug_runtime_fixes
Debug runtime fixes
2 parents 689954c + c24f212 commit 5f172c9

File tree

130 files changed

+12883
-2087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+12883
-2087
lines changed

‎Externals/BugTrap.vcxproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<RootNamespace>BugTrap</RootNamespace>
2424
<Keyword>Win32Proj</Keyword>
2525
<ProjectName>BugTrap</ProjectName>
26-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
2726
</PropertyGroup>
2827
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2928
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -51,19 +50,19 @@
5150
</ImportGroup>
5251
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5352
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54-
<Import Project="..\src\Common.props" />
53+
<Import Project="$(SolutionDir)Common.props" />
5554
</ImportGroup>
5655
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5756
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58-
<Import Project="..\src\Common.props" />
57+
<Import Project="$(SolutionDir)Common.props" />
5958
</ImportGroup>
6059
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6160
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62-
<Import Project="..\src\Common.props" />
61+
<Import Project="$(SolutionDir)Common.props" />
6362
</ImportGroup>
6463
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6564
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66-
<Import Project="..\src\Common.props" />
65+
<Import Project="$(SolutionDir)Common.props" />
6766
</ImportGroup>
6867
<PropertyGroup Label="UserMacros" />
6968
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -130,8 +129,7 @@
130129
</ResourceCompile>
131130
<Link>
132131
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
133-
<ModuleDefinitionFile>
134-
</ModuleDefinitionFile>
132+
<ModuleDefinitionFile>BugTrap\source\Client\BugTrap.def</ModuleDefinitionFile>
135133
<GenerateDebugInformation>true</GenerateDebugInformation>
136134
<GenerateMapFile>false</GenerateMapFile>
137135
<MapFileName>

‎Externals/GameSpy.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<Optimization>Disabled</Optimization>
120120
<MinimalRebuild>true</MinimalRebuild>
121121
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
122-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
122+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
123123
<FunctionLevelLinking>false</FunctionLevelLinking>
124124
<FloatingPointModel>Fast</FloatingPointModel>
125125
<WarningLevel>Level3</WarningLevel>
@@ -135,7 +135,7 @@
135135
<ClCompile>
136136
<Optimization>Disabled</Optimization>
137137
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
138-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
138+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
139139
<FunctionLevelLinking>false</FunctionLevelLinking>
140140
<FloatingPointModel>Fast</FloatingPointModel>
141141
<WarningLevel>Level3</WarningLevel>

‎Externals/MagicFM.vcxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@
5555
</ImportGroup>
5656
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
5757
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58-
<Import Project="..\src\Common.props" />
58+
<Import Project="$(SolutionDir)Common.props" />
5959
</ImportGroup>
6060
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
6161
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62-
<Import Project="..\src\Common.props" />
62+
<Import Project="$(SolutionDir)Common.props" />
6363
</ImportGroup>
6464
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
6565
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66-
<Import Project="..\src\Common.props" />
66+
<Import Project="$(SolutionDir)Common.props" />
6767
</ImportGroup>
6868
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
6969
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70-
<Import Project="..\src\Common.props" />
70+
<Import Project="$(SolutionDir)Common.props" />
7171
</ImportGroup>
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup>
@@ -83,6 +83,7 @@
8383
<WarningLevel>Level3</WarningLevel>
8484
<SuppressStartupBanner>true</SuppressStartupBanner>
8585
<CompileAs>Default</CompileAs>
86+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8687
</ClCompile>
8788
<Lib>
8889
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -107,6 +108,7 @@
107108
<WarningLevel>Level3</WarningLevel>
108109
<SuppressStartupBanner>true</SuppressStartupBanner>
109110
<CompileAs>Default</CompileAs>
111+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
110112
</ClCompile>
111113
<Lib>
112114
<SuppressStartupBanner>true</SuppressStartupBanner>

‎Externals/NVTT/NVTT.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
<Optimization>Disabled</Optimization>
294294
<AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir)src\nvcore;$(ProjectDir)src\nvtt\squish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
295295
<PreprocessorDefinitions>NVTT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
296-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
296+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
297297
</ClCompile>
298298
<Link>
299299
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -305,7 +305,7 @@
305305
<Optimization>Disabled</Optimization>
306306
<AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir)src\nvcore;$(ProjectDir)src\nvtt\squish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
307307
<PreprocessorDefinitions>NVTT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
308-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
308+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
309309
</ClCompile>
310310
<Link>
311311
<GenerateDebugInformation>true</GenerateDebugInformation>

‎Externals/OPCODE/OPCODE.vcxproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<VCProjectVersion>15.0</VCProjectVersion>
2323
<ProjectGuid>{DAFD6D98-3DCD-40AD-BC85-EC71797B6767}</ProjectGuid>
2424
<RootNamespace>OPCODE</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
2625
</PropertyGroup>
2726
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2827
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -58,19 +57,19 @@
5857
</ImportGroup>
5958
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6059
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61-
<Import Project="..\..\src\Common.props" />
60+
<Import Project="$(SolutionDir)Common.props" />
6261
</ImportGroup>
6362
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6463
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65-
<Import Project="..\..\src\Common.props" />
64+
<Import Project="$(SolutionDir)Common.props" />
6665
</ImportGroup>
6766
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6867
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69-
<Import Project="..\..\src\Common.props" />
68+
<Import Project="$(SolutionDir)Common.props" />
7069
</ImportGroup>
7170
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7271
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
73-
<Import Project="..\..\src\Common.props" />
72+
<Import Project="$(SolutionDir)Common.props" />
7473
</ImportGroup>
7574
<PropertyGroup Label="UserMacros" />
7675
<PropertyGroup />
@@ -82,7 +81,7 @@
8281
<ConformanceMode>false</ConformanceMode>
8382
<PrecompiledHeader>Use</PrecompiledHeader>
8483
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
85-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
84+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8685
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8786
</ClCompile>
8887
</ItemDefinitionGroup>
@@ -94,7 +93,7 @@
9493
<ConformanceMode>false</ConformanceMode>
9594
<PrecompiledHeader>Use</PrecompiledHeader>
9695
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
97-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
96+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9897
<PreprocessorDefinitions>OPCODE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9998
</ClCompile>
10099
</ItemDefinitionGroup>

‎Externals/cryptlib.vcxproj

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
<RootNamespace>cryptlib</RootNamespace>
2424
<PlatformToolset>v141</PlatformToolset>
2525
<ConfigurationType>StaticLibrary</ConfigurationType>
26-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
2726
</PropertyGroup>
2827
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2928
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30-
<Import Project="..\src\Common.props" />
29+
<Import Project="$(SolutionDir)Common.props" />
3130
<ImportGroup Label="ExtensionSettings">
3231
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
3332
</ImportGroup>
@@ -61,7 +60,7 @@
6160
<!-- Debug Configurations -->
6261
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DLL-Import Debug'" Label="Debug Configuration">
6362
<ClCompile>
64-
<PreprocessorDefinitions>USE_PRECOMPILED_HEADERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
63+
<PreprocessorDefinitions>CRYPTOPP_DEBUG;USE_PRECOMPILED_HEADERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6564
<Optimization>Disabled</Optimization>
6665
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
6766
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,6 +117,16 @@
118117
<TargetMachine>MachineX64</TargetMachine>
119118
</Lib>
120119
</ItemDefinitionGroup>
120+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
121+
<ClCompile>
122+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
123+
</ClCompile>
124+
</ItemDefinitionGroup>
125+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
126+
<ClCompile>
127+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
128+
</ClCompile>
129+
</ItemDefinitionGroup>
121130
<!-- Original File with special treatment -->
122131
<!-- Source Files -->
123132
<!-- The order of the first three matters -->

0 commit comments

Comments
 (0)