From: Chun-wei Fan Date: Sun, 17 Apr 2011 17:39:56 +0000 (+0800) Subject: VS 2008/2010 support update X-Git-Tag: ATK_2_0_1~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63a228924fa85d9330212e9082e5a2a61e5acff7;p=platform%2Fupstream%2Fatk.git VS 2008/2010 support update -Update the property sheets for 2.x release and other refinements -Update README.txt --- diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt index fd87feb..37d5a92 100644 --- a/build/win32/vs10/README.txt +++ b/build/win32/vs10/README.txt @@ -8,7 +8,7 @@ You will also need to expand atk.vcprojin here into atk.vcproj. The dependencies for this package are gettext-runtime (libintl), GLib* -(inclusive of GLib, GModule, GThread, GObject) and ZLib. +and ZLib. a) look for all of the dependencies (except GLib*) under @@ -16,7 +16,7 @@ a) look for all of the dependencies (except GLib*) under http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) Please use the latest versions of these libraries that are available there, - these are packaged by Tor Lillqvist, which are built with MinGW/GCC AFAIK. + these are packaged by Tor Lillqvist, which are built with MinGW/GCC. Please see b) below regarding the build of GLib* -OR- @@ -75,9 +75,9 @@ After the build of ATK, the "install" project will copy build results and headers into their appropriate location under \vs10\. For instance, built DLLs go into \vs10\\bin, built LIBs into \vs10\\lib and atk headers into -\vs10\\include\atk-1.0. This is then from where +\vs10\\include\atk-2.0. This is then from where project files higher in the stack are supposed to look for them, not from a specific ATK source tree. ---Chun-wei Fan +--Chun-wei Fan --(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist) diff --git a/build/win32/vs10/atk.props b/build/win32/vs10/atk.props index e3afb34..0335940 100644 --- a/build/win32/vs10/atk.props +++ b/build/win32/vs10/atk.props @@ -1,7 +1,7 @@  - 1.0 + 2.0 \"/dummy\" ..\..\..\..\..\vs10\$(Platform) $(AtkEtcInstallRoot) @@ -82,9 +82,9 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(AtkApiVersion).lib $(Cop echo EXPORTS >"..\..\..\atk\atk.def" && cl /EP ..\..\..\atk\atk.symbols >>"..\..\..\atk\atk.def" ATK_LOCALEDIR="\"$(AtkDummyPrefix)/share/locale\"" lib - -1.0-0 + -2.0-0 - -1-vs10 + -2-vs10 $(AtkSeparateVS10DllPrefix) $(AtkSeparateVS10DllSuffix) @@ -114,13 +114,13 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h if exist ..\..\..\atk\atkmarshal.h goto GEN_MARS_C -glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header >..\..\..\atk\atkmarshal.h +$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header >..\..\..\atk\atkmarshal.h :GEN_MARS_C if exist ..\..\..\atk\atkmarshal.c goto END -glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body >..\..\..\atk\atkmarshal.c +$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body >..\..\..\atk\atkmarshal.c :END diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index e040875..f0a4c71 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -8,7 +8,7 @@ You will also need to expand atk.vcprojin here into atk.vcproj. The dependencies for this package are gettext-runtime (libintl), GLib* -(inclusive of GLib, GModule, GThread, GObject) and ZLib. +and ZLib. a) look for all of the dependencies (except GLib*) under @@ -16,7 +16,7 @@ a) look for all of the dependencies (except GLib*) under http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) Please use the latest versions of these libraries that are available there, - these are packaged by Tor Lillqvist, which are built with MinGW/GCC AFAIK. + these are packaged by Tor Lillqvist, which are built with MinGW/GCC. Please see b) below regarding the build of GLib* -OR- @@ -75,9 +75,9 @@ After the build of ATK, the "install" project will copy build results and headers into their appropriate location under \vs9\. For instance, built DLLs go into \vs9\\bin, built LIBs into \vs9\\lib and atk headers into -\vs9\\include\atk-1.0. This is then from where +\vs9\\include\atk-2.0. This is then from where project files higher in the stack are supposed to look for them, not from a specific ATK source tree. ---Chun-wei Fan +--Chun-wei Fan --(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist) diff --git a/build/win32/vs9/atk.vsprops b/build/win32/vs9/atk.vsprops index 2ec4a1f..8200bff 100644 --- a/build/win32/vs9/atk.vsprops +++ b/build/win32/vs9/atk.vsprops @@ -24,16 +24,16 @@ if exist ..\..\..\config.h goto DONE_CONFIG_H copy ..\..\..\config.h.win32 ..\..\..\config.h :DONE_CONFIG_H if exist ..\..\..\atk\atkmarshal.h goto GEN_MARS_C -glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header >..\..\..\atk\atkmarshal.h +$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header >..\..\..\atk\atkmarshal.h :GEN_MARS_C if exist ..\..\..\atk\atkmarshal.c goto END -glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body >..\..\..\atk\atkmarshal.c +$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body >..\..\..\atk\atkmarshal.c :END " />