1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00

- Fix build errors when MAKE_NOUVEAU set in /etc/make.conf

PR:		ports/150883
Submitted by:	Rusty Nejdl <rnejdl@ringofsaturn.com> and swell.k@gmail.com
Approved by:	gabor (mentor) and proler@gmail.com (maintainer)
This commit is contained in:
Stephen Montgomery-Smith 2011-07-03 18:40:21 +00:00
parent 60bba17b80
commit 0aa2142cbb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=277015
3 changed files with 32 additions and 0 deletions

View File

@ -27,6 +27,7 @@ WANT_SDL= yes
USE_SDL= sdl
USE_CMAKE= yes
WRKSRC= ${WRKDIR}/OpenAstroMenaceSVN
USE_DOS2UNIX= yes
OPTIONS= EN "English language pack" on \
DE "German language pack" off \
@ -44,6 +45,10 @@ LANGPACK= ru
IGNORE= cannot be build without/with multiple language packs. Please rerun 'make config' and select single language pack
.endif
.if !defined(WITHOUT_NOUVEAU)
CFLAGS+= -DOLD_MESA
.endif
post-patch:
${REINPLACE_CMD} -e 's|/usr/local/share/openastromenace|${DATADIR}|' \
${WRKSRC}/AstroMenaceSource/Main.cpp

View File

@ -0,0 +1,17 @@
--- AstroMenaceSource/Core/Base.h~
+++ AstroMenaceSource/Core/Base.h
@@ -46,10 +46,14 @@
#include <OpenGL/gl.h> // Header File For The OpenGL32 Library
#include <OpenGL/glu.h> // Header File For The GLu32 Library
#else
+ #ifdef OLD_MESA
#define __glext_h_ // Don't let gl.h include glext.h
+ #endif
#include <GL/gl.h> // Header File For The OpenGL32 Library
#include <GL/glu.h> // Header File For The GLu32 Library
+ #ifdef OLD_MESA
#undef __glext_h_
+ #endif
#endif
#include <stdlib.h> // rand, ...

View File

@ -0,0 +1,10 @@
--- AstroMenaceSource/Core/VirtualFileSystem/VFS.h~
+++ AstroMenaceSource/Core/VirtualFileSystem/VFS.h
@@ -34,6 +34,7 @@
#define VFS_H
+#include <cstdio>
#include "../Base.h"