fix: Define WIN32 and WINDOWS for MSYS2, and remove <qtypes.h> in image.h.
This commit is contained in:
@@ -77,6 +77,12 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# MinGW does not define WIN32/WINDOWS the way OpenFX HostSupport expects.
|
||||||
|
# Ensure these are visible so ofxhBinary.h et al. pick the Windows code path.
|
||||||
|
if(MINGW)
|
||||||
|
add_compile_definitions(WIN32 WINDOWS)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(OLIVE_DEFINITIONS -DQT_DEPRECATED_WARNINGS)
|
set(OLIVE_DEFINITIONS -DQT_DEPRECATED_WARNINGS)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
list(APPEND OLIVE_DEFINITIONS -DUNICODE -D_UNICODE)
|
list(APPEND OLIVE_DEFINITIONS -DUNICODE -D_UNICODE)
|
||||||
|
|||||||
@@ -27,7 +27,6 @@
|
|||||||
#include "render/loopmode.h"
|
#include "render/loopmode.h"
|
||||||
#include "render/videoparams.h"
|
#include "render/videoparams.h"
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <qtypes.h>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
namespace olive
|
namespace olive
|
||||||
|
|||||||
Reference in New Issue
Block a user