From e9fe3eb4488c7faa1f5924c1311df52fd24a8578 2012-06-11 08:50:15 From: Tero Ahola Date: 2012-06-11 08:50:15 Subject: [PATCH] Fixed naming of the lib on system build; debug on OSX and Win --- diff --git a/config.pri b/config.pri index 4cde1f6..6fea298 100644 --- a/config.pri +++ b/config.pri @@ -58,26 +58,26 @@ development_build: { ##################### BUILD CONFIG ######################################################## +CONFIG(debug, debug|release) { + mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug) + win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) +} + !system_build:{ INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR !win32: { LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR - }else{ + } else { win32-msvc*: { # hack fix for error: # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'" QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR - }else{ + } else { LIBS += -L $$CHART_BUILD_LIB_DIR } } - - CONFIG(debug, debug|release) { - mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug) - win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) - } LIBS += -l$$LIBRARY_NAME } else {