[Hdrflow-svn] SF.net SVN: hdrflow: [378] trunk/lib/openlibraries

[<gl...@us...>]

Revision: 378
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=378&view=rev
Author:   glslang
Date:     2007-11-06 14:52:16 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
+ build fixes

Modified Paths:
--------------
    trunk/lib/openlibraries/openlibraries_vc8.sln
    trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj
    trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp
    trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp
    trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp

Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln	2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln	2007-11-06 22:52:16 UTC (rev 378)
@@ -376,7 +376,7 @@
 		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "..\..\..\..\openlibraries\trunk\src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj	2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj	2007-11-06 22:52:16 UTC (rev 378)
@@ -7,7 +7,7 @@
 	RootNamespace="jpg"
 	Keyword="Win32Proj"
 	VCNestedProjectGUID="{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}"
-	VCNestedProjectCRC32="1340418931"
+	VCNestedProjectCRC32="162289014"
 	VCNestedProjectFileName="jpg_vc8.vcproj">
 	<Platforms>
 		<Platform 
@@ -38,11 +38,11 @@
 				Name="CppCmplrTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;&quot;C:\Program Files\HDR\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;HAVE_JPEGHDR"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				EnableEnhancedInstructionSet="0"
 				TreatWChar_tAsBuiltInType="true"

Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp	2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp	2007-11-06 22:52:16 UTC (rev 378)
@@ -5,7 +5,7 @@
 // Released under the LGPL.
 // For more information, see http://www.openlibraries.org.
 
-#include <openobjectlib/plugins/obj/obj_plugin.hpp>
+#include <openobjectlib/plugins/wavefront/obj_plugin.hpp>
 
 namespace opl = olib::openpluginlib;
 namespace OBJ = olib::openobjectlib::plugins::OBJ;

Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp	2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp	2007-11-06 22:52:16 UTC (rev 378)
@@ -21,8 +21,8 @@
 #include <openobjectlib/sg/spatial.hpp>
 #include <openobjectlib/sg/meshes.hpp>
 
-#include <openobjectlib/plugins/obj/obj_plugin.hpp>
-#include <openobjectlib/plugins/obj/spirit.hpp>
+#include <openobjectlib/plugins/wavefront/obj_plugin.hpp>
+#include <openobjectlib/plugins/wavefront/spirit.hpp>
 
 namespace fs		= boost::filesystem;
 namespace spirit	= boost::spirit;

Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp	2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp	2007-11-06 22:52:16 UTC (rev 378)
@@ -10,7 +10,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include <openobjectlib/plugins/obj/config.hpp>
+#include <openobjectlib/plugins/wavefront/config.hpp>
 
 #include <openobjectlib/sg/openobjectlib_plugin.hpp>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.