Skip to content

Commit 9b34a16

Browse files
committed
Unify string literals in qbs project
1 parent e0db01f commit 9b34a16

1 file changed

Lines changed: 45 additions & 39 deletions

File tree

DesktopDuplicator.qbs

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import qbs
2-
31
Project {
42
qbsSearchPaths: [ "qbs/" ]
53

@@ -8,22 +6,22 @@ Project {
86
targetName: "deskdupl"
97
consoleApplication: false
108

11-
Depends { name: 'cpp' }
9+
Depends { name: "cpp" }
1210
cpp.cxxLanguageVersion: "c++23"
1311
cpp.treatWarningsAsErrors: true
1412
cpp.enableRtti: false // disable runtime type information for faster build and smaller object files and executable
1513

1614
cpp.minimumWindowsVersion: "10.0"
17-
cpp.dynamicLibraries: ['d3d11', "User32", "Gdi32", "Shell32", "Ole32", "Comctl32"]
18-
cpp.includePaths: ['src']
15+
cpp.dynamicLibraries: ["d3d11", "User32", "Gdi32", "Shell32", "Ole32", "Comctl32"]
16+
cpp.includePaths: ["src"]
1917

2018
Properties {
21-
condition: qbs.toolchainType == 'msvc'
19+
condition: qbs.toolchainType == "msvc"
2220
cpp.generateManifestFile: false
23-
cpp.defines: ['NOMINMAX']
21+
cpp.defines: ["NOMINMAX"]
2422
cpp.cxxFlags: [
25-
'/analyze', '/Zc:char8_t-',
26-
'/permissive-', '/Zc:__cplusplus', // best C++ compatibilty
23+
"/analyze", "/Zc:char8_t-",
24+
"/permissive-", "/Zc:__cplusplus", // best C++ compatibilty
2725
"/Zc:inline", // do not include inline code in object files
2826
"/Zc:throwingNew", // avoid redundant null checks after new
2927
"/diagnostics:caret", // better error postions
@@ -32,9 +30,9 @@ Project {
3230
]
3331
}
3432
Properties {
35-
condition: qbs.toolchainType == 'clang-cl'
33+
condition: qbs.toolchainType == "clang-cl"
3634
cpp.generateManifestFile: false
37-
cpp.defines: ['NOMINMAX']
35+
cpp.defines: ["NOMINMAX"]
3836
cpp.cxxFlags: [
3937
"/permissive-", "/Zc:__cplusplus", // best C++ compatibilty
4038
"/Zc:inline", // do not include inline code in object files
@@ -43,39 +41,46 @@ Project {
4341
]
4442
}
4543
Properties {
46-
condition: qbs.toolchain.contains('clang')
47-
// note: would require '--target=x86_64-pc-windows-msvc19.43.34808' to work
44+
condition: qbs.toolchain.contains("clang")
45+
// note: would require "--target=x86_64-pc-windows-msvc19.43.34808" to work
4846
// useful: to run third party clang based tools
4947
cpp.defines: [
50-
'_M_X64=100',
51-
'_M_AMD64=100',
52-
'_WIN64=1',
53-
'NOMINMAX'
48+
"_M_X64=100",
49+
"_M_AMD64=100",
50+
"_WIN64=1",
51+
"NOMINMAX"
5452
]
5553
cpp.cxxFlags: [
56-
'-fms-volatile',
57-
'-fms-extensions',
58-
'-fms-compatibility-version=19.43.34808',
59-
'-fms-compatibility',
54+
"-fms-volatile",
55+
"-fms-extensions",
56+
"-fms-compatibility-version=19.43.34808",
57+
"-fms-compatibility",
6058
// "-###" // print cc1 subcommand arguments
6159
]
6260
cpp.systemIncludePaths: [
6361
// note: actually needs msvc include & windows kit includes
62+
"C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.43.34808/include",
63+
"C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.43.34808/atlmfc/include",
64+
"C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/VS/include",
65+
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/shared",
66+
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um",
67+
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/winrt",
68+
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/ucrt"
6469
]
6570
}
6671

67-
Depends { name: 'hlsl' }
68-
hlsl.shaderModel: '4_0_level_9_3'
72+
Depends { name: "hlsl" }
73+
hlsl.shaderModel: "4_0_level_9_3"
6974

7075
Group {
71-
name: 'PCH'
72-
prefix: 'src/'
73-
files: ['stable.h']
76+
name: "PCH"
77+
prefix: "src/"
78+
files: ["stable.h"]
7479
fileTags: ["cpp_pch_src"]
7580
}
7681
Group {
77-
name: 'Meta'
78-
prefix: 'src/meta/'
82+
name: "Meta"
83+
prefix: "src/meta/"
7984
files: [
8085
"callback_adapter.h",
8186
"comptr.h",
@@ -86,8 +91,8 @@ Project {
8691
]
8792
}
8893
Group {
89-
name: 'Win32'
90-
prefix: 'src/win32/'
94+
name: "Win32"
95+
prefix: "src/win32/"
9196
files: [
9297
"DisplayMonitor.cpp",
9398
"DisplayMonitor.h",
@@ -114,21 +119,21 @@ Project {
114119
]
115120
}
116121
Group {
117-
name: 'Main'
122+
name: "Main"
118123
prefix: "src/"
119124

120125
Group {
121-
name: 'Pixelshaders'
122-
hlsl.shaderType: 'ps'
126+
name: "Pixelshaders"
127+
hlsl.shaderType: "ps"
123128
files: ["MaskedPixelShader.hlsl", "PlainPixelShader.hlsl"]
124129
}
125130
Group {
126-
name: 'Vertexshaders'
127-
hlsl.shaderType: 'vs'
131+
name: "Vertexshaders"
132+
hlsl.shaderType: "vs"
128133
files: ["VertexShader.hlsl"]
129134
}
130135
Group {
131-
name: 'Capture'
136+
name: "Capture"
132137
files: [
133138
"CaptureThread.cpp",
134139
"CaptureThread.h",
@@ -137,7 +142,7 @@ Project {
137142
]
138143
}
139144
Group {
140-
name: 'Output'
145+
name: "Output"
141146
files: [
142147
"BaseRenderer.cpp",
143148
"BaseRenderer.h",
@@ -148,10 +153,11 @@ Project {
148153
"WindowRenderer.cpp",
149154
"WindowRenderer.h",
150155
"renderer.cpp",
151-
"renderer.h", ]
156+
"renderer.h",
157+
]
152158
}
153159
Group {
154-
name: 'Application'
160+
name: "Application"
155161
files: [
156162
"CaptureAreaWindow.cpp",
157163
"CaptureAreaWindow.h",

0 commit comments

Comments
 (0)