summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2011-12-08 17:39:26 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2011-12-08 17:39:26 +0800
commitb6c5c0602dfa152603d6345b0c2fc6a1d00b0cf4 (patch)
treed41c9ed25e806a655cf0d2e865247e3e66250d32
parent7a70e1f08b7755a7c3b79c21c49f746006ea7483 (diff)
downloadclutter-b6c5c0602dfa152603d6345b0c2fc6a1d00b0cf4.tar.gz
Update VS property sheets
Generate clutter-marshal.[ch] before the clutter-enum-types.[ch]. Strangely Visual C++ does funny things if this was done the other way around. :|
-rw-r--r--build/win32/vs10/clutter.props14
-rw-r--r--build/win32/vs9/clutter.vsprops8
2 files changed, 11 insertions, 11 deletions
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index 91d097da3..194fe794f 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -35,13 +35,6 @@ copy ..\..\..\clutter\clutter-version.h.win32 ..\..\..\clutter\clutter-version.h
:DONE_CLUTTER_VERSION_H
-cd ..
-
-gen-enums.bat $(GlibEtcInstallRoot)
-
-cd .\vs10
-
-
if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H
cd ..\..\..\clutter
@@ -65,6 +58,13 @@ cd ..\build\win32\vs10
:DONE_CLUTTER_MARSHAL_C
+
+cd ..
+
+gen-enums.bat $(GlibEtcInstallRoot)
+
+cd .\vs10
+
</PreBuildCmd>
<ClutterDoInstall>
mkdir $(CopyDir)
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index 169ae34f8..0117b66ed 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -77,10 +77,6 @@ if exist ..\..\..\clutter\clutter-version.h goto DONE_CLUTTER_VERSION_H&#x0D;&#x
copy ..\..\..\clutter\clutter-version.h.win32 ..\..\..\clutter\clutter-version.h&#x0D;&#x0A;
:DONE_CLUTTER_VERSION_H&#x0D;&#x0A;
-cd ..&#x0D;&#x0A;
-gen-enums.bat $(GlibEtcInstallRoot)&#x0D;&#x0A;
-cd .\vs9&#x0D;&#x0A;
-
if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H&#x0D;&#x0A;
cd ..\..\..\clutter&#x0D;&#x0A;
$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list &gt; clutter-marshal.h&#x0D;&#x0A;
@@ -93,6 +89,10 @@ echo #include &quot;clutter-marshal.h&quot; &gt; clutter-marshal.c&#x0D;&#x0A;
$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list &gt;&gt; clutter-marshal.c&#x0D;&#x0A;
cd ..\build\win32\vs9&#x0D;&#x0A;
:DONE_CLUTTER_MARSHAL_C&#x0D;&#x0A;
+
+cd ..&#x0D;&#x0A;
+gen-enums.bat $(GlibEtcInstallRoot)&#x0D;&#x0A;
+cd .\vs9&#x0D;&#x0A;
"
/>
<UserMacro