Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
510df2fb
Commit
510df2fb
authored
Jul 28, 2020
by
Nikolay Igotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Win port attempt.
parent
5f85d3bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
6 deletions
+24
-6
build.sh
build.sh
+7
-1
build.gradle.kts
skiko/build.gradle.kts
+17
-5
No files found.
build.sh
View file @
510df2fb
...
@@ -6,6 +6,12 @@ else
...
@@ -6,6 +6,12 @@ else
pushd
./skija
&&
git pull
&&
popd
pushd
./skija
&&
git pull
&&
popd
fi
fi
java
-jar
./libs/lombok.jar delombok skija/src/main/java
-d
skija/java_delombok
--classpath
=
./libs/annotations-19.0.0.jar:./libs/lombok.jar
SEP
=
:
if
[
`
uname
-o
`
==
"Msys"
]
;
then
SEP
=
\;
fi
java
-jar
./libs/lombok.jar delombok skija/src/main/java
-d
skija/java_delombok
\
--classpath
=
./libs/annotations-19.0.0.jar
${
SEP
}
./libs/lombok.jar
cd
skiko
&&
./gradlew publishSkikoPublicationToMavenLocal
cd
skiko
&&
./gradlew publishSkikoPublicationToMavenLocal
skiko/build.gradle.kts
View file @
510df2fb
...
@@ -11,7 +11,7 @@ version = "0.1-SNAPSHOT"
...
@@ -11,7 +11,7 @@ version = "0.1-SNAPSHOT"
val
skiaDir
=
System
.
getenv
(
"SKIA_DIR"
)
?:
"/Users/igotti/compose/skija/third_party/skia"
val
skiaDir
=
System
.
getenv
(
"SKIA_DIR"
)
?:
"/Users/igotti/compose/skija/third_party/skia"
val
hostOs
=
System
.
getProperty
(
"os.name"
)
val
hostOs
=
System
.
getProperty
(
"os.name"
)
val
target
=
when
{
val
target
=
when
{
hostOs
==
"Mac OS X"
->
"macos"
hostOs
==
"Mac OS X"
->
"macos"
hostOs
==
"Linux"
->
"linux"
hostOs
==
"Linux"
->
"linux"
hostOs
.
startsWith
(
"Win"
)
->
"windows"
hostOs
.
startsWith
(
"Win"
)
->
"windows"
...
@@ -79,9 +79,6 @@ tasks.withType(CppCompile::class.java).configureEach {
...
@@ -79,9 +79,6 @@ tasks.withType(CppCompile::class.java).configureEach {
)
)
val
jdkHome
=
System
.
getenv
(
"JAVA_HOME"
)
val
jdkHome
=
System
.
getenv
(
"JAVA_HOME"
)
compilerArgs
.
addAll
(
listOf
(
compilerArgs
.
addAll
(
listOf
(
"-std=c++14"
,
"-fvisibility=hidden"
,
"-fvisibility-inlines-hidden"
,
"-I$jdkHome/include"
,
"-I$jdkHome/include"
,
"-I$skiaDir"
,
"-I$skiaDir"
,
"-I$skiaDir/include"
,
"-I$skiaDir/include"
,
...
@@ -101,13 +98,16 @@ tasks.withType(CppCompile::class.java).configureEach {
...
@@ -101,13 +98,16 @@ tasks.withType(CppCompile::class.java).configureEach {
"-DSK_SUPPORT_GPU=1"
,
"-DSK_SUPPORT_GPU=1"
,
"-DSK_SUPPORT_OPENCL=0"
,
"-DSK_SUPPORT_OPENCL=0"
,
"-Dskija_EXPORTS"
,
"-Dskija_EXPORTS"
,
"-O3"
,
"-DNDEBUG"
"-DNDEBUG"
))
))
when
(
target
)
{
when
(
target
)
{
"macos"
->
{
"macos"
->
{
compilerArgs
.
addAll
(
compilerArgs
.
addAll
(
listOf
(
listOf
(
"-std=c++14"
,
"-O3"
,
"-fvisibility=hidden"
,
"-fvisibility-inlines-hidden"
,
"-I$jdkHome/include/darwin"
,
"-I$jdkHome/include/darwin"
,
"-DSK_BUILD_FOR_MAC"
"-DSK_BUILD_FOR_MAC"
)
)
...
@@ -116,12 +116,24 @@ tasks.withType(CppCompile::class.java).configureEach {
...
@@ -116,12 +116,24 @@ tasks.withType(CppCompile::class.java).configureEach {
"linux"
->
{
"linux"
->
{
compilerArgs
.
addAll
(
compilerArgs
.
addAll
(
listOf
(
listOf
(
"-std=c++14"
,
"-O3"
,
"-fvisibility=hidden"
,
"-fvisibility-inlines-hidden"
,
"-I$jdkHome/include/linux"
,
"-I$jdkHome/include/linux"
,
"-DSK_BUILD_FOR_LINUX"
,
"-DSK_BUILD_FOR_LINUX"
,
"-DSK_R32_SHIFT=16"
"-DSK_R32_SHIFT=16"
)
)
)
)
}
}
"windows"
->
{
compilerArgs
.
addAll
(
listOf
(
"-I$jdkHome/include/win32"
,
"-DSK_BUILD_FOR_WIN"
)
)
}
}
}
}
}
...
...
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