Skip to content

Pre v151 updates #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 19, 2025
Merged

Pre v151 updates #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb56667
Use predefined _WIN32 everywhere instead of defining WINDOWS
garyo Nov 14, 2025
8aaf9d2
Remove WINDOWS preproc defs in vcproj & dsp project files
garyo Nov 14, 2025
42776e0
More Windows build fixes
garyo Nov 14, 2025
1f2278a
Add release notes for upcoming 1.5.1 release
garyo Nov 14, 2025
00bcd20
Address review comments
garyo Nov 14, 2025
cb4a05e
Remove unneeded defs of WIN32 and WIN64 in project files
garyo Nov 14, 2025
3722475
Merge branch 'fix/windows-defines'
garyo Nov 19, 2025
7079503
Merge branch 'relnotes-151'
garyo Nov 19, 2025
db93e5a
PRE-1.5.1: Update release notes, build docs
garyo Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ required.

### Test Policy

OpenFX does not yet have an automated CI or test process.

OpenFX runs an automated CI build process on github. All builds must
pass before merging a PR.

#### Copyright Notices

Expand Down
1 change: 0 additions & 1 deletion Documentation/sources/Guide/Code/NMakefileCommon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ OS_LDFLAGS = /NOLOGO /DLL /MANIFEST $(LD_OPTIMISE)
OS_BUNDLE_DIR = Win$(ABI) # 32 or 64

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

Expand Down
4 changes: 4 additions & 0 deletions Documentation/sources/Reference/ofxPropertiesReference.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ Properties Reference

.. doxygendefine:: kOfxImageEffectPluginRenderThreadSafety

.. doxygendefine:: kOfxImageEffectPropCPURenderSupported

.. doxygendefine:: kOfxImageEffectPropClipPreferencesSlaveParam

.. doxygendefine:: kOfxImageEffectPropColourManagementAvailableConfigs
Expand Down Expand Up @@ -153,6 +155,8 @@ Properties Reference

.. doxygendefine:: kOfxImageEffectPropTemporalClipAccess

.. doxygendefine:: kOfxImageEffectPropThumbnailRender

.. doxygendefine:: kOfxImageEffectPropUnmappedFrameRange

.. doxygendefine:: kOfxImageEffectPropUnmappedFrameRate
Expand Down
2 changes: 1 addition & 1 deletion Documentation/sources/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
copyright = '''2025, OpenFX a Series of LF Projects, LLC.
For web site terms of use, trademark policy and other project policies please see https://lfprojects.org/'''
author = 'Contributors to the OpenFX Project'
release = '1.5'
release = '1.5.1'

read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
# -- General configuration ---------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions Examples/Basic/Basic_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down Expand Up @@ -203,7 +203,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -282,7 +282,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions Examples/Custom/Custom_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CUSTOM_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOM_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
5 changes: 3 additions & 2 deletions Examples/Custom/custom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
crafted piece of image processing software.
*/

#ifdef WIN32
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#endif

Expand Down Expand Up @@ -71,7 +72,7 @@ parseCustomParam(char *str, double &x, double &y)
void
writeCustomParam(char *str, int strlen, double x, double y)
{
#ifdef WIN32
#ifdef _WIN32
_snprintf(str, strlen, "%lg %lg", x, y);
#else
snprintf(str, strlen, "%lg %lg", x, y);
Expand Down
4 changes: 2 additions & 2 deletions Examples/DepthConverter/DepthConverter_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEPTHCONVERTER_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DEPTHCONVERTER_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions Examples/DrawSuite/DrawSuite_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
3 changes: 2 additions & 1 deletion Examples/DrawSuite/drawsuite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
and so do nothing.
*/

#ifdef WIN32
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#endif

Expand Down
4 changes: 2 additions & 2 deletions Examples/Invert/Invert_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;INVERT_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;INVERT_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;INVERT_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;INVERT_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
3 changes: 2 additions & 1 deletion Examples/OpenGL/opengl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#if defined(WINDOWS)
#if defined(_WIN32)
#define NOMINMAX
#include <windows.h>
#endif
#include <GL/gl.h>
Expand Down
4 changes: 2 additions & 2 deletions Examples/Overlay/Overlay_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
3 changes: 2 additions & 1 deletion Examples/Overlay/overlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
and so do nothing.
*/

#ifdef WIN32
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#endif

Expand Down
4 changes: 2 additions & 2 deletions Examples/Rectangle/Rectangle_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RECTANGLE_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RECTANGLE_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions Examples/Test/Test_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEST_2005_EXPORTS"
PreprocessorDefinitions="_DEBUG;_USRDLL;TEST_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TEST_2005_EXPORTS"
PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
16 changes: 8 additions & 8 deletions HostSupport/HostSupport.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -107,7 +107,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -173,7 +173,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -238,7 +238,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -299,7 +299,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -363,7 +363,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -426,7 +426,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -488,7 +488,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down
8 changes: 4 additions & 4 deletions HostSupport/examples/CacheDemo.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -121,7 +121,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -197,7 +197,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -276,7 +276,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down
Loading