From 6b9ceb561c9754c2974e92c66ba15596d490754b Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 22 Apr 2016 14:34:42 -0700 Subject: DRTVWR-418 Remove references to gtk-atk-pango-glib from Windows build since it's not used there --- autobuild.xml | 24 ------------------------ indra/cmake/UI.cmake | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 62384113db..d75f8a4efe 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1239,30 +1239,6 @@ name linux64 - windows - - archive - - hash - 5655fb00c37f58cca640a53a9dbc82a7 - url - 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 - - name - windows - - windows64 - - archive - - hash - 5bf8f67b02d89606374d550ca0353083 - url - 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 - - name - windows64 - version 0.1 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 -- cgit v1.2.3