diff --git a/build/win32/vs10/clutter-gen-srcs.props b/build/win32/vs10/clutter-gen-srcs.props
index 11ecedba5..9d8e8b8b7 100644
--- a/build/win32/vs10/clutter-gen-srcs.props
+++ b/build/win32/vs10/clutter-gen-srcs.props
@@ -43,16 +43,6 @@ $(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body ..\..
perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) > ..\..\..\clutter\clutter-enum-types.c
perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) > ..\..\..\clutter\clutter-enum-types.h
perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) > ..\..\..\clutter\clutter-enum-types.c
-
-echo EXPORTS > $(DefDir)\clutter.def
-
-cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def
-
-
-echo EXPORTS > $(DefDir)\clutter.def
-
-cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def
-
<_PropertySheetDisplayName>cluttergensrcsprops
@@ -88,11 +78,5 @@ cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK -DCLUTTER_
$(GenEnumsSrcGDKC)
-
- $(GenerateClutterDef)
-
-
- $(GenerateClutterGDKDef)
-
diff --git a/build/win32/vs10/clutter.vcxproj.filtersin b/build/win32/vs10/clutter.vcxproj.filtersin
index 106877f3e..2d910f754 100644
--- a/build/win32/vs10/clutter.vcxproj.filtersin
+++ b/build/win32/vs10/clutter.vcxproj.filtersin
@@ -30,7 +30,6 @@
Resource Files
Resource Files
Resource Files
- Resource Files
diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin
index 0c9f5b881..6a6263fdd 100644
--- a/build/win32/vs10/clutter.vcxprojin
+++ b/build/win32/vs10/clutter.vcxprojin
@@ -151,7 +151,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -177,7 +176,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -203,7 +201,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -229,7 +226,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -255,7 +251,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -283,7 +278,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -308,7 +302,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -333,7 +326,6 @@
opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)
$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll
- $(IntDir)\$(ProjectName).def
$(TargetDir)$(ProjectName)-$(ApiVersion).lib
true
Windows
@@ -514,32 +506,6 @@
$(GenEnumsSrcC)
..\..\..\clutter\clutter-enum-types.c;%(Outputs)
-
- Generating clutter.def...
- $(GenerateClutterGDKDef)
- $(IntDir)clutter.def;%(Outputs)
- Generating clutter.def...
- $(GenerateClutterDef)
- $(IntDir)clutter.def;%(Outputs)
- Generating clutter.def...
- $(GenerateClutterGDKDef)
- $(IntDir)clutter.def;%(Outputs)
- Generating clutter.def...
- $(GenerateClutterDef)
- $(IntDir)clutter.def;%(Outputs)
- Generating clutter.def...
- $(GenerateClutterGDKDef)
- $(IntDir)clutter.def;%(Outputs)
- Generating clutter.def...
- $(GenerateClutterDef)
- $(IntDir)clutter.def;%(Outputs)
- Generating clutter.def...
- $(GenerateClutterGDKDef)
- $(IntDir)clutter.def;%(Outputs)
- Generating clutter.def...
- $(GenerateClutterDef)
- $(IntDir)clutter.def;%(Outputs)
-
diff --git a/build/win32/vs9/clutter-gen-srcs.vsprops b/build/win32/vs9/clutter-gen-srcs.vsprops
index 78ac858e0..e9a7e757b 100644
--- a/build/win32/vs9/clutter-gen-srcs.vsprops
+++ b/build/win32/vs9/clutter-gen-srcs.vsprops
@@ -64,18 +64,4 @@ $(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body ..\..
Name="GenEnumsSrcGDKC"
Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) > ..\..\..\clutter\clutter-enum-types.c"
/>
-
-
diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin
index fb924e8fb..5c23a3bae 100644
--- a/build/win32/vs9/clutter.vcprojin
+++ b/build/win32/vs9/clutter.vcprojin
@@ -46,7 +46,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -81,7 +80,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -115,7 +113,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -150,7 +147,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -185,7 +181,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -223,7 +218,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -256,7 +250,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -290,7 +283,6 @@
AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
- ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -686,72 +678,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/clutter/config.h.win32.in b/clutter/config.h.win32.in
index 1758b775b..75b79adac 100644
--- a/clutter/config.h.win32.in
+++ b/clutter/config.h.win32.in
@@ -147,3 +147,10 @@
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
+
+/* defines how to decorate public symbols while building */
+#ifdef _MSC_VER
+#define _CLUTTER_EXTERN __declspec(dllexport) extern
+#else
+#define _CLUTTER_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern
+#endif