From 3b1d0790ce36102ddae1166d28dcde22c09f27b6 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Fri, 13 Dec 2013 10:40:41 -0700
Subject: [PATCH] Another blind windows commit, try to build with static
 leap-motion library

---
 indra/cmake/Copy3rdPartyLibs.cmake | 10 ----------
 indra/cmake/LeapMotion.cmake       |  4 ++--
 indra/newview/CMakeLists.txt       |  7 -------
 indra/newview/viewer_manifest.py   |  9 ---------
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 472c8cd9f1..4e9a65291b 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -74,16 +74,6 @@ if(WINDOWS)
       endif( NOT ND_BUILD64BIT_ARCH )
     endif (FMODEX)
 
-    if (LEAPMOTION)
-      if( NOT ND_BUILD64BIT_ARCH )
-        set(debug_files ${debug_files} x86/Leapd.dll)
-        set(release_files ${release_files} x86/Leap.dll)
-      else( NOT ND_BUILD64BIT_ARCH )
-        set(debug_files ${debug_files} x64/Leapd.dll)
-        set(release_files ${release_files} x64/Leap.dll)
-      endif( NOT ND_BUILD64BIT_ARCH )
-    endif (LEAPMOTION)
-
 # <FS:ND> Copy pdb files for symbol generation too
    if( NOT ND_BUILD64BIT_ARCH )
      set(debug_files ${debug_files} ssleay32.pdb libeay32.pdb apr-1.pdb aprutil-1.pdb growl.pdb growl++.pdb )
diff --git a/indra/cmake/LeapMotion.cmake b/indra/cmake/LeapMotion.cmake
index 50fcf618bd..a02a35abb9 100644
--- a/indra/cmake/LeapMotion.cmake
+++ b/indra/cmake/LeapMotion.cmake
@@ -16,8 +16,8 @@ if( LEAPMOTION )
     set(LEAP_MOTION_LIBRARY libLeap.dylib)
   elseif (WINDOWS)
     set(LEAP_MOTION_LIBRARY
-        debug Leapd.dll
-        optimized Leap.dll)
+        debug Leapd.lib
+        optimized Leap.lib)
    elseif (LINUX)
      set(LEAP_MOTION_LIBRARY libLeap.so)
    endif()
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 170573487b..42936f8e2a 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2061,13 +2061,6 @@ if (WINDOWS)
            ${SHARED_LIB_STAGING_DIR}/Debug/fmodexL.dll
           )
     endif (FMODEX)
-	
-    if (LEAPMOTION)
-      list(APPEND COPY_INPUT_DEPENDENCIES
-           ${SHARED_LIB_STAGING_DIR}/Release/Leap.dll
-           ${SHARED_LIB_STAGING_DIR}/Debug/Leapd.dll
-          )
-    endif (LEAPMOTION)
     
     add_custom_command(
       OUTPUT  ${CMAKE_CFG_INTDIR}/copy_touched.bat
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 241aef8a00..b3c6c10a0c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -470,15 +470,6 @@ class WindowsManifest(ViewerManifest):
                     self.path("fmodex64.dll")
             except:
                 print "Skipping fmodex audio library(assuming other audio engine)"
-			
-            # Get Leap Motion SDK
-            try:
-                if self.args['configuration'].lower() == 'debug':
-                    self.path("Leapd.dll")
-                else:
-                    self.path("Leap.dll")
-            except:
-                print "Leap Motion library was not found"
 
             # For textures
             if self.args['configuration'].lower() == 'debug':