mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-19 13:46:13 +00:00
CHANGED: #1471 GUI library will now build with the new externals and Visual Studio 2010.
This commit is contained in:
parent
8c7cd30938
commit
2d30639870
11 changed files with 31 additions and 24 deletions
|
@ -31,7 +31,7 @@ typedef std::map<std::string, std::string> TStyle;
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "WWWInit.h"
|
||||
#include "libwww/WWWInit.h"
|
||||
}
|
||||
|
||||
namespace NLGUI
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "WWWInit.h"
|
||||
#include "libwww/WWWInit.h"
|
||||
}
|
||||
|
||||
namespace NLGUI
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#define LIBWWW_NEL_STREAM_H
|
||||
|
||||
|
||||
#include "HTProt.h"
|
||||
#include "libwww/HTProt.h"
|
||||
|
||||
extern "C" HTProtCallback HTLoadNeLFile;
|
||||
extern "C" PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * param, int mode);
|
||||
|
|
|
@ -19,9 +19,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <lua.h>
|
||||
#include <lauxlib.h>
|
||||
#include <lualib.h>
|
||||
#include <lua/lua.h>
|
||||
#include <lua/lauxlib.h>
|
||||
#include <lua/lualib.h>
|
||||
}
|
||||
|
||||
// load the lua dll, return 1 on success
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <algorithm>
|
||||
|
||||
namespace NLGUI
|
||||
{
|
||||
|
|
|
@ -468,7 +468,7 @@ namespace NLGUI
|
|||
AHMap[ key ] = value;
|
||||
}
|
||||
|
||||
std::string CCtrlBase::getAHString( const stlpx_std::string &key ) const
|
||||
std::string CCtrlBase::getAHString( const std::string &key ) const
|
||||
{
|
||||
std::map< std::string, std::map< std::string, std::string > >::const_iterator itr = AHCache.find( getId() );
|
||||
if( itr == AHCache.end() )
|
||||
|
|
|
@ -100,7 +100,7 @@ namespace NLGUI
|
|||
}
|
||||
}
|
||||
|
||||
std::string CGroupEditBox::getProperty( const stlpx_std::string &name ) const
|
||||
std::string CGroupEditBox::getProperty( const std::string &name ) const
|
||||
{
|
||||
if( name == "onchange" )
|
||||
{
|
||||
|
|
|
@ -18,12 +18,14 @@
|
|||
|
||||
#define NOMINMAX
|
||||
|
||||
#include "nel/gui/group_html.h"
|
||||
|
||||
// LibWWW
|
||||
extern "C"
|
||||
{
|
||||
#include "WWWLib.h" /* Global Library Include file */
|
||||
#include "WWWApp.h"
|
||||
#include "WWWInit.h"
|
||||
#include "libwww/WWWLib.h" /* Global Library Include file */
|
||||
#include "libwww/WWWApp.h"
|
||||
#include "libwww/WWWInit.h"
|
||||
}
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -26,6 +26,8 @@
|
|||
#include "nel/gui/widget_manager.h"
|
||||
#include "nel/misc/algo.h"
|
||||
|
||||
#include <iterator>
|
||||
|
||||
using namespace std;
|
||||
using namespace NLMISC;
|
||||
|
||||
|
|
|
@ -16,12 +16,14 @@
|
|||
|
||||
#define NOMINMAX
|
||||
|
||||
#include "nel/gui/group_html.h"
|
||||
|
||||
// LibWWW
|
||||
extern "C"
|
||||
{
|
||||
#include "WWWLib.h" /* Global Library Include file */
|
||||
#include "WWWApp.h"
|
||||
#include "WWWInit.h"
|
||||
#include "libwww/WWWLib.h" /* Global Library Include file */
|
||||
#include "libwww/WWWApp.h"
|
||||
#include "libwww/WWWInit.h"
|
||||
}
|
||||
|
||||
#include "nel/gui/group_html.h"
|
||||
|
|
|
@ -21,16 +21,16 @@ extern "C"
|
|||
{
|
||||
|
||||
/* Library Includes */
|
||||
#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 "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 "nel/gui/libwww_nel_stream.h" /* Implemented here */
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue