From 6ff677ff2b37525ebfdf9d7e8c0141d190ae087f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Mon, 24 Aug 2026 10:15:28 -0300 Subject: [PATCH] Rename macosmenubar.m to .mm to avoid getting compiled as Objective-C and not Objective-C++. --- premake4.lua | 2 +- premake5.lua | 2 +- projects/macos/ee.files | 2 +- src/eepp/ui/platform/macos/{macosmenubar.m => macosmenubar.mm} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/eepp/ui/platform/macos/{macosmenubar.m => macosmenubar.mm} (100%) diff --git a/premake4.lua b/premake4.lua index 9a2b117b8..0101e8c2f 100644 --- a/premake4.lua +++ b/premake4.lua @@ -1616,7 +1616,7 @@ solution "eepp" language "C++" set_targetdir("libs/" .. os.get_real() .. "/") includedirs { "include", "src" } - files { "src/eepp/ui/platform/macos/macosmenubar.m" } + files { "src/eepp/ui/platform/macos/macosmenubar.mm" } buildoptions { "-x objective-c++" } if not is_vs() then buildoptions{ "-std=c++20" } diff --git a/premake5.lua b/premake5.lua index 328efe74d..c8c7dae81 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1658,7 +1658,7 @@ workspace "eepp" language "C++" cppdialect "C++20" incdirs { "include", "src" } - files { "src/eepp/ui/platform/macos/macosmenubar.m" } + files { "src/eepp/ui/platform/macos/macosmenubar.mm" } buildoptions { "-x objective-c++" } build_base_cpp_configuration( "eepp-macos-helper" ) target_dir_lib( "" ) diff --git a/projects/macos/ee.files b/projects/macos/ee.files index 70b88d858..fc65f96d2 100644 --- a/projects/macos/ee.files +++ b/projects/macos/ee.files @@ -1183,7 +1183,7 @@ ../../src/eepp/ui/uimenubar.cpp ../../src/eepp/ui/platformmenubar.hpp ../../src/eepp/ui/platformmenubar.cpp -../../src/eepp/ui/platform/macos/macosmenubar.m +../../src/eepp/ui/platform/macos/macosmenubar.mm ../../src/eepp/ui/uimenucheckbox.cpp ../../src/eepp/ui/uimenu.cpp ../../src/eepp/ui/uimenuitem.cpp diff --git a/src/eepp/ui/platform/macos/macosmenubar.m b/src/eepp/ui/platform/macos/macosmenubar.mm similarity index 100% rename from src/eepp/ui/platform/macos/macosmenubar.m rename to src/eepp/ui/platform/macos/macosmenubar.mm