fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2024-11-10 07:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a very strange luabind crash on init caused by static initialization of a std::map template dynamic initializer blowing up. can't make this stuff up!

Browse source 
luabind.vpc and lua.vpc were missing "$BASE" macros for libs, seems to be cause (likely the iterator link error i slammed off before)

also working on 2013 just to spite jon
This commit is contained in:
Dexter 2014-05-22 03:11:43 +00:00 committed by squeek
parent 86510f40a2
commit 05347bc4fc
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mp/src/thirdparty/lua/lua.vpc vendored
View file

@ -9,15 +9,20 @@ $Configuration
$Compiler $Compiler
{ {
$AdditionalIncludeDirectories "$BASE" $AdditionalIncludeDirectories "$BASE"
$PreprocessorDefinitions "LUA_OPNAMES"
$CompileAs "Compile as C Code (/TC)" $CompileAs "Compile as C Code (/TC)"
$GCC_ExtraCompilerFlags "-x c" [$LINUXALL] // force compile as C on linux, it will build with G++ by default $GCC_ExtraCompilerFlags "-x c" [$LINUXALL] // force compile as C on linux, it will build with G++ by default
// Dexter 20140516: valve turned on warning as errors, but lua and luabind have some crap warnings we want to ignore // Dexter 20140516: valve turned on warning as errors, but lua and luabind have some crap warnings we want to ignore
$TreatWarningsAsErrors "No (/WX-)" [!$ANALYZE && !$WIN64] $TreatWarningsAsErrors "No (/WX-)" [!$ANALYZE && !$WIN64]
$PreprocessorDefinitions "$BASE;_CRT_SECURE_NO_WARNINGS;LUA_OPNAMES"
}
// additionally shut these up $Librarian
$PreprocessorDefinitions "_CRT_SECURE_NO_WARNINGS" {
// Suppress this warning using the undocumented /ignore linker switch
// schemalib.lib(schemaclassinfo.obj) : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library
$AdditionalOptions "$BASE /ignore:4221"
$IgnoreAllDefaultLibraries "Yes (/NODEFAULTLIB)"
} }
} }

10
mp/src/thirdparty/luabind/luabind.vpc vendored
View file

@ -10,7 +10,7 @@ $Configuration
{ {
$Compiler $Compiler
{ {
$AdditionalIncludeDirectories "$BASE;$THIRDPARTYDIR;$LUADIR" $AdditionalIncludeDirectories "$BASE;$THIRDPARTYDIR;$LUADIR"
$EnableC++Exceptions "Yes (/EHsc)" $EnableC++Exceptions "Yes (/EHsc)"
//$PreprocessorDefinitions "LUABIND_CPLUSPLUS_LUA" //$PreprocessorDefinitions "LUABIND_CPLUSPLUS_LUA"
//$CompileAs "Compile as C Code (/TC)" //$CompileAs "Compile as C Code (/TC)"
@ -18,7 +18,13 @@ $Configuration
$TreatWarningsAsErrors "No (/WX-)" [!$ANALYZE && !$WIN64] $TreatWarningsAsErrors "No (/WX-)" [!$ANALYZE && !$WIN64]
// additionally shut these up. _ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH is a new one, its set to 2 in luabind, and 0 elsewhere now // additionally shut these up. _ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH is a new one, its set to 2 in luabind, and 0 elsewhere now
$PreprocessorDefinitions "_CRT_SECURE_NO_WARNINGS;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH" // ;_ITERATOR_DEBUG_LEVEL=0
$PreprocessorDefinitions "$BASE;_CRT_SECURE_NO_WARNINGS"
}
$Librarian
{
$IgnoreAllDefaultLibraries "Yes (/NODEFAULTLIB)"
} }
} }