diff --git a/framework/apocresources/apocfont.cpp b/framework/apocresources/apocfont.cpp index 2a0622a21..54e057b79 100644 --- a/framework/apocresources/apocfont.cpp +++ b/framework/apocresources/apocfont.cpp @@ -7,9 +7,6 @@ #include "framework/trace.h" #include "library/sp.h" -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB #include namespace OpenApoc diff --git a/framework/configfile.cpp b/framework/configfile.cpp index 521aab88c..97a9a5436 100644 --- a/framework/configfile.cpp +++ b/framework/configfile.cpp @@ -12,9 +12,6 @@ #include #include -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB #include namespace po = boost::program_options; diff --git a/framework/framework.cpp b/framework/framework.cpp index 364c35093..6432139c5 100644 --- a/framework/framework.cpp +++ b/framework/framework.cpp @@ -31,9 +31,6 @@ #include // Boost locale for setting the system locale -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB #include using namespace OpenApoc; diff --git a/framework/logger.cpp b/framework/logger.cpp index b5dacd7f4..6be34590d 100644 --- a/framework/logger.cpp +++ b/framework/logger.cpp @@ -1,7 +1,6 @@ -#ifdef _WIN32 // Seems to be set even on win64? +#ifdef _WIN32 #define BACKTRACE_WINDOWS #define _CRT_SECURE_NO_WARNINGS -#define ERROR_DIALOG #endif #include "framework/logger.h" diff --git a/framework/serialization/providers/providerwithchecksum.cpp b/framework/serialization/providers/providerwithchecksum.cpp index 3c3eb98a5..68eb7d9fe 100644 --- a/framework/serialization/providers/providerwithchecksum.cpp +++ b/framework/serialization/providers/providerwithchecksum.cpp @@ -9,9 +9,6 @@ #include "dependencies/pugixml/src/pugixml.hpp" -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB #include #include #if BOOST_VERSION >= 106600 diff --git a/game/state/gametime.cpp b/game/state/gametime.cpp index 21eb19c64..be1ef8b62 100644 --- a/game/state/gametime.cpp +++ b/game/state/gametime.cpp @@ -4,9 +4,6 @@ #include #include -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB #include // for my sake diff --git a/game/state/gametime_facet.h b/game/state/gametime_facet.h index 6d491cac4..ccd855a09 100644 --- a/game/state/gametime_facet.h +++ b/game/state/gametime_facet.h @@ -1,8 +1,5 @@ #pragma once -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB #include #include diff --git a/game/state/savemanager.cpp b/game/state/savemanager.cpp index 09ba58ae8..7fb2f517b 100644 --- a/game/state/savemanager.cpp +++ b/game/state/savemanager.cpp @@ -9,10 +9,6 @@ #include #include -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB - // boost uuid for generating temporary identifier for new save #include // generators #include // conversion to string diff --git a/library/strings.cpp b/library/strings.cpp index 310ac672f..534e8cede 100644 --- a/library/strings.cpp +++ b/library/strings.cpp @@ -2,9 +2,7 @@ #include "library/strings_format.h" #include #include // used for std::ignore -// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost -// symbols as part of the module that uses it -#define BOOST_ALL_NO_LIB + #include #include diff --git a/tools/code_generators/serialization_xml.h b/tools/code_generators/serialization_xml.h index 79ac6b4f4..510502f77 100644 --- a/tools/code_generators/serialization_xml.h +++ b/tools/code_generators/serialization_xml.h @@ -7,7 +7,6 @@ #include #include -#define BOOST_ALL_NO_LIB #include #include #if BOOST_VERSION >= 106600