Fix merge error

Author: crazytuzi

Source/UnrealEnginePython/Private/PyCommandlet.cpp

@@ -95,6 +95,7 @@ int32 UPyCommandlet::Main(const FString& CommandLine)
 		wcsncpy(argv[i], (const wchar_t *) TCHAR_TO_WCHAR(*PyArgv[i].ReplaceEscapedCharWithChar()), PyArgv[i].Len() + 1);
 	#else
 		wcsncpy(argv[i], *PyArgv[i].ReplaceEscapedCharWithChar(), PyArgv[i].Len() + 1);
+	#endif
 #elif PLATFORM_ANDROID || PLATFORM_IOS
 		wcsncpy(argv[i], (const wchar_t *)*PyArgv[i].ReplaceEscapedCharWithChar(), PyArgv[i].Len() + 1);
 #else

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -529,6 +529,7 @@ void FUnrealEnginePythonModule::StartupModule()
     Py_InitializeEx(0);
 #else
 	Py_Initialize();
+#endif
 
 #if PLATFORM_WINDOWS
 	// Restore stdio state after Py_Initialize set it to O_BINARY, otherwise

Source/UnrealEnginePython/Private/Wrappers/UEPyFFoliageInstance.cpp

@@ -1,7 +1,5 @@
 #include "UEPyFFoliageInstance.h"
 
-#if WITH_EDITOR
-
 #include "Wrappers/UEPyFVector.h"
 #include "Wrappers/UEPyFRotator.h"
 #include "Wrappers/UEPyFTransform.h"

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -108,8 +108,6 @@ public UnrealEnginePython(TargetInfo Target)
 
         PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
         PublicDefinitions.Add("WITH_UNREALENGINEPYTHON=1"); // fixed
-        string enableUnityBuild = System.Environment.GetEnvironmentVariable("UEP_ENABLE_UNITY_BUILD");
-        bFasterWithoutUnity = string.IsNullOrEmpty(enableUnityBuild);
         string PluginDirectory = Path.Combine(ModuleDirectory, "..", "..");
 
         PublicIncludePaths.AddRange(
@@ -297,7 +295,7 @@ public UnrealEnginePython(TargetInfo Target)
             string includePath = Path.Combine(PythonIOSLibsDirectory, "Python", "Headers");
             PublicIncludePaths.Add(includePath);
 
-            PublicLibraryPaths.AddRange(
+            PublicSystemLibraryPaths.AddRange(
                 new string[] {
                     Path.Combine(PythonIOSLibsDirectory, "BZip2"),
                     Path.Combine(PythonIOSLibsDirectory, "OpenSSL"),