##// END OF EJS Templates
Fix shadow build for win32
Jani Honkonen -
r709:d7f0ff03576a
parent child
Show More
@@ -1,44 +1,46
1 CONFIG+=integrated_build #remove if you want to build against installed libs
1 CONFIG+=integrated_build #remove if you want to build against installed libs
2
2
3 SHADOW = $$find(PWD, $${OUT_PWD})
3 SHADOW = $$find(PWD, $${OUT_PWD})
4
4
5 unix:isEmpty(SHADOW){
5 unix:isEmpty(SHADOW){
6 search = "$$PWD:::"
6 search = "$$PWD:::"
7 temp = $$split(search,"/")
7 temp = $$split(search,"/")
8 temp = $$last(temp)
8 temp = $$last(temp)
9 path = $$replace(search,$$temp,'')
9 path = $$replace(search,$$temp,'')
10 temp = $$split(OUT_PWD,$$path)
10 temp = $$split(OUT_PWD,$$path)
11 temp = $$split(temp,'/')
11 temp = $$split(temp,'/')
12 temp = $$first(temp)
12 temp = $$first(temp)
13 path = "$${path}$${temp}"
13 path = "$${path}$${temp}"
14 SHADOW=$$path
14 SHADOW=$$path
15 }
15 }
16
16
17 win32: SHADOW = $$PWD
18
17 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
19 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
18 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
20 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
19 CHART_BUILD_LIB_DIR = $$SHADOW/lib
21 CHART_BUILD_LIB_DIR = $$SHADOW/lib
20 CHART_BUILD_DIR = $$SHADOW/build
22 CHART_BUILD_DIR = $$SHADOW/build
21 CHART_BUILD_BIN_DIR = $$SHADOW/bin
23 CHART_BUILD_BIN_DIR = $$SHADOW/bin
22 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
24 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
23 CHART_BUILD_DOC_DIR = $$SHADOW/doc
25 CHART_BUILD_DOC_DIR = $$SHADOW/doc
24
26
25
27
26 # hack to fix windows builds
28 # hack to fix windows builds
27 win32:{
29 win32:{
28 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
30 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
29 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
31 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
30 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
32 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
31 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
33 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
32 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
34 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
33 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
35 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
34 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
36 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
35 }
37 }
36
38
37 mac: {
39 mac: {
38 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
40 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
39 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
41 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
40 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
42 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
41 # it should probably define the minimum OSX version to be 10.5...
43 # it should probably define the minimum OSX version to be 10.5...
42 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
44 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
43 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
45 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
44 }
46 }
General Comments 0
You need to be logged in to leave comments. Login now