From 3bb10f86ba4c3454ee604044a8eeb0fb12f4be9a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 27 Jan 2018 16:30:16 +0100 Subject: [PATCH] Get rid of orphaned slplugin_x86 prebuilt lib entirely --- autobuild.xml | 21 --------------------- indra/cmake/ViewerMiscLibs.cmake | 6 ------ 2 files changed, 27 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 67542e259a..0c12d74301 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3,27 +3,6 @@ installables - - slplugin_x86 - - license - LGPL - license_file - LICENSES/slplugin.txt - name - slplugin_x86 - platforms - - windows - - archive - - - name - windows - - - ndPhysicsStub license diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 5fefb12101..980b2a0fdc 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -9,11 +9,5 @@ if (NOT USESYSTEMLIBS) use_prebuilt_binary(libhunspell) use_prebuilt_binary(slvoice) # use_prebuilt_binary(libidn) - - if( ADDRESS_SIZE EQUAL 64 ) - if( DARWIN ) - use_prebuilt_binary( slplugin_x86 ) - endif( DARWIN ) - endif( ) endif(NOT USESYSTEMLIBS)