The following commit has been merged in the master branch:
commit 6d8d2ff7df2fb8527dc7bf0ab8edece43ecd00a9
Author: Martin Erik Werner <[email protected]>
Date: Sat Sep 1 18:28:35 2012 +0200
refresh enet patch
diff --git a/debian/patches/build-with-system-enet.patch
b/debian/patches/build-with-system-enet.patch
index 0231f2a..8b637ce 100644
--- a/debian/patches/build-with-system-enet.patch
+++ b/debian/patches/build-with-system-enet.patch
@@ -15,26 +15,26 @@ Author: Adrián Chaves Fernández (Gallaecio)
<[email protected]>
STRIP=
ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -33,7 +33,7 @@
- CLIENT_LIBS= -mwindows -static-libgcc -static-libstdc++ -L$(WINBIN)
-L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32
-lwinmm
+@@ -42,7 +42,7 @@
+ CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image
-lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
else
- CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include
`sdl-config --cflags`
+ 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_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image
-lSDL_mixer -lz -lGL
endif
ifeq ($(PLATFORM),Linux)
CLIENT_LIBS+= -lrt
-@@ -104,7 +104,7 @@
- SERVER_LIBS= -mwindows -static-libgcc -static-libstdc++ -L$(WINBIN)
-L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
+@@ -113,7 +113,7 @@
+ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet
-lws2_32 -lwinmm
else
- SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES)
+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_LIBS= -lenet -lz
endif
SERVER_OBJS= \
shared/crypto-standalone.o \
-@@ -169,13 +169,13 @@
- $(STRIP) ../bin/$(APPSERVER).exe
+@@ -178,13 +178,13 @@
+ $(STRIP) $(WINBIN)/$(APPSERVER).exe
endif
else
-client: libenet $(CLIENT_OBJS)
--
Packaging for Red Eclipse
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
