From f884d1b1dc48121824469963dd03502b815ff34a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 20 Jul 2011 12:35:52 +0800 Subject: Update Visual Studio Project Files -Change ATK dependency back to atk-1.0.lib, and the corresponding include folder back to atk-1.0 for all projects as ATK-2.x will still retain the 1.0 suffixes. (ATK Commit 01cec72) -Update corresponding description in the VS README.txt files -Also fix up the VS2010 README.txt file a bit. --- build/win32/vs10/README.txt | 37 ++++++++-------------- .../vs10/cally-atkeditabletext-example.vcxproj | 8 ++--- build/win32/vs10/cally-atkevents-example.vcxproj | 8 ++--- build/win32/vs10/cally-atktext-example.vcxproj | 8 ++--- build/win32/vs10/clutter.props | 2 +- build/win32/vs10/clutter.vcxprojin | 8 ++--- build/win32/vs9/README.txt | 37 ++++++++-------------- .../win32/vs9/cally-atkeditabletext-example.vcproj | 8 ++--- build/win32/vs9/cally-atkevents-example.vcproj | 8 ++--- build/win32/vs9/cally-atktext-example.vcproj | 8 ++--- build/win32/vs9/clutter.vcprojin | 8 ++--- build/win32/vs9/clutter.vsprops | 2 +- 12 files changed, 60 insertions(+), 82 deletions(-) diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt index 1d7ef327a..68dccd430 100644 --- a/build/win32/vs10/README.txt +++ b/build/win32/vs10/README.txt @@ -7,8 +7,8 @@ the files needed, like config.h.win32.in into config.h.win32 and the .vcprojin files here into corresponding actual .vcproj files. You will need the parts from GNOME: Cogl, JSON-GLib, GDK-Pixbuf, -Pango**, atk (2.x)* and GLib. External dependencies are at least zlib, libpng, -gettext-runtime** and Cairo**, and glext.h from +Pango*, atk and GLib. External dependencies are at least zlib, libpng, +gettext-runtime* and Cairo*, and glext.h from http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder in your include directories or in \vs10\\include\GL). @@ -22,12 +22,12 @@ CRTs-please see also the build/win32/vs10/README.txt in those respective package The recommended build sequence of the dependencies are as follows (the non-GNOME packages that are not downloaded as binaries from ftp://ftp.gnome.org have makefiles and/or VS project files that can be used to compile with VS directly, -except the optional PCRE, which is built on VS using CMake; GLib & ATK-2.x have +except the optional PCRE, which is built on VS using CMake; GLib & ATK have VS10 project files in the latest stable versions, GDK-Pixbuf have VS10 project files in the latest unstable version, and Cogl, JSON-GLib and Pango should have VS10 project files in the next unstable release): -Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig - downloaded from ftp://ftp.gnome.org** + downloaded from ftp://ftp.gnome.org* -zlib -libpng -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is @@ -38,11 +38,11 @@ files in the next unstable release): -GLib -Cairo -Pango --ATK-2.x* +-ATK -GDK-Pixbuf -JSON-GLib -Cogl - (Note that Pango, ATK-2.x, GDK-Pixbuf and JSON-GLib are not dependent on each + (Note that Pango, ATK, GDK-Pixbuf and JSON-GLib are not dependent on each other, so building them in any order will do) Note that a working PERL installation (such as ActiveState or Strawberry PERL) @@ -68,26 +68,15 @@ appropriate location under \vs10\. For instance, built DLLs go into \vs10\\bin, built LIBs into \vs10\\lib and Clutter headers into \vs10\\include\clutter-1.0. - -*Regarding ATK-2.x: prior to compiling ATK-2.0.0, please open atkprops - in VS under "Properties Manager" view (it is under any one of the - build configurations, right-click on atkprops and select "Properties"). - Navigate to "User Macros", and edit the following fields: - AtkApiVersion -> 2.0 - AtkLibToolCompatibleDllSuffix -> -2.0-0 - AtkSeperateVS10DLLSuffix -> -2-vs10 - Sorry this change did not make it upstream prior to ATK-2.0.0 release- - this will be in the subsequent releases of ATK-2.x and was committed - upstream. -**There is no known official VS10 build support for fontconfig - (required for Pango and Pango at the moment-I will see whether this - requirement can be made optional for VS builds) - (along with freetype and expat) and gettext-runtime, so - please use the binaries from: +*There is no known official VS10 build support for fontconfig + (required for Pango and Pango at the moment-I will see whether this + requirement can be made optional for VS builds) + (along with freetype and expat) and gettext-runtime, so + please use the binaries from: - ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) - ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) + ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) + ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) --Chun-wei Fan (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist) diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj b/build/win32/vs10/cally-atkeditabletext-example.vcxproj index 5d8f35ea5..14bfbbda7 100644 --- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj +++ b/build/win32/vs10/cally-atkeditabletext-example.vcxproj @@ -81,7 +81,7 @@ EditAndContinue - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console MachineX86 @@ -101,7 +101,7 @@ CompileAsC - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console false @@ -123,7 +123,7 @@ ProgramDatabase - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console true @@ -142,7 +142,7 @@ CompileAsC - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console true diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj b/build/win32/vs10/cally-atkevents-example.vcxproj index f946c802f..de7389505 100644 --- a/build/win32/vs10/cally-atkevents-example.vcxproj +++ b/build/win32/vs10/cally-atkevents-example.vcxproj @@ -81,7 +81,7 @@ EditAndContinue - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console MachineX86 @@ -101,7 +101,7 @@ CompileAsC - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console false @@ -123,7 +123,7 @@ ProgramDatabase - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console true @@ -142,7 +142,7 @@ CompileAsC - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console true diff --git a/build/win32/vs10/cally-atktext-example.vcxproj b/build/win32/vs10/cally-atktext-example.vcxproj index 9a3d1196d..00e1e83fa 100644 --- a/build/win32/vs10/cally-atktext-example.vcxproj +++ b/build/win32/vs10/cally-atktext-example.vcxproj @@ -81,7 +81,7 @@ EditAndContinue - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console MachineX86 @@ -101,7 +101,7 @@ CompileAsC - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console false @@ -123,7 +123,7 @@ ProgramDatabase - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console true @@ -142,7 +142,7 @@ CompileAsC - atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) true Console true diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props index 896951f2c..aefe0497f 100644 --- a/build/win32/vs10/clutter.props +++ b/build/win32/vs10/clutter.props @@ -308,7 +308,7 @@ copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApi - ..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + ..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) G_DISABLE_SINGLE_INCLUDES;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions) msvc_recommended_pragmas.h;%(ForcedIncludeFiles) 4819;%(DisableSpecificWarnings) diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin index ef9d371a2..fda140ae3 100644 --- a/build/win32/vs10/clutter.vcxprojin +++ b/build/win32/vs10/clutter.vcxprojin @@ -87,7 +87,7 @@ $(GenerateClutterDef) - 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-2.0.lib;gmodule-2.0.lib;%(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;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll ..\..\..\clutter\clutter.def $(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib @@ -116,7 +116,7 @@ $(GenerateClutterDef) - 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-2.0.lib;gmodule-2.0.lib;%(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;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll ..\..\..\clutter\clutter.def $(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib @@ -145,7 +145,7 @@ $(GenerateClutterDef) - 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-2.0.lib;gmodule-2.0.lib;%(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;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll ..\..\..\clutter\clutter.def $(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib @@ -173,7 +173,7 @@ $(GenerateClutterDef) - 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-2.0.lib;gmodule-2.0.lib;%(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;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll ..\..\..\clutter\clutter.def $(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index 52daae646..588ed5c38 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -7,8 +7,8 @@ the files needed, like config.h.win32.in into config.h.win32 and the .vcprojin files here into corresponding actual .vcproj files. You will need the parts from GNOME: Cogl, JSON-GLib, GDK-Pixbuf, -Pango**, atk (2.x)* and GLib. External dependencies are at least zlib, libpng, -gettext-runtime** and Cairo**, and glext.h from +Pango*, atk and GLib. External dependencies are at least zlib, libpng, +gettext-runtime* and Cairo*, and glext.h from http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder in your include directories or in \vs9\\include\GL). @@ -22,12 +22,12 @@ CRTs-please see also the build/win32/vs9/README.txt in those respective packages The recommended build sequence of the dependencies are as follows (the non-GNOME packages that are not downloaded as binaries from ftp://ftp.gnome.org have makefiles and/or VS project files that can be used to compile with VS directly, -except the optional PCRE, which is built on VS using CMake; GLib & ATK-2.x have +except the optional PCRE, which is built on VS using CMake; GLib & ATK have VS9 project files in the latest stable versions, GDK-Pixbuf have VS9 project files in the latest unstable version, and JSON-GLib, Pango and Cogl should have VS9 project files in the next unstable release): -Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig - downloaded from ftp://ftp.gnome.org** + downloaded from ftp://ftp.gnome.org* -zlib -libpng -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is @@ -38,11 +38,11 @@ project files in the next unstable release): -GLib -Cairo -Pango --ATK-2.x* +-ATK -GDK-Pixbuf -JSON-GLib -Cogl - (Note that Pango, ATK-2.x, GDK-Pixbuf and JSON-GLib are not dependent on each + (Note that Pango, ATK, GDK-Pixbuf and JSON-GLib are not dependent on each other, so building them in any order will do) Note that a working PERL installation (such as ActiveState or Strawberry PERL) @@ -68,26 +68,15 @@ appropriate location under \vs9\. For instance, built DLLs go into \vs9\\bin, built LIBs into \vs9\\lib and Clutter headers into \vs9\\include\clutter-1.0. - -*Regarding ATK-2.x: prior to compiling ATK-2.0.0, please open atkprops - in VS under "Properties Manager" view (it is under any one of the - build configurations, right-click on atkprops and select "Properties"). - Navigate to "User Macros", and edit the following fields: - AtkApiVersion -> 2.0 - AtkLibToolCompatibleDllSuffix -> -2.0-0 - AtkSeperateVS9DLLSuffix -> -2-vs9 - Sorry this change did not make it upstream prior to ATK-2.0.0 release- - this will be in the subsequent releases of ATK-2.x and was committed - upstream. -**There is no known official VS9 build support for fontconfig - (required for Pango and Pango at the moment-I will see whether this - requirement can be made optional for VS builds) - (along with freetype and expat) and gettext-runtime, so - please use the binaries from: +*There is no known official VS9 build support for fontconfig + (required for Pango and Pango at the moment-I will see whether this + requirement can be made optional for VS builds) + (along with freetype and expat) and gettext-runtime, so + please use the binaries from: - ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) - ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) + ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit) + ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit) --Chun-wei Fan (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist) diff --git a/build/win32/vs9/cally-atkeditabletext-example.vcproj b/build/win32/vs9/cally-atkeditabletext-example.vcproj index 5b29e791e..b2316dcf2 100644 --- a/build/win32/vs9/cally-atkeditabletext-example.vcproj +++ b/build/win32/vs9/cally-atkeditabletext-example.vcproj @@ -42,7 +42,7 @@