Page MenuHomeWildfire Games

Bump XMB to version 4, improve efficiency of using strings.
ClosedPublic

Authored by wraitii on Apr 30 2021, 3:13 PM.

Details

Summary

Bunch of XMB improvements/changes.
The main difference is that the format changes: element/attribute names are stored _after_ the elements, and not before. This allows writing XMB data in one pass instead of two.
As an optimisation, the names become offset instead of being integers, this makes getting the string from the int name much more efficient.
GetElementString is also changed to return a const char*, thus not creating an std::string. A string_view version is added where convenient.

The XML->XMB and JS->XMB conversion functions and the corresponding storage are moved to ps/XMB, since that format doesn't particularly relate to XML. CX
eromyces becomes lighter and more focused as a result.
The XML->XMB conversion also benefits from the above streamlining.

Note that in a few cases, string_view gets printed to CLogger via data(), which is generally not legal, but we know that the strings are null-terminated here. Our FMT (version 4) doesn't support string_view, that would be FMT5.

Test Plan

Review the new conversion fonctions. Agree with the change. Run tests.

Event Timeline

wraitii created this revision.Apr 30 2021, 3:13 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Apr 30 2021, 3:13 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5799/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4090/display/redirect

wraitii updated this revision to Diff 17295.Apr 30 2021, 3:26 PM

Remove conflict with SVN

Build failure - The Moirai have given mortals hearts that can endure.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    10>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\graphics\mapreader.cpp(494): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\graphics\mapreader.cpp(520): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(598): error C2059: syntax error: '<<' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(600): error C2059: syntax error: '==' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(602): error C2059: syntax error: '>>' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(606): error C2181: illegal else without matching if [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(606): error C2065: 'name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(606): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(608): error C2065: 'name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(608): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(610): error C2065: 'name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(610): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(996): error C2059: syntax error: '<<' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(998): error C2059: syntax error: '==' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1000): error C2059: syntax error: '>>' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1004): error C2181: illegal else without matching if [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1004): error C2065: 'ElementName': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1004): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1037): error C2059: syntax error: '<<' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1039): error C2059: syntax error: '==' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1041): error C2059: syntax error: '>>' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1044): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1044): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1046): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1048): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1048): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1052): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1052): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1056): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1056): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1059): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1060): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1060): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1064): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1064): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1067): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1068): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1068): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1072): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1072): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1075): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1076): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1076): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1080): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1080): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1082): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1082): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1084): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1084): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1086): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1086): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1089): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1089): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1091): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1091): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1094): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1095): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1095): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1099): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1099): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1101): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1102): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1102): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1104): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1104): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1106): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1107): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1107): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1109): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1109): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1112): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1113): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1113): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1124): error C2059: syntax error: '<<' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1126): error C2059: syntax error: '==' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1128): error C2059: syntax error: '>>' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1130): error C2143: syntax error: missing ';' before '{' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1139): error C2181: illegal else without matching if [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1150): error C2059: syntax error: '<<' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1152): error C2059: syntax error: '==' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1154): error C2059: syntax error: '>>' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1157): error C2143: syntax error: missing ';' before '{' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1159): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1161): error C2181: illegal else without matching if [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1161): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1161): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1175): error C2059: syntax error: '<<' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1177): error C2059: syntax error: '==' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1179): error C2059: syntax error: '>>' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1185): error C2181: illegal else without matching if [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1186): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1186): error C2672: 'std::_Tree<std::_Tmap_traits<_Kty,_Ty,_Pr,_Alloc,false>>::emplace': no matching overloaded function found [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1206): error C2059: syntax error: '<<' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1208): error C2059: syntax error: '==' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1210): error C2059: syntax error: '>>' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1213): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1213): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1216): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1216): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1217): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1218): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1218): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1221): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1221): error C2672: 'CGUI::ParseString': no matching overloaded function found [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1221): error C2780: 'bool CGUI::ParseString(const CGUI *,const CStrW &,T &)': expects 3 arguments - 2 provided [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1222): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1222): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1226): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1226): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1229): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1229): error C2672: 'CGUI::ParseString': no matching overloaded function found [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1229): error C2780: 'bool CGUI::ParseString(const CGUI *,const CStrW &,T &)': expects 3 arguments - 2 provided [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1230): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1230): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1234): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1234): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1237): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1237): error C2672: 'CGUI::ParseString': no matching overloaded function found [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1237): error C2780: 'bool CGUI::ParseString(const CGUI *,const CStrW &,T &)': expects 3 arguments - 2 provided [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1238): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1238): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1242): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1242): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1245): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1245): error C2672: 'CGUI::ParseString': no matching overloaded function found [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1245): error C2780: 'bool CGUI::ParseString(const CGUI *,const CStrW &,T &)': expects 3 arguments - 2 provided [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1246): error C2065: 'attr_name': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1246): error C2065: 'attr_value': undeclared identifier [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\cgui.cpp(1246): fatal error C1003: error count exceeds 100; stopping compilation [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\system\ComponentManagerSerialization.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\gui\objecttypes\colist.cpp(206): error C2228: left of '.GetAttributeStringView' must have class/struct/union [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5186/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-gcc7.txt
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadRootSetup(XMBElement, CXeromyces*)':
../../../source/gui/CGUI.cpp:598:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:598:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:598:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:598:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:598:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:598:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:600:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:600:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:600:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:600:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:601:20: error: expected primary-expression before 'name'
   std::string_view name(file.GetElementStringView(child.GetNodeName()));
                    ^~~~
../../../source/gui/CGUI.cpp:602:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:602:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:602:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:602:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:602:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:602:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:606:3: error: 'else' without a previous 'if'
   else if (name == "icon")
   ^~~~
../../../source/gui/CGUI.cpp:606:12: error: 'name' was not declared in this scope
   else if (name == "icon")
            ^~~~
../../../source/gui/CGUI.cpp:606:12: note: suggested alternative: 'rename'
   else if (name == "icon")
            ^~~~
            rename
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadSprite(XMBElement, CXeromyces*)':
../../../source/gui/CGUI.cpp:996:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:996:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:996:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:996:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:996:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:996:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:998:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:998:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:998:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:998:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:999:20: error: expected primary-expression before 'ElementName'
   std::string_view ElementName(file.GetElementStringView(child.GetNodeName()));
                    ^~~~~~~~~~~
../../../source/gui/CGUI.cpp:1000:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1000:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1000:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1000:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1000:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1000:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1004:3: error: 'else' without a previous 'if'
   else if (ElementName == "effect")
   ^~~~
../../../source/gui/CGUI.cpp:1004:12: error: 'ElementName' was not declared in this scope
   else if (ElementName == "effect")
            ^~~~~~~~~~~
../../../source/gui/CGUI.cpp:1004:12: note: suggested alternative: 'Element'
   else if (ElementName == "effect")
            ^~~~~~~~~~~
            Element
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadImage(XMBElement, CXeromyces*, CGUISprite&)':
../../../source/gui/CGUI.cpp:1037:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:1037:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:1037:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:1037:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:1037:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:1037:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:1039:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:1039:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:1039:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:1039:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:1040:20: error: expected primary-expression before 'attr_name'
   std::string_view attr_name(file.GetAttributeStringView(attr.Name));
                    ^~~~~~~~~
../../../source/gui/CGUI.cpp:1041:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1041:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1041:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1041:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1041:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1041:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1044:7: error: 'attr_name' was not declared in this scope
   if (attr_name == "texture")
       ^~~~~~~~~
../../../source/gui/CGUI.cpp:1044:7: note: suggested alternative: 'ttyname'
   if (attr_name == "texture")
       ^~~~~~~~~
       ttyname
../../../source/gui/CGUI.cpp:1046:56: error: 'attr_value' was not declared in this scope
    Image->m_TextureName = VfsPath("art/textures/ui") / attr_value;
                                                        ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1046:56: note: suggested alternative: 'si_value'
    Image->m_TextureName = VfsPath("art/textures/ui") / attr_value;
                                                        ^~~~~~~~~~
                                                        si_value
../../../source/gui/CGUI.cpp:1059:34: error: 'attr_value' was not declared in this scope
    if (!ParseString<CRect>(this, attr_value, rect))
                                  ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1059:34: note: suggested alternative: 'si_value'
    if (!ParseString<CRect>(this, attr_value, rect))
                                  ^~~~~~~~~~
                                  si_value
../../../source/gui/CGUI.cpp:1067:34: error: 'attr_value' was not declared in this scope
    if (!ParseString<float>(this, attr_value, val))
                                  ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1067:34: note: suggested alternative: 'si_value'
    if (!ParseString<float>(this, attr_value, val))
                                  ^~~~~~~~~~
                                  si_value
../../../source/gui/CGUI.cpp:1075:33: error: 'attr_value' was not declared in this scope
    if (!ParseString<bool>(this, attr_value, b))
                                 ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1075:33: note: suggested alternative: 'si_value'
    if (!ParseString<bool>(this, attr_value, b))
                                 ^~~~~~~~~~
                                 si_value
../../../source/gui/CGUI.cpp:1082:8: error: 'attr_value' was not declared in this scope
    if (attr_value == L"repeat")
        ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1082:8: note: suggested alternative: 'si_value'
    if (attr_value == L"repeat")
        ^~~~~~~~~~
        si_value
../../../source/gui/CGUI.cpp:1094:34: error: 'attr_value' was not declared in this scope
    if (!ParseString<float>(this, attr_value, z_level))
                                  ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1094:34: note: suggested alternative: 'si_value'
    if (!ParseString<float>(this, attr_value, z_level))
                                  ^~~~~~~~~~
                                  si_value
../../../source/gui/CGUI.cpp:1101:38: error: 'attr_value' was not declared in this scope
    if (!ParseString<CGUIColor>(this, attr_value, Image->m_BackColor))
                                      ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1101:38: note: suggested alternative: 'si_value'
    if (!ParseString<CGUIColor>(this, attr_value, Image->m_BackColor))
                                      ^~~~~~~~~~
                                      si_value
../../../source/gui/CGUI.cpp:1106:38: error: 'attr_value' was not declared in this scope
    if (!ParseString<CGUIColor>(this, attr_value, Image->m_BorderColor))
                                      ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1106:38: note: suggested alternative: 'si_value'
    if (!ParseString<CGUIColor>(this, attr_value, Image->m_BorderColor))
                                      ^~~~~~~~~~
                                      si_value
../../../source/gui/CGUI.cpp:1112:33: error: 'attr_value' was not declared in this scope
    if (!ParseString<bool>(this, attr_value, b))
                                 ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1112:33: note: suggested alternative: 'si_value'
    if (!ParseString<bool>(this, attr_value, b))
                                 ^~~~~~~~~~
                                 si_value
../../../source/gui/CGUI.cpp:1124:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:1124:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:1124:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:1124:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:1124:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:1124:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:1126:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:1126:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:1126:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:1126:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:1127:20: error: expected primary-expression before 'ElementName'
   std::string_view ElementName(file.GetElementStringView(child.GetNodeName()));
                    ^~~~~~~~~~~
../../../source/gui/CGUI.cpp:1128:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1128:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1128:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1128:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1128:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1128:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1139:3: error: 'else' without a previous 'if'
   else
   ^~~~
../../../source/gui/CGUI.cpp:1029:64: warning: unused parameter 'pFile' [-Wunused-parameter]
 void CGUI::Xeromyces_ReadImage(XMBElement Element, CXeromyces* pFile, CGUISprite& parent)
                                                    ~~~~~~~~~~~~^~~~~
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadEffects(XMBElement, CXeromyces*, SGUIImageEffects&)':
../../../source/gui/CGUI.cpp:1150:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:1150:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:1150:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:1150:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:1150:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:1150:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:1152:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:1152:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:1152:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:1152:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:1153:20: error: expected primary-expression before 'attr_name'
   std::string_view attr_name(file.GetAttributeStringView(attr.Name));
                    ^~~~~~~~~
../../../source/gui/CGUI.cpp:1154:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1154:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1154:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1154:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1154:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1154:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1161:3: error: 'else' without a previous 'if'
   else if (attr_name == "grayscale")
   ^~~~
../../../source/gui/CGUI.cpp:1161:12: error: 'attr_name' was not declared in this scope
   else if (attr_name == "grayscale")
            ^~~~~~~~~
../../../source/gui/CGUI.cpp:1161:12: note: suggested alternative: 'ttyname'
   else if (attr_name == "grayscale")
            ^~~~~~~~~
            ttyname
../../../source/gui/CGUI.cpp:1146:66: warning: unused parameter 'pFile' [-Wunused-parameter]
 void CGUI::Xeromyces_ReadEffects(XMBElement Element, CXeromyces* pFile, SGUIImageEffects& effects)
                                                      ~~~~~~~~~~~~^~~~~
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadStyle(XMBElement, CXeromyces*)':
../../../source/gui/CGUI.cpp:1175:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:1175:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:1175:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:1175:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:1175:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:1175:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:1177:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:1177:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:1177:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:1177:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:1178:20: error: expected primary-expression before 'attr_name'
   std::string_view attr_name(file.GetAttributeStringView(attr.Name));
                    ^~~~~~~~~
../../../source/gui/CGUI.cpp:1179:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1179:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1179:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1179:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1179:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1179:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1185:3: error: 'else' without a previous 'if'
   else
   ^~~~
../../../source/gui/CGUI.cpp:1186:49: error: 'attr_name' was not declared in this scope
    style.m_SettingsDefaults.emplace(std::string(attr_name), attr.Value.FromUTF8());
                                                 ^~~~~~~~~
../../../source/gui/CGUI.cpp:1186:49: note: suggested alternative: 'ttyname'
    style.m_SettingsDefaults.emplace(std::string(attr_name), attr.Value.FromUTF8());
                                                 ^~~~~~~~~
                                                 ttyname
../../../source/gui/CGUI.cpp:1168:64: warning: unused parameter 'pFile' [-Wunused-parameter]
 void CGUI::Xeromyces_ReadStyle(XMBElement Element, CXeromyces* pFile)
                                                    ~~~~~~~~~~~~^~~~~
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadScrollBarStyle(XMBElement, CXeromyces*)':
../../../source/gui/CGUI.cpp:1206:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:1206:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:1206:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:1206:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:1206:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:1206:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:1208:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:1208:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:1208:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:1208:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:1209:20: error: expected primary-expression before 'attr_name'
   std::string_view attr_name(file.GetAttributeStringView(attr.Name));
                    ^~~~~~~~~
../../../source/gui/CGUI.cpp:1210:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1210:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1210:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1210:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1210:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1210:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1213:7: error: 'attr_value' was not declared in this scope
   if (attr_value == "null")
       ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1213:7: note: suggested alternative: 'si_value'
   if (attr_value == "null")
       ^~~~~~~~~~
       si_value
../../../source/gui/CGUI.cpp:1216:7: error: 'attr_name' was not declared in this scope
   if (attr_name == "name")
       ^~~~~~~~~
../../../source/gui/CGUI.cpp:1216:7: note: suggested alternative: 'ttyname'
   if (attr_name == "name")
       ^~~~~~~~~
       ttyname
../../../source/gui/CGUI.cpp:1217:11: error: 'attr_value' was not declared in this scope
    name = attr_value;
           ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1217:11: note: suggested alternative: 'si_value'
    name = attr_value;
           ^~~~~~~~~~
           si_value
../../../source/gui/CGUI.cpp:1221:33: error: 'attr_value' was not declared in this scope
    if (!ParseString<bool>(this, attr_value.FromUTF8(), b))
                                 ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1221:33: note: suggested alternative: 'si_value'
    if (!ParseString<bool>(this, attr_value.FromUTF8(), b))
                                 ^~~~~~~~~~
                                 si_value
../../../source/gui/CGUI.cpp:1229:34: error: 'attr_value' was not declared in this scope
    if (!ParseString<float>(this, attr_value.FromUTF8(), f))
                                  ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1229:34: note: suggested alternative: 'si_value'
    if (!ParseString<float>(this, attr_value.FromUTF8(), f))
                                  ^~~~~~~~~~
                                  si_value
../../../source/gui/CGUI.cpp:1237:34: error: 'attr_value' was not declared in this scope
    if (!ParseString<float>(this, attr_value.FromUTF8(), f))
                                  ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1237:34: note: suggested alternative: 'si_value'
    if (!ParseString<float>(this, attr_value.FromUTF8(), f))
                                  ^~~~~~~~~~
                                  si_value
../../../source/gui/CGUI.cpp:1245:34: error: 'attr_value' was not declared in this scope
    if (!ParseString<float>(this, attr_value.FromUTF8(), f))
                                  ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1245:34: note: suggested alternative: 'si_value'
    if (!ParseString<float>(this, attr_value.FromUTF8(), f))
                                  ^~~~~~~~~~
                                  si_value
../../../source/gui/CGUI.cpp:1251:34: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonTop = attr_value;
                                  ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1251:34: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonTop = attr_value;
                                  ^~~~~~~~~~
                                  si_value
../../../source/gui/CGUI.cpp:1253:41: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonTopPressed = attr_value;
                                         ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1253:41: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonTopPressed = attr_value;
                                         ^~~~~~~~~~
                                         si_value
../../../source/gui/CGUI.cpp:1255:42: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonTopDisabled = attr_value;
                                          ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1255:42: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonTopDisabled = attr_value;
                                          ^~~~~~~~~~
                                          si_value
../../../source/gui/CGUI.cpp:1257:38: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonTopOver = attr_value;
                                      ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1257:38: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonTopOver = attr_value;
                                      ^~~~~~~~~~
                                      si_value
../../../source/gui/CGUI.cpp:1259:37: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonBottom = attr_value;
                                     ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1259:37: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonBottom = attr_value;
                                     ^~~~~~~~~~
                                     si_value
../../../source/gui/CGUI.cpp:1261:44: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonBottomPressed = attr_value;
                                            ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1261:44: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonBottomPressed = attr_value;
                                            ^~~~~~~~~~
                                            si_value
../../../source/gui/CGUI.cpp:1263:45: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonBottomDisabled = attr_value;
                                             ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1263:45: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonBottomDisabled = attr_value;
                                             ^~~~~~~~~~
                                             si_value
../../../source/gui/CGUI.cpp:1265:41: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteButtonBottomOver = attr_value;
                                         ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1265:41: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteButtonBottomOver = attr_value;
                                         ^~~~~~~~~~
                                         si_value
../../../source/gui/CGUI.cpp:1267:37: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteBackVertical = attr_value;
                                     ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1267:37: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteBackVertical = attr_value;
                                     ^~~~~~~~~~
                                     si_value
../../../source/gui/CGUI.cpp:1269:36: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteBarVertical = attr_value;
                                    ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1269:36: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteBarVertical = attr_value;
                                    ^~~~~~~~~~
                                    si_value
../../../source/gui/CGUI.cpp:1271:40: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteBarVerticalOver = attr_value;
                                        ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1271:40: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteBarVerticalOver = attr_value;
                                        ^~~~~~~~~~
                                        si_value
../../../source/gui/CGUI.cpp:1273:43: error: 'attr_value' was not declared in this scope
    scrollbar.m_SpriteBarVerticalPressed = attr_value;
                                           ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1273:43: note: suggested alternative: 'si_value'
    scrollbar.m_SpriteBarVerticalPressed = attr_value;
                                           ^~~~~~~~~~
                                           si_value
../../../source/gui/CGUI.cpp:1193:73: warning: unused parameter 'pFile' [-Wunused-parameter]
 void CGUI::Xeromyces_ReadScrollBarStyle(XMBElement Element, CXeromyces* pFile)
                                                             ~~~~~~~~~~~~^~~~~
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadIcon(XMBElement, CXeromyces*)':
../../../source/gui/CGUI.cpp:1287:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:1287:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:1287:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:1287:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:1287:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:1287:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:1289:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:1289:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:1289:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:1289:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:1290:20: error: expected primary-expression before 'attr_name'
   std::string_view attr_name(file.GetAttributeStringView(attr.Name));
                    ^~~~~~~~~
../../../source/gui/CGUI.cpp:1291:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1291:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1291:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1291:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1291:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1291:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1294:7: error: 'attr_value' was not declared in this scope
   if (attr_value == "null")
       ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1294:7: note: suggested alternative: 'si_value'
   if (attr_value == "null")
       ^~~~~~~~~~
       si_value
../../../source/gui/CGUI.cpp:1297:7: error: 'attr_name' was not declared in this scope
   if (attr_name == "name")
       ^~~~~~~~~
../../../source/gui/CGUI.cpp:1297:7: note: suggested alternative: 'ttyname'
   if (attr_name == "name")
       ^~~~~~~~~
       ttyname
../../../source/gui/CGUI.cpp:1298:11: error: 'attr_value' was not declared in this scope
    name = attr_value;
           ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1298:11: note: suggested alternative: 'si_value'
    name = attr_value;
           ^~~~~~~~~~
           si_value
../../../source/gui/CGUI.cpp:1300:24: error: 'attr_value' was not declared in this scope
    icon.m_SpriteName = attr_value;
                        ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1300:24: note: suggested alternative: 'si_value'
    icon.m_SpriteName = attr_value;
                        ^~~~~~~~~~
                        si_value
../../../source/gui/CGUI.cpp:1304:36: error: 'attr_value' was not declared in this scope
    if (!ParseString<CSize2D>(this, attr_value.FromUTF8(), size))
                                    ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1304:36: note: suggested alternative: 'si_value'
    if (!ParseString<CSize2D>(this, attr_value.FromUTF8(), size))
                                    ^~~~~~~~~~
                                    si_value
../../../source/gui/CGUI.cpp:1280:63: warning: unused parameter 'pFile' [-Wunused-parameter]
 void CGUI::Xeromyces_ReadIcon(XMBElement Element, CXeromyces* pFile)
                                                   ~~~~~~~~~~~~^~~~~
../../../source/gui/CGUI.cpp: In member function 'void CGUI::Xeromyces_ReadTooltip(XMBElement, CXeromyces*)':
../../../source/gui/CGUI.cpp:1323:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
../../../source/gui/CGUI.cpp:1323:3: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
   ^~
../../../source/gui/CGUI.cpp:1323:5: error: expected primary-expression before '<<' token
 <<<<<<< HEAD
     ^~
../../../source/gui/CGUI.cpp:1323:7: error: expected primary-expression before '<' token
 <<<<<<< HEAD
       ^
../../../source/gui/CGUI.cpp:1323:9: error: 'HEAD' was not declared in this scope
 <<<<<<< HEAD
         ^~~~
../../../source/gui/CGUI.cpp:1323:9: note: suggested alternative: 'EADV'
 <<<<<<< HEAD
         ^~~~
         EADV
../../../source/gui/CGUI.cpp:1325:1: error: version control conflict marker in file
 =======
 ^~~~~~~
../../../source/gui/CGUI.cpp:1325:3: error: expected primary-expression before '==' token
 =======
   ^~
../../../source/gui/CGUI.cpp:1325:5: error: expected primary-expression before '==' token
 =======
     ^~
../../../source/gui/CGUI.cpp:1325:7: error: expected primary-expression before '=' token
 =======
       ^
../../../source/gui/CGUI.cpp:1326:20: error: expected primary-expression before 'attr_name'
   std::string_view attr_name(file.GetAttributeStringView(attr.Name));
                    ^~~~~~~~~
../../../source/gui/CGUI.cpp:1327:1: error: version control conflict marker in file
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
 ^~~~~~~
../../../source/gui/CGUI.cpp:1327:3: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
   ^~
../../../source/gui/CGUI.cpp:1327:5: error: expected primary-expression before '>>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
     ^~
../../../source/gui/CGUI.cpp:1327:7: error: expected primary-expression before '>' token
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
       ^
../../../source/gui/CGUI.cpp:1327:9: error: unable to find numeric literal operator 'operator""f3b54...'
 >>>>>>> 0e051f3b54... Bump XMB to version 4, improve efficiency of using strings.
         ^~~~~~~~~~~~~
../../../source/gui/CGUI.cpp:1327:9: note: use -fext-numeric-literals to enable more built-in suffixes
../../../source/gui/CGUI.cpp:1330:7: error: 'attr_name' was not declared in this scope
   if (attr_name == "name")
       ^~~~~~~~~
../../../source/gui/CGUI.cpp:1330:7: note: suggested alternative: 'ttyname'
   if (attr_name == "name")
       ^~~~~~~~~
       ttyname
../../../source/gui/CGUI.cpp:1331:35: error: 'attr_value' was not declared in this scope
    object->SetName("__tooltip_" + attr_value);
                                   ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1331:35: note: suggested alternative: 'si_value'
    object->SetName("__tooltip_" + attr_value);
                                   ^~~~~~~~~~
                                   si_value
../../../source/gui/CGUI.cpp:1333:57: error: 'attr_value' was not declared in this scope
    object->SetSettingFromString(std::string(attr_name), attr_value.FromUTF8(), true);
                                                         ^~~~~~~~~~
../../../source/gui/CGUI.cpp:1333:57: note: suggested alternative: 'si_value'
    object->SetSettingFromString(std::string(attr_name), attr_value.FromUTF8(), true);
                                                         ^~~~~~~~~~
                                                         si_value
../../../source/gui/CGUI.cpp:1317:66: warning: unused parameter 'pFile' [-Wunused-parameter]
 void CGUI::Xeromyces_ReadTooltip(XMBElement Element, CXeromyces* pFile)
                                                      ~~~~~~~~~~~~^~~~~
make[1]: *** [gui.make:173: obj/gui_Debug/CGUI.o] Error 1
make: *** [Makefile:137: gui] Error 2

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5802/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblobby_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas_dbg.a(precompiled.o) has no symbols
../../../source/gui/CGUI.cpp:598:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:996:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:1037:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:1124:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:1150:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:1175:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:1206:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:1287:1: error: version control conflict marker in file
<<<<<<< HEAD
^
../../../source/gui/CGUI.cpp:1323:1: error: version control conflict marker in file
<<<<<<< HEAD
^
9 errors generated.
make[1]: *** [obj/gui_Debug/CGUI.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [gui] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4093/display/redirect

wraitii requested review of this revision.Apr 30 2021, 4:35 PM
wraitii updated this revision to Diff 17297.Apr 30 2021, 5:15 PM

Fix for real for SVN.
Also improve comments, move tests, add simple JS tests, clenaup some code.

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-gcc7.txt
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetNodeName() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:128: multiple definition of `XMBElement::GetNodeName() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:180: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetChildNodes() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:136: multiple definition of `XMBElement::GetChildNodes() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:188: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetAttributes() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:148: multiple definition of `XMBElement::GetAttributes() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:200: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetText() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:160: multiple definition of `XMBElement::GetText() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:212: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetLineNumber() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:169: multiple definition of `XMBElement::GetLineNumber() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:221: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::GetFirstNamedItem(int) const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:178: multiple definition of `XMBElementList::GetFirstNamedItem(int) const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:230: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::iterator::operator++()':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:197: multiple definition of `XMBElementList::iterator::operator++()'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:249: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::operator[](unsigned long)':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:204: multiple definition of `XMBElementList::operator[](unsigned long)'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:256: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::GetNamedItem(int) const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:234: multiple definition of `XMBAttributeList::GetNamedItem(int) const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:286: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::iterator::operator*() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:251: multiple definition of `XMBAttributeList::iterator::operator*() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:303: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::iterator::operator++()':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:256: multiple definition of `XMBAttributeList::iterator::operator++()'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:308: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::operator[](unsigned long)':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:263: multiple definition of `XMBAttributeList::operator[](unsigned long)'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:315: first defined here
collect2: error: ld returned 1 exit status
make[1]: *** [pyrogenesis.make:81: ../../../binaries/system/pyrogenesis_dbg] Error 1
make: *** [Makefile:71: pyrogenesis] Error 2

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5804/display/redirect

Build is unstable, some tests have failed - The Moirai have given mortals hearts that can endure.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

     7>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\network\NetMessageSim.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>tinygettext.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\tinygettext.vcxproj]
    12>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\graphics\mapreader.cpp(494): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\graphics\mapreader.cpp(520): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    12>e:\jenkins\workspace\vs2015-differential\source\simulation2\helpers\render.cpp(115): warning C4701: potentially uninitialized local variable 'cy' used [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    12>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\BinarySerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    12>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\HashSerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    12>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    12>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdSerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    12>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\system\ComponentManagerSerialization.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\renderer\silhouetterenderer.cpp(445): warning C4100: 'camera': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    17>wsecure_crt.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\lowlevel.vcxproj]
    17>wprofiler.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\lowlevel.vcxproj]
    17>manifest.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\lowlevel.vcxproj]
    17>secure_crt.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\lowlevel.vcxproj]
    17>posix.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\lowlevel.vcxproj]
    17>vfs_path.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\lowlevel.vcxproj]
    17>file_stats.obj : warning LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\lowlevel.vcxproj]
     4>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\pyrogenesis.vcxproj]
    19>e:\jenkins\workspace\vs2015-differential\libraries\win32\sdl2\include\sdl\sdl_config.h(96): warning C4005: 'HAVE_WCSLEN': macro redefinition (compiling source file ..\..\..\source\tools\atlas\AtlasUI\Misc\KeyMap.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\AtlasUI.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
Release: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    14>e:\jenkins\workspace\vs2015-differential\source\graphics\mapreader.cpp(494): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\graphics\mapreader.cpp(520): warning C4130: '==': logical operation on address of string constant [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\simulation2\helpers\render.cpp(115): warning C4701: potentially uninitialized local variable 'cy' used [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\renderer\silhouetterenderer.cpp(445): warning C4100: 'camera': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    19>e:\jenkins\workspace\vs2015-differential\libraries\win32\sdl2\include\sdl\sdl_config.h(96): warning C4005: 'HAVE_WCSLEN': macro redefinition (compiling source file ..\..\..\source\tools\atlas\AtlasUI\Misc\KeyMap.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\AtlasUI.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\maths\fixed.h(158): warning C4724: potential mod by 0 [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5188/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libnetwork_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libtinygettext_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libtinygettext_dbg.a(tinygettext.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblobby_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libglooxwrapper_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libscriptinterface_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
../../../source/graphics/ShaderProgram.cpp:86:15: warning: 'Reload' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Reload()
                     ^
../../../source/graphics/ShaderProgram.h:124:15: note: overridden virtual function is here
        virtual void Reload() = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:118:15: warning: 'Bind' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Bind()
                     ^
../../../source/graphics/ShaderProgram.h:135:15: note: overridden virtual function is here
        virtual void Bind() = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:128:15: warning: 'Unbind' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Unbind()
                     ^
../../../source/graphics/ShaderProgram.h:140:15: note: overridden virtual function is here
        virtual void Unbind() = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:156:18: warning: 'GetTextureBinding' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual Binding GetTextureBinding(texture_id_t id)
                        ^
../../../source/graphics/ShaderProgram.h:149:18: note: overridden virtual function is here
        virtual Binding GetTextureBinding(texture_id_t id) = 0;
                        ^
../../../source/graphics/ShaderProgram.cpp:166:15: warning: 'BindTexture' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void BindTexture(texture_id_t id, Handle tex)
                     ^
../../../source/graphics/ShaderProgram.h:153:15: note: overridden virtual function is here
        virtual void BindTexture(texture_id_t id, Handle tex) = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:179:15: warning: 'BindTexture' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void BindTexture(texture_id_t id, GLuint tex)
                     ^
../../../source/graphics/ShaderProgram.h:154:15: note: overridden virtual function is here
        virtual void BindTexture(texture_id_t id, GLuint tex) = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:190:15: warning: 'BindTexture' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void BindTexture(Binding id, Handle tex)
                     ^
../../../source/graphics/ShaderProgram.h:155:15: note: overridden virtual function is here
        virtual void BindTexture(Binding id, Handle tex) = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:197:18: warning: 'GetUniformBinding' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual Binding GetUniformBinding(uniform_id_t id)
                        ^
../../../source/graphics/ShaderProgram.h:158:18: note: overridden virtual function is here
        virtual Binding GetUniformBinding(uniform_id_t id) = 0;
                        ^
../../../source/graphics/ShaderProgram.cpp:202:15: warning: 'Uniform' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Uniform(Binding id, float v0, float v1, float v2, float v3)
                     ^
../../../source/graphics/ShaderProgram.h:161:15: note: overridden virtual function is here
        virtual void Uniform(Binding id, float v0, float v1, float v2, float v3) = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:211:15: warning: 'Uniform' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Uniform(Binding id, const CMatrix3D& v)
                     ^
../../../source/graphics/ShaderProgram.h:162:15: note: overridden virtual function is here
        virtual void Uniform(Binding id, const CMatrix3D& v) = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:230:15: warning: 'Uniform' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Uniform(Binding id, size_t count, const CMatrix3D* v)
                     ^
../../../source/graphics/ShaderProgram.h:163:15: note: overridden virtual function is here
        virtual void Uniform(Binding id, size_t count, const CMatrix3D* v) = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:236:15: warning: 'Uniform' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Uniform(Binding id, size_t count, const float* v)
                     ^
../../../source/graphics/ShaderProgram.h:164:15: note: overridden virtual function is here
        virtual void Uniform(Binding id, size_t count, const float* v) = 0;
                     ^
12 warnings generated.
../../../source/renderer/SilhouetteRenderer.cpp:445:61: warning: unused parameter 'camera' [-Wunused-parameter]
void SilhouetteRenderer::RenderDebugOverlays(const CCamera& camera)
                                                            ^
1 warning generated.
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui_dbg.a(precompiled.o) has no symbols
../../../source/lib/sysdep/arch/amd64/amd64.cpp:70:9: warning: 'OSAtomicAdd64Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_fetch_add() from <atomic> instead [-Wdeprecated-declarations]
        return OSAtomicAdd64Barrier(increment, (volatile int64_t*)location);
               ^
/usr/include/libkern/OSAtomicDeprecated.h:247:9: note: 'OSAtomicAdd64Barrier' has been explicitly marked deprecated here
int64_t OSAtomicAdd64Barrier( int64_t __theAmount,
        ^
../../../source/lib/sysdep/arch/amd64/amd64.cpp:76:9: warning: 'OSAtomicCompareAndSwapPtrBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_compare_exchange_strong() from <atomic> instead [-Wdeprecated-declarations]
        return OSAtomicCompareAndSwapPtrBarrier((void*)expected, (void*)newValue, (void* volatile*)location);
               ^
/usr/include/libkern/OSAtomicDeprecated.h:547:6: note: 'OSAtomicCompareAndSwapPtrBarrier' has been explicitly marked deprecated here
bool    OSAtomicCompareAndSwapPtrBarrier( void *__oldValue, void *__newValue, void * volatile *__theValue );
        ^
../../../source/lib/sysdep/arch/amd64/amd64.cpp:81:9: warning: 'OSAtomicCompareAndSwap64Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_compare_exchange_strong() from <atomic> instead [-Wdeprecated-declarations]
        return OSAtomicCompareAndSwap64Barrier(expected, newValue, location);
               ^
/usr/include/libkern/OSAtomicDeprecated.h:645:9: note: 'OSAtomicCompareAndSwap64Barrier' has been explicitly marked deprecated here
bool    OSAtomicCompareAndSwap64Barrier( int64_t __oldValue, int64_t __newValue,
        ^
3 warnings generated.
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblowlevel_dbg.a(dbghelp.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblowlevel_dbg.a(file_stats.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblowlevel_dbg.a(vfs_path.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreServices.framework/CoreServices.tbd and library file /System/Library/Frameworks//CoreServices.framework/CoreServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CFNetwork.framework/Versions/A/CFNetwork.tbd and library file /System/Library/Frameworks//CFNetwork.framework/Versions/A/CFNetwork are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreFoundation.framework/Versions/A/CoreFoundation.tbd and library file /System/Library/Frameworks//CoreFoundation.framework/Versions/A/CoreFoundation are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Cocoa.framework/Cocoa.tbd and library file /System/Library/Frameworks//Cocoa.framework/Cocoa are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//IOKit.framework/IOKit.tbd and library file /System/Library/Frameworks//IOKit.framework/IOKit are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//QuartzCore.framework/QuartzCore.tbd and library file /System/Library/Frameworks//QuartzCore.framework/QuartzCore are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Metal.framework/Metal.tbd and library file /System/Library/Frameworks//Metal.framework/Metal are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//OpenGL.framework/OpenGL.tbd and library file /System/Library/Frameworks//OpenGL.framework/OpenGL are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Security.framework/Security.tbd and library file /System/Library/Frameworks//Security.framework/Security are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//OpenAL.framework/OpenAL.tbd and library file /System/Library/Frameworks//OpenAL.framework/OpenAL are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ApplicationServices.framework/ApplicationServices.tbd and library file /System/Library/Frameworks//ApplicationServices.framework/ApplicationServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Cocoa.framework/Cocoa.tbd and library file /System/Library/Frameworks//Cocoa.framework/Cocoa are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation.tbd and library file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.tbd and library file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.tbd and library file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AppKit.framework/Versions/C/AppKit.tbd and library file /System/Library/Frameworks//AppKit.framework/Versions/C/AppKit are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreData.framework/Versions/A/CoreData.tbd and library file /System/Library/Frameworks//CoreData.framework/Versions/A/CoreData are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CommonPanels.framework/Versions/A/CommonPanels.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CommonPanels.framework/Versions/A/CommonPanels are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Help.framework/Versions/A/Help.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Help.framework/Versions/A/Help are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/ImageCapture.framework/Versions/A/ImageCapture.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/ImageCapture.framework/Versions/A/ImageCapture are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/OpenScripting.framework/Versions/A/OpenScripting.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/OpenScripting.framework/Versions/A/OpenScripting are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Print.framework/Versions/A/Print.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Print.framework/Versions/A/Print are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SecurityHI.framework/Versions/A/SecurityHI.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SecurityHI.framework/Versions/A/SecurityHI are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreImage.framework/Versions/A/CoreImage.tbd and library file /System/Library/Frameworks//CoreImage.framework/Versions/A/CoreImage are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreGraphics.framework/Versions/A/CoreGraphics.tbd and library file /System/Library/Frameworks//CoreGraphics.framework/Versions/A/CoreGraphics are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreText.framework/Versions/A/CoreText.tbd and library file /System/Library/Frameworks//CoreText.framework/Versions/A/CoreText are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ImageIO.framework/Versions/A/ImageIO.tbd and library file /System/Library/Frameworks//ImageIO.framework/Versions/A/ImageIO are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ColorSync.framework/Versions/A/ColorSync.tbd and library file /System/Library/Frameworks//ColorSync.framework/Versions/A/ColorSync are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreServices.framework/Versions/A/CoreServices.tbd and library file /System/Library/Frameworks//CoreServices.framework/Versions/A/CoreServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation.tbd and library file /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Foundation.framework/Versions/C/Foundation.tbd and library file /System/Library/Frameworks//Foundation.framework/Versions/C/Foundation are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CFNetwork.framework/Versions/A/CFNetwork.tbd and library file /System/Library/Frameworks//CFNetwork.framework/Versions/A/CFNetwork are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList are out of sync. Falling back to library file for linking.
ld: warning: object file (../../../libraries/osx/fmt/lib/libfmt.a(format.cc.o)) was built for newer OSX version (10.13) than being linked (10.12)
ld: warning: text-based stub file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation.tbd and library file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation are out of sync. Falling back to library file for linking.
duplicate symbol __ZNK10XMBElement7GetTextEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement13GetAttributesEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement13GetChildNodesEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement13GetLineNumberEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN14XMBElementList8iteratorppEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN16XMBAttributeList8iteratorppEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement11GetNodeNameEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK16XMBAttributeList8iteratordeEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN14XMBElementListixEm in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN16XMBAttributeListixEm in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK14XMBElementList17GetFirstNamedItemEi in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK16XMBAttributeList12GetNamedItemEi in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
ld: 12 duplicate symbols for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [../../../binaries/system/pyrogenesis_dbg] Error 1
make: *** [pyrogenesis] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4095/display/redirect

wraitii updated this revision to Diff 17305.May 1 2021, 10:25 AM

Fix const char* comparison, rename a buncha things.
This works on my machine, gonna check if the compile errors persist.

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libnetwork_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblobby_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libscriptinterface_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Cocoa.framework/Cocoa.tbd and library file /System/Library/Frameworks//Cocoa.framework/Cocoa are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//IOKit.framework/IOKit.tbd and library file /System/Library/Frameworks//IOKit.framework/IOKit are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//QuartzCore.framework/QuartzCore.tbd and library file /System/Library/Frameworks//QuartzCore.framework/QuartzCore are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Metal.framework/Metal.tbd and library file /System/Library/Frameworks//Metal.framework/Metal are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//OpenGL.framework/OpenGL.tbd and library file /System/Library/Frameworks//OpenGL.framework/OpenGL are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Security.framework/Security.tbd and library file /System/Library/Frameworks//Security.framework/Security are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//OpenAL.framework/OpenAL.tbd and library file /System/Library/Frameworks//OpenAL.framework/OpenAL are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ApplicationServices.framework/ApplicationServices.tbd and library file /System/Library/Frameworks//ApplicationServices.framework/ApplicationServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Cocoa.framework/Cocoa.tbd and library file /System/Library/Frameworks//Cocoa.framework/Cocoa are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation.tbd and library file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreImage.framework/Versions/A/CoreImage.tbd and library file /System/Library/Frameworks//CoreImage.framework/Versions/A/CoreImage are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AppKit.framework/Versions/C/AppKit.tbd and library file /System/Library/Frameworks//AppKit.framework/Versions/C/AppKit are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreData.framework/Versions/A/CoreData.tbd and library file /System/Library/Frameworks//CoreData.framework/Versions/A/CoreData are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CommonPanels.framework/Versions/A/CommonPanels.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CommonPanels.framework/Versions/A/CommonPanels are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Help.framework/Versions/A/Help.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Help.framework/Versions/A/Help are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/ImageCapture.framework/Versions/A/ImageCapture.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/ImageCapture.framework/Versions/A/ImageCapture are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/OpenScripting.framework/Versions/A/OpenScripting.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/OpenScripting.framework/Versions/A/OpenScripting are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Print.framework/Versions/A/Print.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Print.framework/Versions/A/Print are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SecurityHI.framework/Versions/A/SecurityHI.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SecurityHI.framework/Versions/A/SecurityHI are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition.tbd and library file /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.tbd and library file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.tbd and library file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreGraphics.framework/Versions/A/CoreGraphics.tbd and library file /System/Library/Frameworks//CoreGraphics.framework/Versions/A/CoreGraphics are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreText.framework/Versions/A/CoreText.tbd and library file /System/Library/Frameworks//CoreText.framework/Versions/A/CoreText are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ImageIO.framework/Versions/A/ImageIO.tbd and library file /System/Library/Frameworks//ImageIO.framework/Versions/A/ImageIO are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ColorSync.framework/Versions/A/ColorSync.tbd and library file /System/Library/Frameworks//ColorSync.framework/Versions/A/ColorSync are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreServices.framework/Versions/A/CoreServices.tbd and library file /System/Library/Frameworks//CoreServices.framework/Versions/A/CoreServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis.tbd and library file /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CFNetwork.framework/Versions/A/CFNetwork.tbd and library file /System/Library/Frameworks//CFNetwork.framework/Versions/A/CFNetwork are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList.tbd and library file /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation.tbd and library file /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//Foundation.framework/Versions/C/Foundation.tbd and library file /System/Library/Frameworks//Foundation.framework/Versions/C/Foundation are out of sync. Falling back to library file for linking.
ld: warning: object file (../../../libraries/osx/fmt/lib/libfmt.a(format.cc.o)) was built for newer OSX version (10.13) than being linked (10.12)
ld: warning: text-based stub file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation.tbd and library file /System/Library/Frameworks//CoreFoundation.framework/CoreFoundation are out of sync. Falling back to library file for linking.
duplicate symbol __ZNK10XMBElement7GetTextEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement13GetAttributesEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement13GetChildNodesEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement13GetLineNumberEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN14XMBElementList8iteratorppEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN16XMBAttributeList8iteratorppEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK10XMBElement11GetNodeNameEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK16XMBAttributeList8iteratordeEv in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN14XMBElementListixEm in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZN16XMBAttributeListixEm in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK14XMBElementList17GetFirstNamedItemEi in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
duplicate symbol __ZNK16XMBAttributeList12GetNamedItemEi in:
    ../../../binaries/system/libengine_dbg.a(XeroXMB.o)
    ../../../binaries/system/libengine_dbg.a(XMBData.o)
ld: 12 duplicate symbols for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [../../../binaries/system/pyrogenesis_dbg] Error 1
make: *** [pyrogenesis] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4098/display/redirect

Build is unstable, some tests have failed - The Moirai have given mortals hearts that can endure.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     9>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\network\NetMessageSim.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\BinarySerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\system\ComponentManagerSerialization.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     4>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\pyrogenesis.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
Release: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    11>e:\jenkins\workspace\vs2015-differential\source\simulation2\helpers\render.cpp(115): warning C4701: potentially uninitialized local variable 'cy' used [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\source\maths\fixed.h(158): warning C4724: potential mod by 0 [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5191/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-gcc7.txt
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetNodeName() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:128: multiple definition of `XMBElement::GetNodeName() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:180: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetChildNodes() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:136: multiple definition of `XMBElement::GetChildNodes() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:188: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetAttributes() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:148: multiple definition of `XMBElement::GetAttributes() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:200: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetText() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:160: multiple definition of `XMBElement::GetText() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:212: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetLineNumber() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:169: multiple definition of `XMBElement::GetLineNumber() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:221: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::GetFirstNamedItem(int) const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:178: multiple definition of `XMBElementList::GetFirstNamedItem(int) const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:230: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::iterator::operator++()':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:197: multiple definition of `XMBElementList::iterator::operator++()'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:249: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::operator[](unsigned long)':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:204: multiple definition of `XMBElementList::operator[](unsigned long)'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:256: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::GetNamedItem(int) const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:234: multiple definition of `XMBAttributeList::GetNamedItem(int) const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:286: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::iterator::operator*() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:251: multiple definition of `XMBAttributeList::iterator::operator*() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:303: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::iterator::operator++()':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:256: multiple definition of `XMBAttributeList::iterator::operator++()'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:308: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::operator[](unsigned long)':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:263: multiple definition of `XMBAttributeList::operator[](unsigned long)'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:315: first defined here
collect2: error: ld returned 1 exit status
make[1]: *** [pyrogenesis.make:81: ../../../binaries/system/pyrogenesis_dbg] Error 1
make: *** [Makefile:71: pyrogenesis] Error 2

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5807/display/redirect

wraitii updated this revision to Diff 17320.May 1 2021, 4:17 PM

Fix lifetime issue in tests. I expect this to go green on windows, and to still fail on linux/mac because of the patching.

wraitii added inline comments.May 1 2021, 4:23 PM
source/ps/XMB/XMBData.h
86–88

Removed this because the new way is necessarily faster

Vulcan added a comment.May 1 2021, 4:35 PM

Successful build - Chance fights ever on the side of the prudent.

Debug: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\components\CCmpAIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     7>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\network\NetMessageSim.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\BinarySerializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\serialization\StdDeserializer.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter (compiling source file ..\..\..\source\simulation2\system\ComponentManagerSerialization.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\simulation2.vcxproj]
     4>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\pyrogenesis.vcxproj]
    22>e:\jenkins\workspace\vs2015-differential\libraries\source\spidermonkey\include-win32-debug\js\sweepingapi.h(38): warning C4100: 'needs': unreferenced formal parameter [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
    22>MSVCRTD.lib(initializers.obj) : warning LNK4098: defaultlib 'msvcrt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]
Release: 
Microsoft (R) Build Engine version 15.9.21+g9802d43bc3 for .NET Framework
Copyright (C) Microsoft Corporation. All rights reserved.

    22>e:\jenkins\workspace\vs2015-differential\source\maths\fixed.h(158): warning C4724: potential mod by 0 [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\test.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/5202/display/redirect

Vulcan added a comment.May 1 2021, 4:36 PM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
make[1]: *** No rule to make target `/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../source/scriptinterface/NativeWrapperDefns.h', needed by `obj/network_Debug/NetClient.o'.  Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [network] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/4109/display/redirect

Vulcan added a comment.May 1 2021, 5:07 PM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-gcc7.txt
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetNodeName() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:128: multiple definition of `XMBElement::GetNodeName() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:180: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetChildNodes() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:136: multiple definition of `XMBElement::GetChildNodes() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:188: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetAttributes() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:148: multiple definition of `XMBElement::GetAttributes() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:200: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetText() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:160: multiple definition of `XMBElement::GetText() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:212: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElement::GetLineNumber() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:169: multiple definition of `XMBElement::GetLineNumber() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:221: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::GetFirstNamedItem(int) const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:178: multiple definition of `XMBElementList::GetFirstNamedItem(int) const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:230: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::iterator::operator++()':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:197: multiple definition of `XMBElementList::iterator::operator++()'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:249: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBElementList::operator[](unsigned long)':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:204: multiple definition of `XMBElementList::operator[](unsigned long)'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:256: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::GetNamedItem(int) const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:234: multiple definition of `XMBAttributeList::GetNamedItem(int) const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:286: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::iterator::operator*() const':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:251: multiple definition of `XMBAttributeList::iterator::operator*() const'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:303: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::iterator::operator++()':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:256: multiple definition of `XMBAttributeList::iterator::operator++()'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:308: first defined here
/usr/bin/ld: ../../../binaries/system/libengine_dbg.a(XMBData.o): in function `XMBAttributeList::operator[](unsigned long)':
/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XMB/XMBData.cpp:263: multiple definition of `XMBAttributeList::operator[](unsigned long)'; ../../../binaries/system/libengine_dbg.a(XeroXMB.o):/zpool0/gcc7/build/workspaces/gcc/../../../source/ps/XML/XeroXMB.cpp:315: first defined here
collect2: error: ld returned 1 exit status
make[1]: *** [pyrogenesis.make:81: ../../../binaries/system/pyrogenesis_dbg] Error 1
make: *** [Makefile:71: pyrogenesis] Error 2

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/5818/display/redirect

This revision was not accepted when it landed; it landed in state Needs Review.May 4 2021, 3:02 PM
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.