glaxium: fix previous
Also, unconditionally link against libm because this uses cos().
This commit is contained in:
parent
faf6b467f0
commit
5a92aab5c6
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.29 2022/08/11 05:08:26 gutteridge Exp $
|
||||
# $NetBSD: Makefile,v 1.30 2023/05/31 21:53:00 wiz Exp $
|
||||
#
|
||||
|
||||
DISTNAME= glaxium_0.5
|
||||
|
@ -15,6 +15,8 @@ GNU_CONFIGURE= yes
|
|||
USE_TOOLS+= gmake
|
||||
USE_LANGUAGES= c c++
|
||||
CONFIGURE_ENV+= X11_LDFLAGS=${X_LDFLAGS:Q}
|
||||
# uses cos()
|
||||
X_LDFLAGS= ${X11_LDFLAGS} -lm
|
||||
|
||||
BUILD_TARGET= glaxium
|
||||
|
||||
|
@ -38,13 +40,6 @@ do-install:
|
|||
${INSTALL_DATA} ${WRKSRC}/textures/*.png \
|
||||
${DESTDIR}${PREFIX}/share/glaxium/textures/
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
.if ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
|
||||
X_LDFLAGS= ${X11_LDFLAGS} -lm -lstdc++
|
||||
.else
|
||||
X_LDFLAGS= ${X11_LDFLAGS}
|
||||
.endif
|
||||
|
||||
.include "../../audio/SDL_mixer/buildlink3.mk"
|
||||
.include "../../devel/SDL/buildlink3.mk"
|
||||
.include "../../graphics/MesaLib/buildlink3.mk"
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.9 2023/05/28 09:54:19 bsiegert Exp $
|
||||
$NetBSD: distinfo,v 1.10 2023/05/31 21:53:00 wiz Exp $
|
||||
|
||||
BLAKE2s (glaxium_0.5.tar.gz) = c4c6d46cbc7a763d54584350bd172cb59c3640b03d8efc9ed5f996cac463c566
|
||||
SHA512 (glaxium_0.5.tar.gz) = 544c59f9b758accb7de270dc9b2e9943fab9a69bea9114de589709cb976b2144913a1247b4950e9edd4c2630c7fcc75f04832196076afbe156b61891591b8a11
|
||||
Size (glaxium_0.5.tar.gz) = 1692219 bytes
|
||||
SHA1 (patch-aa) = 97d405080adab6baeb6a40921fe8f6d64126b7ea
|
||||
SHA1 (patch-Makefile.in) = 0736466c8a96508adce4ecb5857c25eb404b0046
|
||||
SHA1 (patch-ab) = e8f2abea9053d73090fdb9ec92806fe21b68d3ce
|
||||
SHA1 (patch-ac) = ac0a11ca229865eb637425d6065729d1c8fc3da2
|
||||
SHA1 (patch-ad) = 3572e6f5c97f342d5b68024c7ebb17aeedb8b667
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
$NetBSD: patch-Makefile.in,v 1.1 2023/05/31 21:53:00 wiz Exp $
|
||||
|
||||
Adapt path to data files for pkgsrc.
|
||||
Use c++ compiler when linking c++ objects.
|
||||
|
||||
--- Makefile.in.orig 2002-10-20 18:30:12.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -15,11 +15,11 @@ mandir=@mandir@
|
||||
|
||||
GLAXIUM_INSTALLDIR=$(bindir)
|
||||
DATA_DIRS=samples textures
|
||||
-GLAXIUM_HOME=$(datadir)/games/glaxium
|
||||
+GLAXIUM_HOME=$(datadir)/glaxium
|
||||
MAN_DIR=$(mandir)
|
||||
|
||||
glaxium : $(OBJ)
|
||||
- gcc -g -o glaxium $(OBJ) $(LIB)
|
||||
+ g++ -g -o glaxium $(OBJ) $(LIB)
|
||||
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.2 2023/05/28 09:54:19 bsiegert Exp $
|
||||
|
||||
--- Makefile.in.orig 2023-05-28 09:43:16.671037189 +0000
|
||||
+++ Makefile.in
|
||||
@@ -15,11 +15,11 @@ mandir=@mandir@
|
||||
|
||||
GLAXIUM_INSTALLDIR=$(bindir)
|
||||
DATA_DIRS=samples textures
|
||||
-GLAXIUM_HOME=$(datadir)/games/glaxium
|
||||
+GLAXIUM_HOME=$(datadir)/glaxium
|
||||
MAN_DIR=$(mandir)
|
||||
|
||||
glaxium : $(OBJ)
|
||||
- $(CC) -g -o glaxium $(OBJ) $(LIB)
|
||||
+ gcc -g -o glaxium $(OBJ) $(LIB)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue