Merge with Premake-dev

CHANGES.txt

@@ -51,8 +51,12 @@ Sony NGP  (in progress)
 * Added debug environment variable support for Visual Studio
 * Added debug environment variable support for Codeblocks using gdb
 * Bug: Visual Studio 2010 forces x86 when platform is Native
-* Added new global _WORKING_DIR
 * Patch 3351583: _PREMAKE_COMMAND variable (Konstantin Tokarev)
+* Added new global _WORKING_DIR
+* Patch 3451928: VS2008 trying to build *.h files in C projects
+* Patch 3429777: Support for DragonFly BSD (Joachim de Groot)
+* Patch 3445049: Build fix for FreeBSD (Konstantin Tokarev)
+* Bug 3121217: Test suite fails on Linux x86_64: os.findlib broken
 
 
 -------

premake4.lua

@@ -55,6 +55,10 @@
 		configuration "linux"
 			defines     { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
 			links       { "m", "dl" } 
+
+		configuration "bsd"
+			defines     { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
+			links       { "m" } 
 			
 		configuration "macosx"
 			defines     { "LUA_USE_MACOSX" }

src/actions/vstudio/vs200x_vcproj.lua

@@ -136,9 +136,10 @@
 						local cfg = premake.getconfig(prj, cfginfo.src_buildcfg, cfginfo.src_platform)
 						
 						local usePCH = (not prj.flags.NoPCH and prj.pchsource == node.cfg.name)
-						local useCompileAs = (path.iscfile(fname) ~= premake.project.iscproject(prj))
+						local isSourceCode = path.iscppfile(fname)
+						local needsCompileAs = (path.iscfile(fname) ~= premake.project.iscproject(prj))
 						
-						if usePCH or useCompileAs then
+						if usePCH or (isSourceCode and needsCompileAs) then
 							_p(depth, '<FileConfiguration')
 							_p(depth, '\tName="%s"', cfginfo.name)
 							_p(depth, '\t>')
@@ -146,8 +147,7 @@
 							_p(depth, '\t\tName="%s"', iif(cfg.system == "Xbox360", 
 							                                 "VCCLX360CompilerTool", 
 							                                 "VCCLCompilerTool"))
-
-							if useCompileAs then
+							if needsCompileAs then
 								_p(depth, '\t\tCompileAs="%s"', iif(path.iscfile(fname), 1, 2))
 							end
 							

src/base/os.lua

@@ -46,8 +46,12 @@
 				end
 			end
 			
-			table.insert(formats, "%s")	
-			path = (path or "") .. ":/lib:/usr/lib:/usr/local/lib"
+			table.insert(formats, "%s")
+			path = path or ""
+			if os.is64bit() then
+				path = path .. ":/lib64:/usr/lib64/:usr/local/lib64"
+			end
+			path = ":/lib:/usr/lib:/usr/local/lib"
 		end
 		
 		for _, fmt in ipairs(formats) do

src/host/premake.h

@@ -15,7 +15,7 @@
 #if defined(__linux__)
 #define PLATFORM_LINUX    (1)
 #define PLATFORM_STRING   "linux"
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 #define PLATFORM_BSD      (1)
 #define PLATFORM_STRING   "bsd"
 #elif defined(__APPLE__) && defined(__MACH__)

tests/actions/vstudio/vc200x/test_files.lua

@@ -1,5 +1,5 @@
 --
--- tests/actions/vstudio/vc200x/files.lua
+-- tests/actions/vstudio/vc200x/test_files.lua
 -- Validate generation of <files/> block in Visual Studio 200x projects.
 -- Copyright (c) 2009-2011 Jason Perkins and the Premake project
 --
@@ -80,6 +80,24 @@
 	end
 
 
+--
+-- Non-source code files, such as header files and documentation, should
+-- be marked as such, so the compiler won't attempt to build them.
+--
+
+	function suite.file_markedAsNonBuildable_onSupportFiles()
+		language "c"
+		files { "hello.lua" }
+		prepare()
+		test.capture [[
+		<File
+			RelativePath="hello.lua"
+			>
+		</File>
+		]]
+	end
+
+
 --
 -- Mixed language support
 --

tests/premake4.lua

@@ -99,7 +99,8 @@
 	-- Visual Studio 2002-2008 C/C++ projects
 	dofile("actions/vstudio/vc200x/test_compiler_block.lua")
 	dofile("actions/vstudio/vc200x/debugdir.lua")
-	dofile("actions/vstudio/vc200x/files.lua")
+	dofile("actions/vstudio/vc200x/header.lua")
+	dofile("actions/vstudio/vc200x/test_files.lua")
 	dofile("actions/vstudio/vc200x/test_filters.lua")
 	dofile("actions/vstudio/vc200x/header.lua")
 	dofile("actions/vstudio/vc200x/test_linker_block.lua")