[redeclipse/f17] delete old files, refresh patch

[Martin Erik Werner]

commit 69da03c13bf158f6c04e63911a40d643b36b7bc7
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Thu Dec 6 14:25:24 2012 +0100

    delete old files, refresh patch

 all-licenses                                       | 1649 --------------------
 redeclipse-1.2-backported-fix-icon-sizes.patch     |   63 -
 redeclipse-1.2-security-text-command-fix.patch     |   33 -
 ...atch => redeclipse-build-with-system-enet.patch |   26 +-
 ...t.patch => redeclipse-windowed-by-default.patch |    0
 5 files changed, 13 insertions(+), 1758 deletions(-)
---
diff --git a/redeclipse-1.2-build-with-system-enet.patch b/redeclipse-build-with-system-enet.patch
similarity index 63%
rename from redeclipse-1.2-build-with-system-enet.patch
rename to redeclipse-build-with-system-enet.patch
index 12e39c0..6c1b9e6 100644
--- a/redeclipse-1.2-build-with-system-enet.patch
+++ b/redeclipse-build-with-system-enet.patch
@@ -6,7 +6,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -5,7 +5,7 @@
+@@ -9,7 +9,7 @@
  PLATFORM= $(shell uname -s)
  PLATFORM_SUFFIX=_native
  
@@ -15,37 +15,37 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  
  STRIP=
  ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -22,7 +22,7 @@
- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -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
-@@ -93,7 +93,7 @@
- SERVER_LIBS= -mwindows -Llib -lzdll -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 \
-@@ -158,13 +158,13 @@
- 	$(STRIP) ../bin/reserver.exe
+@@ -178,13 +178,13 @@
+ 	$(STRIP) $(WINBIN)/$(APPSERVER).exe
  endif
  else
 -client: libenet $(CLIENT_OBJS)
 +client: $(CLIENT_OBJS)
- 	$(CXX) $(CXXFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
  ifneq (,$(STRIP))
- 	$(STRIP) reclient
+ 	$(STRIP) $(APPCLIENT)
  endif
  
 -server: libenet $(SERVER_OBJS)
 +server: $(SERVER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
  ifneq (,$(STRIP))
- 	$(STRIP) reserver
+ 	$(STRIP) $(APPSERVER)
diff --git a/redeclipse-1.2-windowed-by-default.patch b/redeclipse-windowed-by-default.patch
similarity index 100%
rename from redeclipse-1.2-windowed-by-default.patch
rename to redeclipse-windowed-by-default.patch