Bit of code cleanup

8 files changed, 15 insertions, 12 deletions

diff --git a/samples/project/CppConsoleApp/CppConsoleApp.cpp b/samples/project/CppConsoleApp/CppConsoleApp.cpp
index fcd83a2..39c8990 100644
--- a/samples/project/CppConsoleApp/CppConsoleApp.cpp
+++ b/samples/project/CppConsoleApp/CppConsoleApp.cpp
@@ -1,4 +1,4 @@
-#include "CppConsoleApp.h"
+#include "stdafx.h"
 
 int main()
 {
diff --git a/samples/project/CppConsoleApp/premake4.lua b/samples/project/CppConsoleApp/premake4.lua
index d4e799f..cd4da3f 100644
--- a/samples/project/CppConsoleApp/premake4.lua
+++ b/samples/project/CppConsoleApp/premake4.lua
@@ -12,8 +12,9 @@ project "CppConsoleApp"
 	libdirs { "../lib" }
 	links   { "CppSharedLib" }
 	
-	pchheader "CppConsoleApp.h"
-
+	pchheader "stdafx.h"
+	pchsource "stdafx.cpp"
+	
 	configuration "Debug"
 		targetdir "../bin/debug (x64)"
 		
diff --git a/samples/project/CppConsoleApp/stdafx.cpp b/samples/project/CppConsoleApp/stdafx.cpp
new file mode 100644
index 0000000..fd4f341
--- /dev/null
+++ b/samples/project/CppConsoleApp/stdafx.cpp
@@ -0,0 +1 @@
+#include "stdafx.h"
diff --git a/samples/project/CppConsoleApp/CppConsoleApp.h b/samples/project/CppConsoleApp/stdafx.h
index 57cb5b8..57cb5b8 100644
--- a/samples/project/CppConsoleApp/CppConsoleApp.h
+++ b/samples/project/CppConsoleApp/stdafx.h
diff --git a/samples/project/premake4.lua b/samples/project/premake4.lua
index 89d7ef1..eadf648 100644
--- a/samples/project/premake4.lua
+++ b/samples/project/premake4.lua
@@ -1,7 +1,5 @@
 solution "PremakeTestbox"
 	configurations { "Debug", "Release" }
-	
-	objdir "obj"
 		
 -- solution level configuration
 	
diff --git a/src/_premake_main.lua b/src/_premake_main.lua
index b467677..3dfecfc 100644
--- a/src/_premake_main.lua
+++ b/src/_premake_main.lua
@@ -112,7 +112,9 @@
 		-- Some actions imply a particular operating system. Set it early so
 		-- it can be picked up by the scripts.
 
-		_OS = premake.actions[_ACTION].os or _OS
+		if (_ACTION and premake.actions[_ACTION]) then
+			_OS = premake.actions[_ACTION].os or _OS
+		end
 
 		
 		-- If there is a project script available, run it to get the
diff --git a/src/actions/vstudio/_vstudio.lua b/src/actions/vstudio/_vstudio.lua
index afd3137..cc6dc2b 100644
--- a/src/actions/vstudio/_vstudio.lua
+++ b/src/actions/vstudio/_vstudio.lua
@@ -317,7 +317,6 @@
 		shortname       = "Visual Studio 2002",
 		description     = "Microsoft Visual Studio 2002",
 		os              = "windows",
-		pathstyle       = "windows",
 		
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
 		
@@ -346,7 +345,6 @@
 		shortname       = "Visual Studio 2003",
 		description     = "Microsoft Visual Studio 2003",
 		os              = "windows",
-		pathstyle       = "windows",
 
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
 		
@@ -375,7 +373,6 @@
 		shortname       = "Visual Studio 2005",
 		description     = "Microsoft Visual Studio 2005 (SharpDevelop, MonoDevelop)",
 		os              = "windows",
-		pathstyle       = "windows",
 
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
 		
@@ -404,7 +401,6 @@
 		shortname       = "Visual Studio 2008",
 		description     = "Microsoft Visual Studio 2008",
 		os              = "windows",
-		pathstyle       = "windows",
 
 		valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
 		
diff --git a/src/base/project.lua b/src/base/project.lua
index 10b21dc..c5a20d5 100644
--- a/src/base/project.lua
+++ b/src/base/project.lua
@@ -253,6 +253,7 @@
 		local cfgname = iif(cfg.name == cfg.project.name, "", cfg.name)
 		
 		-- how should files be named?
+		local pathstyle = premake.getpathstyle(cfg)
 		local namestyle = premake.getnamestyle(cfg)
 		
 		local function canlink(source, target)
@@ -312,7 +313,7 @@
 			end
 
 			if item then
-				if namestyle == "windows" and part ~= "object" then
+				if pathstyle == "windows" and part ~= "object" then
 					item = path.translate(item, "\\")
 				end
 				if not table.contains(result, item) then
@@ -371,7 +372,11 @@
 --
 
 	function premake.getpathstyle(cfg)
-		return premake.actions[_ACTION].pathstyle or "posix"
+		if premake.actions[_ACTION].os == "windows" then
+			return "windows"
+		else
+			return "posix"
+		end
 	end