##// END OF EJS Templates
Fix compilation config for windows
Michal Klocek -
r37:58ed1b062b4f
parent child
Show More
@@ -6,7 +6,8 TEMPLATE = subdirs
6 SUBDIRS += src example test
6 SUBDIRS += src example test
7 CONFIG += ordered
7 CONFIG += ordered
8 QMAKE_CXXFLAGS += -g -Wall
8 QMAKE_CXXFLAGS += -g -Wall
9 QMAKE_DISTCLEAN += -r build bin
9 unix:QMAKE_DISTCLEAN += -r build bin
10 win32:QMAKE_DISTCLEAN += build bin
10
11
11 # install feature file
12 # install feature file
12 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
13 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
@@ -5,4 +5,12 CHART_BUILD_LIB_DIR = $$PWD/lib
5 CHART_BUILD_DIR = $$PWD/build
5 CHART_BUILD_DIR = $$PWD/build
6 CHART_BUILD_BIN = $$PWD/bin
6 CHART_BUILD_BIN = $$PWD/bin
7
7
8 # hack to fix windows builds
9
10 win32:{
11 CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\")
12 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
13 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
14 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
15 }
8
16
@@ -5,9 +5,28 internal_build:{
5 DESTDIR = $$CHART_BUILD_BIN
5 DESTDIR = $$CHART_BUILD_BIN
6 CONFIG(debug, debug|release) {
6 CONFIG(debug, debug|release) {
7 LIBS += -lQtCommercialChartd
7 LIBS += -lQtCommercialChartd
8
9 #this is ugly hack to work around missing rpath, it simply copies lib
10 win32:{
11 copylib.target = QtCommercialChartd.dll
12 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
13 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
14 PRE_TARGETDEPS += QtCommercialChartd.dll
15 QMAKE_EXTRA_TARGETS +=copylib
16 }
17
8 } else {
18 } else {
9 LIBS += -lQtCommercialChart
19 LIBS += -lQtCommercialChart
20
21 #this is ugly hack to work around missing rpath, it simply copies lib
22 win32:{
23 copylib.target = QtCommercialChart
24 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
25 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
26 PRE_TARGETDEPS += QtCommercialChart
27 QMAKE_EXTRA_TARGETS +=copylib
28 }
10 }
29 }
11 }else{
30 }else{
12 CONFIG+=qtcommercialchart
31 CONFIG+=qtcommercialchart
13 }
32 }
@@ -69,4 +69,5 PRE_TARGETDEPS += qchartversion_p.h
69 QMAKE_CLEAN+= qchartversion_p.h
69 QMAKE_CLEAN+= qchartversion_p.h
70 QMAKE_EXTRA_TARGETS += chartversion
70 QMAKE_EXTRA_TARGETS += chartversion
71
71
72 QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR No newline at end of file
72 unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
73 win32:QMAKE_DISTCLEAN += $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now