Another blind windows commit, try to build with static leap-motion library
parent
283e22c9be
commit
3b1d0790ce
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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':
|
||||
|
|
|
|||
Loading…
Reference in New Issue