Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 May 2019 21:48:04 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r501599 - branches/2019Q2/games/megaglest
Message-ID:  <201905132148.x4DLm4Ta050916@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon May 13 21:48:04 2019
New Revision: 501599
URL: https://svnweb.freebsd.org/changeset/ports/501599

Log:
  MFH: r501598
  
  - Fix build with VIEWER enabled
  - Add missing USES
  - Switch to USES=localbase and opt_CMAKE_BOOL
  
  PR:		237607
  Reported by:	doralitze@chaotikum.org
  Approved by:	monwarez@mailoo.org (maintainer)
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2019Q2/games/megaglest/Makefile
Directory Properties:
  branches/2019Q2/   (props changed)

Modified: branches/2019Q2/games/megaglest/Makefile
==============================================================================
--- branches/2019Q2/games/megaglest/Makefile	Mon May 13 21:46:32 2019	(r501598)
+++ branches/2019Q2/games/megaglest/Makefile	Mon May 13 21:48:04 2019	(r501599)
@@ -30,29 +30,25 @@ GH_PROJECT=	megaglest-source
 SUB_FILES=	pkg-message
 
 USES=		cmake:insource compiler:c++11-lib display:build dos2unix jpeg lua \
-		openal:al,alut pkgconfig
+		openal:al,alut pkgconfig ssl localbase:ldflags sdl gl
 USE_GL=		glew gl glu
 USE_SDL=	sdl2
 USE_XORG=	sm ice x11 xext
 USE_CXXSTD=	c++11
 LLD_UNSAFE=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lssl -lcrypto
+LDFLAGS+=	-lssl -lcrypto
 
 OPTIONS_DEFINE=	EDITOR DOCS VIEWER
 OPTIONS_SUB=	yes
 EDITOR_DESC=	Install MegaGlest Editor
 VIEWER_DESC=	Install Megaglest G3D viewer
 
-EDITOR_CMAKE_ON=	-DBUILD_MEGAGLEST_MAP_EDITOR=On
-EDITOR_CMAKE_OFF=	-DBUILD_MEGAGLEST_MAP_EDITOR=Off
+EDITOR_CMAKE_BOOL=	BUILD_MEGAGLEST_MAP_EDITOR
 EDITOR_USE=		WX=3.0
 
-VIEWER_CMAKE_ON=	-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \
-					-BUILD_MEGAGLEST_MODEL_VIEWER=On
-VIEWER_CMAKE_OFF=	-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=Off \
-					-DBUILD_MEGAGLEST_MODEL_VIEWER=Off
+VIEWER_CMAKE_BOOL=	BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS \
+			BUILD_MEGAGLEST_MODEL_VIEWER
 VIEWER_USE=		WX=3.0
 
 post-patch:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905132148.x4DLm4Ta050916>