diff --git a/charts.pro b/charts.pro index 313d47a..04d335b 100644 --- a/charts.pro +++ b/charts.pro @@ -6,7 +6,8 @@ TEMPLATE = subdirs SUBDIRS += src example test CONFIG += ordered QMAKE_CXXFLAGS += -g -Wall -QMAKE_DISTCLEAN += -r build bin +unix:QMAKE_DISTCLEAN += -r build bin +win32:QMAKE_DISTCLEAN += build bin # install feature file feature.path = $$[QT_INSTALL_DATA]/mkspecs/features diff --git a/common.pri b/common.pri index 4d7f581..41587c3 100644 --- a/common.pri +++ b/common.pri @@ -5,4 +5,12 @@ CHART_BUILD_LIB_DIR = $$PWD/lib CHART_BUILD_DIR = $$PWD/build CHART_BUILD_BIN = $$PWD/bin +# hack to fix windows builds + +win32:{ +CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\") +CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\") +CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\") +CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\") +} diff --git a/internal.pri b/internal.pri index 067c473..3cc15c5 100644 --- a/internal.pri +++ b/internal.pri @@ -5,9 +5,28 @@ internal_build:{ DESTDIR = $$CHART_BUILD_BIN CONFIG(debug, debug|release) { LIBS += -lQtCommercialChartd + + #this is ugly hack to work around missing rpath, it simply copies lib + win32:{ + copylib.target = QtCommercialChartd.dll + copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR + copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll + PRE_TARGETDEPS += QtCommercialChartd.dll + QMAKE_EXTRA_TARGETS +=copylib + } + } else { LIBS += -lQtCommercialChart + + #this is ugly hack to work around missing rpath, it simply copies lib + win32:{ + copylib.target = QtCommercialChart + copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR + copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll + PRE_TARGETDEPS += QtCommercialChart + QMAKE_EXTRA_TARGETS +=copylib + } } }else{ - CONFIG+=qtcommercialchart + CONFIG+=qtcommercialchart } diff --git a/src/src.pro b/src/src.pro index d18dafe..1ee565a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -69,4 +69,5 @@ PRE_TARGETDEPS += qchartversion_p.h QMAKE_CLEAN+= qchartversion_p.h QMAKE_EXTRA_TARGETS += chartversion -QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR \ No newline at end of file +unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR +win32:QMAKE_DISTCLEAN += $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR \ No newline at end of file