[redeclipse] refresh Enet patch
Martin Erik Werner
arand at fedoraproject.org
Wed Apr 3 19:47:34 UTC 2013
commit 6eef324a82dc7d3658b85cc00cabe01904f77287
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Mon Mar 25 22:52:22 2013 +0100
refresh Enet patch
redeclipse-build-with-system-enet.patch | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/redeclipse-build-with-system-enet.patch b/redeclipse-build-with-system-enet.patch
index 6c1b9e6..3daa6bb 100644
--- a/redeclipse-build-with-system-enet.patch
+++ b/redeclipse-build-with-system-enet.patch
@@ -4,18 +4,18 @@ Description: Use system Enet instead of bundled version
Origin: http://gitorious.org/chakra-packages/games/commit/1aae10c597cf09a281d47570e43c8892531cd9bf
Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -9,7 +9,7 @@
- PLATFORM= $(shell uname -s)
- PLATFORM_SUFFIX=_native
+--- a/src/core.mk
++++ b/src/core.mk
+@@ -28,7 +28,7 @@
+ CXX_TEMP:=$(CXX)
+ override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
+
+-INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS)
++INCLUDES= -Ishared -Iengine -Igame $(APPFLAGS)
--INCLUDES= -Ishared -Iengine -Igame -Ienet/include
-+INCLUDES= -Ishared -Iengine -Igame -I/usr/share/enet/include
STRIP=
- ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -42,7 +42,7 @@
+@@ -66,7 +66,7 @@
CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
else
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
@@ -24,7 +24,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
endif
ifeq ($(PLATFORM),Linux)
CLIENT_LIBS+= -lrt
-@@ -113,7 +113,7 @@
+@@ -137,7 +137,7 @@
SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
else
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
@@ -33,7 +33,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
endif
SERVER_OBJS= \
shared/crypto-standalone.o \
-@@ -178,13 +178,13 @@
+@@ -202,13 +202,13 @@
$(STRIP) $(WINBIN)/$(APPSERVER).exe
endif
else
More information about the scm-commits
mailing list