From: <br...@us...> - 2012-04-27 02:36:41
|
Revision: 4264 http://openvrml.svn.sourceforge.net/openvrml/?rev=4264&view=rev Author: braden Date: 2012-04-27 02:36:32 +0000 (Fri, 27 Apr 2012) Log Message: ----------- Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost 1.44 and later (and consistency with Makefile.am). Modified Paths: -------------- trunk/ChangeLog trunk/src/libopenvrml/openvrml.vcxproj trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-04-27 00:35:07 UTC (rev 4263) +++ trunk/ChangeLog 2012-04-27 02:36:32 UTC (rev 4264) @@ -1,5 +1,13 @@ 2012-04-26 Braden McDaniel <br...@en...> + Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost + 1.44 and later (and consistency with Makefile.am). + + * src/libopenvrml/openvrml.vcxproj + * src/local/libopenvrml-dl/openvrml-dl.vcxproj + +2012-04-26 Braden McDaniel <br...@en...> + * src/local/libopenvrml-dl/openvrml/local/dl.cpp (openvrml::local::dl::foreachfile(const std::vector<boost::filesystem::path> &, int (*)(const std::string Modified: trunk/src/libopenvrml/openvrml.vcxproj =================================================================== --- trunk/src/libopenvrml/openvrml.vcxproj 2012-04-27 00:35:07 UTC (rev 4263) +++ trunk/src/libopenvrml/openvrml.vcxproj 2012-04-27 02:36:32 UTC (rev 4264) @@ -65,7 +65,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -91,7 +91,7 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -187,4 +187,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-04-27 00:35:07 UTC (rev 4263) +++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-04-27 02:36:32 UTC (rev 4264) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -70,7 +70,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -82,7 +82,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -104,4 +104,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |