mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-03-13 15:21:36 -04:00
Merged in cleanups_p0 (pull request #56)
Few pre work cleanups Approved-by: Matt Feemster
This commit is contained in:
commit
7081d8863b
@ -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 {
|
||||||
@ -50,10 +50,16 @@ win32 {
|
|||||||
#INCLUDEPATH += /usr/include
|
#INCLUDEPATH += /usr/include
|
||||||
INCLUDEPATH += /usr/local/include
|
INCLUDEPATH += /usr/local/include
|
||||||
INCLUDEPATH += /usr/include/GL
|
INCLUDEPATH += /usr/include/GL
|
||||||
|
exists( /usr/local/include/GL ) {
|
||||||
INCLUDEPATH += /usr/local/include/GL
|
INCLUDEPATH += /usr/local/include/GL
|
||||||
|
}
|
||||||
INCLUDEPATH += /usr/include/glm
|
INCLUDEPATH += /usr/include/glm
|
||||||
|
exists( /usr/local/include/GL ) {
|
||||||
INCLUDEPATH += /usr/include/Imath
|
INCLUDEPATH += /usr/include/Imath
|
||||||
INCLUDEPATH += /usr/include/OpenEXR
|
}
|
||||||
|
exists( /usr/include/OpenEXR ) {
|
||||||
|
INCLUDEPATH += /usr/include/OpenEXR
|
||||||
|
}
|
||||||
|
|
||||||
unix:!macx {
|
unix:!macx {
|
||||||
INCLUDEPATH += /usr/include/libxml2
|
INCLUDEPATH += /usr/include/libxml2
|
||||||
@ -87,14 +93,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
|
||||||
|
Loading…
Reference in New Issue
Block a user