Skip to content

GCC compilation fixes #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MellianStudios wants to merge 3 commits into
base: master
Choose a base branch
from
Open

GCC compilation fixes #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41c2113
series of fixes for GCC tested with GCC 13.3.0 on ubuntu 24.04
MellianStudios Nov 22, 2025
84fc5a8
wrong variable usage
MellianStudios Nov 23, 2025
bdcf21b
Merge remote-tracking branch 'refs/remotes/original/master'
MellianStudios Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ build*/
Build*/
.vs/
.vscode/
.idea/
out/
CMakeSettings.json
CMakeLists.txt

# Exceptions
.cache/
Expand Down
2 changes: 1 addition & 1 deletion Dependencies/libsodium/libsodium.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Solution.Util.CreateDep(dep.Name, dep.Dependencies, function()
Solution.Util.SetLibDirs(libPath)
Solution.Util.SetLinks(lib)
else
Solution.Util.SetLinks("libsodium")
Solution.Util.SetLinks("sodium")
end

Solution.Util.SetIncludes(dep.Path)
Expand Down
4 changes: 2 additions & 2 deletions Premake/ProjectUtil.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ end

systemToExecutableExtensionMap =
{
windows = "exe",
linux = "sh"
windows = ".exe",
linux = ""
}

systemToDynamicLibExtensionMap =
Expand Down
6 changes: 4 additions & 2 deletions Source/Base/Base/Types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ using mat4x4 = glm::mat4x4;
using mat4a = glm::mat4x3;
using quat = glm::quat;

template <typename TEnum>
struct EnumTraits;
namespace Generated {
template <typename TEnum>
struct EnumTraits;
}

#define DECLARE_GENERIC_BITWISE_OPERATORS(T) inline const T operator~ (T a) { return (T)~(i32)a; } \
inline const T operator| (T a, T b) { return (T)((i32)a | (i32)b); } \
Expand Down
2 changes: 0 additions & 2 deletions Source/Gameplay/Gameplay/Network/GameMessageRouter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ namespace Network
template <PacketConcept PacketStruct>
void UnregisterPacketHandler(OpcodeType opcode)
{
auto opcode = static_cast<OpcodeType>(PacketStruct::PACKET_ID);

GameMessageHandler& handler = _handlers[opcode];
handler.status = ConnectionStatus::None;
handler.minSize = 0;
Expand Down
4 changes: 2 additions & 2 deletions Source/Gameplay/Gameplay/Network/NetFields.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Network
template <typename T>
concept HasMetaEnumTraits = requires
{
typename EnumTraits<T>::Meta;
typename Generated::EnumTraits<T>::Meta;
};

template <typename TEnum> requires std::is_enum_v<TEnum>&& std::is_same_v<std::underlying_type_t<TEnum>, u16>&& HasMetaEnumTraits<TEnum>
Expand All @@ -24,7 +24,7 @@ namespace Network
template <typename TEnum> requires std::is_enum_v<TEnum> && std::is_same_v<std::underlying_type_t<TEnum>, u16> && HasMetaEnumTraits<TEnum>
struct NetFields
{
using Meta = typename EnumTraits<TEnum>::Meta;
using Meta = typename Generated::EnumTraits<TEnum>::Meta;
static constexpr u16 NumFields = static_cast<u16>(Meta::EnumList.size());

public:
Expand Down
8 changes: 5 additions & 3 deletions Source/Scripting/Scripting/Defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@

#include <robinhood/robinhood.h>

template <u16 TEventDataID>
struct LuaEventDataTraits;
namespace Generated {
template <u16 TEventDataID>
struct LuaEventDataTraits;
}

struct lua_State;
typedef i32(*lua_CFunction)(lua_State* L);
Expand All @@ -21,7 +23,7 @@ namespace Scripting
template <typename T>
concept LuaEventTypeConcept = requires(T t)
{
{ EnumTraits<std::decay_t<T>>::Meta::EnumID } -> std::convertible_to<u16>;
{ Generated::EnumTraits<std::decay_t<T>>::Meta::EnumID } -> std::convertible_to<u16>;
};

template <typename T>
Expand Down
10 changes: 5 additions & 5 deletions Source/Scripting/Scripting/Zenith.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ namespace Scripting
{
auto& eventTypeMap = eventState.eventTypeToState;

using Meta = typename EnumTraits<EventType>::Meta;
using Meta = typename Generated::EnumTraits<EventType>::Meta;
u16 eventTypeID = Meta::EnumID;
if (eventTypeMap.contains(eventTypeID))
return false;
Expand All @@ -322,7 +322,7 @@ namespace Scripting
template <LuaEventDataConcept EventDataType, LuaEventTypeConcept EventType, typename Callback = std::nullptr_t> requires LuaEventCallbackConcept<Callback, EventDataType>
bool RegisterEventTypeID(EventType eventType, Callback&& callback = nullptr)
{
u16 eventTypeID = EnumTraits<EventType>::Meta::EnumID;
u16 eventTypeID = Generated::EnumTraits<EventType>::Meta::EnumID;
u16 eventDataID = std::decay_t<EventDataType>::StructID;
u16 eventTypeVal = static_cast<u16>(eventType);

Expand Down Expand Up @@ -415,7 +415,7 @@ namespace Scripting
template <LuaEventTypeConcept EventType>
bool RegisterEventCallback(EventType eventType, u16 variantID, i32 funcRef)
{
u16 eventTypeID = EnumTraits<EventType>::Meta::EnumID;
u16 eventTypeID = Generated::EnumTraits<EventType>::Meta::EnumID;
u16 eventTypeVal = static_cast<u16>(eventType);

return RegisterEventCallbackRaw(eventTypeID, eventTypeVal, variantID, funcRef);
Expand All @@ -424,7 +424,7 @@ namespace Scripting
template <LuaEventTypeConcept EventType, LuaEventDataConcept EventDataType>
bool CallEvent(EventType eventType, EventDataType&& eventData, u16 variantID = 0)
{
u16 eventTypeID = EnumTraits<EventType>::Meta::EnumID;
u16 eventTypeID = Generated::EnumTraits<EventType>::Meta::EnumID;
u16 eventDataID = std::decay_t<EventDataType>::StructID;
u16 eventTypeVal = static_cast<u16>(eventType);

Expand Down Expand Up @@ -470,7 +470,7 @@ namespace Scripting
template <LuaEventTypeConcept EventType, LuaEventDataConcept EventDataType>
bool CallEventBool(EventType eventType, EventDataType&& eventData, u16 variantID = 0)
{
u16 eventTypeID = EnumTraits<EventType>::Meta::EnumID;
u16 eventTypeID = Generated::EnumTraits<EventType>::Meta::EnumID;
u16 eventDataID = std::decay_t<EventDataType>::StructID;
u16 eventTypeVal = static_cast<u16>(eventType);

Expand Down