diff options
| author | callum_linden <none@none> | 2016-04-22 14:34:42 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-04-22 14:34:42 -0700 |
| commit | 6b9ceb561c9754c2974e92c66ba15596d490754b (patch) | |
| tree | f1be5c945ed9b02a2aead7537e2814b4a4c600fc | |
| parent | 741ab668c4f5ed5e15a1d508fabef170271121e5 (diff) | |
DRTVWR-418 Remove references to gtk-atk-pango-glib from Windows build since it's not used there
| -rwxr-xr-x | autobuild.xml | 24 | ||||
| -rwxr-xr-x | 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 @@ <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> 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 |