##// END OF EJS Templates
Fixed naming of the lib on system build; debug on OSX and Win
Tero Ahola -
r1431:e9fe3eb4488c
parent child
Show More
@@ -58,26 +58,26 development_build: {
58
58
59 ##################### BUILD CONFIG ########################################################
59 ##################### BUILD CONFIG ########################################################
60
60
61 CONFIG(debug, debug|release) {
62 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
63 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
64 }
65
61 !system_build:{
66 !system_build:{
62
67
63 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
68 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
64
69
65 !win32: {
70 !win32: {
66 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
71 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
67 }else{
72 } else {
68 win32-msvc*: {
73 win32-msvc*: {
69 # hack fix for error:
74 # hack fix for error:
70 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
75 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
71 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
76 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
72 }else{
77 } else {
73 LIBS += -L $$CHART_BUILD_LIB_DIR
78 LIBS += -L $$CHART_BUILD_LIB_DIR
74 }
79 }
75 }
80 }
76
77 CONFIG(debug, debug|release) {
78 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
79 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
80 }
81
81
82 LIBS += -l$$LIBRARY_NAME
82 LIBS += -l$$LIBRARY_NAME
83 } else {
83 } else {
General Comments 0
You need to be logged in to leave comments. Login now