Skip to content

Commit d0afdd6

Browse files
authored
Merge pull request #259 from cortex-command-community/meson-configuration
Meson Configuration
2 parents 7aacd39 + e18955a commit d0afdd6

2 files changed

Lines changed: 39 additions & 16 deletions

File tree

.vscode/launch.json

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,28 @@
2020
}
2121
},
2222
{
23-
"name": "meson Debug (Release)",
23+
"name": "meson Configure Final & Launch",
2424
"type": "cppdbg",
2525
"osx": {
2626
"MIMode": "lldb"
2727
},
2828
"request": "launch",
29-
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
29+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
30+
"cwd": "${workspaceFolder}",
31+
"preLaunchTask": "meson Build Release",
32+
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
33+
"presentation": {
34+
"group": "unix"
35+
}
36+
},
37+
{
38+
"name": "meson Configure Debug (Release) & Launch",
39+
"type": "cppdbg",
40+
"osx": {
41+
"MIMode": "lldb"
42+
},
43+
"request": "launch",
44+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
3045
"cwd": "${workspaceFolder}",
3146
"preLaunchTask": "meson Build Debug (Release)",
3247
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -35,13 +50,13 @@
3550
}
3651
},
3752
{
38-
"name": "meson Debug (Minimal)",
53+
"name": "meson Configure Debug (Minimal) & Launch",
3954
"type": "cppdbg",
4055
"osx": {
4156
"MIMode": "lldb"
4257
},
4358
"request": "launch",
44-
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
59+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
4560
"cwd": "${workspaceFolder}",
4661
"preLaunchTask": "meson Build Debug (Minimal)",
4762
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -50,13 +65,13 @@
5065
}
5166
},
5267
{
53-
"name": "meson Debug (Full)",
68+
"name": "meson Configure Debug (Full) & Launch",
5469
"type": "cppdbg",
5570
"osx": {
5671
"MIMode": "lldb"
5772
},
5873
"request": "launch",
59-
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
74+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
6075
"cwd": "${workspaceFolder}",
6176
"preLaunchTask": "meson Build Debug (Full)",
6277
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -116,17 +131,29 @@
116131
"request": "launch",
117132
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
118133
"cwd": "${workspaceFolder}",
134+
"preLaunchTask": "Meson: Build all targets",
135+
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
136+
"presentation": {
137+
"group": "windows"
138+
}
139+
},
140+
{
141+
"name": "meson Configure Final & Launch [Windows]",
142+
"type": "cppvsdbg",
143+
"request": "launch",
144+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
145+
"cwd": "${workspaceFolder}",
119146
"preLaunchTask": "meson Build Release",
120147
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
121148
"presentation": {
122149
"group": "windows"
123150
}
124151
},
125152
{
126-
"name": "meson Debug (Release) [Windows]",
153+
"name": "meson Configure Debug (Release) & Launch [Windows]",
127154
"type": "cppvsdbg",
128155
"request": "launch",
129-
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.release.exe",
156+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
130157
"cwd": "${workspaceFolder}",
131158
"preLaunchTask": "meson Build Debug (Release)",
132159
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -135,10 +162,10 @@
135162
}
136163
},
137164
{
138-
"name": "meson Debug (Minimal) [Windows]",
165+
"name": "meson Configure Debug (Minimal) & Launch [Windows]",
139166
"type": "cppvsdbg",
140167
"request": "launch",
141-
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.minimal.exe",
168+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
142169
"cwd": "${workspaceFolder}",
143170
"preLaunchTask": "meson Build Debug (Minimal)",
144171
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -147,10 +174,10 @@
147174
}
148175
},
149176
{
150-
"name": "meson Debug (Full) [Windows]",
177+
"name": "meson Configure Debug (Full) & Launch [Windows]",
151178
"type": "cppvsdbg",
152179
"request": "launch",
153-
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.full.exe",
180+
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
154181
"cwd": "${workspaceFolder}",
155182
"preLaunchTask": "meson Build Debug (Full)",
156183
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",

meson.build

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,12 @@ elif compiler.get_argument_syntax()== 'msvc'
120120
link_args+=['-ignore:4099', '-ignore:4217']
121121
buildtype_debug = get_option('debug')
122122
if buildtype_debug
123-
elfname+='.debug'
124123
debug_type = get_option('debug_type')
125124
if debug_type == 'release'
126-
elfname+='.release'
127125
preprocessor_flags += ['-DDEBUG_RELEASE_BUILD'] # enable minimal debug features
128126
elif debug_type == 'minimal'
129-
elfname += '.minimal'
130127
preprocessor_flags += ['-DDEBUGMODE'] # enable some debug features
131128
elif debug_type == 'full'
132-
elfname += '.full'
133129
preprocessor_flags += ['-DDEBUG_BUILD', '-DDEBUGMODE'] # enable all debug features; may slow down game
134130
endif
135131
else

0 commit comments

Comments
 (0)