Kompletttrennung Server/Anzeige angefangen

git-svn-id: http://infon.googlecode.com/svn/trunk@13 8171fb75-e542-0410-96e4-03d5dd800671

Makefile

@@ -1,26 +1,23 @@
-#SERVER_GUI=1
-
 LUADIR=lua-5.0.2
 SDLDIR=$(shell sdl-config --prefix)
 
 CFLAGS   = -I$(LUADIR)/include/ -I$(SDLDIR)/include/SDL -std=gnu99 -Wall 
 # CFLAGS  += -O3 -fexpensive-optimizations -finline-functions -fomit-frame-pointer -DNDEBUG
 CFLAGS  += -ggdb
 
-ifdef SERVER_GUI
-	LDFLAGS = -L$(LUADIR)/lib -L$(SDLDIR)/lib -levent -llua -llualib -lm -lSDL -lSDL_image -lSGE -lSDL_gfx
-	GUIFILES=sprite.o video.o 
-	CFLAGS+=-DSERVER_GUI=1
-else
-	LDFLAGS = -L$(LUADIR)/lib -L$(SDLDIR)/lib -levent -llua -llualib -lm -lSDL 
-endif
+LDFLAGS = -L$(LUADIR)/lib -L$(SDLDIR)/lib -levent -llua -llualib -lm -lSDL 
+GUI_LDFLAGS = $(LDFLAGS) -lSDL_image -lSGE -lSDL_gfx
 
-all: infond
+all: infond infon
 
-infond: infond.o server.o listener.o player.o map.o path.o misc.o world.o path.o map.o creature.o packet.o scroller.o $(GUIFILES)
+infond: infond.o server.o listener.o map.o path.o misc.o packet.o player.o world.o creature.o scroller.o 
 	$(MAKE) -C $(LUADIR)
 	$(CC) $^ $(LDFLAGS) -o $@
 
+infon: infon.o client.o packet.o gui_player.o gui_world.o gui_creature.o gui_scroller.o 
+	$(MAKE) -C $(LUADIR)
+	$(CC) $^ $(GUI_LDFLAGS) -o $@ 
+
 clean:
 	$(MAKE) -C $(LUADIR) clean
-	-rm -f *.o infond tags
+	-rm -f *.o infond infon tags

common_player.h

@@ -0,0 +1,23 @@
+/*
+   
+    Copyright (c) 2006 Florian Wesch <fw@dividuum.de>. All Rights Reserved.
+    
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+
+*/
+
+#ifndef COMMON_PLAYER_H
+#define COMMON_PLAYER_H
+