--Code Changes

-Fix mixed tap/space use in defaults.pri
This commit is contained in:
Seth Troisi 2022-02-10 18:14:26 -08:00
parent ee7ca7065e
commit 55014fd83a

View File

@ -42,7 +42,7 @@ win32 {
INCLUDEPATH += $$EXTERNAL_DIR/libxml2/include INCLUDEPATH += $$EXTERNAL_DIR/libxml2/include
INCLUDEPATH += $$EXTERNAL_DIR/zlib INCLUDEPATH += $$EXTERNAL_DIR/zlib
INCLUDEPATH += $$EXTERNAL_DIR/openexr/output/include/Imath INCLUDEPATH += $$EXTERNAL_DIR/openexr/output/include/Imath
INCLUDEPATH += $$EXTERNAL_DIR/openexr/output/include/OpenEXR INCLUDEPATH += $$EXTERNAL_DIR/openexr/output/include/OpenEXR
} }
!win32 { !win32 {
@ -53,7 +53,7 @@ win32 {
INCLUDEPATH += /usr/local/include/GL INCLUDEPATH += /usr/local/include/GL
INCLUDEPATH += /usr/include/glm INCLUDEPATH += /usr/include/glm
INCLUDEPATH += /usr/include/Imath INCLUDEPATH += /usr/include/Imath
INCLUDEPATH += /usr/include/OpenEXR INCLUDEPATH += /usr/include/OpenEXR
unix:!macx { unix:!macx {
INCLUDEPATH += /usr/include/libxml2 INCLUDEPATH += /usr/include/libxml2
@ -87,14 +87,14 @@ else {
LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex-3_1.lib LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex-3_1.lib
LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmThread-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)/Imath-3_1.lib
LIBS += $$absolute_path($$EXTERNAL_LIB)/OpenEXR-3_1.lib LIBS += $$absolute_path($$EXTERNAL_LIB)/OpenEXR-3_1.lib
} }
!win32 { !win32 {
LIBS += -ljpeg LIBS += -ljpeg
LIBS += -lpng LIBS += -lpng
LIBS += -lpthread LIBS += -lpthread
LIBS += -lOpenEXR LIBS += -lOpenEXR
unix:!macx { unix:!macx {
LIBS += -lxml2 LIBS += -lxml2