Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Archive
Alchemy Viewer
Commits
3aeb346b
Commit
3aeb346b
authored
9 years ago
by
simon
Browse files
Options
Downloads
Plain Diff
Merge fix for MAINT-5277 into experience tools branch
parents
30d35f5c
c76e983b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/cmake/Copy3rdPartyLibs.cmake
+71
-60
71 additions, 60 deletions
indra/cmake/Copy3rdPartyLibs.cmake
indra/newview/viewer_manifest.py
+4
-0
4 additions, 0 deletions
indra/newview/viewer_manifest.py
with
75 additions
and
60 deletions
indra/cmake/Copy3rdPartyLibs.cmake
+
71
−
60
View file @
3aeb346b
...
@@ -70,76 +70,87 @@ if(WINDOWS)
...
@@ -70,76 +70,87 @@ if(WINDOWS)
# Copy MS C runtime dlls, required for packaging.
# Copy MS C runtime dlls, required for packaging.
# *TODO - Adapt this to support VC9
# *TODO - Adapt this to support VC9
if
(
MSVC80
)
if
(
MSVC80
)
set
(
MSVC_VER 80
)
list
(
APPEND L
MSVC_VER 80
)
set
(
MSVC_VERDOT 8.0
)
list
(
APPEND L
MSVC_VERDOT 8.0
)
elseif
(
MSVC_VERSION EQUAL 1600
)
# VisualStudio 2010
elseif
(
MSVC_VERSION EQUAL 1600
)
# VisualStudio 2010
set
(
MSVC_VER 100
)
MESSAGE
(
STATUS
"MSVC_VERSION
${
MSVC_VERSION
}
"
)
set
(
MSVC_VERDOT 10.0
)
elseif
(
MSVC_VERSION EQUAL 1800
)
# VisualStudio 2013, which is (sigh) VS 12
elseif
(
MSVC_VERSION EQUAL 1800
)
# VisualStudio 2013, which is (sigh) VS 12
set
(
MSVC_VER 120
)
list
(
APPEND L
MSVC_VER 120
)
set
(
MSVC_VERDOT 12.0
)
list
(
APPEND L
MSVC_VERDOT 12.0
)
else
(
MSVC80
)
else
(
MSVC80
)
MESSAGE
(
WARNING
"New MSVC_VERSION
${
MSVC_VERSION
}
of MSVC: adapt Copy3rdPartyLibs.cmake"
)
MESSAGE
(
WARNING
"New MSVC_VERSION
${
MSVC_VERSION
}
of MSVC: adapt Copy3rdPartyLibs.cmake"
)
endif
(
MSVC80
)
endif
(
MSVC80
)
FIND_PATH
(
debug_msvc_redist_path msvcr
${
MSVC_VER
}
d.dll
# try to copy VS2010 redist independently of system version
PATHS
list
(
APPEND LMSVC_VER 100
)
${
MSVC_DEBUG_REDIST_PATH
}
list
(
APPEND LMSVC_VERDOT 10.0
)
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\
${
MSVC_VERDOT
}
\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC
${
MSVC_VER
}
.DebugCRT
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
list
(
LENGTH LMSVC_VER count
)
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
math
(
EXPR count
"
${
count
}
-1"
)
NO_DEFAULT_PATH
foreach
(
i RANGE
${
count
}
)
)
list
(
GET LMSVC_VER
${
i
}
MSVC_VER
)
list
(
GET LMSVC_VERDOT
${
i
}
MSVC_VERDOT
)
if
(
EXISTS
${
debug_msvc_redist_path
}
)
MESSAGE
(
STATUS
"Copying redist libs for VC
${
MSVC_VERDOT
}
"
)
set
(
debug_msvc_files
FIND_PATH
(
debug_msvc_redist_path NAME msvcr
${
MSVC_VER
}
d.dll
msvcr
${
MSVC_VER
}
d.dll
PATHS
msvcp
${
MSVC_VER
}
d.dll
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\
${
MSVC_VERDOT
}
\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC
${
MSVC_VER
}
.DebugCRT
)
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
copy_if_different
(
${
MSVC_DEBUG_REDIST_PATH
}
${
debug_msvc_redist_path
}
NO_DEFAULT_PATH
"
${
SHARED_LIB_STAGING_DIR_DEBUG
}
"
out_targets
${
debug_msvc_files
}
)
set
(
third_party_targets
${
third_party_targets
}
${
out_targets
}
)
endif
()
FIND_PATH
(
release_msvc_redist_path msvcr
${
MSVC_VER
}
.dll
PATHS
${
MSVC_REDIST_PATH
}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\
${
MSVC_VERDOT
}
\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC
${
MSVC_VER
}
.CRT
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
NO_DEFAULT_PATH
)
if
(
EXISTS
${
release_msvc_redist_path
}
)
set
(
release_msvc_files
msvcr
${
MSVC_VER
}
.dll
msvcp
${
MSVC_VER
}
.dll
)
copy_if_different
(
${
release_msvc_redist_path
}
"
${
SHARED_LIB_STAGING_DIR_RELEASE
}
"
out_targets
${
release_msvc_files
}
)
)
set
(
third_party_targets
${
third_party_targets
}
${
out_targets
}
)
copy_if_different
(
if
(
EXISTS
${
debug_msvc_redist_path
}
)
${
release_msvc_redist_path
}
set
(
debug_msvc_files
"
${
SHARED_LIB_STAGING_DIR_RELWITHDEBINFO
}
"
msvcr
${
MSVC_VER
}
d.dll
out_targets
msvcp
${
MSVC_VER
}
d.dll
${
release_msvc_files
}
)
copy_if_different
(
${
debug_msvc_redist_path
}
"
${
SHARED_LIB_STAGING_DIR_DEBUG
}
"
out_targets
${
debug_msvc_files
}
)
set
(
third_party_targets
${
third_party_targets
}
${
out_targets
}
)
unset
(
debug_msvc_redist_path CACHE
)
endif
()
FIND_PATH
(
release_msvc_redist_path NAME msvcr
${
MSVC_VER
}
.dll
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\
${
MSVC_VERDOT
}
\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC
${
MSVC_VER
}
.CRT
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
${
MSVC_REDIST_PATH
}
NO_DEFAULT_PATH
)
)
set
(
third_party_targets
${
third_party_targets
}
${
out_targets
}
)
endif
()
if
(
EXISTS
${
release_msvc_redist_path
}
)
set
(
release_msvc_files
msvcr
${
MSVC_VER
}
.dll
msvcp
${
MSVC_VER
}
.dll
)
copy_if_different
(
${
release_msvc_redist_path
}
"
${
SHARED_LIB_STAGING_DIR_RELEASE
}
"
out_targets
${
release_msvc_files
}
)
set
(
third_party_targets
${
third_party_targets
}
${
out_targets
}
)
copy_if_different
(
${
release_msvc_redist_path
}
"
${
SHARED_LIB_STAGING_DIR_RELWITHDEBINFO
}
"
out_targets
${
release_msvc_files
}
)
set
(
third_party_targets
${
third_party_targets
}
${
out_targets
}
)
unset
(
release_msvc_redist_path CACHE
)
endif
()
endforeach
()
elseif
(
DARWIN
)
elseif
(
DARWIN
)
set
(
SHARED_LIB_STAGING_DIR_DEBUG
"
${
SHARED_LIB_STAGING_DIR
}
/Debug/Resources"
)
set
(
SHARED_LIB_STAGING_DIR_DEBUG
"
${
SHARED_LIB_STAGING_DIR
}
/Debug/Resources"
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/viewer_manifest.py
+
4
−
0
View file @
3aeb346b
...
@@ -387,9 +387,13 @@ class Windows_i686_Manifest(ViewerManifest):
...
@@ -387,9 +387,13 @@ class Windows_i686_Manifest(ViewerManifest):
if
self
.
args
[
'
configuration
'
].
lower
()
==
'
debug
'
:
if
self
.
args
[
'
configuration
'
].
lower
()
==
'
debug
'
:
self
.
path
(
"
msvcr120d.dll
"
)
self
.
path
(
"
msvcr120d.dll
"
)
self
.
path
(
"
msvcp120d.dll
"
)
self
.
path
(
"
msvcp120d.dll
"
)
self
.
path
(
"
msvcr100d.dll
"
)
self
.
path
(
"
msvcp100d.dll
"
)
else
:
else
:
self
.
path
(
"
msvcr120.dll
"
)
self
.
path
(
"
msvcr120.dll
"
)
self
.
path
(
"
msvcp120.dll
"
)
self
.
path
(
"
msvcp120.dll
"
)
self
.
path
(
"
msvcr100.dll
"
)
self
.
path
(
"
msvcp100.dll
"
)
# Vivox runtimes
# Vivox runtimes
self
.
path
(
"
SLVoice.exe
"
)
self
.
path
(
"
SLVoice.exe
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment