Skip to content

Commit 92c5bb8

Browse files
author
nitrocaster
committed
Clean preprocessor defs, move common defs to props.
1 parent 952b9da commit 92c5bb8

File tree

55 files changed

+190
-153
lines changed

Some content is hidden

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

55 files changed

+190
-153
lines changed

‎src/Common.props‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportGroup Label="PropertySheets" />
3+
<ImportGroup Label="PropertySheets">
4+
<Import Project="$(SolutionDir)ConfigurationDefs.props" />
5+
</ImportGroup>
46
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'">
57
<xrPlatform>Win32</xrPlatform>
68
</PropertyGroup>
@@ -44,6 +46,13 @@
4446
4458 : declaration of 'x' hides class member
4547
-->
4648
<DisableSpecificWarnings>4251;4275;4458</DisableSpecificWarnings>
49+
<!--
50+
LUABIND_DYNAMIC_LINK : self-explanatory
51+
MSVC;dSINGLE;WIN32 : for ODE
52+
_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE : temporary workaround for deprecated API
53+
-->
54+
<PreprocessorDefinitions>LUABIND_DYNAMIC_LINK;MSVC;dSINGLE;WIN32;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
55+
4756
</ClCompile>
4857
<Link>
4958
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

‎src/Common/PlatformWindows.inl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
33
#define IDIRECTPLAY2_OR_GREATER // ?
44
#define DIRECTINPUT_VERSION 0x0800 //
5-
#define _CRT_SECURE_NO_DEPRECATE // vc8.0 stuff, don't deprecate several ANSI functions
65

76
#ifndef _WIN32_WINNT
87
#define _WIN32_WINNT 0x0501

‎src/ConfigurationDefs.props‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets" />
4+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
5+
<ClCompile>
6+
<PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7+
</ClCompile>
8+
</ItemDefinitionGroup>
9+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug_Dedicated'">
10+
<ClCompile>
11+
<PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
12+
</ClCompile>
13+
</ItemDefinitionGroup>
14+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Mixed'">
15+
<ClCompile>
16+
<PreprocessorDefinitions>DEBUG;MIXED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
17+
</ClCompile>
18+
</ItemDefinitionGroup>
19+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Mixed_Dedicated'">
20+
<ClCompile>
21+
<PreprocessorDefinitions>DEBUG;MIXED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
22+
</ClCompile>
23+
</ItemDefinitionGroup>
24+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
25+
<ClCompile>
26+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
27+
</ClCompile>
28+
</ItemDefinitionGroup>
29+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release_Dedicated'">
30+
<ClCompile>
31+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
32+
</ClCompile>
33+
</ItemDefinitionGroup>
34+
</Project>

‎src/Externals/NVTT/NVTT.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
<WarningLevel>Level3</WarningLevel>
243243
<Optimization>Disabled</Optimization>
244244
<AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir)src\nvcore;$(ProjectDir)src\nvtt\squish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
245-
<PreprocessorDefinitions>WIN32;DEBUG;NVTT_EXPORTS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245+
<PreprocessorDefinitions>NVTT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
246246
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
247247
</ClCompile>
248248
<Link>
@@ -256,7 +256,7 @@
256256
<FunctionLevelLinking>true</FunctionLevelLinking>
257257
<IntrinsicFunctions>true</IntrinsicFunctions>
258258
<AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir)src\nvcore;$(ProjectDir)src\nvtt\squish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
259-
<PreprocessorDefinitions>WIN32;NDEBUG;NVTT_EXPORTS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259+
<PreprocessorDefinitions>NVTT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
260260
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
261261
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
262262
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -278,7 +278,7 @@
278278
<FunctionLevelLinking>true</FunctionLevelLinking>
279279
<IntrinsicFunctions>true</IntrinsicFunctions>
280280
<AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir)src\nvcore;$(ProjectDir)src\nvtt\squish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
281-
<PreprocessorDefinitions>WIN32;NDEBUG;NVTT_EXPORTS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
281+
<PreprocessorDefinitions>NVTT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
282282
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
283283
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
284284
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

‎src/Externals/cximage/cximage.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<OmitFramePointers>true</OmitFramePointers>
8080
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
8181
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;JAS_WIN_MSVC_BUILD;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
82+
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8383
<StringPooling>true</StringPooling>
8484
<MinimalRebuild>false</MinimalRebuild>
8585
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -112,7 +112,7 @@
112112
<OmitFramePointers>true</OmitFramePointers>
113113
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
114114
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;JAS_WIN_MSVC_BUILD;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115+
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116116
<StringPooling>true</StringPooling>
117117
<MinimalRebuild>false</MinimalRebuild>
118118
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -140,7 +140,7 @@
140140
<ClCompile>
141141
<Optimization>Disabled</Optimization>
142142
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
143-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_AS_SHARED_LIBRARY;_USRDLL;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143+
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;CXIMAGE_AS_SHARED_LIBRARY;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144144
<MinimalRebuild>false</MinimalRebuild>
145145
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
146146
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

‎src/Externals/glbinding.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
9393
<TreatWarningAsError>true</TreatWarningAsError>
9494
<WarningLevel>Level4</WarningLevel>
95-
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;GLBINDING_STATIC;STRINGS_BY_GL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<PreprocessorDefinitions>GLBINDING_STATIC;STRINGS_BY_GL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<ObjectFileName>$(IntDir)</ObjectFileName>
9797
</ClCompile>
9898
<ResourceCompile>
@@ -133,7 +133,7 @@
133133
<TreatWarningAsError>true</TreatWarningAsError>
134134
<WarningLevel>Level4</WarningLevel>
135135
<WholeProgramOptimization>true</WholeProgramOptimization>
136-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GLBINDING_STATIC;STRINGS_BY_GL;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>GLBINDING_STATIC;STRINGS_BY_GL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137137
<ObjectFileName>$(IntDir)</ObjectFileName>
138138
<DebugInformationFormat>
139139
</DebugInformationFormat>

‎src/Externals/luabind‎

‎src/Externals/ode/contrib/msvc7/ode_default/default.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<ClCompile>
9494
<Optimization>Disabled</Optimization>
9595
<AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96-
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_USRDLL;MSVC;dSINGLE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
96+
<PreprocessorDefinitions>_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<MinimalRebuild>true</MinimalRebuild>
9898
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9999
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -140,7 +140,7 @@
140140
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
141141
<WholeProgramOptimization>true</WholeProgramOptimization>
142142
<AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
143-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;dSINGLE;MSVC;dNODEBUG;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143+
<PreprocessorDefinitions>_USRDLL;dNODEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144144
<StringPooling>true</StringPooling>
145145
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
146146
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -191,7 +191,7 @@
191191
<OmitFramePointers>false</OmitFramePointers>
192192
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
193193
<AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
194-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;dSINGLE;MSVC;dNODEBUG;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194+
<PreprocessorDefinitions>_USRDLL;dNODEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195195
<StringPooling>true</StringPooling>
196196
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
197197
<BufferSecurityCheck>true</BufferSecurityCheck>

‎src/Externals/openal/OpenAL-Windows/Router/Router.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<ClCompile>
7979
<Optimization>Disabled</Optimization>
8080
<AdditionalIncludeDirectories>$(SolutionDir)Externals\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
81-
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;ROUTER_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81+
<PreprocessorDefinitions>_USRDLL;ROUTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8282
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8383
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8484
<FloatingPointModel>Fast</FloatingPointModel>
@@ -120,7 +120,7 @@
120120
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
121121
<WholeProgramOptimization>true</WholeProgramOptimization>
122122
<AdditionalIncludeDirectories>$(SolutionDir)Externals\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ROUTER_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
<PreprocessorDefinitions>_USRDLL;ROUTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124124
<StringPooling>true</StringPooling>
125125
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
126126
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -165,7 +165,7 @@
165165
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
166166
<WholeProgramOptimization>true</WholeProgramOptimization>
167167
<AdditionalIncludeDirectories>$(SolutionDir)Externals\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
168-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ROUTER_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168+
<PreprocessorDefinitions>_USRDLL;ROUTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169169
<StringPooling>true</StringPooling>
170170
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
171171
<BufferSecurityCheck>false</BufferSecurityCheck>

‎src/Layers/xrAPI/xrAPI.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7070
<ClCompile>
7171
<Optimization>Disabled</Optimization>
72-
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;XRAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72+
<PreprocessorDefinitions>_USRDLL;XRAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7373
<MinimalRebuild>true</MinimalRebuild>
7474
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
7575
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -92,7 +92,7 @@
9292
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
9393
<OmitFramePointers>true</OmitFramePointers>
9494
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
95-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XRAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<PreprocessorDefinitions>_USRDLL;XRAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<StringPooling>true</StringPooling>
9797
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9898
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -117,7 +117,7 @@
117117
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
118118
<OmitFramePointers>true</OmitFramePointers>
119119
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
120-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XRAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120+
<PreprocessorDefinitions>_USRDLL;XRAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121121
<StringPooling>true</StringPooling>
122122
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
123123
<BufferSecurityCheck>false</BufferSecurityCheck>

0 commit comments

Comments
 (0)