Skip to content

Commit e1b3b86

Browse files
committed
trying to make it work with predefined env vars
1 parent 3af1933 commit e1b3b86

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

CMakePresets.json

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,18 @@
1919
"CMAKE_BUILD_TYPE": "Release",
2020
"RTS_FLAGS": "/W3"
2121
},
22+
"environment": {
23+
"VS6_DIR": "$env{ProgramFiles(x86)}\\Microsoft Visual Studio",
24+
"PATH": "$env{VS6_DIR}\\VC98\\BIN;$env{VS6_DIR}\\Common\\Tools;$env{VS6_DIR}\\Common\\Tools\\WinNT;$env{VS6_DIR}\\Common\\MSDev98\\Bin;$penv{PATH}",
25+
"INCLUDE": "$env{VS6_DIR}\\VC98\\INCLUDE;$env{VS6_DIR}\\VC98\\MFC\\INCLUDE;$env{VS6_DIR}\\VC98\\ATL\\INCLUDE;$penv{INCLUDE}",
26+
"LIB": "$env{VS6_DIR}\\VC98\\LIB;$env{VS6_DIR}\\VC98\\MFC\\LIB;$penv{LIB}"
27+
},
2228
"vendor": {
2329
"jetbrains.com/clion": {
2430
"toolchain": "Visual Studio 6"
2531
}
2632
}
2733
},
28-
{
29-
"name": "vc6-vars",
30-
"hidden": true,
31-
"environment": {
32-
"VS6_DIR": "$env{ProgramFiles(x86)}\\Microsoft Visual Studio",
33-
"PATH": "$env{VS6_DIR}\\VC98\\BIN;$env{VS6_DIR}\\Common\\Tools;$env{VS6_DIR}\\Common\\Tools\\WinNT;$env{VS6_DIR}\\Common\\MSDev98\\Bin;penv{PATH}",
34-
"INCLUDE": "$env{VS6_DIR}\\VC98\\INCLUDE;$env{VS6_DIR}\\VC98\\MFC\\INCLUDE;$env{VS6_DIR}\\VC98\\ATL\\INCLUDE;penv{INCLUDE}",
35-
"LIB": "$env{VS6_DIR}\\VC98\\LIB;$env{VS6_DIR}\\VC98\\MFC\\LIB;$penv{LIB}"
36-
}
37-
},
3834
{
3935
"name": "vc6-profile",
4036
"displayName": "Windows 32bit VC6 Profile",
@@ -62,14 +58,6 @@
6258
"RTS_BUILD_OPTION_DEBUG": "ON"
6359
}
6460
},
65-
{
66-
"name": "vc6-easy",
67-
"inherits": ["vc6","vc6-vars"]
68-
},
69-
{
70-
"name": "vc6-debug-easy",
71-
"inherits": ["vc6-debug","vc6-vars"]
72-
},
7361
{
7462
"name": "default",
7563
"displayName": "Default Config (don't use directly!)",

0 commit comments

Comments
 (0)