diff options
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | samples/project/CppConsoleApp/premake4.lua | 2 | ||||
| -rw-r--r-- | samples/project/premake4.lua | 8 | ||||
| -rw-r--r-- | src/actions/codeblocks/codeblocks_cbp.tmpl | 7 |
4 files changed, 11 insertions, 9 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 85c7bd8..36d69d4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,8 +11,9 @@ This version is a complete rewrite of Premake. - Upgraded to Lua 5.1.4 - Many, many bug fixes -RC4 -> +RC4 -> Final +- Set Mac OS X linker flags for Code::Blocks - Bug 2533504: Files above project root not added to project RC3 -> RC4 diff --git a/samples/project/CppConsoleApp/premake4.lua b/samples/project/CppConsoleApp/premake4.lua index 50c22d8..b035656 100644 --- a/samples/project/CppConsoleApp/premake4.lua +++ b/samples/project/CppConsoleApp/premake4.lua @@ -3,7 +3,7 @@ project "CppConsoleApp" kind "ConsoleApp" language "C++" - files { "*.cpp", "../fakefile.cpp" } + files { "*.cpp" } includedirs { "I:/Code" } diff --git a/samples/project/premake4.lua b/samples/project/premake4.lua index 24a1cd0..3e01086 100644 --- a/samples/project/premake4.lua +++ b/samples/project/premake4.lua @@ -17,11 +17,15 @@ solution "PremakeTestbox" -- include all the projects include "CppConsoleApp" - include "CsConsoleApp" include "CppWindowedApp" include "CppSharedLib" - include "CsSharedLib" include "CppStaticLib" + + if _ACTION ~= "codeblocks" then + include "CsSharedLib" + include "CsConsoleApp" + end + -- add to the built-in clean action diff --git a/src/actions/codeblocks/codeblocks_cbp.tmpl b/src/actions/codeblocks/codeblocks_cbp.tmpl index 4aeae41..ee966a9 100644 --- a/src/actions/codeblocks/codeblocks_cbp.tmpl +++ b/src/actions/codeblocks/codeblocks_cbp.tmpl @@ -38,11 +38,8 @@ <% end %>
</Compiler>
<Linker>
- <% if cfg.flags.NoSymbols then %>
- <Add options="-s" />
- <% end %>
- <% for _,v in ipairs(cfg.linkoptions) do %>
- <Add option="<%= premake.esc(v) %>" />
+ <% for _,flag in ipairs(table.join(cc.getldflags(cfg), cfg.linkoptions)) do %>
+ <Add option="<%= premake.esc(flag) %>" />
<% end %>
<% for _,v in ipairs(premake.getlinks(cfg, "all", "directory")) do %>
<Add directory="<%= premake.esc(v) %>" />
|