From 3533ea2002482db9486374344c9cbfeeccaa0c7d Mon Sep 17 00:00:00 2001 From: mfeemster Date: Wed, 2 Mar 2016 19:17:37 -0800 Subject: [PATCH] --Bug fixes -Take specific paths out of pri file. --- Builds/QtCreator/defaults.pri | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 1a6e799..64fe3e0 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -54,7 +54,9 @@ win32 { #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 { LIBS = "" LIBS += OpenGL32.lib @@ -69,11 +71,11 @@ win32 { } !win32 { - LIBS += -L/usr/lib -ljpeg - LIBS += -L/usr/lib -lpng - LIBS += -L/usr/lib -ltbb - LIBS += -L/usr/lib -lpthread - LIBS += -L/usr/lib/x86_64-linux-gnu -lxml2 + LIBS += -ljpeg + LIBS += -lpng + LIBS += -ltbb + LIBS += -lpthread + LIBS += -lxml2 } macx {