From eea76e7d9d5793d39ce47377425ca583b741e8dc Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Sun, 2 Sep 2007 23:41:06 +0000
Subject: [PATCH] Added Valgrind headers.

Changed ICC PCH arguments to the form that's not deprecated in ICC 10.

This was SVN commit r5319.
---
 build/premake/extern_libs.lua   | 4 +++-
 build/premake/premake.lua       | 4 +++-
 build/premake/src/Src/gnu_cpp.c | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build/premake/extern_libs.lua b/build/premake/extern_libs.lua
index eb844c456b..879749ec32 100644
--- a/build/premake/extern_libs.lua
+++ b/build/premake/extern_libs.lua
@@ -15,7 +15,7 @@ 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' 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")
 	end
 	tinsert(package.libpaths, libraries_dir .. extern_lib .. "/lib")
@@ -114,6 +114,8 @@ extern_lib_defs = {
 		win_names  = { "js32" },
 		unix_names = { "js" },
 	},
+	valgrind = {
+	},
 	vorbis = {
 		win_names  = { "vorbisfile" },
 		unix_names = { "vorbisfile" },
diff --git a/build/premake/premake.lua b/build/premake/premake.lua
index 9c16289c7d..f5a458f060 100755
--- a/build/premake/premake.lua
+++ b/build/premake/premake.lua
@@ -105,6 +105,7 @@ function package_set_build_flags()
 				"-Wuninitialized",
 				"-Wunknown-pragmas",
 				"-Wunused-function",
+				"-wd1292", -- avoid lots of 'attribute "__nonnull__" ignored'
 			})
 			tinsert(package.config["Debug"].buildoptions, {
 				"-O0", -- ICC defaults to -O2
@@ -408,7 +409,8 @@ function setup_all_libs ()
 		"libjpg",
 		"dbghelp",
 		"directx",
-		"cryptopp"
+		"cryptopp",
+		"valgrind"
 	}
 	setup_static_lib_package("lowlevel", source_dirs, extern_libs, {})
 	sysdep_dirs = {
diff --git a/build/premake/src/Src/gnu_cpp.c b/build/premake/src/Src/gnu_cpp.c
index 778fe77dee..ec38523da5 100644
--- a/build/premake/src/Src/gnu_cpp.c
+++ b/build/premake/src/Src/gnu_cpp.c
@@ -515,7 +515,7 @@ static const char* listCppTargets(const char* name)
 					if (matches(g_cc, "icc"))
 					{
 						basename = path_getbasename(pchSource);
-						strcat(g_buffer, " -create-pch $(OBJDIR)/");
+						strcat(g_buffer, " -pch-create $(OBJDIR)/");
 						strcat(g_buffer, basename);
 						strcat(g_buffer, ".pchi");
 						basename = NULL;
@@ -530,7 +530,7 @@ static const char* listCppTargets(const char* name)
 					if (matches(g_cc, "icc"))
 					{
 						basename = path_getbasename(pchSource);
-						strcat(g_buffer, " -use-pch $(OBJDIR)/");
+						strcat(g_buffer, " -pch-use $(OBJDIR)/");
 						strcat(g_buffer, basename);
 						strcat(g_buffer, ".pchi");
 						basename = NULL;