Skip to content

Commit 373afc2

Browse files
author
rdeioris
authored
Merge pull request #82 from nfergu/fix_mac_compilation
Fix Mac compilation
2 parents dea7d9f + f32e5b7 commit 373afc2

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Source/UnrealEnginePython/Private/UEPyEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ PyObject *py_unreal_engine_get_assets_by_filter(PyObject * self, PyObject * args
316316
PyObject *pyfilter;
317317
PyObject *py_return_asset_data;
318318

319-
static char *kw_names[] = { "filter", "return_asset_data", NULL };
319+
static char *kw_names[] = { (char *)"filter", (char *)"return_asset_data", NULL };
320320

321321
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:get_assets_by_filter", kw_names, &pyfilter, &py_return_asset_data)) {
322322
return NULL;

Source/UnrealEnginePython/Public/PyCommandlet.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ int32 UPyCommandlet::Main(const FString& CommandLine)
7979
#endif
8080
#else
8181
argv[i] = (char*)malloc(PyArgv[i].Len() + 1);
82+
#if UNREAL_ENGINE_PYTHON_ON_MAC || UNREAL_ENGINE_PYTHON_ON_LINUX
83+
strncpy(argv[i], TCHAR_TO_UTF8(*PyArgv[i].ReplaceEscapedCharWithChar()), PyArgv[i].Len()+1);
84+
#else
8285
strcpy_s(argv[i], PyArgv[i].Len()+1, TCHAR_TO_UTF8(*PyArgv[i].ReplaceEscapedCharWithChar()));
86+
#endif
8387
#endif
8488
}
8589

0 commit comments

Comments
 (0)