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
430ce714
Unverified
Commit
430ce714
authored
Aug 19, 2022
by
Igor Demin
Committed by
GitHub
Aug 19, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix debug build (#573)
Recently it was added to CI, and wasn't properly tested
parent
249318c6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
4 deletions
+20
-4
properties.kt
skiko/buildSrc/src/main/kotlin/properties.kt
+3
-1
stubs.cc
skiko/src/jvmMain/cpp/common/stubs.cc
+17
-3
No files found.
skiko/buildSrc/src/main/kotlin/properties.kt
View file @
430ce714
...
@@ -112,7 +112,9 @@ class SkikoProperties(private val myProject: Project) {
...
@@ -112,7 +112,9 @@ class SkikoProperties(private val myProject: Project) {
val
deployVersion
:
String
val
deployVersion
:
String
get
()
{
get
()
{
return
if
(
isRelease
)
planeDeployVersion
else
"$planeDeployVersion-SNAPSHOT"
val
main
=
if
(
isRelease
)
planeDeployVersion
else
"$planeDeployVersion-SNAPSHOT"
val
metadata
=
if
(
buildType
==
SkiaBuildType
.
DEBUG
)
"+debug"
else
""
return
main
+
metadata
}
}
val
isRelease
:
Boolean
val
isRelease
:
Boolean
...
...
skiko/src/jvmMain/cpp/common/stubs.cc
View file @
430ce714
...
@@ -18,10 +18,12 @@ void skikoUnimplemented(const char* message) {
...
@@ -18,10 +18,12 @@ void skikoUnimplemented(const char* message) {
JNIEXPORT
jfloat
JNICALL
Java_org_jetbrains_skiko_PlatformOperationsKt_linuxGetDpiScaleNative
(
JNIEXPORT
jfloat
JNICALL
Java_org_jetbrains_skiko_PlatformOperationsKt_linuxGetDpiScaleNative
(
JNIEnv
*
env
,
jobject
properties
,
jlong
platformInfoPtr
)
{
JNIEnv
*
env
,
jobject
properties
,
jlong
platformInfoPtr
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_PlatformOperationsKt_linuxGetDpiScaleNative"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_PlatformOperationsKt_linuxGetDpiScaleNative"
);
return
0
;
}
}
JNIEXPORT
jfloat
JNICALL
Java_org_jetbrains_skiko_SetupKt_linuxGetSystemDpiScale
(
JNIEnv
*
env
,
jobject
layer
)
{
JNIEXPORT
jfloat
JNICALL
Java_org_jetbrains_skiko_SetupKt_linuxGetSystemDpiScale
(
JNIEnv
*
env
,
jobject
layer
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_SetupKt_linuxGetSystemDpiScale"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_SetupKt_linuxGetSystemDpiScale"
);
return
0
;
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_setSwapInterval
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
displayPtr
,
jlong
windowPtr
,
jint
interval
)
{
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_setSwapInterval
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
displayPtr
,
jlong
windowPtr
,
jint
interval
)
{
...
@@ -38,6 +40,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_m
...
@@ -38,6 +40,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_m
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_createContext
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
displayPtr
,
jboolean
transparency
)
{
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_createContext
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
displayPtr
,
jboolean
transparency
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_createContext"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_createContext"
);
return
0
;
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_destroyContext
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
displayPtr
,
jlong
contextPtr
)
{
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_destroyContext
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
displayPtr
,
jlong
contextPtr
)
{
...
@@ -50,6 +53,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_d
...
@@ -50,6 +53,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_d
#ifndef SK_BUILD_FOR_WIN
#ifndef SK_BUILD_FOR_WIN
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_getDevice
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
platformInfoPtr
)
{
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_getDevice
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
platformInfoPtr
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_getDevice"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_getDevice"
);
return
0
;
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_swapBuffers
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
{
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_swapBuffers
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
{
...
@@ -64,6 +68,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_context_Direct3DContextHandler_f
...
@@ -64,6 +68,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_context_Direct3DContextHandler_f
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_createDirectXDevice
(
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_createDirectXDevice
(
JNIEnv
*
env
,
jobject
redrawer
,
jint
adapterPriority
,
jlong
contentHandle
,
jboolean
transparency
)
{
JNIEnv
*
env
,
jobject
redrawer
,
jint
adapterPriority
,
jlong
contentHandle
,
jboolean
transparency
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_createDirectXDevice"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_createDirectXDevice"
);
return
0
;
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_initSwapChain
(
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_initSwapChain
(
...
@@ -81,6 +86,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_initFe
...
@@ -81,6 +86,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_Direct3DRedrawer_initFe
#ifndef SK_BUILD_FOR_MAC
#ifndef SK_BUILD_FOR_MAC
JNIEXPORT
jboolean
JNICALL
Java_org_jetbrains_skiko_PlatformOperationsKt_osxIsFullscreenNative
(
JNIEnv
*
env
,
jobject
properties
,
jobject
component
)
{
JNIEXPORT
jboolean
JNICALL
Java_org_jetbrains_skiko_PlatformOperationsKt_osxIsFullscreenNative
(
JNIEnv
*
env
,
jobject
properties
,
jobject
component
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_PlatformOperationsKt_osxIsFullscreenNative"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_PlatformOperationsKt_osxIsFullscreenNative"
);
return
false
;
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_PlatformOperationsKt_osxSetFullscreenNative
(
JNIEnv
*
env
,
jobject
properties
,
jobject
component
,
jboolean
value
)
{
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_PlatformOperationsKt_osxSetFullscreenNative
(
JNIEnv
*
env
,
jobject
properties
,
jobject
component
,
jboolean
value
)
{
...
@@ -98,17 +104,20 @@ JNIEXPORT void Java_org_jetbrains_skiko_PlatformOperationsKt_osxOrderEmojiAndSym
...
@@ -98,17 +104,20 @@ JNIEXPORT void Java_org_jetbrains_skiko_PlatformOperationsKt_osxOrderEmojiAndSym
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalContext
(
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalContext
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
{
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalContext"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalContext"
);
return
0
;
}
}
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalRenderTarget
(
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalRenderTarget
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
,
jint
width
,
jint
height
)
{
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
,
jint
width
,
jint
height
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalRenderTarget"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMetalRenderTarget"
);
return
0
;
}
}
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_startRendering
(
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_startRendering
(
JNIEnv
*
env
,
jobject
redrawer
)
JNIEnv
*
env
,
jobject
redrawer
)
{
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_startRendering"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_startRendering"
);
return
0
;
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_endRendering
(
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_endRendering
(
...
@@ -120,6 +129,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_endRender
...
@@ -120,6 +129,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_endRender
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_createMetalDevice
(
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_createMetalDevice
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
windowPtr
,
jboolean
transparency
,
jint
adapterPriority
,
jlong
platformInfoPtr
)
{
JNIEnv
*
env
,
jobject
redrawer
,
jlong
windowPtr
,
jboolean
transparency
,
jint
adapterPriority
,
jlong
platformInfoPtr
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_createMetalDevice"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_createMetalDevice"
);
return
0
;
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_resizeLayers
(
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_resizeLayers
(
...
@@ -154,20 +164,24 @@ JNIEXPORT jstring JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAda
...
@@ -154,20 +164,24 @@ JNIEXPORT jstring JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAda
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
{
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAdapterName"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAdapterName"
);
return
0
;
}
}
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAdapterMemorySize
(
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAdapterMemorySize
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
JNIEnv
*
env
,
jobject
redrawer
,
jlong
devicePtr
)
{
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAdapterMemorySize"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_getAdapterMemorySize"
);
return
0
;
}
}
JNIEXPORT
jint
JNICALL
Java_org_jetbrains_skiko_NativeApplicationKt_getApplicationWindowCount
(
JNIEnv
*
env
,
jobject
obj
)
JNIEXPORT
jint
JNICALL
Java_org_jetbrains_skiko_NativeApplicationKt_getApplicationWindowCount
(
JNIEnv
*
env
,
jobject
obj
)
{
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_NativeApplicationKt_getApplicationWindowCount"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_NativeApplicationKt_getApplicationWindowCount"
);
return
0
;
}
}
JNIEXPORT
jboolean
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_isOccluded
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
windowPtr
)
{
JNIEXPORT
jboolean
JNICALL
Java_org_jetbrains_skiko_redrawer_MetalRedrawer_isOccluded
(
JNIEnv
*
env
,
jobject
redrawer
,
jlong
windowPtr
)
{
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_isOccluded"
);
skikoUnimplemented
(
"Java_org_jetbrains_skiko_redrawer_MetalRedrawer_isOccluded"
);
return
false
;
}
}
#endif
#endif
\ No newline at end of file
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