Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-cmake-builder
Commits
1c6b323f
Commit
1c6b323f
authored
Apr 24, 2014
by
Ghislain MARY
Browse files
Do not build opus statically for webplugin on Windows for the moment.
parent
c176a14d
Changes
3
Hide whitespace changes
Inline
Side-by-side
builders/ms2.cmake
View file @
1c6b323f
...
...
@@ -24,7 +24,7 @@ set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git")
if
(
${
LINPHONE_BUILDER_LATEST
}
)
set
(
EP_ms2_GIT_TAG
"master"
)
else
()
set
(
EP_ms2_GIT_TAG
"1
757cfddfc6762462e526f6c7f9464765f5e78f
b"
)
set
(
EP_ms2_GIT_TAG
"1
e6d4d2e2c84ae731e2a1c659afd97d333ff61b
b"
)
endif
()
if
(
MSVC
)
...
...
builders/opus/postinstall.cmake
View file @
1c6b323f
...
...
@@ -20,4 +20,4 @@
#
############################################################################
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
"-E"
"co
py"
"
${
INSTALL_PREFIX
}
/
lib
/libopus
.a
"
"
${
INSTALL_PREFIX
}
/lib/opus.lib"
)
execute_process
(
COMMAND
"
${
PYTHON_EXECUTABLE
}
"
"
${
SOURCE_DIR
}
/cmake/importlib.
py"
"
${
INSTALL_PREFIX
}
/
bin
/libopus
-0.dll
"
"
${
INSTALL_PREFIX
}
/lib/opus.lib"
)
configs/config-webplugin.cmake
View file @
1c6b323f
...
...
@@ -95,7 +95,10 @@ list(APPEND EP_ms2_CONFIGURE_OPTIONS
)
# opus
set
(
EP_opus_LINKING_TYPE
"--enable-static"
"--disable-shared"
"--with-pic"
)
if
(
NOT MSVC
)
# TODO: Also build statically on windows
set
(
EP_opus_LINKING_TYPE
"--enable-static"
"--disable-shared"
"--with-pic"
)
endif
()
# v4l
set
(
EP_v4l_LINKING_TYPE
"--enable-static"
"--disable-shared"
"--with-pic"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment