From: <br...@us...> - 2008-09-27 07:43:15
|
Revision: 3697 http://openvrml.svn.sourceforge.net/openvrml/?rev=3697&view=rev Author: braden Date: 2008-09-27 07:43:08 +0000 (Sat, 27 Sep 2008) Log Message: ----------- Fixes for Windows. Modified Paths: -------------- trunk/ChangeLog trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj trunk/src/libopenvrml/openvrml/local/dl.cpp trunk/src/libopenvrml/openvrml/local/uri.cpp trunk/src/libopenvrml/openvrml/local/xml_reader.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-26 21:57:13 UTC (rev 3696) +++ trunk/ChangeLog 2008-09-27 07:43:08 UTC (rev 3697) @@ -1,3 +1,12 @@ +2008-09-27 Braden McDaniel <br...@en...> + + Fixes for the Visual C++ build. + + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj + * src/libopenvrml/openvrml/local/dl.cpp + * src/libopenvrml/openvrml/local/uri.cpp + * src/libopenvrml/openvrml/local/xml_reader.cpp + 2008-09-26 Braden McDaniel <br...@en...> Moved proto_node class from an inner class of Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-09-26 21:57:13 UTC (rev 3696) +++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2008-09-27 07:43:08 UTC (rev 3697) @@ -191,6 +191,10 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" > <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\bad_url.cpp" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\basetypes.cpp" > <FileConfiguration @@ -220,6 +224,10 @@ </FileConfiguration> </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\dl.cpp" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.cpp" > </File> @@ -244,6 +252,10 @@ > </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\proto.cpp" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.cpp" > </File> @@ -252,10 +264,22 @@ > </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scene.cpp" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.cpp" > </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\script.cpp" + > + </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\uri.cpp" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\viewer.cpp" > </File> @@ -351,12 +375,20 @@ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_texturing.cpp" > </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\xml_reader.cpp" + > + </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc" > <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\bad_url.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\basetypes.h" > </File> @@ -373,6 +405,10 @@ > </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\dl.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\event.h" > </File> @@ -409,6 +445,10 @@ > </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\proto.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\read_write_mutex.h" > </File> @@ -417,6 +457,10 @@ > </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scene.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\scope.h" > </File> @@ -425,6 +469,10 @@ > </File> <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\uri.h" + > + </File> + <File RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\viewer.h" > </File> @@ -504,6 +552,10 @@ RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\x3d_vrml_grammar.h" > </File> + <File + RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\local\xml_reader.h" + > + </File> </Filter> <Filter Name="Resource Files" Modified: trunk/src/libopenvrml/openvrml/local/dl.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/local/dl.cpp 2008-09-26 21:57:13 UTC (rev 3696) +++ trunk/src/libopenvrml/openvrml/local/dl.cpp 2008-09-27 07:43:08 UTC (rev 3697) @@ -20,10 +20,9 @@ # include "dl.h" # include <string> +# include <boost/filesystem.hpp> +# include <boost/tokenizer.hpp> -namespace { -} - int openvrml::local::dl::init() { # ifdef _WIN32 Modified: trunk/src/libopenvrml/openvrml/local/uri.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/local/uri.cpp 2008-09-26 21:57:13 UTC (rev 3696) +++ trunk/src/libopenvrml/openvrml/local/uri.cpp 2008-09-27 07:43:08 UTC (rev 3697) @@ -21,6 +21,10 @@ # include "uri.h" # include <list> # include <cerrno> +# ifdef _WIN32 +# include <boost/multi_index/detail/scope_guard.hpp> +using namespace boost::multi_index::detail; // for scope_guard +# endif openvrml::local::uri::uri() OPENVRML_THROW1(std::bad_alloc): scheme_begin(this->str_.begin()), Modified: trunk/src/libopenvrml/openvrml/local/xml_reader.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/local/xml_reader.cpp 2008-09-26 21:57:13 UTC (rev 3696) +++ trunk/src/libopenvrml/openvrml/local/xml_reader.cpp 2008-09-27 07:43:08 UTC (rev 3697) @@ -21,6 +21,8 @@ # include "xml_reader.h" # ifdef _WIN32 # include <shlwapi.h> +# include <boost/multi_index/detail/scope_guard.hpp> +using namespace boost::multi_index::detail; // for scope_guard # endif /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |