Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/_manifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"base/profiler.lua",
"tools/dotnet.lua",
"tools/gcc.lua",
"tools/clang.lua",
"tools/ghs.lua",
"tools/msc.lua",
"tools/ow.lua",
Expand Down
2 changes: 1 addition & 1 deletion src/actions/cmake/_cmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ newaction {
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
valid_languages = { "C", "C++" },
valid_tools = {
cc = { "gcc" },
cc = { "gcc", "clang" },
},
onsolution = function(sln)
premake.generate(sln, "CMakeLists.txt", premake.cmake.workspace)
Expand Down
2 changes: 1 addition & 1 deletion src/actions/example/_example.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
-- is specified with the /cc and /dotnet command-line options. You can find
-- the tool interfaces at src/tools.
valid_tools = {
cc = { "msc", "gcc", "ow" },
cc = { "msc", "gcc", "clang", "ow" },
dotnet = { "mono", "msnet", "pnet" },
},

Expand Down
2 changes: 1 addition & 1 deletion src/actions/jcdb/_jcdb.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ newaction {

valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
valid_languages = { "C", "C++" },
valid_tools = { cc = { "gcc" } },
valid_tools = { cc = { "gcc", "clang" } },

onsolution = function(sln)
local jsonpath = path.join(sln.location, "compile_commands.json")
Expand Down
2 changes: 1 addition & 1 deletion src/actions/make/_make.lua
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
valid_languages = { "C", "C++", "C#", "Vala", "Swift" },

valid_tools = {
cc = { "gcc", "ghs" },
cc = { "gcc", "clang", "ghs" },
dotnet = { "mono", "msnet", "pnet" },
valac = { "valac" },
swift = { "swift" },
Expand Down
2 changes: 1 addition & 1 deletion src/actions/ninja/_ninja.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ newaction
valid_kinds = {"ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle"},
valid_languages = {"C", "C++", "Swift"},
valid_tools = {
cc = { "gcc" },
cc = { "gcc", "clang" },
swift = { "swift" },
},

Expand Down
2 changes: 1 addition & 1 deletion src/actions/qbs/_qbs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ newaction
valid_kinds = {"ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle"},
valid_languages = {"C", "C++"},
valid_tools = {
cc = { "gcc", "msc" },
cc = { "gcc", "clang", "msc" },
},

-- Solution and project generation logic
Expand Down
2 changes: 1 addition & 1 deletion src/actions/xcode/xcode10.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
valid_languages = { "C", "C++" },

valid_tools = {
cc = { "gcc" },
cc = { "gcc", "clang" },
},

valid_platforms = {
Expand Down
2 changes: 1 addition & 1 deletion src/actions/xcode/xcode8.lua
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
valid_languages = { "C", "C++" },

valid_tools = {
cc = { "gcc" },
cc = { "gcc", "clang" },
},

valid_platforms = {
Expand Down
2 changes: 1 addition & 1 deletion src/actions/xcode/xcode9.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
valid_languages = { "C", "C++" },

valid_tools = {
cc = { "gcc" },
cc = { "gcc", "clang" },
},

valid_platforms = {
Expand Down
7 changes: 4 additions & 3 deletions src/base/cmdline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
value = "VALUE",
description = "Choose a C/C++ compiler set",
allowed = {
{ "gcc", "GNU GCC (gcc/g++)" },
{ "ow", "OpenWatcom" },
{ "ghs", "Green Hills Software" },
{ "gcc", "GNU GCC (gcc/g++)" },
{ "clang", "LLVM Clang (clang/clang++)" },
{ "ow", "OpenWatcom" },
{ "ghs", "Green Hills Software" },
}
}

Expand Down
Loading