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
90ea3d3b
Commit
90ea3d3b
authored
15 years ago
by
brad kittenbrink
Browse files
Options
Downloads
Patches
Plain Diff
Implemented linux staging for DEV-41722 normalizing shared lib staging.
parent
35469b04
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/cmake/Copy3rdPartyLibs.cmake
+32
-2
32 additions, 2 deletions
indra/cmake/Copy3rdPartyLibs.cmake
with
32 additions
and
2 deletions
indra/cmake/Copy3rdPartyLibs.cmake
+
32
−
2
View file @
90ea3d3b
...
@@ -184,18 +184,48 @@ elseif(DARWIN)
...
@@ -184,18 +184,48 @@ elseif(DARWIN)
endif
(
EXISTS
"
${
release_src_dir
}
/libllkdu.dylib"
)
endif
(
EXISTS
"
${
release_src_dir
}
/libllkdu.dylib"
)
endif
(
NOT EXISTS
${
internal_llkdu_path
}
)
endif
(
NOT EXISTS
${
internal_llkdu_path
}
)
elseif
(
LINUX
)
elseif
(
LINUX
)
# linux is weird, multiple side by side configurations aren't supported
# and we don't seem to have any debug shared libs built yet anyways...
set
(
SHARED_LIB_STAGING_DIR_DEBUG
"
${
SHARED_LIB_STAGING_DIR
}
"
)
set
(
SHARED_LIB_STAGING_DIR_RELWITHDEBINFO
"
${
SHARED_LIB_STAGING_DIR
}
"
)
set
(
SHARED_LIB_STAGING_DIR_RELEASE
"
${
SHARED_LIB_STAGING_DIR
}
"
)
set
(
vivox_src_dir
"
${
CMAKE_SOURCE_DIR
}
/newview/vivox-runtime/i686-linux"
)
set
(
vivox_src_dir
"
${
CMAKE_SOURCE_DIR
}
/newview/vivox-runtime/i686-linux"
)
set
(
vivox_files
set
(
vivox_files
libalut.so
libopenal.so.1
libortp.so
libvivoxsdk.so
SLVoice
)
)
# *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
# *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
# or ARCH_PREBUILT_DIRS
# or ARCH_PREBUILT_DIRS
set
(
debug_src_dir
"
${
CMAKE_SOURCE_DIR
}
/../libraries/i686-linux/lib
/
debug"
)
set
(
debug_src_dir
"
${
CMAKE_SOURCE_DIR
}
/../libraries/i686-linux/lib
_
debug"
)
set
(
debug_files
set
(
debug_files
)
)
# *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
# *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
# or ARCH_PREBUILT_DIRS
# or ARCH_PREBUILT_DIRS
set
(
release_src_dir
"
${
CMAKE_SOURCE_DIR
}
/../libraries/i686-linux/lib/release"
)
set
(
release_src_dir
"
${
CMAKE_SOURCE_DIR
}
/../libraries/i686-linux/lib_release_client"
)
# *FIX - figure out what to do with duplicate libalut.so here -brad
set
(
release_files
set
(
release_files
libapr-1.so
libaprutil-1.so
libatk-1.0.so
libcrypto.so
libexpat.so
libgmock_main.so
libgmock.so
libgmodule-2.0.so
libgobject-2.0.so
libgtest_main.so
libgtest.so
libopenal.so
libopenjpeg.so
libssl.so
libstacktrace.so
libtcmalloc.so
libuuid.so
libz.so
)
)
if
(
FMOD_SDK_DIR
)
if
(
FMOD_SDK_DIR
)
...
...
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