Skip to content

Commit

Permalink
Compile warning fixes for fork code
Browse files Browse the repository at this point in the history
  • Loading branch information
getnamo committed Nov 3, 2017
1 parent 3319e0a commit 81b5571
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ void FPYRichTextSyntaxHighlighterTextLayoutMarshaller::ParseTokens(const FString
FRunInfo RunInfo(TEXT("SyntaxHighlight.PY.Normal"));
FTextBlockStyle TextBlockStyle = SyntaxTextStyle.NormalTextStyle;

const bool bIsWhitespace = FString(TokenText).TrimTrailing().IsEmpty();
const bool bIsWhitespace = FString(TokenText).TrimEnd().IsEmpty();
if(!bIsWhitespace)
{
bool bHasMatchedSyntax = false;
Expand Down
2 changes: 1 addition & 1 deletion Source/UnrealEnginePython/Private/UEPyEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ PyObject *py_unreal_engine_get_up_vector(PyObject * self, PyObject * args)

PyObject *py_unreal_engine_get_content_dir(PyObject * self, PyObject * args)
{
return PyUnicode_FromString(TCHAR_TO_UTF8(*FPaths::GameContentDir()));
return PyUnicode_FromString(TCHAR_TO_UTF8(*FPaths::ProjectContentDir()));
}

PyObject *py_unreal_engine_convert_relative_path_to_full(PyObject * self, PyObject * args)
Expand Down
6 changes: 3 additions & 3 deletions Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ void FUnrealEnginePythonModule::UESetupPythonInterpreter(bool verbose) {

PyObject *py_path = PyDict_GetItemString(py_sys_dict, "path");

char *zip_path = TCHAR_TO_UTF8(*FPaths::ConvertRelativePathToFull(FPaths::Combine(FPaths::GameContentDir(), FString("ue_python.zip"))));
char *zip_path = TCHAR_TO_UTF8(*FPaths::ConvertRelativePathToFull(FPaths::Combine(PROJECT_CONTENT_DIR, FString("ue_python.zip"))));
PyObject *py_zip_path = PyUnicode_FromString(zip_path);
PyList_Insert(py_path, 0, py_zip_path);

char *scripts_path = TCHAR_TO_UTF8(*FPaths::ConvertRelativePathToFull(FPaths::Combine(FPaths::GameContentDir(), FString("Scripts"))));
char *scripts_path = TCHAR_TO_UTF8(*FPaths::ConvertRelativePathToFull(FPaths::Combine(PROJECT_CONTENT_DIR, FString("Scripts"))));
PyObject *py_scripts_path = PyUnicode_FromString(scripts_path);
PyList_Insert(py_path, 0, py_scripts_path);

Expand All @@ -103,7 +103,7 @@ void FUnrealEnginePythonModule::UESetupPythonInterpreter(bool verbose) {
PyList_Insert(py_path, 0, py_plugin_scripts_path);

/* add the plugin paths - windows only */
FString PythonHome = FPaths::ConvertRelativePathToFull(FPaths::Combine(FPaths::GamePluginsDir(), FString("UnrealEnginePython/Binaries/Win64")));
FString PythonHome = FPaths::ConvertRelativePathToFull(FPaths::Combine(PROJECT_CONTENT_DIR, FString("UnrealEnginePython/Binaries/Win64")));
char *python_path = TCHAR_TO_UTF8(*PythonHome);
char *site_path = TCHAR_TO_UTF8(*FPaths::Combine(FString(PythonHome), FString("Lib/site-packages")));
PyList_Insert(py_path, 0, PyUnicode_FromString(python_path));
Expand Down
2 changes: 1 addition & 1 deletion Source/UnrealEnginePython/UnrealEnginePython.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public UnrealEnginePython(TargetInfo Target)
}
else if (Target.Platform == UnrealTargetPlatform.Linux)
{
string[] items = pythonHome.Split(';');
string[] items = PythonHome.Split(';');
PublicIncludePaths.Add(items[0]);
PublicAdditionalLibraries.Add(items[1]);
}
Expand Down

0 comments on commit 81b5571

Please sign in to comment.