AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Changed makefile CONFIG variable to "config" to match "verbose"

Browse Source
This commit is contained in:
starkos 2008-12-22 22:47:16 +00:00
parent 78c4c02997
commit b0441e8eb4
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
premake4.lua
View File

@ -134,8 +134,6 @@ project "Premake4"
out:write("\t0\n};\n");
out:close()
print("Done.")
end

1
samples/project/CppSharedLib/premake4.lua
View File

@ -9,4 +9,3 @@ project "CppSharedLib"
configuration "Release"
targetdir "lib/release"
flags { "NoImportLib" }

4
src/actions/make/make_cpp.tmpl
View File

@ -2,7 +2,7 @@
# <%= premake.actions[_ACTION].shortname %> project makefile autogenerated by Premake
ifndef config
config=<%= _MAKE.esc(this.configurations[1]) %>
config=<%= _MAKE.esc(this.configurations[1]:lower()) %>
endif
ifndef verbose
@ -11,7 +11,7 @@ endif
<% for cfg in premake.eachconfig(this) do %>
ifeq ($(config),<%= _MAKE.esc(cfg.name)%>)
ifeq ($(config),<%= _MAKE.esc(cfg.name:lower())%>)
TARGETDIR = <%= _MAKE.esc(cfg.buildtarget.directory) %>
TARGET = $(TARGETDIR)/<%= _MAKE.esc(cfg.buildtarget.name) %>
OBJDIR = <%= _MAKE.esc(cfg.objectsdir) %>

6
src/actions/make/make_csharp.tmpl
View File

@ -74,7 +74,7 @@
# <%= premake.actions[_ACTION].shortname %> project makefile autogenerated by Premake
ifndef config
config=<%= _MAKE.esc(this.configurations[1]) %>
config=<%= _MAKE.esc(this.configurations[1]:lower()) %>
endif
ifndef verbose
@ -91,7 +91,7 @@ endif
<% for cfg in premake.eachconfig(this) do %>
ifeq ($(config),<%= _MAKE.esc(cfg.name)%>)
ifeq ($(config),<%= _MAKE.esc(cfg.name:lower())%>)
TARGETDIR := <%= _MAKE.esc(cfg.buildtarget.directory) %>
OBJDIR := <%= _MAKE.esc(cfg.objectsdir) %>
DEPENDS := <%= table.concat(_MAKE.esc(premake.getlinks(cfg, "dependencies", "fullpath")), " ") %>
@ -211,7 +211,7 @@ prelink:
# Per-configuration copied file rules
<% for cfg in premake.eachconfig(this) do %>
ifeq ($(config),<%= _MAKE.esc(cfg.name)%>)
ifeq ($(config),<%= _MAKE.esc(cfg.name:lower())%>)
<% for target, source in pairs(cfgpairs[cfg]) do %>
<%= _MAKE.esc(target) %>: <%= _MAKE.esc(source) %>
$(COPY_RULE)

6
src/actions/make/make_solution.tmpl
View File

@ -1,9 +1,9 @@
# <%= premake.actions[_ACTION].shortname %> solution makefile autogenerated by Premake
# Usage: make [ config=config_name ]
# Where {config_name} is one of: <%= table.implode(this.configurations, '"', '"', ', ') %>.
# Where {config_name} is one of: <%= table.implode(this.configurations, '"', '"', ', '):lower() %>.
ifndef config
config=<%= _MAKE.esc(this.configurations[1]) %>
config=<%= _MAKE.esc(this.configurations[1]:lower()) %>
endif
export config
@ -15,7 +15,7 @@ all: $(PROJECTS)
<% for _,prj in ipairs(this.projects) do %>
<% for cfg in premake.eachconfig(prj) do %>
ifeq ($(config),<%= _MAKE.esc(cfg.name)%>)
ifeq ($(config),<%= _MAKE.esc(cfg.name:lower())%>)
DEPENDENCIES := <%= table.concat(_MAKE.esc(table.extract(premake.getdependencies(cfg), "name")), " ") %>
endif
<% end %>