mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
More Linux build fixes
This was SVN commit r5539.
This commit is contained in:
@@ -56,7 +56,7 @@ end
|
||||
-- library installation rules.
|
||||
extern_lib_defs = {
|
||||
boost = {
|
||||
unix_names = { "boost_signals" }
|
||||
unix_names = { "boost_signals", "boost_filesystem" }
|
||||
},
|
||||
cryptopp = {
|
||||
},
|
||||
|
||||
@@ -677,7 +677,7 @@ function setup_atlas_packages()
|
||||
},{ -- extern_libs
|
||||
"boost",
|
||||
"devil",
|
||||
"ffmpeg",
|
||||
--"ffmpeg", -- disabled for now because it causes too many build difficulties
|
||||
"spidermonkey",
|
||||
"wxwidgets",
|
||||
"xerces",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "lib/self_test.h"
|
||||
|
||||
#include "lib/file/VFS/VFS.h"
|
||||
#include "lib/file/vfs/vfs.h"
|
||||
#include "lib/file/io/io.h"
|
||||
#include "lib/file/path.h"
|
||||
#include "lib/file/file_system_posix.h"
|
||||
|
||||
@@ -56,7 +56,7 @@ CStr g_AutostartMap = "";
|
||||
|
||||
static void LoadProfile( const CStr& profile )
|
||||
{
|
||||
VfsPath path = VfsPath("profiles") / profile;
|
||||
VfsPath path = VfsPath("profiles") / (std::string)profile;
|
||||
|
||||
VfsPath configFilename = path / "settings/user.cfg";
|
||||
g_ConfigDB.SetConfigFile(CFG_USER, true, configFilename.string().c_str());
|
||||
|
||||
@@ -945,7 +945,7 @@ JSBool WriteVideoMemToConsole( JSContext* cx, JSObject*, uint argc, jsval* argv,
|
||||
{
|
||||
JSU_REQUIRE_NO_PARAMS();
|
||||
|
||||
SDL_VideoInfo* videoInfo = SDL_GetVideoInfo();
|
||||
const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo();
|
||||
g_Console->InsertMessage(L"VRAM: total %d", videoInfo->video_mem);
|
||||
return JS_TRUE;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ class LeakReporter : public CxxTest::GlobalFixture
|
||||
// (This is done in tearDownWorld so that it doesn't report 'leaks'
|
||||
// if the program is aborted before finishing cleanly.)
|
||||
|
||||
#ifdef HAVE_VC_DEBUG_ALLOC
|
||||
#if HAVE_VC_DEBUG_ALLOC
|
||||
int flags = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
|
||||
flags |= _CRTDBG_LEAK_CHECK_DF; // check for memory leaks
|
||||
flags |= _CRTDBG_ALLOC_MEM_DF; // also check allocs using the non-debug version of new
|
||||
@@ -34,7 +34,7 @@ class LeakReporter : public CxxTest::GlobalFixture
|
||||
|
||||
virtual bool setUpWorld()
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
#if MSC_VERSION
|
||||
// (Warning: the allocation numbers seem to differ by 3 when you
|
||||
// run in the build process vs the debugger)
|
||||
// _CrtSetBreakAlloc(1952);
|
||||
|
||||
Reference in New Issue
Block a user