Get things compiling on Linux again under Unreal 4.21

Author: crizCraig

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -43,14 +43,14 @@ public class UnrealEnginePython : ModuleRules
         "/usr/local/include/python3.7m",
         "/usr/local/include/python3.6",
         "/usr/local/include/python3.6m",
-        "/usr/local/include/python3.5",
+//        "/usr/local/include/python3.5",
         "/usr/local/include/python3.5m",
         "/usr/local/include/python2.7",
         "/usr/include/python3.7",
         "/usr/include/python3.7m",
         "/usr/include/python3.6",
         "/usr/include/python3.6m",
-        "/usr/include/python3.5",
+//        "/usr/include/python3.5",
         "/usr/include/python3.5m",
         "/usr/include/python2.7",
     };
@@ -255,6 +255,8 @@ public UnrealEnginePython(TargetInfo Target)
                 System.Console.WriteLine("Discovered Python includes in " + includesPath);
                 System.Console.WriteLine("Discovered Python lib at " + libsPath);
                 PublicIncludePaths.Add(includesPath);
+//                PublicIncludePaths.Add("/usr/include");
+//                PublicIncludePaths.Add("/home/a/src/deepdrive-sim-2.1/Plugins/UnrealEnginePython/linux/include");
                 PublicAdditionalLibraries.Add(libsPath);
 
             }
@@ -333,7 +335,9 @@ private string DiscoverPythonPath(string[] knownPaths, string binaryPath)
     private string DiscoverLinuxPythonIncludesPath()
     {
         List<string> paths = new List<string>(linuxKnownIncludesPaths);
-        paths.Insert(0, Path.Combine(ModuleDirectory, "../../linux", "python3.5m", "include"));
+        string projPy35path = Path.Combine(ModuleDirectory, "../../linux", "python3.5m", "include");
+        System.Console.WriteLine("Adding project python include path: " + projPy35path);
+        paths.Insert(0,  projPy35path);
         paths.Insert(0, Path.Combine(ModuleDirectory, "../../Binaries", "Linux", "include"));
         foreach (string path in paths)
         {
@@ -350,7 +354,9 @@ private string DiscoverLinuxPythonIncludesPath()
     private string DiscoverLinuxPythonLibsPath()
     {
         List<string> paths = new List<string>(linuxKnownLibsPaths);
-        paths.Insert(0, Path.Combine(ModuleDirectory, "../../linux", "x86_64-linux-gnu", "libpython3.5m.so"));
+        string projPy35path = Path.Combine(ModuleDirectory, "../../linux", "x86_64-linux-gnu", "libpython3.5m.so");
+        System.Console.WriteLine("Adding project python lib path: " + projPy35path);
+        paths.Insert(0, projPy35path);
         paths.Insert(0, Path.Combine(ModuleDirectory, "../../Binaries", "Linux", "lib"));
         paths.Insert(0, Path.Combine(ModuleDirectory, "../../Binaries", "Linux", "lib64"));
         foreach (string path in paths)

linux/python3.5m/include/ImDib.h

@@ -0,0 +1,57 @@
+/*
+ * The Python Imaging Library
+ * $Id$
+ *
+ * Windows DIB specifics
+ *
+ * Copyright (c) Secret Labs AB 1997-98.
+ * Copyright (c) Fredrik Lundh 1996.
+ *
+ * See the README file for information on usage and redistribution.
+ */
+
+#ifdef _WIN32
+
+#include "ImPlatform.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+struct ImagingDIBInstance {
+    /* Windows interface */
+    HDC dc;
+    HBITMAP bitmap;
+    HGDIOBJ old_bitmap;
+    BITMAPINFO *info;
+    UINT8 *bits;
+    HPALETTE palette;
+    /* Used by cut and paste */
+    char mode[4];
+    int xsize, ysize;
+    int pixelsize;
+    int linesize;
+    ImagingShuffler pack;
+    ImagingShuffler unpack;
+};
+
+typedef struct ImagingDIBInstance* ImagingDIB;
+
+extern char* ImagingGetModeDIB(int size_out[2]);
+
+extern ImagingDIB ImagingNewDIB(const char *mode, int xsize, int ysize);
+
+extern void ImagingDeleteDIB(ImagingDIB im);
+
+extern void ImagingDrawDIB(ImagingDIB dib, void *dc, int dst[4], int src[4]);
+extern void ImagingExposeDIB(ImagingDIB dib, void *dc);
+
+extern int ImagingQueryPaletteDIB(ImagingDIB dib, void *dc);
+
+extern void ImagingPasteDIB(ImagingDIB dib, Imaging im, int xy[4]);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif

linux/python3.5m/include/ImPlatform.h

@@ -0,0 +1,80 @@
+/*
+ * The Python Imaging Library
+ * $Id$
+ *
+ * platform declarations for the imaging core library
+ *
+ * Copyright (c) Fredrik Lundh 1995-2003.
+ */
+
+#include "Python.h"
+
+/* Check that we have an ANSI compliant compiler */
+#ifndef HAVE_PROTOTYPES
+#error Sorry, this library requires support for ANSI prototypes.
+#endif
+#ifndef STDC_HEADERS
+#error Sorry, this library requires ANSI header files.
+#endif
+
+#if defined(PIL_NO_INLINE)
+#define inline 
+#else
+#if defined(_MSC_VER) && !defined(__GNUC__)
+#define inline __inline
+#endif
+#endif
+
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#else
+/* For System that are not Windows, we'll need to define these. */
+
+#if SIZEOF_SHORT == 2
+#define	INT16 short
+#elif SIZEOF_INT == 2
+#define	INT16 int
+#else
+#define	INT16 short /* most things works just fine anyway... */
+#endif
+
+#if SIZEOF_SHORT == 4
+#define	INT32 short
+#elif SIZEOF_INT == 4
+#define	INT32 int
+#elif SIZEOF_LONG == 4
+#define	INT32 long
+#else
+#error Cannot find required 32-bit integer type
+#endif
+
+#if SIZEOF_LONG == 8
+#define	INT64 long
+#elif SIZEOF_LONG_LONG == 8
+#define	INT64 long
+#endif
+
+#define	INT8  signed char
+#define	UINT8 unsigned char
+
+#define	UINT16 unsigned INT16
+#define	UINT32 unsigned INT32
+
+#endif
+
+/* assume IEEE; tweak if necessary (patches are welcome) */
+#define	FLOAT32 float
+#define	FLOAT64 double
+
+#ifdef _MSC_VER
+typedef signed __int64       int64_t;
+#endif
+
+#ifdef __GNUC__
+    #define GCC_VERSION (__GNUC__ * 10000 \
+                       + __GNUC_MINOR__ * 100 \
+                       + __GNUC_PATCHLEVEL__)
+#endif