Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
16
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-sdk
Commits
b9563403
Commit
b9563403
authored
6 months ago
by
Constantin P.
💬
Browse files
Options
Downloads
Plain Diff
Merge branch 'support-13178' into 'master'
[*] sub See merge request
!1812
parents
94924fc3
d44899fb
No related branches found
No related tags found
1 merge request
!1812
[*] sub
Pipeline
#44775
passed with stage
in 16 minutes and 31 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cellframe-sdk.pro
+6
-6
6 additions, 6 deletions
cellframe-sdk.pro
dap-sdk
+1
-1
1 addition, 1 deletion
dap-sdk
with
7 additions
and
7 deletions
cellframe-sdk.pro
+
6
−
6
View file @
b9563403
...
...
@@ -9,24 +9,24 @@ linux: !android {
win32
{
CONFIG
(
release
,
debug
|
release
)
:
sdk_build
.
commands
=
"$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)"
--
target
windows
release
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
CONFIG
(
debug
,
debug
|
release
)
:
sdk_build
.
commands
=
"$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)"
--
target
windows
rwd
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
CONFIG
(
release
,
debug
|
release
)
:
sdk_build
.
commands
=
"$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)"
--
target
windows
release
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCELLFRAME_NO_OPTIMIZATION
=
1
CONFIG
(
debug
,
debug
|
release
)
:
sdk_build
.
commands
=
"$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)"
--
target
windows
rwd
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCELLFRAME_NO_OPTIMIZATION
=
1
}
android
{
for
(
AABI
,
ANDROID_ABIS
)
{
message
(
"Requested ABI: $$AABI"
)
CONFIG
(
release
,
debug
|
release
)
:
sdk_build_
$$
{
AABI
}.
commands
+=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
-
b
$$
AABI
--
target
android
release
-
DANDROID_PLATFORM
=
android
-
21
-
DANDROID_ABI
=
$$
AABI
-
DANDROID_NATIVE_API_LEVEL
=
29
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCMAKE_VERBOSE_MAKEFILE
:
BOOL
=
ON
CONFIG
(
debug
,
debug
|
release
)
:
sdk_build_
$$
{
AABI
}.
commands
+=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
-
b
$$
AABI
--
target
android
release
-
DANDROID_PLATFORM
=
android
-
21
-
DANDROID_ABI
=
$$
AABI
-
DANDROID_NATIVE_API_LEVEL
=
29
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCMAKE_VERBOSE_MAKEFILE
:
BOOL
=
ON
CONFIG
(
release
,
debug
|
release
)
:
sdk_build_
$$
{
AABI
}.
commands
+=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
-
b
$$
AABI
--
target
android
release
-
DANDROID_PLATFORM
=
android
-
21
-
DANDROID_ABI
=
$$
AABI
-
DANDROID_NATIVE_API_LEVEL
=
29
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCMAKE_VERBOSE_MAKEFILE
:
BOOL
=
ON
-
DCELLFRAME_NO_OPTIMIZATION
=
1
CONFIG
(
debug
,
debug
|
release
)
:
sdk_build_
$$
{
AABI
}.
commands
+=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
-
b
$$
AABI
--
target
android
release
-
DANDROID_PLATFORM
=
android
-
21
-
DANDROID_ABI
=
$$
AABI
-
DANDROID_NATIVE_API_LEVEL
=
29
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCMAKE_VERBOSE_MAKEFILE
:
BOOL
=
ON
-
DCELLFRAME_NO_OPTIMIZATION
=
1
}
}
mac
{
CONFIG
(
release
,
debug
|
release
)
:
sdk_build
.
commands
=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
--
target
osx
release
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
CONFIG
(
debug
,
debug
|
release
)
:
sdk_build
.
commands
=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
--
target
osx
rwd
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
CONFIG
(
release
,
debug
|
release
)
:
sdk_build
.
commands
=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
--
target
osx
release
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCELLFRAME_NO_OPTIMIZATION
=
1
CONFIG
(
debug
,
debug
|
release
)
:
sdk_build
.
commands
=
$$
PWD
/../
cellframe
-
sdk
/
prod_build
/
build
.
sh
--
target
osx
rwd
-
DINSTALL_SDK
=
1
-
DCMAKE_INSTALL_PREFIX
=/
-
DCELLFRAME_NO_OPTIMIZATION
=
1
}
...
...
This diff is collapsed.
Click to expand it.
dap-sdk
@
16bc9813
Compare
30bfb069
...
16bc9813
Subproject commit
30bfb069b0bcb7ce57befaab68051d0d4feb414e
Subproject commit
16bc9813751b728c9b0ad67402198a5749a1ce86
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