mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-01 05:46:06 -04:00
--Bug fixes
-Set path to libxml2 properly on Mac in defaults.pri -Workaround for color picker dialog crashing on program exit on Mac
This commit is contained in:
@ -51,7 +51,13 @@ win32 {
|
||||
INCLUDEPATH += /usr/local/include/GL
|
||||
INCLUDEPATH += /usr/include/glm
|
||||
INCLUDEPATH += /usr/include/tbb
|
||||
INCLUDEPATH += /usr/include/libxml2
|
||||
|
||||
unix:!macx {
|
||||
INCLUDEPATH += /usr/include/libxml2
|
||||
}
|
||||
else {
|
||||
INCLUDEPATH += /usr/local/opt/libxml2/include/libxml2
|
||||
}
|
||||
|
||||
#libjpeg and libpng aren't in separate folders, so nothing to add here for them.
|
||||
}
|
||||
@ -83,7 +89,13 @@ else {
|
||||
LIBS += -lpng
|
||||
LIBS += -ltbb
|
||||
LIBS += -lpthread
|
||||
LIBS += -lxml2
|
||||
|
||||
unix:!macx {
|
||||
LIBS += -lxml2
|
||||
}
|
||||
else {
|
||||
LIBS += -L/usr/local/opt/libxml2/lib -lxml2
|
||||
}
|
||||
}
|
||||
|
||||
macx {
|
||||
|
Reference in New Issue
Block a user