[Jahshaka-cvs] openlibraries/src/openassetlib/plugins/filesystem_storage_plugin Makefile.am, 1.2,
Status: Beta
Brought to you by:
jahshaka
From: Charles Y. <lil...@us...> - 2006-07-17 18:55:22
|
Update of /cvsroot/openlibraries/openlibraries/src/openassetlib/plugins/filesystem_storage_plugin In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14828/plugins/filesystem_storage_plugin Modified Files: Makefile.am filesystem_storage_plugin.cpp Log Message: + Corrections for oal build on linux Index: Makefile.am =================================================================== RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/plugins/filesystem_storage_plugin/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 7 Jul 2006 09:39:00 -0000 1.2 +++ Makefile.am 17 Jul 2006 18:55:20 -0000 1.3 @@ -18,6 +18,7 @@ libopenassetlib_filesystem_plugin_la_CXXFLAGS = \ $(OLIB_CXXFLAGS) \ $(BOOST_INCLUDE_PATH) \ + $(XML2_CXXFLAGS) \ # end libopenassetlib_filesystem_plugin_la_LIBADD = \ @@ -25,7 +26,8 @@ libopenassetlib_filesystem_plugin_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ - $(BOOST_LIB_PATH \ + $(BOOST_LIB_PATH) \ + $(XML2_LIBS) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) libopenassetlib_filesystem_plugin_ladir = $(OPENASSETLIB_PLUGINPATH) Index: filesystem_storage_plugin.cpp =================================================================== RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/plugins/filesystem_storage_plugin/filesystem_storage_plugin.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- filesystem_storage_plugin.cpp 17 Jul 2006 14:43:00 -0000 1.8 +++ filesystem_storage_plugin.cpp 17 Jul 2006 18:55:20 -0000 1.9 @@ -13,6 +13,8 @@ #pragma warning( disable : 4290 ) #include <atlbase.h> #else +#include <iostream> +#include <stdexcept> #include <libxml/tree.h> #include <libxml/parser.h> #endif @@ -306,7 +308,7 @@ if( (pNode->children != NULL) && (pNode->children->type == XML_TEXT_NODE ) ) { - comparison_filesize = static_cast<boost::intmax_t>(_atoi64((const char*)pNode->children->content)); + comparison_filesize = static_cast<boost::intmax_t>(atoi((const char*)pNode->children->content)); } } else if(xmlStrcmp(xmlCharStrdup("lastmodified"), pNode->name) == 0) |