Commit 510df2fb authored by Nikolay Igotti's avatar Nikolay Igotti

Win port attempt.

parent 5f85d3bc
...@@ -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
...@@ -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"
)
)
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment