[redeclipse] 408/494: refresh enet patch
Martin Werner
arand-guest at moszumanska.debian.org
Sun Jun 21 20:52:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
arand-guest pushed a commit to branch debdir
in repository redeclipse.
commit b380327a15ff402fbdc54ab65f9a792efddb8cba
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Sat Sep 1 18:28:35 2012 +0200
refresh enet patch
---
patches/build-with-system-enet.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/patches/build-with-system-enet.patch b/patches/build-with-system-enet.patch
index 0231f2a..8b637ce 100644
--- a/patches/build-with-system-enet.patch
+++ b/patches/build-with-system-enet.patch
@@ -15,26 +15,26 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git
More information about the Pkg-games-commits
mailing list