diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua index 452bba870a..4f51c2c0ed 100644 --- a/build/premake/extern_libs5.lua +++ b/build/premake/extern_libs5.lua @@ -643,6 +643,17 @@ extern_lib_defs = { }, spidermonkey = { compile_settings = function() + -- This define is not supposed to be needed anymore, but it leaks into the + -- SpiderMonkey headers, and is necessary to build with ESR140 at the time + -- of writing (https://bugzilla.mozilla.org/show_bug.cgi?id=1987876). + filter "system:windows" + defines { "XP_WIN" } + filter { } + + filter "Debug" + defines { "MOZ_DIAGNOSTIC_ASSERT_ENABLED" } + filter {} + if _OPTIONS["with-system-mozjs"] then if not _OPTIONS["android"] then pkgconfig.add_includes_after("mozjs-128") diff --git a/source/dapinterface/DapInterface.cpp b/source/dapinterface/DapInterface.cpp index ba64390241..a91f647a77 100644 --- a/source/dapinterface/DapInterface.cpp +++ b/source/dapinterface/DapInterface.cpp @@ -31,7 +31,6 @@ #include "scriptinterface/Object.h" #include "scriptinterface/ScriptContext.h" #include "scriptinterface/ScriptExceptions.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptInterface.h" #include "scriptinterface/ScriptRequest.h" diff --git a/source/graphics/MapGenerator.h b/source/graphics/MapGenerator.h index 03f16fc331..06354f3f92 100644 --- a/source/graphics/MapGenerator.h +++ b/source/graphics/MapGenerator.h @@ -20,7 +20,6 @@ #include "lib/file/vfs/vfs_path.h" #include "lib/types.h" -#include "scriptinterface/ScriptTypes.h" #include "scriptinterface/StructuredClone.h" #include diff --git a/source/graphics/MapReader.h b/source/graphics/MapReader.h index 82482ff50a..9b4d5be4df 100644 --- a/source/graphics/MapReader.h +++ b/source/graphics/MapReader.h @@ -28,7 +28,6 @@ #include "ps/CStr.h" #include "ps/Errors.h" #include "ps/FileIo.h" -#include "scriptinterface/ScriptTypes.h" #include "simulation2/system/Entity.h" #include diff --git a/source/gui/ObjectBases/IGUIObject.cpp b/source/gui/ObjectBases/IGUIObject.cpp index b972eb7e3b..ea20d2262d 100644 --- a/source/gui/ObjectBases/IGUIObject.cpp +++ b/source/gui/ObjectBases/IGUIObject.cpp @@ -31,7 +31,6 @@ #include "ps/CLogger.h" #include "ps/Profiler2.h" #include "scriptinterface/Object.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptInterface.h" #include "soundmanager/ISoundManager.h" diff --git a/source/gui/ObjectBases/IGUIObject.h b/source/gui/ObjectBases/IGUIObject.h index 6dba4a27df..fbd8d9b198 100644 --- a/source/gui/ObjectBases/IGUIObject.h +++ b/source/gui/ObjectBases/IGUIObject.h @@ -33,7 +33,6 @@ #include "lib/input.h" #include "maths/Rect.h" #include "ps/CStr.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/gui/Scripting/JSInterface_CGUISize.cpp b/source/gui/Scripting/JSInterface_CGUISize.cpp index 78bc8e57fb..bcddadb882 100644 --- a/source/gui/Scripting/JSInterface_CGUISize.cpp +++ b/source/gui/Scripting/JSInterface_CGUISize.cpp @@ -33,7 +33,6 @@ #include "scriptinterface/ScriptConversions.h" #include "scriptinterface/ScriptInterface.h" #include "scriptinterface/ScriptRequest.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/gui/Scripting/JSInterface_GUIProxy.h b/source/gui/Scripting/JSInterface_GUIProxy.h index 0e7d750f47..b8089ba4d2 100644 --- a/source/gui/Scripting/JSInterface_GUIProxy.h +++ b/source/gui/Scripting/JSInterface_GUIProxy.h @@ -20,10 +20,10 @@ #include "gui/ObjectBases/IGUIObject.h" #include "lib/sysdep/compiler.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include #include +#include #include #include #include diff --git a/source/gui/Scripting/JSInterface_GUIProxy_impl.h b/source/gui/Scripting/JSInterface_GUIProxy_impl.h index 1a0c9dd3ac..0140ae2ef6 100644 --- a/source/gui/Scripting/JSInterface_GUIProxy_impl.h +++ b/source/gui/Scripting/JSInterface_GUIProxy_impl.h @@ -26,7 +26,6 @@ #include "scriptinterface/FunctionWrapper.h" #include "scriptinterface/Object.h" #include "scriptinterface/ScriptConversions.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptRequest.h" #include diff --git a/source/gui/Scripting/JSInterface_GUISize.h b/source/gui/Scripting/JSInterface_GUISize.h index 137ae92275..a028de4db8 100644 --- a/source/gui/Scripting/JSInterface_GUISize.h +++ b/source/gui/Scripting/JSInterface_GUISize.h @@ -22,7 +22,6 @@ #include "lib/posix/posix_types.h" #include "lib/types.h" #include "ps/CStr.h" -#include "scriptinterface/ScriptTypes.h" class ScriptInterface; namespace JS { class Value; } diff --git a/source/lobby/IXmppClient.h b/source/lobby/IXmppClient.h index dcc0317b25..983da67620 100644 --- a/source/lobby/IXmppClient.h +++ b/source/lobby/IXmppClient.h @@ -19,8 +19,10 @@ #define IXMPPCLIENT_H #include "lib/types.h" -#include "scriptinterface/ScriptTypes.h" +#include + +class ScriptInterface; class ScriptRequest; class IXmppClient diff --git a/source/network/NetMessages.h b/source/network/NetMessages.h index f1c50ad152..ad0c940fad 100644 --- a/source/network/NetMessages.h +++ b/source/network/NetMessages.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -24,7 +24,6 @@ #define NETMESSAGES_H #include "ps/CStr.h" -#include "scriptinterface/ScriptTypes.h" #define PS_PROTOCOL_MAGIC 0x5073013f // 'P', 's', 0x01, '?' #define PS_PROTOCOL_MAGIC_RESPONSE 0x50630121 // 'P', 'c', 0x01, '!' diff --git a/source/network/NetServer.h b/source/network/NetServer.h index 569f434bb8..014f38be94 100644 --- a/source/network/NetServer.h +++ b/source/network/NetServer.h @@ -23,7 +23,6 @@ #include "lib/types.h" #include "network/NetHost.h" #include "ps/CStr.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/pch/engine/precompiled.h b/source/pch/engine/precompiled.h index df76d5f55f..674e6f32b9 100644 --- a/source/pch/engine/precompiled.h +++ b/source/pch/engine/precompiled.h @@ -26,7 +26,6 @@ #include "ps/Errors.h" #include "lib/file/vfs/vfs_path.h" #include "lib/file/vfs/vfs_util.h" -#include "scriptinterface/ScriptTypes.h" #endif // CONFIG_ENABLE_PCH // IWYU pragma: end_keep diff --git a/source/pch/graphics/precompiled.h b/source/pch/graphics/precompiled.h index c69aacc4a2..925b56a1c4 100644 --- a/source/pch/graphics/precompiled.h +++ b/source/pch/graphics/precompiled.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2023 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -18,6 +18,5 @@ #include "lib/precompiled.h" // common precompiled header // "graphics"-specific PCH: -#include "scriptinterface/ScriptTypes.h" #include "ps/CStr.h" #include "maths/Matrix3D.h" diff --git a/source/ps/Game.h b/source/ps/Game.h index 545486f228..4b5e3eb6c4 100644 --- a/source/ps/Game.h +++ b/source/ps/Game.h @@ -23,7 +23,6 @@ #include "lib/types.h" #include "ps/CStr.h" #include "ps/Errors.h" -#include "scriptinterface/ScriptTypes.h" #include "simulation2/helpers/Player.h" #include diff --git a/source/ps/Replay.cpp b/source/ps/Replay.cpp index 0229552124..404e3ae99a 100644 --- a/source/ps/Replay.cpp +++ b/source/ps/Replay.cpp @@ -42,7 +42,6 @@ #include "scriptinterface/JSON.h" #include "scriptinterface/Object.h" #include "scriptinterface/ScriptContext.h" -#include "scriptinterface/ScriptConversions.h" #include "scriptinterface/ScriptInterface.h" #include "scriptinterface/ScriptRequest.h" #include "scriptinterface/ScriptStats.h" @@ -55,7 +54,6 @@ #include #include -#include #include /** diff --git a/source/ps/Replay.h b/source/ps/Replay.h index a640399005..cb7034386b 100644 --- a/source/ps/Replay.h +++ b/source/ps/Replay.h @@ -21,11 +21,11 @@ #include "lib/code_annotation.h" #include "lib/os_path.h" #include "lib/types.h" -#include "scriptinterface/ScriptTypes.h" #include #include #include +#include #include #include diff --git a/source/ps/SavedGame.h b/source/ps/SavedGame.h index e3632e5757..a9958c4760 100644 --- a/source/ps/SavedGame.h +++ b/source/ps/SavedGame.h @@ -19,7 +19,6 @@ #define INCLUDED_SAVEDGAME #include "lib/status.h" -#include "scriptinterface/ScriptTypes.h" #include "scriptinterface/StructuredClone.h" #include diff --git a/source/ps/VisualReplay.h b/source/ps/VisualReplay.h index de3763158d..05e1044655 100644 --- a/source/ps/VisualReplay.h +++ b/source/ps/VisualReplay.h @@ -19,7 +19,6 @@ #define INCLUDED_VISUAL_REPLAY #include "lib/os_path.h" -#include "scriptinterface/ScriptTypes.h" #include diff --git a/source/ps/scripting/JSInterface_VFS.h b/source/ps/scripting/JSInterface_VFS.h index 719e77aea8..b572fbe4fc 100644 --- a/source/ps/scripting/JSInterface_VFS.h +++ b/source/ps/scripting/JSInterface_VFS.h @@ -19,7 +19,6 @@ #define INCLUDED_JSI_VFS #include "lib/types.h" -#include "scriptinterface/ScriptTypes.h" #include diff --git a/source/scriptinterface/JSON.cpp b/source/scriptinterface/JSON.cpp index e1f4744890..10ac3e3c91 100644 --- a/source/scriptinterface/JSON.cpp +++ b/source/scriptinterface/JSON.cpp @@ -30,7 +30,6 @@ #include "scriptinterface/FunctionWrapper.h" #include "scriptinterface/ScriptExceptions.h" #include "scriptinterface/ScriptRequest.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/scriptinterface/ModuleLoader.h b/source/scriptinterface/ModuleLoader.h index 221af46e10..3f7e470daf 100644 --- a/source/scriptinterface/ModuleLoader.h +++ b/source/scriptinterface/ModuleLoader.h @@ -20,7 +20,6 @@ #include "lib/file/vfs/vfs_path.h" #include "lib/path.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/scriptinterface/Object.h b/source/scriptinterface/Object.h index 552b4f58f4..f116d83e3a 100644 --- a/source/scriptinterface/Object.h +++ b/source/scriptinterface/Object.h @@ -23,12 +23,12 @@ #include "ps/CLogger.h" #include "scriptinterface/ScriptConversions.h" #include "scriptinterface/ScriptRequest.h" -#include "scriptinterface/ScriptTypes.h" #include #include #include #include +#include #include #include #include diff --git a/source/scriptinterface/ScriptContext.cpp b/source/scriptinterface/ScriptContext.cpp index 49607fd14b..19cce2733d 100644 --- a/source/scriptinterface/ScriptContext.cpp +++ b/source/scriptinterface/ScriptContext.cpp @@ -29,7 +29,6 @@ #include "scriptinterface/ModuleLoader.h" #include "scriptinterface/Promises.h" #include "scriptinterface/ScriptEngine.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include #include diff --git a/source/scriptinterface/ScriptContext.h b/source/scriptinterface/ScriptContext.h index 93a420364b..16c536ee86 100644 --- a/source/scriptinterface/ScriptContext.h +++ b/source/scriptinterface/ScriptContext.h @@ -18,9 +18,6 @@ #ifndef INCLUDED_SCRIPTCONTEXT #define INCLUDED_SCRIPTCONTEXT -#include "scriptinterface/ScriptExtraHeaders.h" -#include "scriptinterface/ScriptTypes.h" - #include #include #include diff --git a/source/scriptinterface/ScriptConversions.cpp b/source/scriptinterface/ScriptConversions.cpp index 03b9d92a9e..ae2b3fd2dc 100644 --- a/source/scriptinterface/ScriptConversions.cpp +++ b/source/scriptinterface/ScriptConversions.cpp @@ -23,7 +23,6 @@ #include "lib/path.h" #include "ps/CStr.h" #include "scriptinterface/ScriptExceptions.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptRequest.h" #include diff --git a/source/scriptinterface/ScriptConversions.h b/source/scriptinterface/ScriptConversions.h index a736ce6780..902d6e1138 100644 --- a/source/scriptinterface/ScriptConversions.h +++ b/source/scriptinterface/ScriptConversions.h @@ -23,7 +23,6 @@ #include "lib/types.h" #include "ps/CStr.h" #include "scriptinterface/ScriptExceptions.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptRequest.h" #include diff --git a/source/scriptinterface/ScriptEngine.h b/source/scriptinterface/ScriptEngine.h index 28dd0855e6..5a8f65f5ca 100644 --- a/source/scriptinterface/ScriptEngine.h +++ b/source/scriptinterface/ScriptEngine.h @@ -20,11 +20,17 @@ #include "lib/debug.h" #include "ps/Singleton.h" -#include "scriptinterface/ScriptTypes.h" #include #include +#if MOZJS_MAJOR_VERSION != 128 +#error Your compiler is trying to use an incorrect major version of the \ +SpiderMonkey library. The SpiderMonkey API is subject to changes, and the \ +game will not build with the selected version of the library. Make sure \ +you have got all the right files and include paths. +#endif + struct JSContext; /** diff --git a/source/scriptinterface/ScriptExtraHeaders.h b/source/scriptinterface/ScriptExtraHeaders.h deleted file mode 100644 index 82bb4f8701..0000000000 --- a/source/scriptinterface/ScriptExtraHeaders.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2025 Wildfire Games. - * This file is part of 0 A.D. - * - * 0 A.D. is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * 0 A.D. is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with 0 A.D. If not, see . - */ - -#ifndef INCLUDED_SCRIPTEXTRAHEADERS -#define INCLUDED_SCRIPTEXTRAHEADERS - -// Includes occasionally-used SpiderMonkey headers for typed arrays and debug API, -// with appropriate tweaks to fix warnings and build errors. (Most code should -// just include ScriptTypes.h directly to get the standard jsapi.h.) - -#include "scriptinterface/ScriptTypes.h" - -#include "jsfriendapi.h" - -#include "js/AllocPolicy.h" -#include "js/Array.h" -#include "js/ArrayBuffer.h" -#include "js/CompilationAndEvaluation.h" -#include "js/Conversions.h" -#include "js/ContextOptions.h" -#include "js/ForOfIterator.h" -#include "js/GCAPI.h" -#include "js/GCHashTable.h" -#include "js/SourceText.h" -#include "js/Proxy.h" -#include "js/Warnings.h" - -#include "js/experimental/TypedData.h" - -#include "js/friend/ErrorMessages.h" - -#undef signbit - -#endif // INCLUDED_SCRIPTEXTRAHEADERS diff --git a/source/scriptinterface/ScriptInterface.cpp b/source/scriptinterface/ScriptInterface.cpp index 7c4a39dcce..0ca2a0e2ab 100644 --- a/source/scriptinterface/ScriptInterface.cpp +++ b/source/scriptinterface/ScriptInterface.cpp @@ -33,7 +33,6 @@ #include "scriptinterface/ModuleLoader.h" #include "scriptinterface/Object.h" #include "scriptinterface/ScriptContext.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptStats.h" #include "scriptinterface/StructuredClone.h" diff --git a/source/scriptinterface/ScriptInterface.h b/source/scriptinterface/ScriptInterface.h index b65559802b..290af11389 100644 --- a/source/scriptinterface/ScriptInterface.h +++ b/source/scriptinterface/ScriptInterface.h @@ -24,7 +24,6 @@ #include "scriptinterface/ScriptConversions.h" #include "scriptinterface/ScriptExceptions.h" #include "scriptinterface/ScriptRequest.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/scriptinterface/ScriptTypes.h b/source/scriptinterface/ScriptTypes.h deleted file mode 100644 index 3106719eb4..0000000000 --- a/source/scriptinterface/ScriptTypes.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 2025 Wildfire Games. - * This file is part of 0 A.D. - * - * 0 A.D. is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * 0 A.D. is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with 0 A.D. If not, see . - */ - -#ifndef INCLUDED_SCRIPTTYPES -#define INCLUDED_SCRIPTTYPES - -#ifdef DEBUG -#define MOZ_DIAGNOSTIC_ASSERT_ENABLED -#endif - -#ifdef _WIN32 -# define XP_WIN -# ifndef WIN32 -# define WIN32 // SpiderMonkey expects this -# endif -#endif - -#include "jspubtd.h" -#include "jsapi.h" - -#if MOZJS_MAJOR_VERSION != 128 -#error Your compiler is trying to use an incorrect major version of the \ -SpiderMonkey library. The SpiderMonkey API is subject to changes, and the \ -game will not build with the selected version of the library. Make sure \ -you have got all the right files and include paths. -#endif - -class ScriptInterface; - -#endif // INCLUDED_SCRIPTTYPES diff --git a/source/simulation2/components/ICmpAIManager.cpp b/source/simulation2/components/ICmpAIManager.cpp index a93e31b3d9..b54e80a351 100644 --- a/source/simulation2/components/ICmpAIManager.cpp +++ b/source/simulation2/components/ICmpAIManager.cpp @@ -27,7 +27,6 @@ #include "ps/Filesystem.h" #include "scriptinterface/JSON.h" #include "scriptinterface/Object.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptInterface.h" #include "scriptinterface/ScriptRequest.h" #include "simulation2/system/InterfaceScripted.h" diff --git a/source/simulation2/helpers/SimulationCommand.h b/source/simulation2/helpers/SimulationCommand.h index 1a62c833f9..6596f40315 100644 --- a/source/simulation2/helpers/SimulationCommand.h +++ b/source/simulation2/helpers/SimulationCommand.h @@ -18,7 +18,6 @@ #ifndef INCLUDED_SIMULATIONCOMMAND #define INCLUDED_SIMULATIONCOMMAND -#include "scriptinterface/ScriptTypes.h" #include "simulation2/helpers/Player.h" #include diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp index 2c7b79932e..8570316b20 100644 --- a/source/simulation2/serialization/BinarySerializer.cpp +++ b/source/simulation2/serialization/BinarySerializer.cpp @@ -23,7 +23,6 @@ #include "ps/CLogger.h" #include "scriptinterface/FunctionWrapper.h" #include "scriptinterface/JSON.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptRequest.h" #include "simulation2/serialization/SerializedScriptTypes.h" diff --git a/source/simulation2/serialization/BinarySerializer.h b/source/simulation2/serialization/BinarySerializer.h index 5632930948..3e8ae3dc71 100644 --- a/source/simulation2/serialization/BinarySerializer.h +++ b/source/simulation2/serialization/BinarySerializer.h @@ -25,7 +25,6 @@ #include "lib/debug.h" #include "lib/types.h" #include "maths/Fixed.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "simulation2/system/Component.h" #include diff --git a/source/simulation2/serialization/IDeserializer.h b/source/simulation2/serialization/IDeserializer.h index 416677d5f3..ef6a7c47d8 100644 --- a/source/simulation2/serialization/IDeserializer.h +++ b/source/simulation2/serialization/IDeserializer.h @@ -21,7 +21,6 @@ #include "lib/types.h" #include "maths/Fixed.h" #include "ps/Errors.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/simulation2/serialization/ISerializer.h b/source/simulation2/serialization/ISerializer.h index 295a09523d..234dc336f9 100644 --- a/source/simulation2/serialization/ISerializer.h +++ b/source/simulation2/serialization/ISerializer.h @@ -21,7 +21,6 @@ #include "lib/types.h" #include "maths/Fixed.h" #include "ps/Errors.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/simulation2/serialization/StdDeserializer.cpp b/source/simulation2/serialization/StdDeserializer.cpp index e4739b57cc..e3cab4127f 100644 --- a/source/simulation2/serialization/StdDeserializer.cpp +++ b/source/simulation2/serialization/StdDeserializer.cpp @@ -25,7 +25,6 @@ #include "lib/utf8.h" #include "ps/CStr.h" #include "scriptinterface/FunctionWrapper.h" -#include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptInterface.h" #include "scriptinterface/ScriptRequest.h" #include "simulation2/serialization/ISerializer.h" diff --git a/source/simulation2/system/Message.h b/source/simulation2/system/Message.h index ca09a2e52e..fca3ee14ac 100644 --- a/source/simulation2/system/Message.h +++ b/source/simulation2/system/Message.h @@ -19,7 +19,6 @@ #define INCLUDED_MESSAGE #include "lib/code_annotation.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/simulation2/system/ParamNode.h b/source/simulation2/system/ParamNode.h index b74c91aee0..426d0092ba 100644 --- a/source/simulation2/system/ParamNode.h +++ b/source/simulation2/system/ParamNode.h @@ -22,7 +22,6 @@ #include "lib/types.h" #include "maths/Fixed.h" #include "ps/Errors.h" -#include "scriptinterface/ScriptTypes.h" #include #include diff --git a/source/tools/lint/cppcheck/suppressions-list.txt b/source/tools/lint/cppcheck/suppressions-list.txt index 45e40c3ffe..f3610a5850 100644 --- a/source/tools/lint/cppcheck/suppressions-list.txt +++ b/source/tools/lint/cppcheck/suppressions-list.txt @@ -6,6 +6,15 @@ cppcheckError:./source/lib/file/file_system.cpp *:source/third_party/* +// Ignore SpiderMonkey version compile check + +preprocessorErrorDirective:source/scriptinterface/ScriptEngine.h + +// Lists of network/simulation messages are included in other files which define macros + +unknownMacro:source/network/NetMessages.h +unknownMacro:source/simulation2/TypeList.h + // Issues reported by cppcheck and not yet fixed danglingLifetime:source/lib/sysdep/os/unix/ufilesystem.cpp @@ -34,7 +43,6 @@ preprocessorErrorDirective:source/lib/sysdep/arch.h preprocessorErrorDirective:source/lib/sysdep/arch/x86_x64/x86_x64.h preprocessorErrorDirective:source/lib/sysdep/os/win/win.h preprocessorErrorDirective:source/network/NMTCreator.h -preprocessorErrorDirective:source/scriptinterface/ScriptTypes.h preprocessorErrorDirective:source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h returnDanglingLifetime:source/lib/file/vfs/vfs_tree.cpp @@ -53,4 +61,3 @@ unknownMacro:source/lib/sysdep/os/win/wdbg_sym.cpp unknownMacro:source/lib/sysdep/os/win/wfirmware.cpp unknownMacro:source/lib/sysdep/os/win/wposix/wutsname.cpp unknownMacro:source/ps/CStr.cpp -unknownMacro:source/simulation2/TypeList.h