--- parser3/src/main/pa_globals.C 2002/05/07 07:23:10 1.124.2.2 +++ parser3/src/main/pa_globals.C 2002/08/01 11:41:18 1.134 @@ -3,10 +3,10 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_globals.C,v 1.124.2.2 2002/05/07 07:23:10 paf Exp $ */ +static const char* IDENT_GLOBALS_C="$Date: 2002/08/01 11:41:18 $"; + #include "pa_config_includes.h" #ifdef XML @@ -42,6 +42,7 @@ String *text_name; String *content_disposition_name; String *content_disposition_filename_name; +String *conf_method_name; String *auto_method_name; String *main_class_name; @@ -317,6 +318,7 @@ void pa_globals_init(Pool& pool) { content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME); content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); + conf_method_name=NEW String(pool, CONF_METHOD_NAME); auto_method_name=NEW String(pool, AUTO_METHOD_NAME); main_class_name=NEW String(pool, MAIN_CLASS_NAME); @@ -456,17 +458,17 @@ void pa_globals_init(Pool& pool) { } #if defined(XML) && defined(_MSC_VER) -# define XML_LIBS "/parser3project/win32xml" -# pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib") +# define GNOME_LIBS "/parser3project/win32xml/win32/gnome" +# pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") # ifdef _DEBUG -# pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib") -# pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib") # else -# pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib") -# pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib") # endif #endif