Automatically set the OS to Windows when generating for Visual Studio

This commit is contained in:
starkos 2009-06-08 16:06:06 +00:00
parent 2e920a1ef1
commit 88db91b2f1
3 changed files with 13 additions and 2 deletions

View File

@ -26,6 +26,7 @@ RC1 -> RC2
- Removed additional MonoDevelop files in clean action - Removed additional MonoDevelop files in clean action
- Fixed naming of system libraries in Visual Studio link step - Fixed naming of system libraries in Visual Studio link step
- Set OS to Windows when generating for Visual Studio
----- -----

View File

@ -1,7 +1,7 @@
-- --
-- _premake_main.lua -- _premake_main.lua
-- Script-side entry point for the main program logic. -- Script-side entry point for the main program logic.
-- Copyright (c) 2002-2008 Jason Perkins and the Premake project -- Copyright (c) 2002-2009 Jason Perkins and the Premake project
-- --
@ -108,6 +108,12 @@
end end
end end
-- 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 there is a project script available, run it to get the -- If there is a project script available, run it to get the
-- project information, available options and actions, etc. -- project information, available options and actions, etc.
@ -185,4 +191,4 @@
return 0 return 0
end end

View File

@ -316,6 +316,7 @@
trigger = "vs2002", trigger = "vs2002",
shortname = "Visual Studio 2002", shortname = "Visual Studio 2002",
description = "Microsoft Visual Studio 2002", description = "Microsoft Visual Studio 2002",
os = "windows",
pathstyle = "windows", pathstyle = "windows",
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" }, valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
@ -344,6 +345,7 @@
trigger = "vs2003", trigger = "vs2003",
shortname = "Visual Studio 2003", shortname = "Visual Studio 2003",
description = "Microsoft Visual Studio 2003", description = "Microsoft Visual Studio 2003",
os = "windows",
pathstyle = "windows", pathstyle = "windows",
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" }, valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
@ -372,6 +374,7 @@
trigger = "vs2005", trigger = "vs2005",
shortname = "Visual Studio 2005", shortname = "Visual Studio 2005",
description = "Microsoft Visual Studio 2005 (SharpDevelop, MonoDevelop)", description = "Microsoft Visual Studio 2005 (SharpDevelop, MonoDevelop)",
os = "windows",
pathstyle = "windows", pathstyle = "windows",
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" }, valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },
@ -400,6 +403,7 @@
trigger = "vs2008", trigger = "vs2008",
shortname = "Visual Studio 2008", shortname = "Visual Studio 2008",
description = "Microsoft Visual Studio 2008", description = "Microsoft Visual Studio 2008",
os = "windows",
pathstyle = "windows", pathstyle = "windows",
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" }, valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib" },