From 922af57c82db9b491cec085fba283f724e796cc8 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 1 Apr 2014 22:34:49 +0200 Subject: [PATCH] =?UTF-8?q?More=20hacking=20on=20L=C3=B6ve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fails to link with a strange libtool error about libstdc++.la ("no such file or directory", but the file is there). I'm clueless. --- games-engines/love/love-0.9.0.recipe | 6 +++-- .../love/patches/love-0.9.0.patchset | 26 ++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/games-engines/love/love-0.9.0.recipe b/games-engines/love/love-0.9.0.recipe index 506fe173a..d2fc04315 100644 --- a/games-engines/love/love-0.9.0.recipe +++ b/games-engines/love/love-0.9.0.recipe @@ -59,15 +59,17 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix -# cmd:libtoolize cmd:pkg_config$secondaryArchSuffix + cmd:awk " PATCHES="love-0.9.0.patchset" BUILD() { runConfigure ./configure - make $jobArgs + # The pkg-config for freetype doesn't give this directory, which means + # there is no good way of finding it... + make $jobArgs CXXFLAGS="-I/system/develop/headers/x86/freetype2/ --std=c++11" } INSTALL() diff --git a/games-engines/love/patches/love-0.9.0.patchset b/games-engines/love/patches/love-0.9.0.patchset index 5dc81f5fd..ff417add8 100644 --- a/games-engines/love/patches/love-0.9.0.patchset +++ b/games-engines/love/patches/love-0.9.0.patchset @@ -1,4 +1,4 @@ -From 42a0ac9d4b717dccdb1c6f3d9615b702255574d2 Mon Sep 17 00:00:00 2001 +From 812eb4fa9c69400b4bd0c10e29db3ca14dc51bf0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 28 Jan 2014 20:25:18 +0100 Subject: Hack Glee to compile (we don't need GLX!) @@ -53,3 +53,27 @@ index 631cddc..42782ec 100644 -- 1.8.3.4 + +From cd63b6001a9dca28e0af9803b50f5127621ef1b7 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 1 Apr 2014 22:32:15 +0200 +Subject: Remove dupliczte definition of __stdcall + +* Haiku defines that to empty already, for legacy reasons. + +diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c +index 850a87d..1f46525 100644 +--- a/src/modules/graphics/opengl/GLee.c ++++ b/src/modules/graphics/opengl/GLee.c +@@ -55,7 +55,7 @@ typedef GLuint(*GLEE_LINK_FUNCTION)(void); + + GLboolean __GLeeInited=GL_FALSE; + +-#ifndef _WIN32 ++#if !defined(_WIN32) && !defined(__HAIKU__) + #define __stdcall /* nothing */ + #endif + +-- +1.8.3.4 +