gnomemm r1441 - in gstreamermm/trunk: . docs/reference gstreamer gstreamerbase

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Fri Apr  4 03:04:00 2008
New Revision: 1441
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1441&view=rev

Log:
2008-04-03  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/gstreamermmconfig.h.in:
	* gstreamerbase/gstreamerbasemmconfig.h.in: Corrected config files to
	include the glibmmconfig.h file so that things like
	GLIBMM_PROPERTIES_ENABLED are defined (and properties can be wrapped)

	* docs/reference/Doxyfile.in: Added list of predefined macros as in
	other *mm projects

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/docs/reference/Doxyfile.in
   gstreamermm/trunk/gstreamer/gstreamermmconfig.h.in
   gstreamermm/trunk/gstreamerbase/gstreamerbasemmconfig.h.in

Modified: gstreamermm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- gstreamermm/trunk/docs/reference/Doxyfile.in	(original)
+++ gstreamermm/trunk/docs/reference/Doxyfile.in	Fri Apr  4 03:04:00 2008
@@ -1013,7 +1013,12 @@
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = 
+PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
+                         GLIBMM_VFUNCS_ENABLED \
+                         GLIBMM_PROPERTIES_ENABLED \
+                         GLIBMM_EXCEPTIONS_ENABLED \
+                         GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED \
+ 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

Modified: gstreamermm/trunk/gstreamer/gstreamermmconfig.h.in
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermmconfig.h.in	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermmconfig.h.in	Fri Apr  4 03:04:00 2008
@@ -1,84 +1,12 @@
 #ifndef _GSTREAMERMM_CONFIG_H
 #define _GSTREAMERMM_CONFIG_H 1
 
+#include "glibmmconfig.h"
+
 /* version numbers */
 #undef GSTREAMERMM_MAJOR_VERSION
 #undef GSTREAMERMM_MINOR_VERSION
 #undef GSTREAMERMM_MICRO_VERSION
 
-// detect common platforms
-#if defined(_WIN32)
-// Win32 compilers have a lot of varation
-#if defined(_MSC_VER)
-#define GSTREAMERMM_MSC
-#define GSTREAMERMM_WIN32
-#define GSTREAMERMM_DLL
-#elif defined(__CYGWIN__)
-#define GSTREAMERMM_CONFIGURE
-#elif defined(__MINGW32__)
-#define GSTREAMERMM_WIN32
-#define GSTREAMERMM_CONFIGURE
-#else
-//AIX clR compiler complains about this even though it doesn't get this far:
-//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)"
-#endif
-#else
-#define GSTREAMERMM_CONFIGURE
-#endif /* _WIN32 */
-
-#ifdef GSTREAMERMM_CONFIGURE
-/* compiler feature tests that are used during compile time and run-time
-   by gtk-- only. tests used by gdk-- and gtk-- should go into
-   gdk--config.h.in */
-#undef GSTREAMERMM_CXX_HAVE_MUTABLE
-#undef GSTREAMERMM_CXX_HAVE_NAMESPACES
-//#undef GSTREAMERMM_CXX_GAUB
-//#undef GSTREAMERMM_CXX_AMBIGUOUS_TEMPLATES
-#undef GSTREAMERMM_HAVE_NAMESPACE_STD
-#undef GSTREAMERMM_HAVE_STD_ITERATOR_TRAITS
-#undef GSTREAMERMM_HAVE_SUN_REVERSE_ITERATOR
-#undef GSTREAMERMM_HAVE_TEMPLATE_SEQUENCE_CTORS
-#undef GSTREAMERMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
-#undef GSTREAMERMM_COMPILER_SUN_FORTE
-#undef GSTREAMERMM_DEBUG_REFCOUNTING
-#undef GSTREAMERMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION
-#undef GSTREAMERMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
-#undef GSTREAMERMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC
-#undef GSTREAMERMM_HAVE_ALLOWS_STATIC_INLINE_NPOS
-#endif
-
-#ifdef GSTREAMERMM_MSC
-  #define GSTREAMERMM_CXX_HAVE_MUTABLE 1
-  #define GSTREAMERMM_CXX_HAVE_NAMESPACES 1
-  #define GSTREAMERMM_HAVE_NAMESPACE_STD 1
-  #define GSTREAMERMM_HAVE_STD_ITERATOR_TRAITS 1
-  #define GSTREAMERMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
-  #define GSTREAMERMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
-  #define GSTREAMERMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
-  #define GSTREAMERMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
-  #define GSTREAMERMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
-  #pragma warning (disable: 4786 4355 4800 4181)
-#endif
-
-#ifndef GSTREAMERMM_HAVE_NAMESPACE_STD
-#  define GSTREAMERMM_USING_STD(Symbol) namespace std { using ::Symbol; }
-#else
-#  define GSTREAMERMM_USING_STD(Symbol) /* empty */
-#endif
-
-#ifdef GSTREAMERMM_DLL
-  #if defined(GSTREAMERMM_BUILD) && defined(_WINDLL)
-    /* Do not dllexport as it is handled by gendef on MSVC */
-    #define GSTREAMERMM_API 
-  #elif !defined(GSTREAMERMM_BUILD)
-    #define GSTREAMERMM_API __declspec(dllimport)
-  #else
-    /* Build a static library */
-    #define GSTREAMERMM_API
-  #endif /* GSTREAMERMM_BUILD - _WINDLL */
-#else
-  #define GSTREAMERMM_API
-#endif /* GSTREAMERMM_DLL */
-
 #endif /* _GSTREAMERMM_CONFIG_H */
 

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemmconfig.h.in
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemmconfig.h.in	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemmconfig.h.in	Fri Apr  4 03:04:00 2008
@@ -1,84 +1,7 @@
 #ifndef _GSTREAMERBASEMM_CONFIG_H
 #define _GSTREAMERBASEMM_CONFIG_H 1
 
-/* version numbers */
-#undef GSTREAMERBASEMM_MAJOR_VERSION
-#undef GSTREAMERBASEMM_MINOR_VERSION
-#undef GSTREAMERBASEMM_MICRO_VERSION
-
-// detect common platforms
-#if defined(_WIN32)
-// Win32 compilers have a lot of varation
-#if defined(_MSC_VER)
-#define GSTREAMERBASEMM_MSC
-#define GSTREAMERBASEMM_WIN32
-#define GSTREAMERBASEMM_DLL
-#elif defined(__CYGWIN__)
-#define GSTREAMERBASEMM_CONFIGURE
-#elif defined(__MINGW32__)
-#define GSTREAMERBASEMM_WIN32
-#define GSTREAMERBASEMM_CONFIGURE
-#else
-//AIX clR compiler complains about this even though it doesn't get this far:
-//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)"
-#endif
-#else
-#define GSTREAMERBASEMM_CONFIGURE
-#endif /* _WIN32 */
-
-#ifdef GSTREAMERBASEMM_CONFIGURE
-/* compiler feature tests that are used during compile time and run-time
-   by gtk-- only. tests used by gdk-- and gtk-- should go into
-   gdk--config.h.in */
-#undef GSTREAMERBASEMM_CXX_HAVE_MUTABLE
-#undef GSTREAMERBASEMM_CXX_HAVE_NAMESPACES
-//#undef GSTREAMERBASEMM_CXX_GAUB
-//#undef GSTREAMERBASEMM_CXX_AMBIGUOUS_TEMPLATES
-#undef GSTREAMERBASEMM_HAVE_NAMESPACE_STD
-#undef GSTREAMERBASEMM_HAVE_STD_ITERATOR_TRAITS
-#undef GSTREAMERBASEMM_HAVE_SUN_REVERSE_ITERATOR
-#undef GSTREAMERBASEMM_HAVE_TEMPLATE_SEQUENCE_CTORS
-#undef GSTREAMERBASEMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
-#undef GSTREAMERBASEMM_COMPILER_SUN_FORTE
-#undef GSTREAMERBASEMM_DEBUG_REFCOUNTING
-#undef GSTREAMERBASEMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION
-#undef GSTREAMERBASEMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS
-#undef GSTREAMERBASEMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC
-#undef GSTREAMERBASEMM_HAVE_ALLOWS_STATIC_INLINE_NPOS
-#endif
-
-#ifdef GSTREAMERBASEMM_MSC
-  #define GSTREAMERBASEMM_CXX_HAVE_MUTABLE 1
-  #define GSTREAMERBASEMM_CXX_HAVE_NAMESPACES 1
-  #define GSTREAMERBASEMM_HAVE_NAMESPACE_STD 1
-  #define GSTREAMERBASEMM_HAVE_STD_ITERATOR_TRAITS 1
-  #define GSTREAMERBASEMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
-  #define GSTREAMERBASEMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
-  #define GSTREAMERBASEMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
-  #define GSTREAMERBASEMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
-  #define GSTREAMERBASEMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
-  #pragma warning (disable: 4786 4355 4800 4181)
-#endif
-
-#ifndef GSTREAMERBASEMM_HAVE_NAMESPACE_STD
-#  define GSTREAMERBASEMM_USING_STD(Symbol) namespace std { using ::Symbol; }
-#else
-#  define GSTREAMERBASEMM_USING_STD(Symbol) /* empty */
-#endif
-
-#ifdef GSTREAMERBASEMM_DLL
-  #if defined(GSTREAMERBASEMM_BUILD) && defined(_WINDLL)
-    /* Do not dllexport as it is handled by gendef on MSVC */
-    #define GSTREAMERBASEMM_API 
-  #elif !defined(GSTREAMERBASEMM_BUILD)
-    #define GSTREAMERBASEMM_API __declspec(dllimport)
-  #else
-    /* Build a static library */
-    #define GSTREAMERBASEMM_API
-  #endif /* GSTREAMERBASEMM_BUILD - _WINDLL */
-#else
-  #define GSTREAMERBASEMM_API
-#endif /* GSTREAMERBASEMM_DLL */
+#include "glibmmconfig.h"
 
 #endif /* _GSTREAMERBASEMM_CONFIG_H */