From 55014fd83a280b108baac63b86908157c24fea4d Mon Sep 17 00:00:00 2001 From: Seth Troisi Date: Thu, 10 Feb 2022 18:14:26 -0800 Subject: [PATCH 1/2] --Code Changes -Fix mixed tap/space use in defaults.pri --- Builds/QtCreator/defaults.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 038feec..ce686f6 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -42,7 +42,7 @@ win32 { INCLUDEPATH += $$EXTERNAL_DIR/libxml2/include INCLUDEPATH += $$EXTERNAL_DIR/zlib INCLUDEPATH += $$EXTERNAL_DIR/openexr/output/include/Imath - INCLUDEPATH += $$EXTERNAL_DIR/openexr/output/include/OpenEXR + INCLUDEPATH += $$EXTERNAL_DIR/openexr/output/include/OpenEXR } !win32 { @@ -53,7 +53,7 @@ win32 { INCLUDEPATH += /usr/local/include/GL INCLUDEPATH += /usr/include/glm INCLUDEPATH += /usr/include/Imath - INCLUDEPATH += /usr/include/OpenEXR + INCLUDEPATH += /usr/include/OpenEXR unix:!macx { INCLUDEPATH += /usr/include/libxml2 @@ -87,14 +87,14 @@ else { LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex-3_1.lib LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmThread-3_1.lib LIBS += $$absolute_path($$EXTERNAL_LIB)/Imath-3_1.lib - LIBS += $$absolute_path($$EXTERNAL_LIB)/OpenEXR-3_1.lib + LIBS += $$absolute_path($$EXTERNAL_LIB)/OpenEXR-3_1.lib } !win32 { LIBS += -ljpeg LIBS += -lpng LIBS += -lpthread - LIBS += -lOpenEXR + LIBS += -lOpenEXR unix:!macx { LIBS += -lxml2 From 345262a6cc42936504797744c48b8fbd4d78fead Mon Sep 17 00:00:00 2001 From: Seth Troisi Date: Sat, 12 Feb 2022 17:10:05 -0800 Subject: [PATCH 2/2] --Code Changes -Test if directories exist before adding to INCLUDEPATH Fixes all 190 instances of [-Wmissing-include-dirs] for me --- Builds/QtCreator/defaults.pri | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index ce686f6..9e6c50d 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -50,10 +50,16 @@ win32 { #INCLUDEPATH += /usr/include INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/include/GL +exists( /usr/local/include/GL ) { INCLUDEPATH += /usr/local/include/GL +} INCLUDEPATH += /usr/include/glm +exists( /usr/local/include/GL ) { INCLUDEPATH += /usr/include/Imath +} +exists( /usr/include/OpenEXR ) { INCLUDEPATH += /usr/include/OpenEXR +} unix:!macx { INCLUDEPATH += /usr/include/libxml2