From 243cf4d3e3ba38a176a07a515d3c2c22107e39d7 Mon Sep 17 00:00:00 2001 From: Begasus Date: Thu, 6 Feb 2025 09:25:20 +0100 Subject: Build fixes diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eb336e..0456f65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ endif() if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") elseif (NOT CMAKE_VERSION VERSION_LESS "3.1") set (CMAKE_C_STANDARD_REQUIRED TRUE) set (CMAKE_C_STANDARD "99") @@ -288,6 +288,10 @@ if (CEGUI_WARNINGS_AS_ERRORS) endif () endif () +if(HAIKU) + add_definitions(-Wno-deprecated-declarations -Wno-deprecated-copy) # TODO too much spam for now +endif() + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CEGUI_EXTRA_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEGUI_EXTRA_FLAGS}") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CEGUI_EXTRA_FLAGS}") diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp index 73934d3..fe4cacc 100644 --- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp @@ -99,7 +99,7 @@ void LibxmlParser::parseXML(XMLHandler& handler, if (!doc) { - xmlError* err = xmlGetLastError(); + const xmlError* err = xmlGetLastError(); CEGUI_THROW(GenericException( String("xmlParseMemory failed in file: '") + diff --git a/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp b/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp index 1660499..005d17d 100644 --- a/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp +++ b/cegui/src/XMLParserModules/TinyXML/XMLParser.cpp @@ -130,7 +130,7 @@ namespace CEGUI processElement(childNode->ToElement()); break; case TiXmlNode::CEGUI_TINYXML_TEXT: - if (childNode->ToText()->Value() != '\0') + if (childNode->ToText()->Value() != nullptr) d_handler->text((encoded_char*)childNode->ToText()->Value()); break; -- 2.45.2