Remove redundant -L linker arguments on non-Windows.

Fix some compiler warnings.
Fix missing non-PCH headers.

This was SVN commit r7083.

build/premake/extern_libs.lua

@@ -15,10 +15,10 @@ local function add_extern_lib_paths(extern_lib)
 	-- Often, the headers in libraries/ are windows-specific (always, except
 	-- for cxxtest and fcollada). So don't add the include dir unless on
 	-- windows or processing one of those libs.
-	if OS == "windows" or extern_lib == 'cxxtest' or extern_lib == 'fcollada' or extern_lib == 'valgrind' then
+	if OS == "windows" or extern_lib == "cxxtest" or extern_lib == "fcollada" or extern_lib == "valgrind" then
 		tinsert(package.includepaths, libraries_dir .. extern_lib .. "/include")
+		tinsert(package.libpaths, libraries_dir .. extern_lib .. "/lib")
 	end
-	tinsert(package.libpaths, libraries_dir .. extern_lib .. "/lib")
 
 end
 

source/lib/debug.cpp

@@ -22,8 +22,9 @@
 #include "precompiled.h"
 #include "debug.h"
 
-#include <stdarg.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstring>
+#include <cstdio>
 
 #include "app_hooks.h"
 #include "os_path.h"

source/lib/file/common/trace.cpp

@@ -22,6 +22,8 @@
 #include "precompiled.h"
 #include "trace.h"
 
+#include <cstdio>
+
 #include "lib/allocators/pool.h"
 #include "lib/timer.h"	// timer_Time
 

source/lib/file/file_system_util.cpp

@@ -24,6 +24,7 @@
 
 #include <queue>
 #include <cstring>
+#include <cstdio>
 
 #include "lib/path_util.h"
 #include "lib/regex.h"

source/lib/file/vfs/vfs_tree.cpp

@@ -22,6 +22,8 @@
 #include "precompiled.h"
 #include "vfs_tree.h"
 
+#include <cstdio>
+
 #include "lib/file/common/file_stats.h"
 #include "lib/sysdep/cpu.h"
 
@@ -166,7 +168,7 @@ void VfsDirectory::DisplayR(size_t depth) const
 		file.GenerateDescription(description, ARRAY_SIZE(description));
 
 		for(size_t i = 0; i < depth+1; i++)
-			printf(indent);
+			printf("%s", indent);
 		printf(fmt, name.c_str(), description);
 	}
 
@@ -176,7 +178,7 @@ void VfsDirectory::DisplayR(size_t depth) const
 		const VfsDirectory& directory = it->second;
 
 		for(size_t i = 0; i < depth+1; i++)
-			printf(indent);
+			printf("%s", indent);
 		printf("[%s/]\n", name.c_str());
 
 		directory.DisplayR(depth+1);

source/lib/lib_errors.cpp

@@ -27,8 +27,9 @@
 #include "precompiled.h"
 #include "lib_errors.h"
 
-#include <string.h>
-#include <stdlib.h>	// abs
+#include <cstring>
+#include <cstdlib>	// abs
+#include <cstdio>
 #include <map>
 
 #include "lib/posix/posix_errno.h"

source/lib/res/graphics/cursor.cpp

@@ -22,7 +22,8 @@
 #include "precompiled.h"
 #include "cursor.h"
 
-#include <string.h>
+#include <cstring>
+#include <cstdio>
 #include <sstream>
 
 #include "lib/ogl.h"

source/lib/res/graphics/ogl_tex.cpp

@@ -23,6 +23,8 @@
 #include "precompiled.h"
 #include "ogl_tex.h"
 
+#include <cstdio>
+
 #include "lib/app_hooks.h"
 #include "lib/ogl.h"
 #include "lib/bits.h"

source/lib/res/sound/snd_mgr.cpp

@@ -28,7 +28,8 @@
 #include <vector>
 #include <algorithm>
 #include <deque>
-#include <math.h>
+#include <cmath>
+#include <cstdio>
 
 #include "lib/path_util.h"
 #include "../h_mgr.h"

source/lib/sysdep/compiler.h

@@ -69,7 +69,7 @@
 
 // are PreCompiled Headers supported?
 #if MSC_VERSION
-# define  HAVE_PCH 1
+# define HAVE_PCH 1
 #elif defined(USING_PCH)
 # define HAVE_PCH 1
 #else

source/lib/sysdep/os/unix/udbg.cpp

@@ -24,6 +24,8 @@ symbol lookups and backtraces)
 
 #include "precompiled.h"
 
+#include <cstdio>
+
 #include "lib/timer.h"
 #include "lib/sysdep/sysdep.h"
 #include "lib/debug.h"

source/mocks/mocks_real.cpp

@@ -1,5 +1,12 @@
 #define CXXTEST_MOCK_REAL_SOURCE_FILE
-#include "lib/sysdep/os.h"
+
+// Pull in the common config headers from precompiled.h,
+// but disable the actual precompiling (since we've only got
+// one source file)
+#ifdef USING_PCH
+# undef USING_PCH
+#endif
+#include "lib/precompiled.h"
 
 #include "mocks/boost_filesystem.h"
 

source/mocks/mocks_test.cpp

@@ -1,5 +1,12 @@
 #define CXXTEST_MOCK_TEST_SOURCE_FILE
-#include "lib/sysdep/os.h"
+
+// Pull in the common config headers from precompiled.h,
+// but disable the actual precompiling (since we've only got
+// one source file)
+#ifdef USING_PCH
+# undef USING_PCH
+#endif
+#include "lib/precompiled.h"
 
 // Cause calls to be redirected to the real function by default
 #define DEFAULT(name) static T::Real_##name real_##name

source/ps/Pyrogenesis.cpp

@@ -17,6 +17,8 @@
 
 #include "precompiled.h"
 
+#include <cstdio>
+
 #include "Pyrogenesis.h"
 #include "ps/i18n.h"
 

source/ps/tests/test_CLogger.h

@@ -46,15 +46,15 @@ public:
 		std::string clipped (buflen-4, '*');
 		clipped += "...";
 
-		logger->Log(CLogger::Normal, "", msg0.c_str());
-		logger->Log(CLogger::Normal, "", msg1.c_str());
-		logger->Log(CLogger::Normal, "", msg2.c_str());
-		logger->Log(CLogger::Normal, "", msg3.c_str());
+		logger->Log(CLogger::Normal, "", "%s", msg0.c_str());
+		logger->Log(CLogger::Normal, "", "%s", msg1.c_str());
+		logger->Log(CLogger::Normal, "", "%s", msg2.c_str());
+		logger->Log(CLogger::Normal, "", "%s", msg3.c_str());
 
-		logger->LogOnce(CLogger::Normal, "", msg0.c_str());
-		logger->LogOnce(CLogger::Normal, "", msg1.c_str());
-		logger->LogOnce(CLogger::Normal, "", msg2.c_str());
-		logger->LogOnce(CLogger::Normal, "", msg3.c_str());
+		logger->LogOnce(CLogger::Normal, "", "%s", msg0.c_str());
+		logger->LogOnce(CLogger::Normal, "", "%s", msg1.c_str());
+		logger->LogOnce(CLogger::Normal, "", "%s", msg2.c_str());
+		logger->LogOnce(CLogger::Normal, "", "%s", msg3.c_str());
 
 		ParseOutput();
 

source/tools/atlas/GameInterface/MessagePasserImpl.cpp

@@ -17,6 +17,8 @@
 
 #include "precompiled.h"
 
+#include <cstdio>
+
 #include "MessagePasserImpl.h"
 #include "Messages.h"
 
@@ -32,7 +34,7 @@ MessagePasserImpl::MessagePasserImpl()
 	int tries = 0;
 	while (tries++ < 16) // some arbitrary cut-off point to avoid infinite loops
 	{
-		static char name[1024];
+		static char name[64];
 		sprintf(name, "/wfg-atlas-msgpass-%d-%d",
 				(int)rand(1, 1000), (int)(time(0)%1000));
 		sem_t* sem = sem_open(name, O_CREAT | O_EXCL, 0700, 0);