Skip to content

Commit

Permalink
Corrected linux preset (#533)
Browse files Browse the repository at this point in the history
  • Loading branch information
DarkWanderer authored Jan 1, 2025
1 parent 468a2a0 commit 7496c66
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
}
},
{
"name": "linux-gcc-base",
"name": "linux-winegcc-base",
"inherits": "ninja-base",
"hidden": true,
"cacheVariables": {
"CMAKE_C_COMPILER": "gcc",
"CMAKE_CXX_COMPILER": "g++"
"CMAKE_C_COMPILER": "winegcc",
"CMAKE_CXX_COMPILER": "wineg++",
"ORBITER_MAKE_DOC": "OFF",
"ORBITER_BUILD_D3D9CLIENT": false
},
"condition": {
"type": "equals",
Expand All @@ -50,19 +52,10 @@
}
}
},
{
"name": "linux-clang-base",
"inherits": "linux-gcc-base",
"hidden": true,
"cacheVariables": {
"CMAKE_C_COMPILER": "clang",
"CMAKE_CXX_COMPILER": "clang++"
}
},
{
"name": "linux-x64-debug",
"displayName": "x64 Debug",
"inherits": "linux-clang-base",
"inherits": "linux-winegcc-base",
"architecture": {
"value": "x64",
"strategy": "external"
Expand All @@ -74,7 +67,7 @@
{
"name": "linux-x64-release",
"displayName": "x64 Release",
"inherits": "linux-clang-base",
"inherits": "linux-winegcc-base",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
Expand Down

0 comments on commit 7496c66

Please sign in to comment.