We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

A patch including the changes described in this ticket.

xamarin.diff (text/plain), 7.51 KB, created by Cole Campbell on 2018-01-20 20:04:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cole Campbell

Created: 2018-01-20 20:04:46 UTC

Size: 7.51 KB

patch

obsolete

># HG changeset patch
># User Cole Campbell <cole.campbell@twistedlogik.net>
># Date 1516478341 18000
>#      Sat Jan 20 14:59:01 2018 -0500
># Node ID 34a3c00a25e915a518b29d64957937f14df0c721
># Parent  c3446901fc1c22973ec41c5d3e39f2de16b7821d
>Make iOS build friendlier for consumption by Xamarin projects
>
>diff -r c3446901fc1c -r 34a3c00a25e9 Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
>--- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Wed Jan 17 17:24:15 2018 -0800
>+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Sat Jan 20 14:59:01 2018 -0500
>@@ -110,6 +110,7 @@
> 		56F9D5601DF73BA400C15B5D /* SDL_dataqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 566726431DF72CF5001DD3DB /* SDL_dataqueue.c */; };
> 		93CB792313FC5E5200BD3E05 /* SDL_uikitviewcontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */; };
> 		93CB792613FC5F5300BD3E05 /* SDL_uikitviewcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */; };
>+		9E89A6B52013D24E002CF4EB /* SDL_dynamic_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9E89A6B42013D24E002CF4EB /* SDL_dynamic_main.c */; };
> 		A7A9EEA91F702631002A5589 /* SDL_steamcontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = A7A9EEA71F702631002A5589 /* SDL_steamcontroller.c */; };
> 		A7A9EEAA1F702631002A5589 /* SDL_steamcontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A9EEA81F702631002A5589 /* SDL_steamcontroller.h */; };
> 		A7F629241FE06523002F9CC9 /* SDL_uikitmetalview.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D7516F81EE1C28A00820EEA /* SDL_uikitmetalview.m */; };
>@@ -431,6 +432,7 @@
> 		56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_syspower.m; path = ../../src/power/uikit/SDL_syspower.m; sourceTree = SOURCE_ROOT; };
> 		93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitviewcontroller.h; sourceTree = "<group>"; };
> 		93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitviewcontroller.m; sourceTree = "<group>"; };
>+		9E89A6B42013D24E002CF4EB /* SDL_dynamic_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dynamic_main.c; sourceTree = "<group>"; };
> 		A7A9EEA71F702631002A5589 /* SDL_steamcontroller.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_steamcontroller.c; sourceTree = "<group>"; };
> 		A7A9EEA81F702631002A5589 /* SDL_steamcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_steamcontroller.h; sourceTree = "<group>"; };
> 		AA0AD06116647BBB00CE5896 /* SDL_gamecontroller.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gamecontroller.c; sourceTree = "<group>"; };
>@@ -777,6 +779,24 @@
> 			name = uikit;
> 			sourceTree = "<group>";
> 		};
>+		9E89A6B22013D224002CF4EB /* main */ = {
>+			isa = PBXGroup;
>+			children = (
>+				9E89A6B32013D234002CF4EB /* dynamic */,
>+			);
>+			name = main;
>+			path = ../../src/main;
>+			sourceTree = SOURCE_ROOT;
>+		};
>+		9E89A6B32013D234002CF4EB /* dynamic */ = {
>+			isa = PBXGroup;
>+			children = (
>+				9E89A6B42013D24E002CF4EB /* SDL_dynamic_main.c */,
>+			);
>+			name = dynamic;
>+			path = ../../src/main/dynamic;
>+			sourceTree = SOURCE_ROOT;
>+		};
> 		A7A9EEA61F702607002A5589 /* steam */ = {
> 			isa = PBXGroup;
> 			children = (
>@@ -961,6 +981,7 @@
> 		FD99B8BD0DD52E6D00FB1D6B /* Library Source */ = {
> 			isa = PBXGroup;
> 			children = (
>+				9E89A6B22013D224002CF4EB /* main */,
> 				04B2ECEF1025CEB900F9BC5F /* atomic */,
> 				FD99B8FB0DD52EDC00FB1D6B /* audio */,
> 				FD99B98A0DD52EDC00FB1D6B /* cpuinfo */,
>@@ -1598,6 +1619,7 @@
> 				FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */,
> 				FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */,
> 				047677BB0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */,
>+				9E89A6B52013D24E002CF4EB /* SDL_dynamic_main.c in Sources */,
> 				047677BC0EA76A31008ABAF1 /* SDL_haptic.c in Sources */,
> 				047AF1B30EA98D6C00811173 /* SDL_sysloadso.c in Sources */,
> 				046387460F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */,
>diff -r c3446901fc1c -r 34a3c00a25e9 include/SDL_main.h
>--- a/include/SDL_main.h	Wed Jan 17 17:24:15 2018 -0800
>+++ b/include/SDL_main.h	Sat Jan 20 14:59:01 2018 -0500
>@@ -156,7 +156,37 @@
> extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * reserved);
> 
> #endif /* __WINRT__ */
>+    
>+/**
>+ *  When running under Xamarin iOS, we need a way to define SDL_main() from our C# code.
>+ *  SDL_DYNAMIC_MAIN, when defined, implements a set of functions and a simple shim which
>+ *  allow the main function to be injected via a function pointer using P/Invoke. See
>+ *  src/main/dynamic/SDL_dynamic_main.c for more details.
>+ */
>+#if defined(XAMARIN) && defined(__IPHONEOS__)
>+#define SDL_DYNAMIC_MAIN
>+#endif
>+    
>+#ifdef SDL_DYNAMIC_MAIN
>+    
>+typedef int (SDLCALL * SDL_DynamicMain) (void);
> 
>+/**
>+ *  \brief Specifies the function pointer which is invoked by the dynamic SDL_main shim.
>+ *
>+ *  \param proc A function pointer which implements SDL_main.
>+ *  \return The exit code which should be returned by SDL_main.
>+ */
>+extern DECLSPEC void SDLCALL SDL_SetDynamicMain(SDL_DynamicMain proc);
>+
>+/**
>+ *  \brief Gets the function pointer which is invoked by the dynamic SDL_main shim.
>+ *
>+ *  \return A function pointer which implements SDL_main.
>+ */
>+extern DECLSPEC SDL_DynamicMain SDLCALL SDL_GetDynamicMain(void);
>+    
>+#endif
> 
> #ifdef __cplusplus
> }
>diff -r c3446901fc1c -r 34a3c00a25e9 src/main/dynamic/SDL_dynamic_main.c
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/src/main/dynamic/SDL_dynamic_main.c	Sat Jan 20 14:59:01 2018 -0500
>@@ -0,0 +1,45 @@
>+/*
>+ SDL_dynamic_main.c
>+ */
>+#include "../../SDL_internal.h"
>+
>+/* Include the SDL main definition header */
>+#include "SDL_main.h"
>+
>+#ifdef SDL_DYNAMIC_MAIN
>+
>+static SDL_DynamicMain SDL_dynamic_main_fn;
>+
>+void
>+SDL_SetDynamicMain(SDL_DynamicMain proc)
>+{
>+    SDL_dynamic_main_fn = proc;
>+}
>+
>+SDL_DynamicMain
>+SDL_GetDynamicMain()
>+{
>+    return SDL_dynamic_main_fn;
>+}
>+
>+#ifdef __cplusplus
>+extern "C"
>+#endif
>+int SDL_main(int argc, char *argv[])
>+{
>+    /*
>+     * Note that we don't pass any arguments to our main; this is because
>+     * it's safe to assume, given that you're using the dynamic main at all,
>+     * that you already have access to them in whatever code initialized this.
>+     * Leaving them out here keeps the P/Invoke declarations simple.
>+     */
>+    if (SDL_dynamic_main_fn)
>+    {
>+        return SDL_dynamic_main_fn();
>+    }
>+    return 1;
>+}
>+
>+#endif /* SDL_DYNAMIC_MAIN */
>+
>+/* vi: set ts=4 sw=4 expandtab: */
>diff -r c3446901fc1c -r 34a3c00a25e9 src/video/uikit/SDL_uikitappdelegate.m
>--- a/src/video/uikit/SDL_uikitappdelegate.m	Wed Jan 17 17:24:15 2018 -0800
>+++ b/src/video/uikit/SDL_uikitappdelegate.m	Sat Jan 20 14:59:01 2018 -0500
>@@ -42,6 +42,11 @@
> static char **forward_argv;
> static int exit_status;
> 
>+/*
>+ * Xamarin already defines main(), so we have to get rid of this one or else
>+ * we'll get duplicate symbol errors during linking.
>+ */
>+#ifndef XAMARIN
> int main(int argc, char **argv)
> {
>     int i;
>@@ -68,6 +73,7 @@
> 
>     return exit_status;
> }
>+#endif
> 
> static void SDLCALL
> SDL_IdleTimerDisabledChanged(void *userdata, const char *name, const char *oldValue, const char *hint)

Actions: View

Attachments on bug 4058: 3148

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.