diff --git a/autobuild.xml b/autobuild.xml index 183a051e5a..e7f289105e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -36,26 +36,6 @@ - wix - - license - MS-RL - license_file - LICENSES/wix.txt - name - wix - platforms - - windows - - archive - - - name - windows - - - ndPhysicsStub license diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 6841109a4d..ac26c36a28 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -11,11 +11,9 @@ if (NOT USESYSTEMLIBS) # use_prebuilt_binary(libidn) if( ND_BUILD64BIT_ARCH ) - if( WINDOWS ) - use_prebuilt_binary( wix ) - elseif( DARWIN ) + if( DARWIN ) use_prebuilt_binary( slplugin_x86 ) - endif() + endif( DARWIN ) endif( ND_BUILD64BIT_ARCH ) endif(NOT USESYSTEMLIBS) diff --git a/package_override_vc12.ini b/package_override_vc12.ini index c202968614..1d35c2cbb7 100644 --- a/package_override_vc12.ini +++ b/package_override_vc12.ini @@ -79,9 +79,6 @@ windows = http://downloads.phoenixviewer.com/uriparser-0.8.0.1-windows-x64-20150 [ndphysicsstub] windows = http://downloads.phoenixviewer.com/ndPhysicsStub-1.201412081952-windows-x64-201412081952.tar.bz2|a2baf97f950cc16af9fe5cf316b7fa4d -[wix] -windows = http://downloads.phoenixviewer.com/wix-3.7-windows-x64-201412081602.tar.bz2|cf5701345012bf9865696df0bed91fd3 - [gtk-atk-pango-glib] windows =