diff options
| -rw-r--r-- | premake4.lua | 2 | ||||
| -rw-r--r-- | samples/project/CppSharedLib/premake4.lua | 1 | ||||
| -rw-r--r-- | src/actions/make/make_cpp.tmpl | 4 | ||||
| -rw-r--r-- | src/actions/make/make_csharp.tmpl | 6 | ||||
| -rw-r--r-- | src/actions/make/make_solution.tmpl | 6 |
5 files changed, 8 insertions, 11 deletions
diff --git a/premake4.lua b/premake4.lua index e77c013..b4da202 100644 --- a/premake4.lua +++ b/premake4.lua @@ -134,8 +134,6 @@ project "Premake4" out:write("\t0\n};\n"); out:close() - - print("Done.") end diff --git a/samples/project/CppSharedLib/premake4.lua b/samples/project/CppSharedLib/premake4.lua index afbd38a..7f6ae09 100644 --- a/samples/project/CppSharedLib/premake4.lua +++ b/samples/project/CppSharedLib/premake4.lua @@ -9,4 +9,3 @@ project "CppSharedLib" configuration "Release" targetdir "lib/release" - flags { "NoImportLib" }
\ No newline at end of file diff --git a/src/actions/make/make_cpp.tmpl b/src/actions/make/make_cpp.tmpl index afcad44..6e71174 100644 --- a/src/actions/make/make_cpp.tmpl +++ b/src/actions/make/make_cpp.tmpl @@ -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) %>
diff --git a/src/actions/make/make_csharp.tmpl b/src/actions/make/make_csharp.tmpl index bb4185a..6623929 100644 --- a/src/actions/make/make_csharp.tmpl +++ b/src/actions/make/make_csharp.tmpl @@ -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)
diff --git a/src/actions/make/make_solution.tmpl b/src/actions/make/make_solution.tmpl index 0edc0ce..092cd58 100644 --- a/src/actions/make/make_solution.tmpl +++ b/src/actions/make/make_solution.tmpl @@ -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 %>
|