From 5d7c5db31a7159f73a2bec8e6e6741088bdb8ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 1 Oct 2017 17:20:21 +0200
Subject: Godot: platform detection patch for AMD64 arch.


diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index e38f06e..690c0a7 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -42,8 +42,12 @@ def configure(env):
 
     env.Append(CPPPATH=['#platform/haiku'])
 
-    env["CC"] = "gcc-x86"
-    env["CXX"] = "g++-x86"
+    if (is64):
+        env["CC"] = "gcc"
+        env["CXX"] = "g++"
+    else:
+        env["CC"] = "gcc-x86"
+        env["CXX"] = "g++-x86"
 
     if (env["target"] == "release"):
         if (env["debug_release"] == "yes"):
-- 
2.7.0


From 0fda477887db92077ee046e1aeaefbfce0e2a1ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 1 Oct 2017 17:22:22 +0200
Subject: Build fix for Haiku


diff --git a/core/image.h b/core/image.h
index c2f556a..6a38726 100644
--- a/core/image.h
+++ b/core/image.h
@@ -30,6 +30,11 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+/*Hack to get it work on Haiku*/
+#ifdef __HAIKU__
+#include_next <kernel/image.h>
+#endif
+
 #include "color.h"
 #include "dvector.h"
 #include "math_2d.h"
-- 
2.7.0


From b8c1eec487ecc9aef959946b1686aac1b64b4ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 1 Oct 2017 17:25:05 +0200
Subject: Sysleebs needst to be added manually as LDFLAGS


diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index 690c0a7..b8cb77f 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -65,6 +65,10 @@ def configure(env):
     env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
     env.Append(LIBS=['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
 
+    # Stuff for Haikuports
+    # You need to adjust it every time if you add or remove a syslib in the recipe
+    env.Append(LIBS=['GLEW', 'GLU', 'mpcdec', 'ogg', 'png16', 'ssl', 'crypto', 'theora', 'vorbis', 'vorbisfile', 'webp'])
+
     import methods
     env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')})
     env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')})
-- 
2.7.0