From d5363b521be9fe961ae75a36a09204265fa37199 Mon Sep 17 00:00:00 2001
From: dfighter1985 <dfighter1985@gmail.com>
Date: Tue, 19 Feb 2013 17:19:51 +0100
Subject: [PATCH] Merged in dfighter1985/ryzomcore (pull request #3)

GCC build error fixes for #20
---
 code/CMakeLists.txt                          |  4 ++++
 code/nel/include/nel/gui/group_html.h        |  2 +-
 code/nel/include/nel/gui/libwww.h            |  2 +-
 code/nel/include/nel/gui/libwww_nel_stream.h |  2 +-
 code/nel/src/gui/CMakeLists.txt              |  2 +-
 code/nel/src/gui/group_html.cpp              |  6 +++---
 code/nel/src/gui/libwww.cpp                  |  6 +++---
 code/nel/src/gui/libwww_nel_stream.cpp       | 20 ++++++++++----------
 code/ryzom/CMakeLists.txt                    |  6 ++++--
 9 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 8cf86ecc2..985c56a10 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -135,6 +135,10 @@ IF(WITH_NEL)
     FIND_PACKAGE(CppTest)
   ENDIF(WITH_NEL_TESTS)
 
+  IF(WITH_GUI)
+    FIND_PACKAGE(Libwww REQUIRED)
+  ENDIF(WITH_GUI)
+
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
   ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
   ADD_SUBDIRECTORY(nel)
diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h
index 2a0c22113..14f1ded84 100644
--- a/code/nel/include/nel/gui/group_html.h
+++ b/code/nel/include/nel/gui/group_html.h
@@ -31,7 +31,7 @@ typedef std::map<std::string, std::string>	TStyle;
 
 extern "C"
 {
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 namespace NLGUI
diff --git a/code/nel/include/nel/gui/libwww.h b/code/nel/include/nel/gui/libwww.h
index 3983e5777..8da217382 100644
--- a/code/nel/include/nel/gui/libwww.h
+++ b/code/nel/include/nel/gui/libwww.h
@@ -22,7 +22,7 @@
 
 extern "C"
 {
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 namespace NLGUI
diff --git a/code/nel/include/nel/gui/libwww_nel_stream.h b/code/nel/include/nel/gui/libwww_nel_stream.h
index 4e1bd4e01..4dbadf1b8 100644
--- a/code/nel/include/nel/gui/libwww_nel_stream.h
+++ b/code/nel/include/nel/gui/libwww_nel_stream.h
@@ -20,7 +20,7 @@
 #define LIBWWW_NEL_STREAM_H
 
 
-#include "libwww/HTProt.h"
+#include "HTProt.h"
 
 extern "C" HTProtCallback HTLoadNeLFile;
 extern "C" PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * param, int mode);
diff --git a/code/nel/src/gui/CMakeLists.txt b/code/nel/src/gui/CMakeLists.txt
index 1db5ed186..187f8e008 100644
--- a/code/nel/src/gui/CMakeLists.txt
+++ b/code/nel/src/gui/CMakeLists.txt
@@ -12,7 +12,7 @@ SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
 NL_ADD_RUNTIME_FLAGS(nelgui)
 
-INCLUDE_DIRECTORIES( ${LUA_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${LUA_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
 
 NL_ADD_LIB_SUFFIX(nelgui)
 
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index f602b148e..67134a5f6 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -23,9 +23,9 @@
 // LibWWW
 extern "C"
 {
-#include "libwww/WWWLib.h"			      /* Global Library Include file */
-#include "libwww/WWWApp.h"
-#include "libwww/WWWInit.h"
+#include "WWWLib.h"			      /* Global Library Include file */
+#include "WWWApp.h"
+#include "WWWInit.h"
 }
 
 #include <string>
diff --git a/code/nel/src/gui/libwww.cpp b/code/nel/src/gui/libwww.cpp
index ccb97af6f..167816e3c 100644
--- a/code/nel/src/gui/libwww.cpp
+++ b/code/nel/src/gui/libwww.cpp
@@ -21,9 +21,9 @@
 // LibWWW
 extern "C"
 {
-#include "libwww/WWWLib.h"			      /* Global Library Include file */
-#include "libwww/WWWApp.h"
-#include "libwww/WWWInit.h"
+#include "WWWLib.h"			      /* Global Library Include file */
+#include "WWWApp.h"
+#include "WWWInit.h"
 }
 
 #include "nel/gui/group_html.h"
diff --git a/code/nel/src/gui/libwww_nel_stream.cpp b/code/nel/src/gui/libwww_nel_stream.cpp
index 216f091cc..740078a99 100644
--- a/code/nel/src/gui/libwww_nel_stream.cpp
+++ b/code/nel/src/gui/libwww_nel_stream.cpp
@@ -21,16 +21,16 @@ extern "C"
 {
 
 	/* Library Includes */
-#include "libwww/wwwsys.h"
-#include "libwww/WWWUtil.h"
-#include "libwww/WWWCore.h"
-#include "libwww/WWWDir.h"
-#include "libwww/WWWTrans.h"
-#include "libwww/HTReqMan.h"
-#include "libwww/HTBind.h"
-#include "libwww/HTMulti.h"
-#include "libwww/HTNetMan.h"
-#include "libwww/HTChannl.h"
+#include "wwwsys.h"
+#include "WWWUtil.h"
+#include "WWWCore.h"
+#include "WWWDir.h"
+#include "WWWTrans.h"
+#include "HTReqMan.h"
+#include "HTBind.h"
+#include "HTMulti.h"
+#include "HTNetMan.h"
+#include "HTChannl.h"
 #include "nel/gui/libwww_nel_stream.h"		/* Implemented here */
 }
 
diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt
index 933e305b5..991437159 100644
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@@ -10,6 +10,10 @@ SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
 ADD_SUBDIRECTORY(common)
 
 IF(WITH_RYZOM_CLIENT)
+  IF(NOT WITH_GUI)
+    MESSAGE( FATAL_ERROR "The client cannot be built without the NeL GUI Library (WITH_GUI)")
+  ENDIF(NOT WITH_GUI)
+
   IF(WITH_LUA51)
     FIND_PACKAGE(Lua51 REQUIRED)
   ELSE(WITH_LUA51)
@@ -41,8 +45,6 @@ IF(WITH_RYZOM_CLIENT)
     ENDIF(APPLE)
   ENDIF(CURL_STATIC)
 
-  FIND_PACKAGE(Libwww REQUIRED)
-
   ADD_SUBDIRECTORY(client)
 ENDIF(WITH_RYZOM_CLIENT)