dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove CONFIG_ENABLE_BOOST

Browse source 
Code within CONFIG_ENABLE_BOOST is required to compile pyrogenesis.

As boost is required in many other places, making it truly optional in
the one case where there is currently a guard is meaningless.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2025-02-09 20:31:32 +01:00
parent a9819e9865
commit 82ff0ea90b
No known key found for this signature in database
3 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/lib/config.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -52,9 +52,4 @@
# define CONFIG_ENABLE_CHECKS 0
#endif
// allow the use of Boost? (affects PCH and several individual modules)
#ifndef CONFIG_ENABLE_BOOST
# define CONFIG_ENABLE_BOOST 1
#endif
#endif // #ifndef INCLUDED_CONFIG

8
source/lib/precompiled.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2022 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -36,7 +36,7 @@
# define MINIMAL_PCH 0
#endif
#include "lib/config.h" // CONFIG_ENABLE_BOOST, CONFIG_ENABLE_PCH
#include "lib/config.h" // CONFIG_ENABLE_PCH
#include "lib/sysdep/compiler.h" // MSC_VERSION
// must come before any STL headers are included
@ -74,9 +74,7 @@ double __cdecl abs(double x); // not declared by mathimf
#include "lib/lib.h"
#include "lib/secure_crt.h"
#if CONFIG_ENABLE_BOOST
# include "lib/pch/pch_boost.h"
#endif
#include "lib/pch/pch_boost.h"
#include <array>
#include <memory>

12
source/lib/sysdep/os/win/wsysdep.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -39,10 +39,8 @@
#include "lib/sysdep/os/win/error_dialog.h"
#include "lib/sysdep/os/win/wutil.h"
#if CONFIG_ENABLE_BOOST
# include <boost/algorithm/string/classification.hpp>
# include <boost/algorithm/string/split.hpp>
#endif
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <string_view>
@ -523,8 +521,6 @@ Status sys_generate_random_bytes(u8* buffer, size_t size)
}
#if CONFIG_ENABLE_BOOST
/*
* Given a string of the form
* "example.com:80"
@ -635,8 +631,6 @@ done:
return err;
}
#endif
FILE* sys_OpenFile(const OsPath& pathname, const char* mode)
{
FILE* f = 0;