livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update copying of fmodex{64}.dll to right place for 32/64 bit builds

meow-7.2.2
Callum Prentice 2016-12-05 12:24:00 -08:00
parent 011d07f1e3
commit 004cd151ff
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -30,17 +30,6 @@ if(WINDOWS)
#*******************************
# Misc shared libs
# set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
# set(debug_files
# libapr-1.dll
# libaprutil-1.dll
# libapriconv-1.dll
# ssleay32.dll
# libeay32.dll
# glod.dll
# libhunspell.dll
# )
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(release_files
openjpeg.dll
@ -54,8 +43,12 @@ if(WINDOWS)
)
if (FMODEX)
# set(debug_files ${debug_files} fmodexL.dll)
set(release_files ${release_files} fmodex.dll)
if(ADDRESS_SIZE EQUAL 32)
set(release_files ${release_files} fmodex.dll)
else(ADDRESS_SIZE EQUAL 32)
set(release_files ${release_files} fmodex64.dll)
endif(ADDRESS_SIZE EQUAL 32)
endif (FMODEX)
#*******************************

14
indra/newview/viewer_manifest.py
View File

@ -379,8 +379,8 @@ class WindowsManifest(ViewerManifest):
# Get fmodex dll, continue if missing
try:
if self.args['configuration'].lower() == 'debug':
self.path("fmodexL.dll")
if(self.args['arch'].lower() == 'x86_64'):
self.path("fmodex64.dll")
else:
self.path("fmodex.dll")
except:
@ -432,11 +432,6 @@ class WindowsManifest(ViewerManifest):
self.path("featuretable.txt")
self.path("featuretable_xp.txt")
# Media plugins - QuickTime
if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
self.path("media_plugin_quicktime.dll")
self.end_prefix()
# Media plugins - CEF
if self.prefix(src='../media_plugins/cef/%s' % self.args['configuration'], dst="llplugin"):
self.path("media_plugin_cef.dll")
@ -447,11 +442,6 @@ class WindowsManifest(ViewerManifest):
self.path("media_plugin_libvlc.dll")
self.end_prefix()
# winmm.dll shim
if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst=""):
self.path("winmm.dll")
self.end_prefix()
# CEF runtime files - debug
if self.args['configuration'].lower() == 'debug':
if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'debug'), dst="llplugin"):