From 7f83f6d506c324fb7c1b706d4ef120c0f4a028a7 Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Mon, 23 Jan 2012 11:47:48 -0500 Subject: [PATCH] Fix some minor issues with release build --- src/_premake_main.lua | 10 ---------- src/base/globals.lua | 9 +++++++++ src/project/project.lua | 13 ------------- tests/actions/vstudio/vc200x/test_files.lua | 2 +- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/_premake_main.lua b/src/_premake_main.lua index ceb43d74..1f94aad3 100644 --- a/src/_premake_main.lua +++ b/src/_premake_main.lua @@ -12,16 +12,6 @@ _WORKING_DIR = os.getcwd() --- --- Create a top-level namespace for Premake's own APIs. The premake5 namespace --- is a place to do next-gen (4.5) work without breaking the existing code (yet). --- I think it will eventually go away. --- - - premake = { } - premake5 = { } - - -- -- Inject a new target platform into each solution; called if the --platform -- argument was specified on the command line. diff --git a/src/base/globals.lua b/src/base/globals.lua index 5b64d92c..6bf9272f 100644 --- a/src/base/globals.lua +++ b/src/base/globals.lua @@ -4,6 +4,15 @@ -- Copyright (c) 2002-2011 Jason Perkins and the Premake project -- +-- +-- Create a top-level namespace for Premake's own APIs. The premake5 namespace +-- is a place to do next-gen (4.5) work without breaking the existing code (yet). +-- I think it will eventually go away. +-- + + premake = { } + premake5 = { } + -- The list of supported platforms; also update list in cmdline.lua diff --git a/src/project/project.lua b/src/project/project.lua index 947b1111..3fa192e0 100755 --- a/src/project/project.lua +++ b/src/project/project.lua @@ -228,19 +228,6 @@ function project.getsourcetree(prj) local tr = premake.tree.new(prj.name) - --[[ - local isvpath - local function onadd(node) - node.isvpath = isvpath - end - - for fcfg in premake.project.eachfile(prj) do - isvpath = (fcfg.name ~= fcfg.vpath) - local node = premake.tree.add(tr, fcfg.vpath, onadd) - node.cfg = fcfg - end - --]] - for fcfg in project.eachfile(prj) do local node = premake.tree.add(tr, fcfg.fullpath) node.cfg = fcfg diff --git a/tests/actions/vstudio/vc200x/test_files.lua b/tests/actions/vstudio/vc200x/test_files.lua index 434e1e33..d70aae67 100644 --- a/tests/actions/vstudio/vc200x/test_files.lua +++ b/tests/actions/vstudio/vc200x/test_files.lua @@ -166,4 +166,4 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="1" ]] - end \ No newline at end of file + end