Skip to content

Commit cb4a05e

Browse files
garyogaryo
committed
Remove unneeded defs of WIN32 and WIN64 in project files
Signed-off-by: Gary Oberbrunner <[email protected]>
1 parent 42776e0 commit cb4a05e

File tree

31 files changed

+102
-103
lines changed

31 files changed

+102
-103
lines changed

‎Documentation/sources/Guide/Code/NMakefileCommon‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ OS_LDFLAGS = /NOLOGO /DLL /MANIFEST $(LD_OPTIMISE)
1919
OS_BUNDLE_DIR = Win$(ABI) # 32 or 64
2020

2121
# set up flags
22-
CXXDEFINES=/DWIN32 # OFX includes need this, Windows only auto-defines _WIN32
2322
CXXFLAGS = $(OFX_INC_DIR) $(CXXDEFINES) $(OPTIMISE) $(OS_CXXFLAGS) $(VERBOSE)
2423
LDFLAGS = $(LD_OPTIMISE) $(OS_LDFLAGS)
2524

‎Examples/Basic/Basic_2005.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
Name="VCCLCompilerTool"
4646
Optimization="0"
4747
AdditionalIncludeDirectories="..\..\Include"
48-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
48+
PreprocessorDefinitions="_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
4949
MinimalRebuild="true"
5050
BasicRuntimeChecks="3"
5151
RuntimeLibrary="3"
@@ -123,7 +123,7 @@
123123
<Tool
124124
Name="VCCLCompilerTool"
125125
AdditionalIncludeDirectories="..\..\Include"
126-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
126+
PreprocessorDefinitions="NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
127127
RuntimeLibrary="2"
128128
UsePrecompiledHeader="0"
129129
WarningLevel="3"
@@ -203,7 +203,7 @@
203203
Name="VCCLCompilerTool"
204204
Optimization="0"
205205
AdditionalIncludeDirectories="..\..\Include"
206-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
206+
PreprocessorDefinitions="_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
207207
MinimalRebuild="true"
208208
BasicRuntimeChecks="3"
209209
RuntimeLibrary="3"
@@ -282,7 +282,7 @@
282282
<Tool
283283
Name="VCCLCompilerTool"
284284
AdditionalIncludeDirectories="..\..\Include"
285-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
285+
PreprocessorDefinitions="NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
286286
RuntimeLibrary="2"
287287
UsePrecompiledHeader="0"
288288
WarningLevel="3"

‎Examples/Custom/Custom_2005.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Name="VCCLCompilerTool"
4242
Optimization="0"
4343
AdditionalIncludeDirectories="..\..\Include"
44-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
44+
PreprocessorDefinitions="_DEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
4545
MinimalRebuild="true"
4646
BasicRuntimeChecks="3"
4747
RuntimeLibrary="3"
@@ -120,7 +120,7 @@
120120
<Tool
121121
Name="VCCLCompilerTool"
122122
AdditionalIncludeDirectories="..\..\Include"
123-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
123+
PreprocessorDefinitions="NDEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
124124
RuntimeLibrary="2"
125125
UsePrecompiledHeader="0"
126126
WarningLevel="3"

‎Examples/DepthConverter/DepthConverter_2005.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Name="VCCLCompilerTool"
4242
Optimization="0"
4343
AdditionalIncludeDirectories="..\..\Include"
44-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
44+
PreprocessorDefinitions="_DEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
4545
MinimalRebuild="true"
4646
BasicRuntimeChecks="3"
4747
RuntimeLibrary="3"
@@ -119,7 +119,7 @@
119119
<Tool
120120
Name="VCCLCompilerTool"
121121
AdditionalIncludeDirectories="..\..\Include"
122-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
122+
PreprocessorDefinitions="NDEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
123123
RuntimeLibrary="2"
124124
UsePrecompiledHeader="0"
125125
WarningLevel="3"

‎Examples/DrawSuite/DrawSuite_2005.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Name="VCCLCompilerTool"
4242
Optimization="0"
4343
AdditionalIncludeDirectories="..\..\Include"
44-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
44+
PreprocessorDefinitions="_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
4545
MinimalRebuild="true"
4646
BasicRuntimeChecks="3"
4747
RuntimeLibrary="3"
@@ -120,7 +120,7 @@
120120
<Tool
121121
Name="VCCLCompilerTool"
122122
AdditionalIncludeDirectories="..\..\Include"
123-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
123+
PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
124124
RuntimeLibrary="2"
125125
UsePrecompiledHeader="0"
126126
WarningLevel="3"

‎Examples/Invert/Invert_2005.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Name="VCCLCompilerTool"
4242
Optimization="0"
4343
AdditionalIncludeDirectories="..\..\Include"
44-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;INVERT_2005_EXPORTS"
44+
PreprocessorDefinitions="_DEBUG;_USRDLL;INVERT_2005_EXPORTS"
4545
MinimalRebuild="true"
4646
BasicRuntimeChecks="3"
4747
RuntimeLibrary="3"
@@ -119,7 +119,7 @@
119119
<Tool
120120
Name="VCCLCompilerTool"
121121
AdditionalIncludeDirectories="..\..\Include"
122-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;INVERT_2005_EXPORTS"
122+
PreprocessorDefinitions="NDEBUG;_USRDLL;INVERT_2005_EXPORTS"
123123
RuntimeLibrary="2"
124124
UsePrecompiledHeader="0"
125125
WarningLevel="3"

‎Examples/Overlay/Overlay_2005.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Name="VCCLCompilerTool"
4242
Optimization="0"
4343
AdditionalIncludeDirectories="..\..\Include"
44-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
44+
PreprocessorDefinitions="_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
4545
MinimalRebuild="true"
4646
BasicRuntimeChecks="3"
4747
RuntimeLibrary="3"
@@ -120,7 +120,7 @@
120120
<Tool
121121
Name="VCCLCompilerTool"
122122
AdditionalIncludeDirectories="..\..\Include"
123-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
123+
PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
124124
RuntimeLibrary="2"
125125
UsePrecompiledHeader="0"
126126
WarningLevel="3"

‎Examples/Rectangle/Rectangle_2005.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Name="VCCLCompilerTool"
4242
Optimization="0"
4343
AdditionalIncludeDirectories="..\..\Include"
44-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
44+
PreprocessorDefinitions="_DEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
4545
MinimalRebuild="true"
4646
BasicRuntimeChecks="3"
4747
RuntimeLibrary="3"
@@ -119,7 +119,7 @@
119119
<Tool
120120
Name="VCCLCompilerTool"
121121
AdditionalIncludeDirectories="..\..\Include"
122-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
122+
PreprocessorDefinitions="NDEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
123123
RuntimeLibrary="2"
124124
UsePrecompiledHeader="0"
125125
WarningLevel="3"

‎Examples/Test/Test_2005.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Name="VCCLCompilerTool"
4242
Optimization="0"
4343
AdditionalIncludeDirectories="..\..\Include"
44-
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;TEST_2005_EXPORTS"
44+
PreprocessorDefinitions="_DEBUG;_USRDLL;TEST_2005_EXPORTS"
4545
MinimalRebuild="true"
4646
BasicRuntimeChecks="3"
4747
RuntimeLibrary="3"
@@ -119,7 +119,7 @@
119119
<Tool
120120
Name="VCCLCompilerTool"
121121
AdditionalIncludeDirectories="..\..\Include"
122-
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;TEST_2005_EXPORTS"
122+
PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_2005_EXPORTS"
123123
RuntimeLibrary="2"
124124
UsePrecompiledHeader="0"
125125
WarningLevel="3"

‎HostSupport/HostSupport.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Name="VCCLCompilerTool"
4444
Optimization="0"
4545
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
46-
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
46+
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
4747
MinimalRebuild="true"
4848
BasicRuntimeChecks="3"
4949
RuntimeLibrary="3"
@@ -107,7 +107,7 @@
107107
Name="VCCLCompilerTool"
108108
Optimization="0"
109109
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
110-
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
110+
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
111111
MinimalRebuild="true"
112112
BasicRuntimeChecks="3"
113113
RuntimeLibrary="3"
@@ -173,7 +173,7 @@
173173
EnableIntrinsicFunctions="true"
174174
FavorSizeOrSpeed="1"
175175
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
176-
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
176+
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
177177
RuntimeLibrary="2"
178178
WarningLevel="3"
179179
Detect64BitPortabilityProblems="true"
@@ -238,7 +238,7 @@
238238
EnableIntrinsicFunctions="true"
239239
FavorSizeOrSpeed="1"
240240
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
241-
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
241+
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
242242
RuntimeLibrary="2"
243243
WarningLevel="3"
244244
Detect64BitPortabilityProblems="true"
@@ -299,7 +299,7 @@
299299
Name="VCCLCompilerTool"
300300
Optimization="0"
301301
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
302-
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
302+
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
303303
MinimalRebuild="true"
304304
BasicRuntimeChecks="3"
305305
RuntimeLibrary="1"
@@ -363,7 +363,7 @@
363363
Name="VCCLCompilerTool"
364364
Optimization="0"
365365
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
366-
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
366+
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
367367
MinimalRebuild="true"
368368
BasicRuntimeChecks="3"
369369
RuntimeLibrary="1"
@@ -426,7 +426,7 @@
426426
<Tool
427427
Name="VCCLCompilerTool"
428428
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
429-
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
429+
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
430430
RuntimeLibrary="2"
431431
WarningLevel="3"
432432
Detect64BitPortabilityProblems="true"
@@ -488,7 +488,7 @@
488488
<Tool
489489
Name="VCCLCompilerTool"
490490
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
491-
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
491+
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
492492
RuntimeLibrary="2"
493493
WarningLevel="3"
494494
Detect64BitPortabilityProblems="true"

0 commit comments

Comments
 (0)