[Hdrflow-svn] SF.net SVN: hdrflow: [227] trunk/lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [227] trunk/lib/openlibraries
|
From: <gl...@us...> - 2007-08-04 19:57:45
|
Revision: 227
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=227&view=rev
Author: glslang
Date: 2007-08-04 12:57:41 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ add gcc visibility attributes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/src/openassetlib/al/Makefile.am
trunk/lib/openlibraries/src/openassetlib/al/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
trunk/lib/openlibraries/src/openimagelib/il/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/utility.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp
trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp
trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
Removed Paths:
-------------
trunk/lib/openlibraries/src/openmedialib/plugins/caca/
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/configure.ac 2007-08-04 19:57:41 UTC (rev 227)
@@ -169,7 +169,7 @@
dnl OpenLibraries common flags
dnl NOTE: we could use $(var) instead of @var@ if we want late-expansion in the generated makefiles.
-OLIB_CXXFLAGS=''
+OLIB_CXXFLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
AC_SUBST(OLIB_CXXFLAGS)
OLIB_LDFLAGS=''
@@ -199,20 +199,6 @@
fi
AM_CONDITIONAL(HAVE_LIBAVFORMAT, [test x"$libavformat" = "xyes"])
-dnl caca support
-AC_PATH_PROG(CACA_CONFIG, caca-config, no)
-if test "x$CACA_CONFIG" = "xno" ; then
- AC_MSG_RESULT([*** caca support is not available ***])
-else
- AC_DEFINE(HAVE_LIBCACA,1,[Define this for caca support])
- CACA_CXXFLAGS=`$CACA_CONFIG --cflags`
- CACA_LIBS=`$CACA_CONFIG --plugin-libs`
- AC_SUBST(CACA_CXXFLAGS)
- AC_SUBST(CACA_LIBS)
- have_libcaca="yes"
-fi
-AM_CONDITIONAL(HAVE_LIBCACA, [test x"$have_libcaca" = "xyes"])
-
dnl mlt support
AC_PATH_PROG(MLT_CONFIG, mlt-config, no)
if test "x$MLT_CONFIG" = "xno" ; then
@@ -370,7 +356,6 @@
src/openmedialib/plugins/template/Makefile
src/openmedialib/plugins/avformat/Makefile
src/openmedialib/plugins/oil/Makefile
-src/openmedialib/plugins/caca/Makefile
src/openmedialib/plugins/glew/Makefile
src/openmedialib/plugins/openal/Makefile
src/openmedialib/plugins/gensys/Makefile
Modified: trunk/lib/openlibraries/src/openassetlib/al/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openassetlib/al/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -25,7 +25,8 @@
libopenassetlib_al_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(XML2_CXXFLAGS)
+ $(XML2_CXXFLAGS) \
+ -DAL_EXPORTS
libopenassetlib_al_la_LIBADD =
Modified: trunk/lib/openlibraries/src/openassetlib/al/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -7,7 +7,6 @@
#ifndef AL_CONFIG_INC_
#define AL_CONFIG_INC_
-//======================================================
#ifdef WIN32
# ifdef AL_EXPORTS
# define AL_DECLSPEC __declspec( dllexport )
@@ -15,15 +14,17 @@
# define AL_DECLSPEC __declspec( dllimport )
# endif
#else
-# define AL_DECLSPEC
+# ifdef AL_EXPORTS
+# define AL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define AL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_LIBNAME
# define OPENASSETLIB_LIBNAME "openassetlib_al"
#endif
-//======================================================
#ifndef OPENASSETLIB_TOOLSET
# if defined( _MSC_VER ) && ( _MSC_VER == 1310 ) && !defined( __ICL )
# define OPENASSETLIB_TOOLSET "vc71"
@@ -34,7 +35,6 @@
# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_DEBUG_SUFFIX
# ifndef NDEBUG
# define OPENASSETLIB_DEBUG_SUFFIX "d"
@@ -43,12 +43,10 @@
# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_VERSION
# define OPENASSETLIB_VERSION "0_4_0"
#endif
-//======================================================
// library search record (auto link).
#if defined( WIN32 ) && !defined( OPENASSETLIB_BUILD )
# if defined( OPENASSETLIB_LIBNAME ) && defined( OPENASSETLIB_TOOLSET ) && defined( OPENASSETLIB_DEBUG_SUFFIX ) && defined( OPENASSETLIB_VERSION )
@@ -56,6 +54,5 @@
# endif
#endif
-//======================================================
-
#endif
+
Modified: trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -23,7 +23,8 @@
libopenimagelib_il_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_il_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/il/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,14 +9,18 @@
#define IL_CONFIG_INC_
#ifdef WIN32
- #ifdef IL_EXPORTS
- #define IL_DECLSPEC __declspec( dllexport )
- #else
- #define IL_DECLSPEC __declspec( dllimport )
- #endif // IL_EXPORTS
+# ifdef IL_EXPORTS
+# define IL_DECLSPEC __declspec( dllexport )
+# else
+# define IL_DECLSPEC __declspec( dllimport )
+# endif
#else
- #define IL_DECLSPEC
-#endif // WIN32
+# ifdef IL_EXPORTS
+# define IL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define IL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
+#endif
#ifndef OPENIMAGELIB_LIBNAME
# define OPENIMAGELIB_LIBNAME "openimagelib_il"
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -42,7 +42,7 @@
IL_DECLSPEC image_type_ptr deinterlace( const image_type_ptr &im );
IL_DECLSPEC image_type_ptr extract_alpha( const image_type_ptr &im );
-enum IL_DECLSPEC rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING };
+enum rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING };
IL_DECLSPEC image_type_ptr rescale( const image_type_ptr &im, int new_w, int new_h, int new_d = 1, rescale_filter filter = POINT_SAMPLING );
@@ -83,7 +83,7 @@
typedef std::vector<unsigned int> histogram_type;
-enum IL_DECLSPEC histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba.
+enum histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba.
IL_DECLSPEC void histogram( const image_type_ptr& im, int size, float mask[ ], histogram_type& hist );
IL_DECLSPEC void histogram( const image_type_ptr& im, int size, histogram_filter filter, histogram_type& hist );
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_3D_lightmap_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_3D_lightmap_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_bmp_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_bmp_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_dds_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_dds_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_dpx_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_dpx_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_exr_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(OPENEXR_CFLAGS)
+ $(OPENEXR_CFLAGS) \
+ -DIL_EXPORTS
libopenimagelib_exr_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_hdr_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_hdr_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -13,7 +13,8 @@
libopenimagelib_jpg_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)s
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_jpg_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -13,7 +13,8 @@
libopenimagelib_png_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_png_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_psd_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_psd_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_quicktime_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_quicktime_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_sgi_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_sgi_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_tga_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_tga_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_tiff_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_tiff_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -18,7 +18,8 @@
libopenmedialib_ml_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DML_EXPORTS
libopenmedialib_ml_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -166,8 +166,8 @@
size_type eom_;
};
-typedef ML_DECLSPEC audio<unsigned char, audio_format> audio_type;
-typedef ML_DECLSPEC boost::shared_ptr<audio_type> audio_type_ptr;
+typedef audio<unsigned char, audio_format> audio_type;
+typedef boost::shared_ptr<audio_type> audio_type_ptr;
template<typename T, class storage = olib::openimagelib::il::default_storage<T> >
class pcm16 : public audio_format<T, storage>
@@ -208,3 +208,4 @@
} } }
#endif
+
Modified: trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,28 +9,32 @@
#define ML_CONFIG_INC_
#ifdef WIN32
- #ifdef ML_PLUGIN_EXPORTS
- #define ML_PLUGIN_DECLSPEC __declspec( dllexport )
- #else
- #define ML_PLUGIN_DECLSPEC __declspec( dllimport )
- #endif
+# ifdef ML_PLUGIN_EXPORTS
+# define ML_PLUGIN_DECLSPEC __declspec( dllexport )
+# else
+# define ML_PLUGIN_DECLSPEC __declspec( dllimport )
+# endif
#else
- #ifdef ML_PLUGIN_EXPORTS
- #define ML_PLUGIN_DECLSPEC extern
- #else
- #define ML_PLUGIN_DECLSPEC
- #endif
+# ifdef ML_PLUGIN_EXPORTS
+# define ML_PLUGIN_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define ML_PLUGIN_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
#ifdef WIN32
- #ifdef ML_EXPORTS
- #define ML_DECLSPEC __declspec( dllexport )
- #else
- #define ML_DECLSPEC __declspec( dllimport )
- #endif // ML_EXPORTS
+# ifdef ML_EXPORTS
+# define ML_DECLSPEC __declspec( dllexport )
+# else
+# define ML_DECLSPEC __declspec( dllimport )
+# endif
#else
- #define ML_DECLSPEC
-#endif // WIN32
+# ifdef ML_EXPORTS
+# define ML_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define ML_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
+#endif
#ifndef OPENMEDIALIB_LIBNAME
# define OPENMEDIALIB_LIBNAME "openmedialib_ml"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -22,11 +22,11 @@
namespace pcos = olib::openpluginlib::pcos;
-typedef ML_DECLSPEC olib::openimagelib::il::image_type image_type;
-typedef ML_DECLSPEC olib::openimagelib::il::image_type_ptr image_type_ptr;
+typedef olib::openimagelib::il::image_type image_type;
+typedef olib::openimagelib::il::image_type_ptr image_type_ptr;
-class ML_DECLSPEC frame_type;
-typedef ML_DECLSPEC boost::shared_ptr< frame_type > frame_type_ptr;
+class frame_type;
+typedef boost::shared_ptr< frame_type > frame_type_ptr;
class ML_DECLSPEC frame_type
{
Modified: trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -47,7 +47,7 @@
process_flags;
// Forward declarations
-class ML_DECLSPEC input_type;
+class input_type;
typedef boost::shared_ptr< input_type > input_type_ptr;
// The input abstract class - implementations will extend this class and (minimally)
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,27 +9,24 @@
lib_LTLIBRARIES = libopenmedialib_avformat.la
libopenmedialib_avformat_la_SOURCES = \
- avformat_plugin.cpp \
- # end
+ avformat_plugin.cpp
libopenmedialib_avformat_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
$(LIBAVFORMAT_CFLAGS) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_avformat_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(LIBAVFORMAT_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_avformat_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_avformat_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_avformat_la_DATA = avformat_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -8,25 +8,22 @@
lib_LTLIBRARIES = libopenmedialib_gensys.la
libopenmedialib_gensys_la_SOURCES = \
- gensys_plugin.cpp \
- # end
+ gensys_plugin.cpp
libopenmedialib_gensys_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_gensys_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_gensys_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_gensys_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_gensys_la_DATA = gensys_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,14 +9,13 @@
lib_LTLIBRARIES = libopenmedialib_glew.la
libopenmedialib_glew_la_SOURCES = \
- glew_plugin.cpp \
- # end
+ glew_plugin.cpp
libopenmedialib_glew_la_CXXFLAGS = \
$(GLEW_INCLUDE_PATH) \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_glew_la_LIBADD = \
$(OPENGL_LIBS) \
@@ -25,8 +24,7 @@
$(GLUT_LIBS) \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_glew_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -15,7 +15,8 @@
libopenmedialib_ofx_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(OFX_INCLUDE_PATH)
+ $(OFX_INCLUDE_PATH) \
+ -DML_PLUGIN_EXPORTS
libopenmedialib_ofx_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -8,25 +8,22 @@
lib_LTLIBRARIES = libopenmedialib_oil.la
libopenmedialib_oil_la_SOURCES = \
- oil_plugin.cpp \
- # end
+ oil_plugin.cpp
libopenmedialib_oil_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_oil_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_oil_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_oil_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_oil_la_DATA = oil_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -16,7 +16,8 @@
$(BOOST_INCLUDE_PATH) \
$(OPENAL_INCLUDE_PATH) \
$(GLEW_INCLUDE_PATH) \
- $(SWAB_AUDIO)
+ $(SWAB_AUDIO) \
+ -DML_PLUGIN_EXPORTS
libopenmedialib_openal_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,19 +14,17 @@
libopenmedialib_template_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_template_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_template_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_template_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_template_la_DATA = template_plugin.opl
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -70,6 +70,7 @@
$(GLEW_INCLUDE_PATH) \
$(XML2_CXXFLAGS) \
$(OFX_INCLUDE_PATH) \
+ -DOPENPLUGINLIB_EXPORTS \
-DOPENEFFECTSLIB_SHADERS=\"$(OPENEFFECTSLIB_SHADERSPATH)/\" \
-DOPENIMAGELIB_PLUGINS=\"$(OPENIMAGELIB_PLUGINPATH)\" \
-DOPENMEDIALIB_PLUGINS=\"$(OPENMEDIALIB_PLUGINPATH)\" \
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -15,7 +15,11 @@
# define OPENPLUGINLIB_DECLSPEC __declspec( dllimport )
# endif
#else
-# define OPENPLUGINLIB_DECLSPEC
+# ifdef OPENPLUGINLIB_EXPORTS
+# define OPENPLUGINLIB_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define OPENPLUGINLIB_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
#ifndef OPENPLUGINLIB_LIBNAME
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
