diff options
| -rwxr-xr-x | autobuild.xml | 34 | ||||
| -rwxr-xr-x | indra/cmake/UI.cmake | 4 |
2 files changed, 7 insertions, 31 deletions
diff --git a/autobuild.xml b/autobuild.xml index 31f9c8e05a..6717da5eea 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1239,30 +1239,6 @@ <key>name</key> <string>linux64</string> </map> - <key>windows</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>5655fb00c37f58cca640a53a9dbc82a7</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-gtk-atk-pango-glib/rev/314220/arch/CYGWIN/installer/gtk_atk_pango_glib-0.1-windows-314220.tar.bz2</string> - </map> - <key>name</key> - <string>windows</string> - </map> - <key>windows64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>5bf8f67b02d89606374d550ca0353083</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-gtk-atk-pango-glib/rev/314220/arch/CYGWIN/installer/gtk_atk_pango_glib-0.1-windows64-314220.tar.bz2</string> - </map> - <key>name</key> - <string>windows64</string> - </map> </map> <key>version</key> <string>0.1</string> @@ -2032,11 +2008,11 @@ <key>archive</key> <map> <key>hash</key> - <string>823133ce846c2a80051d08ef818dff77</string> + <string>120a020cff13fd46296860efb36dfb5c</string> <key>hash_algorithm</key> <string>md5</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-llceflib/rev/314301/arch/CYGWIN/installer/llceflib-1.5.3.314301-windows-314301.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-llceflib/rev/314446/arch/CYGWIN/installer/llceflib-1.5.3.314446-windows-314446.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -2046,16 +2022,16 @@ <key>archive</key> <map> <key>hash</key> - <string>4c2b46a595fcbf3edddfe1c36422056d</string> + <string>062403f09f34f79d1bb5eec81d470973</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-llceflib/rev/314301/arch/CYGWIN/installer/llceflib-1.5.3.314301-windows64-314301.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-llceflib/rev/314446/arch/CYGWIN/installer/llceflib-1.5.3.314446-windows64-314446.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.5.3.314301</string> + <string>1.5.3.314446</string> </map> <key>llphysicsextensions_source</key> <map> diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 31174209a3..77fd505df3 100755 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -32,9 +32,9 @@ if (USESYSTEMLIBS) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) else (USESYSTEMLIBS) - if (LINUX OR WINDOWS) + if (LINUX) use_prebuilt_binary(gtk-atk-pango-glib) - endif (LINUX OR WINDOWS) + endif (LINUX) if (LINUX) set(UI_LIBRARIES |