More hacking on Löve

Fails to link with a strange libtool error about libstdc++.la ("no such
file or directory", but the file is there). I'm clueless.
This commit is contained in:
Adrien Destugues
2014-04-01 22:34:49 +02:00
parent fec97cb13d
commit 922af57c82
2 changed files with 29 additions and 3 deletions

View File

@@ -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()

View File

@@ -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 <pulkomandy@pulkomandy.tk>
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 <pulkomandy@pulkomandy.tk>
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