Skip to content

Commit 0495906

Browse files
author
xleoliu
committed
Merge branch 'Add-support-for-iOS' of https://github.com/cyberbibby/UnrealEnginePython into cyberbibby-Add-support-for-iOS
# Conflicts: # Source/UnrealEnginePython/Private/PyCommandlet.cpp # Source/UnrealEnginePython/Private/UnrealEnginePython.cpp # Source/UnrealEnginePython/Private/Wrappers/UEPyFFoliageInstance.cpp # Source/UnrealEnginePython/UnrealEnginePython.Build.cs
2 parents a7ec270 + 0eb1a2d commit 0495906

219 files changed

Lines changed: 66391 additions & 32 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/UnrealEnginePython/Private/PyCommandlet.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,14 @@ int32 UPyCommandlet::Main(const FString& CommandLine)
9595
wcsncpy(argv[i], (const wchar_t *) TCHAR_TO_WCHAR(*PyArgv[i].ReplaceEscapedCharWithChar()), PyArgv[i].Len() + 1);
9696
#else
9797
wcsncpy(argv[i], *PyArgv[i].ReplaceEscapedCharWithChar(), PyArgv[i].Len() + 1);
98-
#endif
99-
#elif PLATFORM_ANDROID
98+
#elif PLATFORM_ANDROID || PLATFORM_IOS
10099
wcsncpy(argv[i], (const wchar_t *)*PyArgv[i].ReplaceEscapedCharWithChar(), PyArgv[i].Len() + 1);
101100
#else
102101
wcscpy_s(argv[i], PyArgv[i].Len() + 1, *PyArgv[i].ReplaceEscapedCharWithChar());
103102
#endif
104103
#else
105104
argv[i] = (char*)malloc(PyArgv[i].Len() + 1);
106-
#if PLATFORM_MAC || PLATFORM_LINUX || PLATFORM_ANDROID
105+
#if PLATFORM_MAC || PLATFORM_LINUX || PLATFORM_ANDROID || PLATFORM_IOS
107106
strncpy(argv[i], TCHAR_TO_UTF8(*PyArgv[i].ReplaceEscapedCharWithChar()), PyArgv[i].Len() + 1);
108107
#else
109108
strcpy_s(argv[i], PyArgv[i].Len() + 1, TCHAR_TO_UTF8(*PyArgv[i].ReplaceEscapedCharWithChar()));

‎Source/UnrealEnginePython/Private/Slate/UEPyIDetailsView.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static PyObject *py_ue_idetails_view_set_object(ue_PyIDetailsView *self, PyObjec
4040
}
4141

4242
static PyMethodDef ue_PyIDetailsView_methods[] = {
43-
#pragma warning(suppress: 4191)
43+
#pragma warning(disable: 4191)
4444
{ "set_object", (PyCFunction)py_ue_idetails_view_set_object, METH_VARARGS | METH_KEYWORDS, "" },
4545
{ NULL } /* Sentinel */
4646
};
@@ -93,4 +93,4 @@ ue_PyIDetailsView *py_ue_is_idetails_view(PyObject *obj)
9393
return nullptr;
9494
return (ue_PyIDetailsView *)obj;
9595
}
96-
#endif
96+
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPyIStructureDetailsView.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static PyObject *py_ue_istructure_details_view_get_widget(ue_PyIStructureDetails
8181
}
8282

8383
static PyMethodDef ue_PyIStructureDetailsView_methods[] = {
84-
#pragma warning(suppress: 4191)
84+
#pragma warning(disable: 4191)
8585
{ "set_structure_data", (PyCFunction)py_ue_istructure_details_view_set_structure_data, METH_VARARGS | METH_KEYWORDS, "" },
8686
{ "get_widget", (PyCFunction)py_ue_istructure_details_view_get_widget, METH_VARARGS, "" },
8787
{ NULL } /* Sentinel */
@@ -224,4 +224,4 @@ ue_PyIStructureDetailsView *py_ue_is_istructure_details_view(PyObject *obj)
224224
return nullptr;
225225
return (ue_PyIStructureDetailsView *)obj;
226226
}
227-
#endif
227+
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPySCanvas.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ static PyObject *py_ue_scanvas_add_slot(ue_PySCanvas *self, PyObject * args, PyO
9393
}
9494

9595
static PyMethodDef ue_PySCanvas_methods[] = {
96-
#pragma warning(suppress: 4191)
96+
#ifdef _MSC_VER
97+
#pragma warning(disable: 4191)
98+
#endif
9799
{ "add_slot", (PyCFunction)py_ue_scanvas_add_slot, METH_VARARGS | METH_KEYWORDS, "" },
98100
{ "clear_children", (PyCFunction)py_ue_scanvas_clear_children, METH_VARARGS, "" },
99101
{ NULL } /* Sentinel */

‎Source/UnrealEnginePython/Private/Slate/UEPySGridPanel.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ static PyObject *py_ue_sgrid_panel_add_slot(ue_PySGridPanel *self, PyObject * ar
4646

4747
static PyMethodDef ue_PySGridPanel_methods[] = {
4848
{ "clear_children", (PyCFunction)py_ue_sgrid_panel_clear_children, METH_VARARGS, "" },
49-
#pragma warning(suppress: 4191)
49+
#ifdef _MSC_VER
50+
#pragma warning(disable: 4191)
51+
#endif
5052
{ "add_slot", (PyCFunction)py_ue_sgrid_panel_add_slot, METH_VARARGS | METH_KEYWORDS, "" },
5153
{ NULL } /* Sentinel */
5254
};

‎Source/UnrealEnginePython/Private/Slate/UEPySHeaderRow.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ static PyObject *py_ue_sheader_row_add_column(ue_PySHeaderRow *self, PyObject *a
6767
}
6868

6969
static PyMethodDef ue_PySHeaderRow_methods[] = {
70-
#pragma warning(suppress: 4191)
70+
#ifdef _MSC_VER
71+
#pragma warning(disable: 4191)
72+
#endif
7173
{ "add_column", (PyCFunction)py_ue_sheader_row_add_column, METH_VARARGS | METH_KEYWORDS, "" },
7274
{ NULL } /* Sentinel */
7375
};

‎Source/UnrealEnginePython/Private/Slate/UEPySHorizontalBox.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ static PyObject *py_ue_shorizontal_box_num_slots(ue_PySHorizontalBox *self, PyOb
3232
}
3333

3434
static PyMethodDef ue_PySHorizontalBox_methods[] = {
35-
#pragma warning(suppress: 4191)
35+
#ifdef _MSC_VER
36+
#pragma warning(disable: 4191)
37+
#endif
3638
{ "add_slot", (PyCFunction)py_ue_shorizontal_box_add_slot, METH_VARARGS | METH_KEYWORDS, "" },
3739
{ "num_slots", (PyCFunction)py_ue_shorizontal_box_num_slots, METH_VARARGS, "" },
3840
{ NULL } /* Sentinel */

‎Source/UnrealEnginePython/Private/Slate/UEPySOverlay.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ static PyObject *py_ue_soverlay_get_num_widgets(ue_PySOverlay *self, PyObject *
7474
}
7575

7676
static PyMethodDef ue_PySOverlay_methods[] = {
77-
#pragma warning(suppress: 4191)
77+
#ifdef _MSC_VER
78+
#pragma warning(disable: 4191)
79+
#endif
7880
{ "add_slot", (PyCFunction)py_ue_soverlay_add_slot, METH_VARARGS | METH_KEYWORDS, "" },
7981
{ "get_num_widgets", (PyCFunction)py_ue_soverlay_get_num_widgets, METH_VARARGS, "" },
8082
{ NULL } /* Sentinel */

‎Source/UnrealEnginePython/Private/Slate/UEPySScrollBox.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ static PyObject *py_ue_sscroll_box_clear_children(ue_PySScrollBox *self, PyObjec
3131

3232
static PyMethodDef ue_PySScrollBox_methods[] = {
3333
{ "clear_children", (PyCFunction)py_ue_sscroll_box_clear_children, METH_VARARGS, "" },
34-
#pragma warning(suppress: 4191)
34+
#ifdef _MSC_VER
35+
#pragma warning(disable: 4191)
36+
#endif
3537
{ "add_slot", (PyCFunction)py_ue_sscroll_box_add_slot, METH_VARARGS | METH_KEYWORDS, "" },
3638
{ NULL } /* Sentinel */
3739
};

‎Source/UnrealEnginePython/Private/Slate/UEPySSplitter.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ static PyObject *py_ue_ssplitter_add_slot(ue_PySSplitter *self, PyObject * args,
5252
}
5353

5454
static PyMethodDef ue_PySSplitter_methods[] = {
55-
#pragma warning(suppress: 4191)
55+
#ifdef _MSC_VER
56+
#pragma warning(disable: 4191)
57+
#endif
5658
{ "add_slot", (PyCFunction)py_ue_ssplitter_add_slot, METH_VARARGS | METH_KEYWORDS, "" },
5759
{ NULL } /* Sentinel */
5860
};

0 commit comments

Comments
 (0)