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

[BOOST 1.75 2/2] Update binaries for windows (1.65 → 1.75).

Browse Source 
Refs #3004

This was SVN commit r24484.
This commit is contained in:
Stan 2020-12-31 12:13:25 +00:00
parent e3c5cc83b7
commit a395a0ab66
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/premake/extern_libs5.lua
View File

@ -184,8 +184,8 @@ extern_lib_defs = {
boost = {
compile_settings = function()
if os.istarget("windows") then
-- Force the autolink to use the vc140 libs even on VS2017
defines { 'BOOST_LIB_TOOLSET="vc140"' }
-- Force the autolink to use the vc141 libs.
defines { 'BOOST_LIB_TOOLSET="vc141"' }
add_default_include_paths("boost")
elseif os.istarget("macosx") then
-- Suppress all the Boost warnings on OS X by including it as a system directory
@ -199,7 +199,7 @@ extern_lib_defs = {
link_settings = function()
if os.istarget("windows") or os.istarget("macosx") then
if os.istarget("windows") then
defines { 'BOOST_LIB_TOOLSET="vc140"' }
defines { 'BOOST_LIB_TOOLSET="vc141"' }
end
add_default_lib_paths("boost")
end

3
source/lib/posix/posix.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2020 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -82,7 +82,6 @@ need only be renamed (e.g. _open, _stat).
// provide C99 *snprintf functions if compiler doesn't already
// (MinGW does, VC7.1 doesn't).
#if MSC_VERSION
# define snprintf _snprintf
# define swprintf _snwprintf
# define vsnprintf _vsnprintf
# define vswprintf _vsnwprintf

20
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Tools.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Wildfire Games.
/* Copyright (C) 2020 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -28,12 +28,12 @@ class DummyTool : public ITool
bool OnMouse(wxMouseEvent& WXUNUSED(evt)) { return false; }
bool OnKey(wxKeyEvent& WXUNUSED(evt), KeyEventType) { return false; }
void OnTick(float) {}
void OnCommand(const wxString& WXUNUSED(command), void* WXUNUSED(userData)) {}
} dummy;
void OnCommand(const wxString& WXUNUSED(command), void* WXUNUSED(userData)) {}
} defaultTool;
struct ToolManagerImpl
{
ToolManagerImpl() : CurrentTool(&dummy) {}
ToolManagerImpl() : CurrentTool(&defaultTool) {}
ObservablePtr<ITool> CurrentTool;
wxString CurrentToolName;
@ -63,11 +63,11 @@ void SetActive(bool active, const wxString& name);
void ToolManager::SetCurrentTool(const wxString& name, void* initData)
{
if (*m->CurrentTool != &dummy)
if (*m->CurrentTool != &defaultTool)
{
m->CurrentTool->Shutdown();
delete *m->CurrentTool;
m->CurrentTool = &dummy;
delete* m->CurrentTool;
m->CurrentTool = &defaultTool;
}
SetActive(false, m->CurrentToolName);
@ -145,7 +145,7 @@ void RegisterToolBarButton(wxToolBar* toolbar, int buttonId, const wxString& too
IMPLEMENT_CLASS(WorldCommand, AtlasWindowCommand);
WorldCommand::WorldCommand(AtlasMessage::mWorldCommand* command)
: AtlasWindowCommand(true, wxString::FromAscii(command->GetName())), m_Command(command), m_AlreadyDone(false)
: AtlasWindowCommand(true, wxString::FromAscii(command->GetName())), m_Command(command), m_AlreadyDone(false)
{
}
@ -180,13 +180,13 @@ bool WorldCommand::Merge(AtlasWindowCommand* p)
{
WorldCommand* prev = wxDynamicCast(p, WorldCommand);
if (! prev)
if (!prev)
return false;
if (m_Command->GetName() != prev->m_Command->GetName()) // comparing char* pointers, because they're unique-per-class constants
return false;
if (! m_Command->IsMergeable())
if (!m_Command->IsMergeable())
return false;
POST_MESSAGE(MergeCommand, ());