loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to eliminate wxWidgets 2.9.5 and Boost.Log compiler errors.

Browse Source
This commit is contained in:
WrinklyNinja
2013-07-17 20:48:01 +01:00
parent 6856b8d144
commit a1ae731f2c
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/parsers.h
+4 -1
View File
@@ -28,6 +28,10 @@
#define BOOST_SPIRIT_UNICODE
#endif
#ifndef BOOST_SPIRIT_USE_PHOENIX_V3
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#endif
#include "metadata.h"
#include "helpers.h"
#include "error.h"
@@ -43,7 +47,6 @@
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/home/phoenix/object/construct.hpp>
#include <boost/spirit/include/phoenix_bind.hpp>
namespace YAML {
src/gui/ids.h
-2
View File
@@ -28,8 +28,6 @@
#include <boost/format.hpp>
#include "wx/wxprec.h"
#include "../backend/error.h" //Something in wxWidgets has a #define that conflicts with the error codes.
#ifndef WX_PRECOMP
# include "wx/wx.h"
#endif
src/gui/main.cpp
+4 -1
View File
@@ -47,6 +47,9 @@
#include <boost/algorithm/string.hpp>
#include <boost/format.hpp>
#include <boost/locale.hpp>
#include <boost/log/core.hpp>
#include <boost/log/trivial.hpp>
#include <boost/log/expressions.hpp>
#include <wx/snglinst.h>
#include <wx/aboutdlg.h>
@@ -834,7 +837,7 @@ void Launcher::OnAbout(wxCommandEvent& event) {
wxAboutBox(aboutInfo);
}
LoadOrderPreview::LoadOrderPreview(wxWindow *parent, const wxChar *title, const std::list<boss::Plugin>& plugins) : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER), _plugins(plugins) {
LoadOrderPreview::LoadOrderPreview(wxWindow *parent, const wxString title, const std::list<boss::Plugin>& plugins) : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER), _plugins(plugins) {
//Init controls.
_loadOrder = new wxListView(this, LIST_LoadOrder, wxDefaultPosition, wxDefaultSize, wxLC_REPORT);
src/gui/main.h
+1 -1
View File
@@ -69,7 +69,7 @@ private:
class LoadOrderPreview : public wxDialog {
public:
LoadOrderPreview(wxWindow *parent, const wxChar *title, const std::list<boss::Plugin>& plugins);
LoadOrderPreview(wxWindow *parent, const wxString title, const std::list<boss::Plugin>& plugins);
void OnMoveUp(wxCommandEvent& event);
void OnMoveDown(wxCommandEvent& event);