From 6541294ebf8975adaf4089a7df749dcddc036220 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Tue, 8 Jan 2008 00:09:52 +0000
Subject: [PATCH] More Linux build fixes

This was SVN commit r5539.
---
 build/premake/extern_libs.lua            | 2 +-
 build/premake/premake.lua                | 2 +-
 source/graphics/tests/test_MeshManager.h | 2 +-
 source/ps/GameSetup/Config.cpp           | 2 +-
 source/scripting/ScriptGlue.cpp          | 2 +-
 source/test_setup.cpp                    | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/premake/extern_libs.lua b/build/premake/extern_libs.lua
index a264f6450e..a642366ab9 100644
--- a/build/premake/extern_libs.lua
+++ b/build/premake/extern_libs.lua
@@ -56,7 +56,7 @@ end
 --   library installation rules.
 extern_lib_defs = {
 	boost = {
-		unix_names = { "boost_signals" }
+		unix_names = { "boost_signals", "boost_filesystem" }
 	},
 	cryptopp = {
 	},
diff --git a/build/premake/premake.lua b/build/premake/premake.lua
index 81698cc6fe..3d25749565 100755
--- a/build/premake/premake.lua
+++ b/build/premake/premake.lua
@@ -677,7 +677,7 @@ function setup_atlas_packages()
 	},{	-- extern_libs
 		"boost",
 		"devil",
-		"ffmpeg",
+		--"ffmpeg", -- disabled for now because it causes too many build difficulties
 		"spidermonkey",
 		"wxwidgets",
 		"xerces",
diff --git a/source/graphics/tests/test_MeshManager.h b/source/graphics/tests/test_MeshManager.h
index c3a7b1905f..9c12841e3d 100644
--- a/source/graphics/tests/test_MeshManager.h
+++ b/source/graphics/tests/test_MeshManager.h
@@ -1,6 +1,6 @@
 #include "lib/self_test.h"
 
-#include "lib/file/VFS/VFS.h"
+#include "lib/file/vfs/vfs.h"
 #include "lib/file/io/io.h"
 #include "lib/file/path.h"
 #include "lib/file/file_system_posix.h"
diff --git a/source/ps/GameSetup/Config.cpp b/source/ps/GameSetup/Config.cpp
index a59784b8bf..bf63ac3be8 100644
--- a/source/ps/GameSetup/Config.cpp
+++ b/source/ps/GameSetup/Config.cpp
@@ -56,7 +56,7 @@ CStr g_AutostartMap = "";
 
 static void LoadProfile( const CStr& profile )
 {
-	VfsPath path = VfsPath("profiles") / profile;
+	VfsPath path = VfsPath("profiles") / (std::string)profile;
 
 	VfsPath configFilename = path / "settings/user.cfg";
 	g_ConfigDB.SetConfigFile(CFG_USER, true, configFilename.string().c_str());
diff --git a/source/scripting/ScriptGlue.cpp b/source/scripting/ScriptGlue.cpp
index 0b554c61a6..24b7262539 100644
--- a/source/scripting/ScriptGlue.cpp
+++ b/source/scripting/ScriptGlue.cpp
@@ -945,7 +945,7 @@ JSBool WriteVideoMemToConsole( JSContext* cx, JSObject*, uint argc, jsval* argv,
 {
 	JSU_REQUIRE_NO_PARAMS();
 
-	SDL_VideoInfo* videoInfo = SDL_GetVideoInfo();
+	const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo();
 	g_Console->InsertMessage(L"VRAM: total %d", videoInfo->video_mem);
 	return JS_TRUE;
 }
diff --git a/source/test_setup.cpp b/source/test_setup.cpp
index 2f62a98ce1..0af95650d1 100644
--- a/source/test_setup.cpp
+++ b/source/test_setup.cpp
@@ -17,7 +17,7 @@ class LeakReporter : public CxxTest::GlobalFixture
 		// (This is done in tearDownWorld so that it doesn't report 'leaks'
 		// if the program is aborted before finishing cleanly.)
 
-#ifdef HAVE_VC_DEBUG_ALLOC
+#if HAVE_VC_DEBUG_ALLOC
 		int flags = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
 		flags |= _CRTDBG_LEAK_CHECK_DF; // check for memory leaks
 		flags |= _CRTDBG_ALLOC_MEM_DF; // also check allocs using the non-debug version of new
@@ -34,7 +34,7 @@ class LeakReporter : public CxxTest::GlobalFixture
 
 	virtual bool setUpWorld()
 	{
-#ifdef _MSC_VER
+#if MSC_VERSION
 		// (Warning: the allocation numbers seem to differ by 3 when you
 		// run in the build process vs the debugger)
 		// _CrtSetBreakAlloc(1952);