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

Removed dependency on libwww

Browse source
This commit is contained in:
kervala 2015-04-25 12:53:52 +02:00
parent d4ccb454c5
commit 9df7299a64
10 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/CMakeLists.txt
View file

@ -81,7 +81,6 @@ INCLUDE_DIRECTORIES(
${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}
${LUA_INCLUDE_DIR} ${LUA_INCLUDE_DIR}
${LUABIND_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR}
${LIBWWW_INCLUDE_DIR}
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
) )
@ -101,7 +100,6 @@ TARGET_LINK_LIBRARIES(ryzom_client
${LUA_LIBRARIES} ${LUA_LIBRARIES}
${LUABIND_LIBRARIES} ${LUABIND_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${LIBWWW_LIBRARIES}
${SEVENZIP_LIBRARY} ${SEVENZIP_LIBRARY}
) )

5
code/ryzom/client/src/interface_v3/chat_displayer.h
View file

@ -25,11 +25,6 @@
#include "nel/misc/mutex.h" #include "nel/misc/mutex.h"
// to fix a conflict with syslog.h being included by libwww
#ifdef LOG_WARNING
#undef LOG_WARNING
#endif
/** /**
* class used to display console text commands in the chat window * class used to display console text commands in the chat window
* \author Nicolas Brigand * \author Nicolas Brigand

6
dist/debian/precise/debian/control vendored
View file

@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log

2
dist/debian/precise/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install

6
dist/debian/trusty/debian/control vendored
View file

@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log

2
dist/debian/trusty/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install

6
dist/debian/utopic/debian/control vendored
View file

@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log

2
dist/debian/utopic/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install

6
dist/debian/vivid/debian/control vendored
View file

@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log

2
dist/debian/vivid/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install