wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Added Valgrind headers.

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

This was SVN commit r5319.
This commit is contained in:
Ykkrosh 2007-09-02 23:41:06 +00:00
parent f5a2a141dc
commit eea76e7d9d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/premake/extern_libs.lua
View File

@ -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" },

4
build/premake/premake.lua
View File

@ -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 = {

4
build/premake/src/Src/gnu_cpp.c
View File

@ -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;