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
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
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 Viewer
Alchemy Viewer
Commits
004cd151
Commit
004cd151
authored
8 years ago
by
Callum Prentice
Browse files
Options
Downloads
Patches
Plain Diff
update copying of fmodex{64}.dll to right place for 32/64 bit builds
parent
011d07f1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/cmake/Copy3rdPartyLibs.cmake
+6
-13
6 additions, 13 deletions
indra/cmake/Copy3rdPartyLibs.cmake
indra/newview/viewer_manifest.py
+2
-12
2 additions, 12 deletions
indra/newview/viewer_manifest.py
with
8 additions
and
25 deletions
indra/cmake/Copy3rdPartyLibs.cmake
+
6
−
13
View file @
004cd151
...
@@ -30,17 +30,6 @@ if(WINDOWS)
...
@@ -30,17 +30,6 @@ if(WINDOWS)
#*******************************
#*******************************
# Misc shared libs
# 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_src_dir
"
${
ARCH_PREBUILT_DIRS_RELEASE
}
"
)
set
(
release_files
set
(
release_files
openjpeg.dll
openjpeg.dll
...
@@ -54,8 +43,12 @@ if(WINDOWS)
...
@@ -54,8 +43,12 @@ if(WINDOWS)
)
)
if
(
FMODEX
)
if
(
FMODEX
)
# set(debug_files ${debug_files} fmodexL.dll)
if
(
ADDRESS_SIZE EQUAL 32
)
set
(
release_files
${
release_files
}
fmodex.dll
)
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
)
endif
(
FMODEX
)
#*******************************
#*******************************
...
...
This diff is collapsed.
Click to expand it.
indra/newview/viewer_manifest.py
+
2
−
12
View file @
004cd151
...
@@ -379,8 +379,8 @@ def construct(self):
...
@@ -379,8 +379,8 @@ def construct(self):
# Get fmodex dll, continue if missing
# Get fmodex dll, continue if missing
try
:
try
:
if
self
.
args
[
'
configuration
'
].
lower
()
==
'
debug
'
:
if
(
self
.
args
[
'
arch
'
].
lower
()
==
'
x86_64
'
)
:
self
.
path
(
"
fmodex
L
.dll
"
)
self
.
path
(
"
fmodex
64
.dll
"
)
else
:
else
:
self
.
path
(
"
fmodex.dll
"
)
self
.
path
(
"
fmodex.dll
"
)
except
:
except
:
...
@@ -432,11 +432,6 @@ def construct(self):
...
@@ -432,11 +432,6 @@ def construct(self):
self
.
path
(
"
featuretable.txt
"
)
self
.
path
(
"
featuretable.txt
"
)
self
.
path
(
"
featuretable_xp.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
# Media plugins - CEF
if
self
.
prefix
(
src
=
'
../media_plugins/cef/%s
'
%
self
.
args
[
'
configuration
'
],
dst
=
"
llplugin
"
):
if
self
.
prefix
(
src
=
'
../media_plugins/cef/%s
'
%
self
.
args
[
'
configuration
'
],
dst
=
"
llplugin
"
):
self
.
path
(
"
media_plugin_cef.dll
"
)
self
.
path
(
"
media_plugin_cef.dll
"
)
...
@@ -447,11 +442,6 @@ def construct(self):
...
@@ -447,11 +442,6 @@ def construct(self):
self
.
path
(
"
media_plugin_libvlc.dll
"
)
self
.
path
(
"
media_plugin_libvlc.dll
"
)
self
.
end_prefix
()
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
# CEF runtime files - debug
if
self
.
args
[
'
configuration
'
].
lower
()
==
'
debug
'
:
if
self
.
args
[
'
configuration
'
].
lower
()
==
'
debug
'
:
if
self
.
prefix
(
src
=
os
.
path
.
join
(
os
.
pardir
,
'
packages
'
,
'
bin
'
,
'
debug
'
),
dst
=
"
llplugin
"
):
if
self
.
prefix
(
src
=
os
.
path
.
join
(
os
.
pardir
,
'
packages
'
,
'
bin
'
,
'
debug
'
),
dst
=
"
llplugin
"
):
...
...
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