Attachment 204124 Details for Bug 237607 – Patch

[patch] Patch

megaglest.patch (text/plain), 1.22 KB, created by Dmitry Marakasov on 2019-04-30 17:07:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2019-04-30 17:07:48 UTC

Size: 1.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 500488)
>+++ Makefile	(working copy)
>@@ -30,7 +30,7 @@
> 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
> USE_GL=		glew gl glu
> USE_SDL=	sdl2
> USE_XORG=	sm ice x11 xext
>@@ -37,8 +37,7 @@
> 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
>@@ -45,14 +44,11 @@
> 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:

Flags:

amdmi3: maintainer-approval?

Actions: View | Diff

Attachments on bug 237607: 204067 | 204124