Merge branch 'master' into dev

sammyfreg · Dec 11, 2023 · 528b263 · 528b263
2 parents 04918a2 + 33c2cd0
commit 528b263
Show file tree

Hide file tree

Showing 9 changed files with 444 additions and 4 deletions.
diff --git a/Build/Sharpmake/Sharpmake.Application b/Build/Sharpmake/Sharpmake.Application
diff --git a/Build/netImgui.sharpmake.cs b/Build/netImgui.sharpmake.cs
@@ -90,7 +90,14 @@ public override void ConfigureAll(Configuration conf, NetImguiTarget target)
 			conf.Options.Add(new Options.Vc.Linker.DisableSpecificWarnings("4099")); //Prevents: warning LNK4099: PDB '' was not found with 'glfw3_mtd.lib(context.c.obj)' or at ''; linking object as if no debug info
 			//---------------------------------------------
 
-			conf.EventPostBuild.Add("xcopy \"" + NetImguiTarget.GetPath(@"\Code\ServerApp\Background.png") + "\" \"" + conf.TargetPath + "\" /D /Y");
+			if (target.DevEnv == DevEnv.xcode4ios)
+			{
+				conf.Options.Add(new Sharpmake.Options.XCode.Compiler.InfoPListFile(NetImguiTarget.GetPath(@"/Code/ServerApp/info.plist")));
+			}
+			else
+			{
+				conf.EventPostBuild.Add("xcopy \"" + NetImguiTarget.GetPath(@"\Code\ServerApp\Background.png") + "\" \"" + conf.TargetPath + "\" /D /Y");
+			}
 		}
 
 		private string getGlfwLibName(Platform platform, DevEnv developerEnv)
@@ -102,7 +109,9 @@ private string getGlfwLibName(Platform platform, DevEnv developerEnv)
                 libName += "-vc2019";
 			} else if( developerEnv == DevEnv.vs2017 ) {
                 libName += "-vc2017";
-			}
+			} else if( developerEnv == DevEnv.xcode4ios ) {
+                libName += "-macos-universal";
+            }
 
             if (platform == Platform.win64) {
                 libName += "-64";

diff --git a/Build/readme.txt b/Build/readme.txt
@@ -1,5 +1,5 @@
 This folder contains files needed to generate the various NetImgui projects.
 
-User can safely ignore its content; only "GenerateProject.bat" needs calling.
+User can safely ignore its content; only "GenerateProject.bat" needs calling, or "GenerateProject.sh" on macOS.
 
 Optionally, "GenerateCompatibilityTest.bat" can be called to get older versions of Dear ImGui and test compatibility of NetImgui against all of them.