Index: src/include/widgets.h
===================================================================
--- src/include/widgets.h (revision 7912)
+++ src/include/widgets.h (working copy)
@@ -31,8 +31,8 @@
#ifndef __WIDGETS_H__
#define __WIDGETS_H__
-#include <guichan.h>
-#include <guichan/gsdl.h>
+#include <guichan.hpp>
+#include <guichan/sdl.hpp>
typedef int lua_Object; // from tolua++.h
Index: src/include/video.h
===================================================================
--- src/include/video.h (revision 7912)
+++ src/include/video.h (working copy)
@@ -40,7 +40,7 @@
class CFont;
#endif
-#include "guichan.h"
+#include <guichan.hpp>
class CGraphic : public gcn::Image {
protected:
Index: src/editor/editloop.cpp
===================================================================
--- src/editor/editloop.cpp (revision 7912)
+++ src/editor/editloop.cpp (working copy)
@@ -57,7 +57,7 @@
#include "iolib.h"
#include "iocompat.h"
#include "commands.h"
-#include "guichan.h"
+#include <guichan.hpp>
#include "script.h"
Index: Rules.make.in
===================================================================
--- Rules.make.in (revision 7912)
+++ Rules.make.in (working copy)
@@ -17,9 +17,9 @@
# Prefix for 'make install'
PREFIX=@PREFIX@
-CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include -I$(TOPDIR)/src/guichan/include
+CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include
CXXFLAGS=@CXXFLAGS@
-LDFLAGS=@LDFLAGS@ -lpng -lz -lm
+LDFLAGS=@LDFLAGS@ -lpng -lz -lm -ltolua++ -lguichan
OBJDIR=@OBJDIR@
Index: Makefile
===================================================================
--- Makefile (revision 7912)
+++ Makefile (working copy)
@@ -38,7 +38,7 @@
INCLUDE_DIRS = src/include
MODULES = src/action src/ai src/beos src/editor src/game \
- src/guichan src/map src/network src/pathfinder \
+ src/map src/network src/pathfinder \
src/sound src/stratagus src/tolua src/ui src/unit \
src/video