Sacrifices a goat to the gods of insanity.
Fixes random crashes on Windows due to differences of STL types on the binary level between different static libraries. The differences are caused by the definition of _HAS_ITERATOR_DEBUGGING and _SECURE_SCL in lib/precompiled.h. All our engine static libs use precompiled headers but we didn't use them for tinygettext because they aren't needed (except for these two defines). I've decided to add precompiled headers to tinygettext too instead of just copying these defines. That should cause less headaches in the future. This was SVN commit r14983.
This commit is contained in:
parent
0027dcef31
commit
fd3d335265
@ -597,8 +597,9 @@ function setup_all_libs ()
|
||||
}
|
||||
extern_libs = {
|
||||
"iconv",
|
||||
"boost",
|
||||
}
|
||||
setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { no_pch = 1 })
|
||||
setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } )
|
||||
|
||||
-- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output
|
||||
if _ACTION == "vs2005" or _ACTION == "vs2008" or _ACTION == "vs2010" or _ACTION == "vs2012" or _ACTION == "vs2013" then
|
||||
|
18
source/pch/tinygettext/precompiled.cpp
Normal file
18
source/pch/tinygettext/precompiled.cpp
Normal file
@ -0,0 +1,18 @@
|
||||
/* Copyright (C) 2014 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* 0 A.D. is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "precompiled.h"
|
18
source/pch/tinygettext/precompiled.h
Normal file
18
source/pch/tinygettext/precompiled.h
Normal file
@ -0,0 +1,18 @@
|
||||
/* Copyright (C) 2014 Wildfire Games.
|
||||
* This file is part of 0 A.D.
|
||||
*
|
||||
* 0 A.D. is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* 0 A.D. is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "lib/precompiled.h" // common precompiled header
|
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include "log_stream.hpp"
|
||||
#include "dictionary.hpp"
|
||||
|
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "dictionary_manager.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
2
source/third_party/tinygettext/src/iconv.cpp
vendored
2
source/third_party/tinygettext/src/iconv.cpp
vendored
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <assert.h>
|
||||
#include <sstream>
|
||||
|
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "language.hpp"
|
||||
|
||||
#include <map>
|
||||
|
2
source/third_party/tinygettext/src/log.cpp
vendored
2
source/third_party/tinygettext/src/log.cpp
vendored
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include <iostream>
|
||||
#include "log.hpp"
|
||||
|
||||
|
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "plural_forms.hpp"
|
||||
|
||||
#include <map>
|
||||
|
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "po_parser.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
@ -14,6 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#include "precompiled.h"
|
||||
|
||||
namespace tinygettext {
|
||||
|
||||
|
@ -15,6 +15,8 @@
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "unix_file_system.hpp"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -8,6 +8,8 @@
|
||||
|
||||
*/
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "dirent.h"
|
||||
#include <errno.h>
|
||||
#include <io.h> /* _findfirst and _findnext set errno iff they return -1 */
|
||||
|
Loading…
Reference in New Issue
Block a user