[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52669] trunk/lib/darwin-9.x.universal/osl : OSX/OSL: update to latest osl fixes
jens verwiebe
info at jensverwiebe.de
Thu Nov 29 21:14:01 CET 2012
Revision: 52669
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52669
Author: jensverwiebe
Date: 2012-11-29 20:13:59 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
OSX/OSL: update to latest osl fixes
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/osl/bin/oslc
trunk/lib/darwin-9.x.universal/osl/include/OSL/export.h
trunk/lib/darwin-9.x.universal/osl/include/OSL/oslquery.h
trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslc
===================================================================
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/export.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/export.h 2012-11-29 19:04:33 UTC (rev 52668)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/export.h 2012-11-29 20:13:59 UTC (rev 52669)
@@ -67,7 +67,7 @@
/// another.
#if defined(_MSC_VER) || defined(__CYGWIN__)
- #define OSL_DLL_IMPORT __declspec(dllimport)
+ #define OSL_DLL_IMPORT // disabled for static build __declspec(dllimport)
#define OSL_DLL_EXPORT __declspec(dllexport)
#define OSL_DLL_LOCAL
#else
Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslquery.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslquery.h 2012-11-29 19:04:33 UTC (rev 52668)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslquery.h 2012-11-29 20:13:59 UTC (rev 52669)
@@ -78,13 +78,13 @@
{ }
};
- OSLQUERYPUBLIC OSLQuery ();
- OSLQUERYPUBLIC ~OSLQuery ();
+ OSLQuery ();
+ ~OSLQuery ();
/// Get info on the named shader with optional searcphath. Return
/// true for success, false if the shader could not be found or
/// opened properly.
- OSLQUERYPUBLIC bool open (const std::string &shadername,
+ bool open (const std::string &shadername,
const std::string &searchpath=std::string());
/// Return the shader type: "surface", "displacement", "volume",
Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
===================================================================
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
===================================================================
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
===================================================================
(Binary files differ)
More information about the Bf-blender-cvs
mailing list