Skip to content

Commit 3722475

Browse files
garyogaryo
committed
Merge branch 'fix/windows-defines'
Signed-off-by: Gary Oberbrunner <[email protected]>
2 parents a718b47 + cb4a05e commit 3722475

Some content is hidden

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

49 files changed

+157
-153
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;_WINDOWS;_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;_WINDOWS;_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;_WINDOWS;_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;_WINDOWS;_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;_WINDOWS;_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;_WINDOWS;_USRDLL;CUSTOM_2005_EXPORTS"
123+
PreprocessorDefinitions="NDEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
124124
RuntimeLibrary="2"
125125
UsePrecompiledHeader="0"
126126
WarningLevel="3"

‎Examples/Custom/custom.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
crafted piece of image processing software.
99
*/
1010

11-
#ifdef WIN32
11+
#ifdef _WIN32
12+
#define NOMINMAX
1213
#include <windows.h>
1314
#endif
1415

@@ -71,7 +72,7 @@ parseCustomParam(char *str, double &x, double &y)
7172
void
7273
writeCustomParam(char *str, int strlen, double x, double y)
7374
{
74-
#ifdef WIN32
75+
#ifdef _WIN32
7576
_snprintf(str, strlen, "%lg %lg", x, y);
7677
#else
7778
snprintf(str, strlen, "%lg %lg", x, y);

‎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;_WINDOWS;_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;_WINDOWS;_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;_WINDOWS;_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;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
123+
PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
124124
RuntimeLibrary="2"
125125
UsePrecompiledHeader="0"
126126
WarningLevel="3"

‎Examples/DrawSuite/drawsuite.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
and so do nothing.
1313
*/
1414

15-
#ifdef WIN32
15+
#ifdef _WIN32
16+
#define NOMINMAX
1617
#include <windows.h>
1718
#endif
1819

‎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;_WINDOWS;_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;_WINDOWS;_USRDLL;INVERT_2005_EXPORTS"
122+
PreprocessorDefinitions="NDEBUG;_USRDLL;INVERT_2005_EXPORTS"
123123
RuntimeLibrary="2"
124124
UsePrecompiledHeader="0"
125125
WarningLevel="3"

‎Examples/OpenGL/opengl.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
#ifdef __APPLE__
1212
#include <OpenGL/gl.h>
1313
#else
14-
#if defined(WINDOWS)
14+
#if defined(_WIN32)
15+
#define NOMINMAX
1516
#include <windows.h>
1617
#endif
1718
#include <GL/gl.h>

‎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;_WINDOWS;_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;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
123+
PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
124124
RuntimeLibrary="2"
125125
UsePrecompiledHeader="0"
126126
WarningLevel="3"

0 commit comments

Comments
 (0)