🔪 Sharpmake Update

Engine.sharpmake.cs

@@ -456,7 +456,7 @@ public override void ConfigureMac(Configuration conf, CommonTarget target)
         }
 
         //??
-        conf.Options.Add(new Options.XCode.Compiler.UserFrameworks("Mono"));
+        conf.XcodeUserFrameworks.Add( "Mono" );
 
         // #TODO Read path from Globals / Move to own class again
         if (Directory.Exists(Globals.MONO_macOS_Dir))

Source/Components/Scripting/ScriptComponent.cpp

@@ -3,6 +3,7 @@
 #if USING( ME_SCRIPTING )
 #include <mono/metadata/loader.h>
 #include <mono/metadata/reflection.h>    // this should go
+#include <mono/metadata/appdomain.h>
 #endif
 
 #include "ScriptComponent.h"
@@ -16,7 +17,6 @@
 #include "Scripting/MonoUtils.h"
 #include <Web\HttpDownload.h>
 #include "File.h"
-#include <mono\metadata\appdomain.h>
 #include "Utils/HavanaUtils.h"
 #include "Engine/World.h"
 

Source/Scripting/Bindings/ImGui.bindings.cpp

@@ -1,6 +1,8 @@
 #include "PCH.h"
 #include "ImGui.bindings.h"
 
+#if USING( ME_SCRIPTING )
+
 #include <mono/metadata/object.h>
 #include "imgui.h"
 
@@ -56,3 +58,5 @@ void Register_ImGuiBindings()
     mono_add_internal_call( "ImGui::ImGui_Checkbox", (void*)ImGui_Checkbox );
     mono_add_internal_call( "ImGui::ImGui_Button", (void*)ImGui_Button );
 }
+
+#endif

Source/Scripting/Bindings/Log.bindings.cpp

@@ -1,6 +1,8 @@
 #include "PCH.h"
 #include "Log.bindings.h"
 
+#if USING( ME_SCRIPTING )
+
 #include <mono/metadata/object.h>
 
 static void Log( MonoString* inString )
@@ -52,3 +54,5 @@ void Register_LogBindings()
     mono_add_internal_call( "TestScript::NativeLog_Vector", (void*)NativeLog_Vector );
     mono_add_internal_call( "TestScript::Native_VectorLength", (void*)Native_VectorLength );
 }
+
+#endif

Source/Scripting/Bindings/World.bindings.cpp

@@ -1,5 +1,7 @@
 #include "PCH.h"
 
+#if USING( ME_SCRIPTING )
+
 #include <mono/metadata/object.h>
 #include <Components/Transform.h>
 #include <Scripting/ScriptEngine.h>
@@ -55,3 +57,5 @@ void Register_WorldBindings()
     mono_add_internal_call( "World::World_GetTransformByName", (void*)World_GetTransformByName );
     mono_add_internal_call( "World::World_CreateEntity", (void*)World_CreateEntity );
 }
+
+#endif

Tools/BaseProject.sharpmake.cs

@@ -204,16 +204,11 @@ public virtual void ConfigureMac(Configuration conf, CommonTarget target)
         conf.Options.Add(Options.XCode.Compiler.OnlyActiveArch.Enable);
         conf.Options.Add(Options.XCode.Compiler.CppLanguageStandard.GNU17);
         conf.Options.Add(Options.XCode.Compiler.RTTI.Enable);
-        conf.Options.Add(Options.XCode.Compiler.Exceptions.Enable);
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Cocoa"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Metal"));
-        conf.Options.Add(new Options.XCode.Compiler.UserFrameworks("libiconv.tbd"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("IOKit"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("ForceFeedback"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Carbon"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("CoreVideo"));
+        conf.Options.Add(Options.XCode.Compiler.CppExceptions.Enable);
+        conf.Options.Add(Options.XCode.Compiler.ObjCExceptions.Enable);
         //conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Foundation"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Quartz"));
+        conf.XcodeSystemFrameworks.Add("Cocoa", "Metal", "IOKit", "ForceFeedback", "Carbon", "CoreVideo", "Quartz");
+        conf.XcodeUserFrameworks.Add("libiconv.tbd");
         conf.Options.Add(new Options.XCode.Compiler.OnlyActiveArch());
 
         conf.Defines.Add("DEFINE_ME_PLATFORM_MACOS");

Tools/CommonTarget.sharpmake.cs

@@ -104,14 +104,14 @@ public static CommonTarget[] GetDefaultTargets()
                 {
                     var macOSTarget = new CommonTarget(
                         Platform.mac,
-                        DevEnv.xcode4ios,
+                        DevEnv.xcode,
                         Optimization.Debug | Optimization.Release,
                         DotNetFramework.v4_8,
                         dotNetOS: 0);
                     macOSTarget.SubPlatform = SubPlatformType.macOS;
                     var macEditor = new CommonTarget(
                         Platform.mac,
-                        DevEnv.xcode4ios,
+                        DevEnv.xcode,
                         Optimization.Debug | Optimization.Release,
                         DotNetFramework.v4_8,
                         dotNetOS: 0);