Fix:win32:A better approach to fix the duplicate include file isue|Thanks to Stressed...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2270 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/gui/win32/Makefile.am b/navit/gui/win32/Makefile.am
index 794b328..1e24450 100644 (file)
--- a/navit/gui/win32/Makefile.am
+++ b/navit/gui/win32/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ -DMODULE=gui_win32
+AM_CPPFLAGS = -I$(top_srcdir)/navit -I$(top_srcdir)/navit/graphics/win32 @NAVIT_CFLAGS@ -DMODULE=gui_win32
 if PLUGINS
 modulegui_LTLIBRARIES = libgui_win32.la
 else

diff --git a/navit/gui/win32/gui_win32.c b/navit/gui/win32/gui_win32.c
index 0bdf023..135450b 100644 (file)
--- a/navit/gui/win32/gui_win32.c
+++ b/navit/gui/win32/gui_win32.c
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "plugin.h"
 #include "gui.h"
-#include "../../graphics/win32/graphics_win32.h"
+#include "graphics_win32.h"
 #include "point.h"
 #include "menu.h"
 #include "item.h"