Skip to content

Fix Windows build failures for cklib and CMake tasks #1677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crowforkotlin wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fix Windows build failures for cklib and CMake tasks #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions zipline/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ cklib {
listOf(
//"-DDUMP_LEAKS=1", // For local testing ONLY!
"-DKONAN_MI_MALLOC=1",
"-DCONFIG_VERSION=\"${quickJsVersion()}\"",
if (isWindows()) {
"-DCONFIG_VERSION=\"\\\"${quickJsVersion()}\\\"\""
} else {
"-DCONFIG_VERSION=\"${quickJsVersion()}\""
},
"-Wno-unknown-pragmas",
"-ftls-model=initial-exec",
"-Wno-unused-function",
Expand Down Expand Up @@ -212,9 +216,13 @@ android {

externalNativeBuild {
cmake {
arguments("-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static")
cFlags("-fstrict-aliasing", "-DCONFIG_VERSION=\\\"${quickJsVersion()}\\\"")
cppFlags("-fstrict-aliasing", "-DCONFIG_VERSION=\\\"${quickJsVersion()}\\\"")
arguments(
"-DANDROID_TOOLCHAIN=clang",
"-DANDROID_STL=c++_static",
"-DQUICKJS_VERSION=${quickJsVersion()}"
)
cFlags("-fstrict-aliasing")
cppFlags("-fstrict-aliasing")
}
}

Expand Down Expand Up @@ -285,6 +293,11 @@ android {
fun quickJsVersion(): String {
return File(projectDir, "native/quickjs/VERSION").readText().trim()
}
fun isWindows(): Boolean {
return System.getProperty("os.name")?.contains("windows", ignoreCase = true) == true
}



configure<MavenPublishBaseExtension> {
configure(
Expand Down
4 changes: 4 additions & 0 deletions zipline/src/androidMain/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.4.1)
set(CMAKE_C_STANDARD 99)
set(CMAKE_CXX_STANDARD 11)

if(DEFINED QUICKJS_VERSION)
add_compile_definitions(CONFIG_VERSION="${QUICKJS_VERSION}")
endif()

file(GLOB_RECURSE sources "../../native/*.c" "../../native/*.cpp")

add_library(quickjs SHARED ${sources})
Expand Down