--Bug fixes

-Take specific paths out of pri file.
This commit is contained in:
mfeemster 2016-03-02 19:17:37 -08:00
parent 1c7e95c59a
commit 3533ea2002

View File

@ -54,7 +54,9 @@ win32 {
#libjpeg and libpng aren't in separate folders, so nothing to add here for them. #libjpeg and libpng aren't in separate folders, so nothing to add here for them.
} }
#5) Add up all library paths. #5) Add up all library paths. Ember and EmberCL don't need libjpeb, libpng or zlib and
# Ember doesn't need OpenCL. But just place them all here in the common file for ease of maintenance.
# Unneeded libs will just be ignored.
win32 { win32 {
LIBS = "" LIBS = ""
LIBS += OpenGL32.lib LIBS += OpenGL32.lib
@ -69,11 +71,11 @@ win32 {
} }
!win32 { !win32 {
LIBS += -L/usr/lib -ljpeg LIBS += -ljpeg
LIBS += -L/usr/lib -lpng LIBS += -lpng
LIBS += -L/usr/lib -ltbb LIBS += -ltbb
LIBS += -L/usr/lib -lpthread LIBS += -lpthread
LIBS += -L/usr/lib/x86_64-linux-gnu -lxml2 LIBS += -lxml2
} }
macx { macx {