Stripped out premake.tools namespace to keep templates cleaner

3 files changed, 11 insertions, 11 deletions

diff --git a/src/actions/codeblocks/codeblocks_cbp.tmpl b/src/actions/codeblocks/codeblocks_cbp.tmpl
index e67f9e1..5c98a70 100644
--- a/src/actions/codeblocks/codeblocks_cbp.tmpl
+++ b/src/actions/codeblocks/codeblocks_cbp.tmpl
@@ -76,7 +76,7 @@
 					<% for _,v in ipairs(cfg.libdirs) do %>

 					<Add directory="<%= premake.esc(v) %>" />

 					<% end %>

-					<% local dirs, links = premake.tools.gcc.getlinks(cfg) %>

+					<% local dirs, links = premake.gcc.getlinks(cfg) %>

 					<% for _,v in ipairs(dirs) do %>

 					<Add directory="<%= premake.esc(v) %>" />

 					<% end %>

diff --git a/src/actions/codelite/codelite_project.tmpl b/src/actions/codelite/codelite_project.tmpl
index 96fcbd7..15c0632 100644
--- a/src/actions/codelite/codelite_project.tmpl
+++ b/src/actions/codelite/codelite_project.tmpl
@@ -6,7 +6,7 @@
   <%  local target = premake.gettargetfile(cfg, "target", nil, true) %>

     <Configuration Name="<%= premake.esc(cfg.name) %>" CompilerType="gnu <%= iif(cfg.language == "C", "gcc", "g++") %>" DebuggerType="GNU gdb debugger" Type="<%= _CODELITE.kind(cfg.kind) %>">

       <General OutputFile="<%= premake.esc(target) %>" IntermediateDirectory="<%= premake.esc(premake.getobjdir(cfg)) %>" Command="./<%= path.getname(target) %>" CommandArguments="" WorkingDirectory="<%= path.getdirectory(target) %>" PauseExecWhenProcTerminates="<%= iif(cfg.kind == "WindowedApp", "no", "yes") %>"/>

-      <Compiler Required="yes" Options="<%= table.concat(table.join(premake.tools.gcc.getcflags(cfg), premake.tools.gcc.getcxxflags(cfg), cfg.buildoptions), ";") %>">

+      <Compiler Required="yes" Options="<%= table.concat(table.join(premake.gcc.getcflags(cfg), premake.gcc.getcxxflags(cfg), cfg.buildoptions), ";") %>">

         <% for _,v in ipairs(cfg.includedirs) do %>

         <IncludePath Value="<%= premake.esc(v) %>"/>

         <% end %>

@@ -14,8 +14,8 @@
         <Preprocessor Value="<%= premake.esc(v) %>"/>

         <% end %>

       </Compiler>

-      <Linker Required="yes" Options="<%= table.concat(table.join(premake.tools.gcc.getldflags(cfg), cfg.linkoptions), ";") %>">

-        <% local dirs, links = premake.tools.gcc.getlinks(cfg) %>

+      <Linker Required="yes" Options="<%= table.concat(table.join(premake.gcc.getldflags(cfg), cfg.linkoptions), ";") %>">

+        <% local dirs, links = premake.gcc.getlinks(cfg) %>

         <% for _,v in ipairs(dirs) do %>

         <LibraryPath Value="<%= premake.esc(v) %>" />

         <% end %>

diff --git a/src/actions/make/make_cpp.tmpl b/src/actions/make/make_cpp.tmpl
index d385bf9..a93fb8f 100644
--- a/src/actions/make/make_cpp.tmpl
+++ b/src/actions/make/make_cpp.tmpl
@@ -9,12 +9,12 @@ ifeq ($(CONFIG),<%= _MAKE.esc(cfg.name)%>)
   TARGETDIR  = <%= _MAKE.esc(path.getdirectory(cfg.target)) %>

   TARGET     = $(TARGETDIR)/<%= _MAKE.esc(path.getname(premake.gettargetfile(cfg, "target", nil, true))) %>

   OBJDIR     = <%= _MAKE.esc(premake.getobjdir(cfg)) %>

-  DEFINES   += <%= premake.tools[_OPTIONS.cc].make_defines(cfg)  %>

-  INCLUDES  += <%= premake.tools[_OPTIONS.cc].make_includes(cfg) %>

-  CPPFLAGS  += <%= premake.tools[_OPTIONS.cc].make_cppflags(cfg) %> $(DEFINES) $(INCLUDES)

-  CFLAGS    += $(CPPFLAGS) $(ARCH) <%= premake.tools[_OPTIONS.cc].make_cflags(cfg) %> <%= table.concat(cfg.buildoptions, " ") %>

-  CXXFLAGS  += $(CFLAGS) <%= premake.tools[_OPTIONS.cc].make_cxxflags(cfg) %>

-  LDFLAGS   += <%= premake.tools[_OPTIONS.cc].make_ldflags(cfg) %> <%= table.concat(cfg.linkoptions, " ") %>

+  DEFINES   += <%= premake[_OPTIONS.cc].make_defines(cfg)  %>

+  INCLUDES  += <%= premake[_OPTIONS.cc].make_includes(cfg) %>

+  CPPFLAGS  += <%= premake[_OPTIONS.cc].make_cppflags(cfg) %> $(DEFINES) $(INCLUDES)

+  CFLAGS    += $(CPPFLAGS) $(ARCH) <%= premake[_OPTIONS.cc].make_cflags(cfg) %> <%= table.concat(cfg.buildoptions, " ") %>

+  CXXFLAGS  += $(CFLAGS) <%= premake[_OPTIONS.cc].make_cxxflags(cfg) %>

+  LDFLAGS   += <%= premake[_OPTIONS.cc].make_ldflags(cfg) %> <%= table.concat(cfg.linkoptions, " ") %>

   RESFLAGS  += $(DEFINES) $(INCLUDES) <%= table.concat(cfg.resoptions, " ") %>

   LDDEPS    += <%= table.concat(_MAKE.gettargetdeps(cfg), " ") %>

   <% if cfg.kind == "StaticLib" then %>

@@ -121,7 +121,7 @@ prelink:
  <% if path.iscppfile(file) then %>

 $(OBJDIR)/<%= _MAKE.esc(path.getbasename(file)) %>.o: <%= _MAKE.esc(file) %>

 	@echo $(notdir $<)

-	@<%= premake.tools[_OPTIONS.cc].make_file_rule(file) %>

+	@<%= premake[_OPTIONS.cc].make_file_rule(file) %>

 	

  <% end %>

 <% end %>