Attachment 152957 Details for Bug 197605 – v1

[patch] v1

system_libenet.diff (text/plain), 16.39 KB, created by Jan Beich on 2015-02-14 06:00:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-02-14 06:00:21 UTC

Size: 16.39 KB

patch

obsolete

>Index: games/assaultcube/Makefile
>===================================================================
>--- games/assaultcube/Makefile	(revision 378632)
>+++ games/assaultcube/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	assaultcube
> PORTVERSION=	1.2.0.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games
> MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
> DISTNAME=	AssaultCube_v${PORTVERSION}
>@@ -23,12 +23,12 @@ LICENSE_PERMS_ACUBE=	dist-mirror dist-sell pkg-mir
> LICENSE_PERMS_CUBE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> LICENSE_PERMS_OTHER=	dist-mirror pkg-mirror auto-accept
> 
>+LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet
>+
> USES=		gmake openal:al tar:bzip2
>-GNU_CONFIGURE=	yes
>-ALL_TARGET=	libenet
>+EXTRACT_AFTER_ARGS=--exclude enet
>+ALL_TARGET=	# empty
> WRKSRC=		${WRKDIR}/AssaultCube_v${PORTVERSION}
>-CONFIGURE_ARGS=	--enable-shared=no --enable-static=yes
>-CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
> BUILD_WRKSRC=	${WRKSRC}/source/src
> 
> PORTDATA=	config packages scripts
>Index: games/assaultcube/files/patch-source_src_Makefile
>===================================================================
>--- games/assaultcube/files/patch-source_src_Makefile	(revision 378632)
>+++ games/assaultcube/files/patch-source_src_Makefile	(working copy)
>@@ -1,6 +1,6 @@
> --- source/src/Makefile.orig	2013-10-29 13:20:58.000000000 +0400
> +++ source/src/Makefile	2013-10-29 17:00:06.000000000 +0400
>-@@ -1,9 +1,7 @@
>+@@ -1,11 +1,9 @@
> -CXXFLAGS= -O3 -fomit-frame-pointer
> -CXX=clang++	# Use clang++, as g++ optimizations cause crashes...
>  override CXXFLAGS+= -Wall -fsigned-char
>@@ -9,8 +9,11 @@
> -PLATFORM_PREFIX=native
> +PLATFORM_PREFIX=FreeBSD
>  
>- INCLUDES= -I. -Ibot -I../enet/include
>+-INCLUDES= -I. -Ibot -I../enet/include
>++INCLUDES= -I. -Ibot -I${LOCALBASE}/include
>  
>+ STRIP=
>+ ifeq (,$(findstring -g,$(CXXFLAGS)))
> @@ -22,8 +20,8 @@
>  else
>  USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
>@@ -17,19 +20,27 @@
>  # override CXXFLAGS+= -rdynamic		# clang++ doesn't use this...
> -CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
> -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
>-+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
>-+CLIENT_LIBS= -L../enet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
>++CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -idirafter ../include
>++CLIENT_LIBS= -L${LOCALBASE}/lib -lenet -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
>  endif
>  
>  CLIENT_OBJS= \
>-@@ -87,8 +85,8 @@
>- SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
>+@@ -88,7 +86,7 @@
>  SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
>  else
>--SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
>+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
> -SERVER_LIBS= -L../enet/.libs -lenet -lz
>-+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
>-+SERVER_LIBS= -L../enet/.libs -lenet -lz -L${LOCALBASE}/lib
>++SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
>  endif
>  
>  SERVER_OBJS= \
>+@@ -118,8 +116,7 @@
>+ ../enet/Makefile:
>+ 	cd ../enet; ./configure --enable-shared=no --enable-static=yes
>+ 
>+-libenet: ../enet/Makefile
>+-	-$(MAKE) -C ../enet all
>++libenet: ${LOCALBASE}/lib/libenet.so
>+ 
>+ clean-enet: ../enet/Makefile
>+ 	$(MAKE) -C ../enet/ clean
>Index: games/cube/Makefile
>===================================================================
>--- games/cube/Makefile	(revision 378947)
>+++ games/cube/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cube
> DISTVERSION=	2005_08_29
>-PORTREVISION=	14
>+PORTREVISION=	15
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
> DISTFILES=	${CUBE_DATA} ${CUBE_SRC}
>@@ -11,9 +11,10 @@ DISTFILES=	${CUBE_DATA} ${CUBE_SRC}
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	OpenGL 3D FPS (first person shooter) game
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet
>+LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet
> 
> USES=		dos2unix gmake
>+EXTRACT_AFTER_ARGS=--exclude enet
> ALL_TARGET=	#
> USE_XORG=	x11
> 
>Index: games/bloodfrontier/Makefile
>===================================================================
>--- games/bloodfrontier/Makefile	(revision 378632)
>+++ games/bloodfrontier/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	bloodfrontier
> DISTVERSION=	B2
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/Blood%20Frontier%20Beta%202
> DISTNAME=	${PORTNAME}-${DISTVERSION}-linux
>@@ -13,14 +13,15 @@ COMMENT=	Single- and multi-player first-person sho
> 
> LICENSE=	ZLIB
> 
>+LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet
>+
> USES=		tar:bzip2 gmake
>-GNU_CONFIGURE=	yes
>-CONFIGURE_WRKSRC=	${WRKSRC}/src/enet
>+EXTRACT_AFTER_ARGS=--exclude enet
> BUILD_WRKSRC=	${WRKSRC}/src
> WRKSRC=		${WRKDIR}/${PORTNAME}
> USE_XORG=	x11
> 
>-ALL_TARGET=	libenet ${BINARIES}
>+ALL_TARGET=	${BINARIES}
> 
> SUB_FILES=	bfclient bfserver
> 
>Index: games/bloodfrontier/files/patch-src-Makefile
>===================================================================
>--- games/bloodfrontier/files/patch-src-Makefile	(revision 378632)
>+++ games/bloodfrontier/files/patch-src-Makefile	(working copy)
>@@ -1,19 +1,45 @@
>---- src/Makefile.orig	2009-11-25 14:52:58.000000000 +0300
>-+++ src/Makefile	2013-09-14 03:43:17.632226100 +0400
>-@@ -1,5 +1,4 @@
>+--- src/Makefile.orig	2009-11-25 11:52:58 UTC
>++++ src/Makefile
>+@@ -1,11 +1,10 @@
>  #CXXFLAGS= -ggdb3
> -CXXFLAGS= -O3 -fomit-frame-pointer
>  override CXXFLAGS+= -Wall -fsigned-char
>  
>  PLATFORM= $(shell uname -s)
>-@@ -21,8 +20,8 @@
>+ PLATFORM_SUFFIX= 
>+ 
>+-INCLUDES= -Ishared -Iengine -Igame -Ienet/include
>++INCLUDES= -Ishared -Iengine -Igame -I${LOCALBASE}/include
>+ 
>+ STRIP=
>+ ifeq (,$(findstring -g,$(CXXFLAGS)))
>+@@ -21,8 +20,8 @@ WINDRES= windres
>  CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -Iinclude
>  CLIENT_LIBS= -mwindows -lmingw32 -Llib -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
>  else
> -CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
> -CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
>-+CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
>-+CLIENT_LIBS= -Lenet -lenet -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
>++CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) `${SDL_CONFIG} --cflags`
>++CLIENT_LIBS= -L${LOCALBASE}/lib -lenet `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
>  endif
>  ifeq ($(PLATFORM),Linux)
>  CLIENT_LIBS+= -lrt
>+@@ -90,7 +89,7 @@ SERVER_INCLUDES= -DSTANDALONE -DMASTERSE
>+ SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
>+ else
>+ SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES)
>+-SERVER_LIBS= -Lenet -lenet -lz
>++SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
>+ endif
>+ SERVER_OBJS= \
>+     shared/crypto-standalone.o \
>+@@ -107,8 +106,7 @@ default: all
>+ enet/Makefile:
>+ 	cd enet; chmod +x ./configure; ./configure
>+ 
>+-libenet: enet/Makefile
>+-	$(MAKE)	-C enet/ all
>++libenet: ${LOCALBASE}/lib/libenet.so
>+ 
>+ clean-enet: enet/Makefile
>+ 	$(MAKE) -C enet/ clean
>Index: games/bloodfrontier/files/patch-src_engine_client.cpp
>===================================================================
>--- games/bloodfrontier/files/patch-src_engine_client.cpp	(revision 0)
>+++ games/bloodfrontier/files/patch-src_engine_client.cpp	(working copy)
>@@ -0,0 +1,22 @@
>+--- src/engine/client.cpp.orig	2009-12-03 14:33:27 UTC
>++++ src/engine/client.cpp
>+@@ -102,11 +102,19 @@ void connectserv(const char *name, int p
>+ 		address.host = ENET_HOST_BROADCAST;
>+ 	}
>+ 
>++#if ENET_VERSION > 130
>++	if(!clienthost) clienthost = enet_host_create(NULL, 2, 0, rate, rate);
>++#else
>+ 	if(!clienthost) clienthost = enet_host_create(NULL, 2, rate, rate);
>++#endif
>+ 
>+ 	if(clienthost)
>+ 	{
>++#if ENET_VERSION > 130
>++		connpeer = enet_host_connect(clienthost, &address, client::numchannels(), 0);
>++#else
>+ 		connpeer = enet_host_connect(clienthost, &address, client::numchannels());
>++#endif
>+ 		enet_host_flush(clienthost);
>+ 		connmillis = totalmillis;
>+ 		connattempts = 0;
>
>Property changes on: games/bloodfrontier/files/patch-src_engine_client.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: games/bloodfrontier/files/patch-src_engine_server.cpp
>===================================================================
>--- games/bloodfrontier/files/patch-src_engine_server.cpp	(revision 0)
>+++ games/bloodfrontier/files/patch-src_engine_server.cpp	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/engine/server.cpp.orig	2009-12-03 14:33:27 UTC
>++++ src/engine/server.cpp
>+@@ -745,7 +745,11 @@ void setupserver()
>+ 	{
>+ 		if(enet_address_set_host(&address, serverip) < 0) conoutf("\frWARNING: server address not resolved");
>+ 	}
>++#if ENET_VERSION > 130
>++	serverhost = enet_host_create(&address, serverclients + server::reserveclients(), 0, 0, serveruprate);
>++#else
>+ 	serverhost = enet_host_create(&address, serverclients + server::reserveclients(), 0, serveruprate);
>++#endif
>+ 	if(!serverhost)
>+ 	{
>+ 		conoutf("\frcould not create server socket");
>
>Property changes on: games/bloodfrontier/files/patch-src_engine_server.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: games/redeclipse/Makefile
>===================================================================
>--- games/redeclipse/Makefile	(revision 378632)
>+++ games/redeclipse/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	redeclipse
> PORTVERSION=	1.4
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*/\1/}
> DISTNAME=	${PORTNAME}_${PORTVERSION}_nix
>@@ -14,18 +14,16 @@ COMMENT=	Single-player and multi-player first-pers
> LICENSE_COMB=	multi
> LICENSE=	MIT ZLIB
> 
>+LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet
>+
> MANUAL_PACKAGE_BUILD=	huge
> 
> USES=		tar:bzip2 gmake
>-GNU_CONFIGURE=	yes
>-CONFIGURE_WRKSRC=	${WRKSRC}/src/enet
>-CONFIGURE_ARGS=	--enable-shared=no --enable-static=yes
>-USE_AUTOTOOLS=	aclocal automake autoconf:env
>-AUTOMAKE_ARGS=	-ia
>+EXTRACT_AFTER_ARGS=--exclude enet
> BUILD_WRKSRC=	${WRKSRC}/src
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>-ALL_TARGET=	libenet
>+ALL_TARGET=	# empty
> 
> SUB_FILES=	${PORTNAME} ${PORTNAME}_server
> 
>Index: games/redeclipse/files/patch-src-core.mk
>===================================================================
>--- games/redeclipse/files/patch-src-core.mk	(revision 378632)
>+++ games/redeclipse/files/patch-src-core.mk	(working copy)
>@@ -8,6 +8,15 @@
>  override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
>  
>  PLATFORM= $(shell uname -s)
>+@@ -28,7 +27,7 @@
>+ CXX_TEMP:=$(CXX)
>+ override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
>+ 
>+-INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS)
>++INCLUDES= -Ishared -Iengine -Igame -I${LOCALBASE}/include $(APPFLAGS)
>+ 
>+ 
>+ STRIP=
> @@ -65,8 +64,8 @@
>  CLIENT_INCLUDES= $(INCLUDES) -Iinclude
>  CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
>@@ -14,8 +23,27 @@
>  else
> -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
> -CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
>-+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
>-+CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
>++CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags`
>++CLIENT_LIBS= -L${LOCALBASE}/lib -lenet -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
>  endif
>  ifeq ($(PLATFORM),Linux)
>  CLIENT_LIBS+= -lrt
>+@@ -137,7 +136,7 @@
>+ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
>+ else
>+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
>+-SERVER_LIBS= -Lenet/.libs -lenet -lz
>++SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
>+ endif
>+ SERVER_OBJS= \
>+ 	shared/crypto-standalone.o \
>+@@ -155,8 +154,7 @@
>+ enet/Makefile:
>+ 	cd enet; ./configure --enable-shared=no --enable-static=yes
>+ 
>+-libenet: enet/Makefile
>+-	$(MAKE) -C enet/ all
>++libenet: ${LOCALBASE}/lib/libenet.so
>+ 
>+ clean-enet: enet/Makefile
>+ 	$(MAKE) -C enet/ clean
>Index: games/sauerbraten/Makefile
>===================================================================
>--- games/sauerbraten/Makefile	(revision 378632)
>+++ games/sauerbraten/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	sauerbraten
> PORTVERSION=	20130203
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
> DISTNAME=	${PORTNAME}_2013_02_03_collect_edition_linux
>@@ -14,14 +14,13 @@ COMMENT=	First person shooter based on Cube
> LICENSE=	MIT ZLIB
> LICENSE_COMB=	multi
> 
>+LIB_DEPENDS=	libenet.so:${PORTSDIR}/net/enet
>+
> USES=		gmake tar:bzip2
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	ACLOCAL=true AUTOCONF=true AUTOMAKE=true
>-CONFIGURE_WRKSRC=	${WRKSRC}/src/enet
>-CONFIGURE_ARGS=	--enable-shared=no --enable-static=yes
>+EXTRACT_AFTER_ARGS=--exclude enet
> BUILD_WRKSRC=	${WRKSRC}/src
> WRKSRC=		${WRKDIR}/${PORTNAME}
>-ALL_TARGET=	libenet
>+ALL_TARGET=	# empty
> 
> PORTDATA=	data packages
> PORTDOCS=	*
>@@ -65,10 +64,6 @@ post-extract:
> 	@${FIND} ${WRKSRC} -type d -name CVS -type d -print0 | \
> 		${XARGS} -0 ${RM} -R
> 
>-post-patch:
>-	@${REINPLACE_CMD} -Ee '/^#define (HAS_GETHOSTBY(NAME|ADDR)_R) 1/d' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-
> do-install:
> .for f in ${SAUER_BIN}
> 	${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${STAGEDIR}${PREFIX}/bin
>Index: games/sauerbraten/files/patch-src_Makefile
>===================================================================
>--- games/sauerbraten/files/patch-src_Makefile	(revision 378632)
>+++ games/sauerbraten/files/patch-src_Makefile	(working copy)
>@@ -1,6 +1,6 @@
> --- src/Makefile	2012-08-28 00:30:07.000000000 -0500
> +++ src/Makefile	2013-03-24 00:38:04.000000000 -0500
>-@@ -1,8 +1,7 @@
>+@@ -1,10 +1,9 @@
> -CXXFLAGS= -O3 -fomit-frame-pointer
>  override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
>  
>@@ -8,8 +8,11 @@
> -PLATFORM_PREFIX= native
> +PLATFORM_PREFIX= FreeBSD
>  
>- INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
>+-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
>++INCLUDES= -Ishared -Iengine -Ifpsgame -I${LOCALBASE}/include
>  
>+ STRIP=
>+ ifeq (,$(findstring -g,$(CXXFLAGS)))
> @@ -36,8 +35,8 @@
>  endif
>  CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
>@@ -16,19 +19,27 @@
>  else	
> -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
> -CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
>-+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
>-+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL_image -lSDL_mixer -lz -lGL
>++CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags`
>++CLIENT_LIBS= -L${LOCALBASE}/lib -lenet `${SDL_CONFIG} --libs` -lX11 -lSDL_image -lSDL_mixer -lz -lGL
>  endif
>  ifeq ($(PLATFORM),Linux)
>  CLIENT_LIBS+= -lrt
>-@@ -105,8 +104,8 @@
>- SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
>+@@ -106,7 +105,7 @@
>  MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
>  else
>--SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
>+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
> -SERVER_LIBS= -Lenet/.libs -lenet -lz
>-+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
>-+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
>++SERVER_LIBS= -L${LOCALBASE}/lib -lenet -lz
>  MASTER_LIBS= $(SERVER_LIBS)
>  endif
>  SERVER_OBJS= \
>+@@ -138,8 +137,7 @@
>+ enet/Makefile:
>+ 	cd enet; ./configure --enable-shared=no --enable-static=yes
>+ 	
>+-libenet: enet/Makefile
>+-	$(MAKE)	-C enet/ all
>++libenet: ${LOCALBASE}/lib/libenet.so
>+ 
>+ clean-enet: enet/Makefile
>+ 	$(MAKE) -C enet/ clean

Flags:

jbeich: maintainer-approval? (lightside)
jbeich: maintainer-approval? (amdmi3)
jbeich: maintainer-approval? (acm)

Actions: View | Diff

Attachments on bug 197605: 152957 | 152968 | 152969 | 152970 | 152986 | 152993 | 152999 | 153001 | 153002 | 153016 | 153018 | 153021 | 153045 | 153046 | 153048 | 153056 | 153656 | 153657 | 154399 | 154400 | 154401 | 154402 | 155563 | 156341 | 156342 | 156343 | 156532