WIP: ges: fix API export/import and 'inconsistent linkage' on MSVC

Export GES library API in headers when we're building the
library itself, otherwise import the API from the headers.

This fixes linker warnings on Windows when building with MSVC.

Fix up some missing config.h includes when building the lib which
is needed to get the export api define from config.h

Fixes https://gitlab.freedesktop.org/gstreamer/gst-editing-services/issues/42

diff --git a/configure.ac b/configure.ac
index ea89600..95dd728 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -353,7 +353,13 @@ fi
 AC_SUBST(DEPRECATED_CFLAGS)
 
 VISIBILITY_CFLAGS=""
-AS_COMPILER_FLAG([-fvisibility=hidden], [VISIBILITY_CFLAGS="-fvisibility=hidden"])
+AS_COMPILER_FLAG([-fvisibility=hidden], [
+  VISIBILITY_CFLAGS="-fvisibility=hidden"
+  AC_DEFINE(GST_API_EXPORT, [extern __attribute__ ((visibility ("default")))], [public symbol export define])
+], [
+  VISIBILITY_CFLAGS=""
+  AC_DEFINE(GST_API_EXPORT, [extern], [public symbol export define])
+])
 AC_SUBST(VISIBILITY_CFLAGS)
 
 dnl disable strict aliasing

diff --git a/ges/Makefile.am b/ges/Makefile.am
index dae513f..18d2444 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -155,7 +155,7 @@ noinst_HEADERS = \
 libges_@GST_API_VERSION@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) \
                $(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
                $(GST_CFLAGS) $(XML_CFLAGS) $(GIO_CFLAGS) $(GST_VALIDATE_CFLAGS) \
-               -DG_LOG_DOMAIN=\"GES\"
+               -DG_LOG_DOMAIN=\"GES\" -DBUILDING_GES
 libges_@GST_API_VERSION@_la_LIBADD = $(GST_PBUTILS_LIBS) \
                $(GST_VIDEO_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) \
                $(GST_BASE_LIBS) $(GST_LIBS) $(XML_LIBS) $(GIO_LIBS) $(GST_VALIDATE_LIBS)

diff --git a/ges/ges-asset.c b/ges/ges-asset.c
index a7d5d30..9503b3e 100644 (file)
--- a/ges/ges-asset.c
+++ b/ges/ges-asset.c
@@ -82,6 +82,9 @@
  * ges_asset_request_async(). All the #GESAssets are cached and thus any asset that has already
  * been created can be requested again without overhead.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges.h"
 #include "ges-internal.h"

diff --git a/ges/ges-audio-source.c b/ges/ges-audio-source.c
index 1588a1e..8997107 100644 (file)
--- a/ges/ges-audio-source.c
+++ b/ges/ges-audio-source.c
@@ -48,6 +48,9 @@
  * </tgroup>
  * </informaltable>
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges/ges-meta-container.h"

diff --git a/ges/ges-audio-test-source.c b/ges/ges-audio-test-source.c
index 03831ad..81627ab 100644 (file)
--- a/ges/ges-audio-test-source.c
+++ b/ges/ges-audio-test-source.c
@@ -27,6 +27,9 @@
  * output silence. Useful for testing pipelines, or to fill gaps in an audio
  * track.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-audio-track.c b/ges/ges-audio-track.c
index 68bc2f7..1ac8af0 100644 (file)
--- a/ges/ges-audio-track.c
+++ b/ges/ges-audio-track.c
@@ -36,6 +36,9 @@
  * - rate: 44100
  * - layout: interleaved
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-smart-adder.h"

diff --git a/ges/ges-audio-transition.c b/ges/ges-audio-transition.c
index 10c70e2..3a94876 100644 (file)
--- a/ges/ges-audio-transition.c
+++ b/ges/ges-audio-transition.c
@@ -23,6 +23,9 @@
  * @title: GESAudioTransition
  * @short_description: implements audio crossfade transition
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-audio-uri-source.c b/ges/ges-audio-uri-source.c
index 11c3675..755d6e0 100644 (file)
--- a/ges/ges-audio-uri-source.c
+++ b/ges/ges-audio-uri-source.c
@@ -23,6 +23,9 @@
  * @title: GESAudioUriSource
  * @short_description: outputs a single audio stream from a given file
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-utils.h"
 #include "ges-internal.h"

diff --git a/ges/ges-auto-transition.c b/ges/ges-auto-transition.c
index 18e41cf..37ea759 100644 (file)
--- a/ges/ges-auto-transition.c
+++ b/ges/ges-auto-transition.c
@@ -22,6 +22,9 @@
  *
  * NOTE: This is for internal use exclusively
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-auto-transition.h"
 #include "ges-internal.h"

diff --git a/ges/ges-base-effect-clip.c b/ges/ges-base-effect-clip.c
index 18e03d1..4cf1e65 100644 (file)
--- a/ges/ges-base-effect-clip.c
+++ b/ges/ges-base-effect-clip.c
@@ -25,6 +25,9 @@
  * The effect will be applied on the sources that have lower priorities
  * (higher number) between the inpoint and the end of it.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <ges/ges.h>
 #include "ges-internal.h"

diff --git a/ges/ges-base-effect.c b/ges/ges-base-effect.c
index ee11d6c..b604833 100644 (file)
--- a/ges/ges-base-effect.c
+++ b/ges/ges-base-effect.c
@@ -23,6 +23,9 @@
  * @short_description: adds an effect to a stream in a GESSourceClip or a
  * GESLayer
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <glib/gprintf.h>
 

diff --git a/ges/ges-base-transition-clip.c b/ges/ges-base-transition-clip.c
index b2347bf..ac3a47c 100644 (file)
--- a/ges/ges-base-transition-clip.c
+++ b/ges/ges-base-transition-clip.c
@@ -23,6 +23,9 @@
  * @title: GESBaseTransitionClip
  * @short_description: Base classes for transitions
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <ges/ges.h>
 #include "ges-internal.h"

diff --git a/ges/ges-base-xml-formatter.c b/ges/ges-base-xml-formatter.c
index 414fc0c..5e1fe77 100644 (file)
--- a/ges/ges-base-xml-formatter.c
+++ b/ges/ges-base-xml-formatter.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges.h"
 #include "ges-internal.h"

diff --git a/ges/ges-clip-asset.c b/ges/ges-clip-asset.c
index 4561084..e749c8a 100644 (file)
--- a/ges/ges-clip-asset.c
+++ b/ges/ges-clip-asset.c
@@ -26,6 +26,9 @@
  * it is mostly used to get information about the #GESTrackType-s the objects extracted
  * from it can potentialy create #GESTrackElement for.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-clip-asset.h"
 

diff --git a/ges/ges-clip.c b/ges/ges-clip.c
index 1393516..a7110a1 100644 (file)
--- a/ges/ges-clip.c
+++ b/ges/ges-clip.c
@@ -31,6 +31,9 @@
  * Keeps a reference to the #GESTrackElement(s) it created and
  * sets/updates their properties.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-clip.h"
 #include "ges.h"

diff --git a/ges/ges-command-line-formatter.c b/ges/ges-command-line-formatter.c
index 4dbc181..afca778 100644 (file)
--- a/ges/ges-command-line-formatter.c
+++ b/ges/ges-command-line-formatter.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-command-line-formatter.h"
 

diff --git a/ges/ges-container.c b/ges/ges-container.c
index 06f2a25..35abcbf 100644 (file)
--- a/ges/ges-container.c
+++ b/ges/ges-container.c
@@ -24,6 +24,9 @@
  * @short_description: Base Class for objects responsible for controlling other
  * GESTimelineElement-s
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-container.h"
 #include "ges.h"

diff --git a/ges/ges-effect-asset.c b/ges/ges-effect-asset.c
index b836ed5..120dbf4 100644 (file)
--- a/ges/ges-effect-asset.c
+++ b/ges/ges-effect-asset.c
@@ -24,6 +24,9 @@
  * This is internal, and implementation details, so we are not showing it in the
  * documentation
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-effect-asset.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-effect-clip.c b/ges/ges-effect-clip.c
index fab0370..f43f2f4 100644 (file)
--- a/ges/ges-effect-clip.c
+++ b/ges/ges-effect-clip.c
@@ -26,6 +26,9 @@
  * The effect will be applied on the sources that have lower priorities
  * (higher number) between the inpoint and the end of it.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <ges/ges.h>
 #include "ges-internal.h"

diff --git a/ges/ges-effect.c b/ges/ges-effect.c
index 84ef696..a2a80f4 100644 (file)
--- a/ges/ges-effect.c
+++ b/ges/ges-effect.c
@@ -23,6 +23,9 @@
  * @short_description: adds an effect build from a parse-launch style
  * bin description to a stream in a GESSourceClip or a GESLayer
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-extractable.h"

diff --git a/ges/ges-enums.c b/ges/ges-enums.c
index 440657e..c4072ff 100644 (file)
--- a/ges/ges-enums.c
+++ b/ges/ges-enums.c
@@ -23,6 +23,9 @@
  * @title: GES Enumerations
  * @short_description: Various enums for the Gstreamer Editing Services
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-enums.h"
 #include "ges-internal.h"

diff --git a/ges/ges-extractable.c b/ges/ges-extractable.c
index 77f56d6..9d7d3f1 100644 (file)
--- a/ges/ges-extractable.c
+++ b/ges/ges-extractable.c
@@ -25,6 +25,10 @@
  *
  * FIXME: Long description needed
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ges-asset.h"
 #include "ges-internal.h"
 #include "ges-extractable.h"

diff --git a/ges/ges-formatter.c b/ges/ges-formatter.c
index 5ff9f04..2bc22e2 100644 (file)
--- a/ges/ges-formatter.c
+++ b/ges/ges-formatter.c
@@ -24,6 +24,9 @@
  * @short_description: Timeline saving and loading.
  *
  **/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/gst.h>
 #include <gio/gio.h>

diff --git a/ges/ges-group.c b/ges/ges-group.c
index f676269..a0fb24e 100644 (file)
--- a/ges/ges-group.c
+++ b/ges/ges-group.c
@@ -31,6 +31,9 @@
  * should be instaciated to group the various #GESTimelineElement passed
  * in parametter.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-group.h"
 #include "ges.h"

diff --git a/ges/ges-image-source.c b/ges/ges-image-source.c
index 54ebcb4..b4c3eb4 100644 (file)
--- a/ges/ges-image-source.c
+++ b/ges/ges-image-source.c
@@ -28,6 +28,9 @@
  * chosen will be determined by the in-point property on the track element. For
  * image files, do not set the in-point property.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-layer.c b/ges/ges-layer.c
index fcc036c..ad33c02 100644 (file)
--- a/ges/ges-layer.c
+++ b/ges/ges-layer.c
@@ -30,6 +30,9 @@
  * priorities of individual Clips. Two layers should not have the
  * same priority within a given timeline.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-layer.h"

diff --git a/ges/ges-meta-container.c b/ges/ges-meta-container.c
index 883eb98..e9a3522 100644 (file)
--- a/ges/ges-meta-container.c
+++ b/ges/ges-meta-container.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <glib-object.h>
 #include <gst/gst.h>

diff --git a/ges/ges-multi-file-source.c b/ges/ges-multi-file-source.c
index ce9e19d..f6b6c4b 100644 (file)
--- a/ges/ges-multi-file-source.c
+++ b/ges/ges-multi-file-source.c
@@ -25,6 +25,10 @@
  * Outputs the video stream from a given image sequence. The start frame
  * chosen will be determined by the in-point property on the track element.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include "ges-internal.h"

diff --git a/ges/ges-operation-clip.c b/ges/ges-operation-clip.c
index 9b81168..d8be92d 100644 (file)
--- a/ges/ges-operation-clip.c
+++ b/ges/ges-operation-clip.c
@@ -25,6 +25,9 @@
  *
  * Operations are any kind of object that both outputs AND consumes data.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges.h"
 #include "ges-internal.h"

diff --git a/ges/ges-operation.c b/ges/ges-operation.c
index 6bf10cd..15a7102 100644 (file)
--- a/ges/ges-operation.c
+++ b/ges/ges-operation.c
@@ -23,6 +23,9 @@
  * @title: GESOperation
  * @short_description: Base Class for effects and overlays
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-overlay-clip.c b/ges/ges-overlay-clip.c
index 51e0488..8ab9695 100644 (file)
--- a/ges/ges-overlay-clip.c
+++ b/ges/ges-overlay-clip.c
@@ -30,6 +30,9 @@
  * Transitions, which change from one source to another over time, are
  * not considered overlays.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-operation-clip.h"

diff --git a/ges/ges-pipeline.c b/ges/ges-pipeline.c
index 9dda930..de68b58 100644 (file)
--- a/ges/ges-pipeline.c
+++ b/ges/ges-pipeline.c
@@ -27,6 +27,9 @@
  * in a simple fashion.
  * Its usage is inspired by the 'playbin' element from gst-plugins-base.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/gst.h>
 #include <gst/video/videooverlay.h>

diff --git a/ges/ges-pitivi-formatter.c b/ges/ges-pitivi-formatter.c
index 76cdda0..38fd0a2 100644 (file)
--- a/ges/ges-pitivi-formatter.c
+++ b/ges/ges-pitivi-formatter.c
@@ -27,6 +27,10 @@
  *
  * Deprecated: 1.0
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#undef VERSION
+#endif
 
 #include <libxml/xmlreader.h>
 #include <libxml/tree.h>
@@ -41,7 +45,7 @@
 #include <ges/ges.h>
 
 /* The Pitivi etree formatter is 0.1 we set GES one to 0.2 */
-#define VERSION "0.2"
+//#define VERSION "0.2"
 #define DOUBLE_VERSION 0.2
 
 #undef GST_CAT_DEFAULT

diff --git a/ges/ges-prelude.h b/ges/ges-prelude.h
index fc6c940..ccfff57 100644 (file)
--- a/ges/ges-prelude.h
+++ b/ges/ges-prelude.h
@@ -25,7 +25,11 @@
 #include <gst/gst.h>
 
 #ifndef GES_API
-#define GES_API GST_EXPORT
+# ifdef BUILDING_GES
+#  define GES_API GST_API_EXPORT         /* from config.h */
+# else
+#  define GES_API GST_API_IMPORT
+# endif
 #endif
 
 #endif /* __GST_GES_PRELUDE_H__ */

diff --git a/ges/ges-project.c b/ges/ges-project.c
index e4d9f20..4ad6281 100644 (file)
--- a/ges/ges-project.c
+++ b/ges/ges-project.c
@@ -44,6 +44,10 @@
  * a set of signals. Also it handles problem such as missing files/missing
  * #GstElement and lets you try to recover from those.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ges.h"
 #include "ges-internal.h"
 

diff --git a/ges/ges-screenshot.c b/ges/ges-screenshot.c
index 755aae7..1a99a5e 100644 (file)
--- a/ges/ges-screenshot.c
+++ b/ges/ges-screenshot.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/gst.h>
 #include <gst/video/video.h>

diff --git a/ges/ges-smart-adder.c b/ges/ges-smart-adder.c
index 5d8b2bc..85ea017 100644 (file)
--- a/ges/ges-smart-adder.c
+++ b/ges/ges-smart-adder.c
@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.";
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gst/audio/audio.h>
 
 #include "ges-types.h"

diff --git a/ges/ges-smart-video-mixer.c b/ges/ges-smart-video-mixer.c
index 6315f41..aa39651 100644 (file)
--- a/ges/ges-smart-video-mixer.c
+++ b/ges/ges-smart-video-mixer.c
@@ -16,6 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.";
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gstframepositioner.h"
 #include "ges-types.h"

diff --git a/ges/ges-source-clip.c b/ges/ges-source-clip.c
index 24dd0bf..21c9f95 100644 (file)
--- a/ges/ges-source-clip.c
+++ b/ges/ges-source-clip.c
@@ -23,6 +23,9 @@
  * @title: GESSourceClip
  * @short_description: Base Class for sources of a GESLayer
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-clip.h"

diff --git a/ges/ges-source.c b/ges/ges-source.c
index 90119e6..e70c4e5 100644 (file)
--- a/ges/ges-source.c
+++ b/ges/ges-source.c
@@ -23,6 +23,9 @@
  * @title: GESSource
  * @short_description: Base Class for single-media sources
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges/ges-meta-container.h"

diff --git a/ges/ges-structure-parser.c b/ges/ges-structure-parser.c
index ae05622..bcd2a24 100644 (file)
--- a/ges/ges-structure-parser.c
+++ b/ges/ges-structure-parser.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-structure-parser.h"
 

diff --git a/ges/ges-structured-interface.c b/ges/ges-structured-interface.c
index 1e00a3d..cf1de50 100644 (file)
--- a/ges/ges-structured-interface.c
+++ b/ges/ges-structured-interface.c
@@ -17,6 +17,10 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ges-structured-interface.h"
 
 #include <string.h>

diff --git a/ges/ges-test-clip.c b/ges/ges-test-clip.c
index 9f2c5fb..77bd5f3 100644 (file)
--- a/ges/ges-test-clip.c
+++ b/ges/ges-test-clip.c
@@ -28,6 +28,9 @@
  * You can use the ges_asset_request_simple API to create an Asset
  * capable of extracting GESTestClip-s
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-test-clip.h"

diff --git a/ges/ges-text-overlay-clip.c b/ges/ges-text-overlay-clip.c
index 57f1f3a..72d8265 100644 (file)
--- a/ges/ges-text-overlay-clip.c
+++ b/ges/ges-text-overlay-clip.c
@@ -25,6 +25,9 @@
  *
  * Renders text onto the next lower priority stream using textrender.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-text-overlay-clip.h"

diff --git a/ges/ges-text-overlay.c b/ges/ges-text-overlay.c
index 1278a6d..98d90b8 100644 (file)
--- a/ges/ges-text-overlay.c
+++ b/ges/ges-text-overlay.c
@@ -24,6 +24,9 @@
  * @short_description: render text onto another video stream in a GESLayer
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-timeline-element.c b/ges/ges-timeline-element.c
index fffaf5a..4a1e352 100644 (file)
--- a/ges/ges-timeline-element.c
+++ b/ges/ges-timeline-element.c
@@ -26,6 +26,9 @@
  * as priority. A GESTimelineElement can have a parent object which will be
  * responsible for controlling its timing properties.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-utils.h"
 #include "ges-timeline-element.h"

diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index 4394146..041c29b 100644 (file)
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -40,6 +40,9 @@
  * Note that any change you make in the timeline will not actually be taken
  * into account until you call the #ges_timeline_commit method.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-project.h"

diff --git a/ges/ges-title-clip.c b/ges/ges-title-clip.c
index 4e012a1..f663a22 100644 (file)
--- a/ges/ges-title-clip.c
+++ b/ges/ges-title-clip.c
@@ -26,6 +26,9 @@
  * Renders the given text in the specified font, at specified position, and
  * with the specified background pattern.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-title-clip.h"

diff --git a/ges/ges-title-source.c b/ges/ges-title-source.c
index 82ddaa2..be4671e 100644 (file)
--- a/ges/ges-title-source.c
+++ b/ges/ges-title-source.c
@@ -87,6 +87,9 @@
  * </tgroup>
  * </informaltable>
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-track-element-asset.c b/ges/ges-track-element-asset.c
index 9e54c40..d6ed7a2 100644 (file)
--- a/ges/ges-track-element-asset.c
+++ b/ges/ges-track-element-asset.c
@@ -23,6 +23,9 @@
  * @title: GESTrackElementAsset
  * @short_description: A GESAsset subclass specialized in GESTrackElement extraction
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-track-element-asset.h"
 

diff --git a/ges/ges-track-element.c b/ges/ges-track-element.c
index ffc77dc..2fc2c33 100644 (file)
--- a/ges/ges-track-element.c
+++ b/ges/ges-track-element.c
@@ -30,6 +30,10 @@
  * its container, like the start position, the inpoint, the duration and the
  * priority.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ges-internal.h"
 #include "ges-extractable.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-track.c b/ges/ges-track.c
index 534a7af..b23d47c 100644 (file)
--- a/ges/ges-track.c
+++ b/ges/ges-track.c
@@ -27,6 +27,9 @@
  *
  * Contains the compatible TrackElement(s).
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track.h"

diff --git a/ges/ges-transition-clip.c b/ges/ges-transition-clip.c
index acff2f3..8a64291 100644 (file)
--- a/ges/ges-transition-clip.c
+++ b/ges/ges-transition-clip.c
@@ -36,6 +36,9 @@
  * that this value can be changed after creation and the GESExtractable.asset value
  * will be updated when needed.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <ges/ges.h>
 #include "ges-internal.h"

diff --git a/ges/ges-transition.c b/ges/ges-transition.c
index 0036564..65c07e6 100644 (file)
--- a/ges/ges-transition.c
+++ b/ges/ges-transition.c
@@ -24,6 +24,9 @@
  * @short_description: base class for audio and video transitions
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <ges/ges.h>
 #include "ges-internal.h"

diff --git a/ges/ges-uri-asset.c b/ges/ges-uri-asset.c
index b440d77..7a28515 100644 (file)
--- a/ges/ges-uri-asset.c
+++ b/ges/ges-uri-asset.c
@@ -28,6 +28,10 @@
  * let you get information about the medias. Also, the tags found in the media file are
  * set as Metadatas of the Asser.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <gst/pbutils/pbutils.h>
 #include "ges.h"

diff --git a/ges/ges-uri-clip.c b/ges/ges-uri-clip.c
index d4ae141..3f8f63c 100644 (file)
--- a/ges/ges-uri-clip.c
+++ b/ges/ges-uri-clip.c
@@ -26,6 +26,9 @@
  * Represents all the output streams from a particular uri. It is assumed that
  * the URI points to a file of some type.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-uri-clip.h"

diff --git a/ges/ges-utils.c b/ges/ges-utils.c
index bd330cb..adb0d0c 100644 (file)
--- a/ges/ges-utils.c
+++ b/ges/ges-utils.c
@@ -23,6 +23,9 @@
  * @short_description: Convenience methods
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <string.h>
 

diff --git a/ges/ges-video-source.c b/ges/ges-video-source.c
index f73a8f1..4433d88 100644 (file)
--- a/ges/ges-video-source.c
+++ b/ges/ges-video-source.c
@@ -77,6 +77,9 @@
  * </tgroup>
  * </informaltable>
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/pbutils/missing-plugins.h>
 

diff --git a/ges/ges-video-test-source.c b/ges/ges-video-test-source.c
index baea99f..22e04d8 100644 (file)
--- a/ges/ges-video-test-source.c
+++ b/ges/ges-video-test-source.c
@@ -23,6 +23,9 @@
  * @title: GESVideoTestSource
  * @short_description: produce solid colors and patterns
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-internal.h"
 #include "ges-track-element.h"

diff --git a/ges/ges-video-track.c b/ges/ges-video-track.c
index 0bcf1df..90fdeda 100644 (file)
--- a/ges/ges-video-track.c
+++ b/ges/ges-video-track.c
@@ -22,6 +22,9 @@
  * @title: GESVideoTrack
  * @short_description: A standard GESTrack for raw video
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ges-video-track.h"
 #include "ges-smart-video-mixer.h"

diff --git a/ges/ges-video-transition.c b/ges/ges-video-transition.c
index 58af634..6165735 100644 (file)
--- a/ges/ges-video-transition.c
+++ b/ges/ges-video-transition.c
@@ -23,6 +23,9 @@
  * @title: GESVideoTransition
  * @short_description: implements video crossfade transition
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <ges/ges.h>
 #include "ges-internal.h"

diff --git a/ges/ges-video-uri-source.c b/ges/ges-video-uri-source.c
index 7b72539..1939046 100644 (file)
--- a/ges/ges-video-uri-source.c
+++ b/ges/ges-video-uri-source.c
@@ -23,6 +23,9 @@
  * @title: GESVideoUriSource
  * @short_description: outputs a single video stream from a given file
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/pbutils/missing-plugins.h>
 

diff --git a/ges/ges-xml-formatter.c b/ges/ges-xml-formatter.c
index 4fe7c65..d529212 100644 (file)
--- a/ges/ges-xml-formatter.c
+++ b/ges/ges-xml-formatter.c
@@ -17,6 +17,10 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#undef VERSION
+#endif
 
 
 /* TODO Determine error codes numbers */

diff --git a/ges/meson.build b/ges/meson.build
index d342191..ba89315 100644 (file)
--- a/ges/meson.build
+++ b/ges/meson.build
@@ -160,7 +160,7 @@ libges = library('ges-1.0', ges_sources, parser,
     version : libversion,
     soversion : soversion,
     darwin_versions : osxversion,
-    c_args : [ges_c_args],
+    c_args : [ges_c_args] + ['-DBUILDING_GES'],
     include_directories : [configinc],
     install : true,
     dependencies : libges_deps)

diff --git a/meson.build b/meson.build
index 80cf650..4dfc112 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -29,6 +29,9 @@ glib_req = '>= 2.40.0'
 gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
 
 cc = meson.get_compiler('c')
+
+cdata = configuration_data()
+
 # Ignore several spurious warnings for things gstreamer does very commonly
 # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
 # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once
@@ -47,16 +50,23 @@ if cc.has_link_argument('-Wl,-Bsymbolic-functions')
 endif
 
 # Symbol visibility
-if cc.has_argument('-fvisibility=hidden')
+if cc.get_id() == 'msvc'
+  export_define = '__declspec(dllexport) extern'
+elif cc.has_argument('-fvisibility=hidden')
   add_project_arguments('-fvisibility=hidden', language: 'c')
+  export_define = 'extern __attribute__ ((visibility ("default")))'
+else
+  export_define = 'extern'
 endif
 
+# Passing this through the command line would be too messy
+cdata.set('GST_API_EXPORT', export_define)
+
 # Disable strict aliasing
 if cc.has_argument('-fno-strict-aliasing')
   add_project_arguments('-fno-strict-aliasing', language: 'c')
 endif
 
-cdata = configuration_data()
 cdata.set('VERSION', '"@0@"'.format(gst_version))
 cdata.set('PACKAGE', '"gst-editing-services"')
 cdata.set('PACKAGE_VERSION', '"@0@"'.format(gst_version))