Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

changed #20 - moved the libwww package discovery and fixed include paths in library project.

Browse source
This commit is contained in:
mattraykowski 2013-02-19 10:04:40 -06:00
parent 4243639143
commit 9048c3bb21
9 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeLists.txt
View file

@ -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)

2
code/nel/include/nel/gui/group_html.h
View file

@ -31,7 +31,7 @@ typedef std::map<std::string, std::string> TStyle;
extern "C"
{
#include "libwww/WWWInit.h"
#include "WWWInit.h"
}
namespace NLGUI

2
code/nel/include/nel/gui/libwww.h
View file

@ -22,7 +22,7 @@
extern "C"
{
#include "libwww/WWWInit.h"
#include "WWWInit.h"
}
namespace NLGUI

2
code/nel/include/nel/gui/libwww_nel_stream.h
View file

@ -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);

2
code/nel/src/gui/CMakeLists.txt
View file

@ -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)

6
code/nel/src/gui/group_html.cpp
View file

@ -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>

6
code/nel/src/gui/libwww.cpp
View file

@ -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"

20
code/nel/src/gui/libwww_nel_stream.cpp
View file

@ -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 */
}

6
code/ryzom/CMakeLists.txt
View file

@ -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)