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
37d8787a
Commit
37d8787a
authored
Feb 03, 2021
by
Igor Demin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set $projectDir/src/jvmMain/cpp/include as include folder
parent
0499e314
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
4 deletions
+8
-4
build.gradle.kts
skiko/build.gradle.kts
+4
-0
jni_helpers.h
skiko/src/jvmMain/cpp/include/jni_helpers.h
+0
-0
drawlayer.cc
skiko/src/jvmMain/cpp/linux/drawlayer.cc
+1
-1
redrawer.cc
skiko/src/jvmMain/cpp/linux/redrawer.cc
+1
-1
drawlayer.cc
skiko/src/jvmMain/cpp/windows/drawlayer.cc
+1
-1
redrawer.cc
skiko/src/jvmMain/cpp/windows/redrawer.cc
+1
-1
No files found.
skiko/build.gradle.kts
View file @
37d8787a
...
@@ -228,6 +228,7 @@ tasks.withType(CppCompile::class.java).configureEach {
...
@@ -228,6 +228,7 @@ tasks.withType(CppCompile::class.java).configureEach {
"-DSK_UNICODE_AVAILABLE"
,
"-DSK_UNICODE_AVAILABLE"
,
*
buildType
.
flags
*
buildType
.
flags
))
))
val
includeDir
=
"$projectDir/src/jvmMain/cpp/include"
when
(
targetOs
)
{
when
(
targetOs
)
{
OS
.
MacOS
->
{
OS
.
MacOS
->
{
compilerArgs
.
addAll
(
compilerArgs
.
addAll
(
...
@@ -235,6 +236,7 @@ tasks.withType(CppCompile::class.java).configureEach {
...
@@ -235,6 +236,7 @@ tasks.withType(CppCompile::class.java).configureEach {
"-fvisibility=hidden"
,
"-fvisibility=hidden"
,
"-fvisibility-inlines-hidden"
,
"-fvisibility-inlines-hidden"
,
"-I$jdkHome/include/darwin"
,
"-I$jdkHome/include/darwin"
,
"-I$includeDir"
,
"-DSK_SHAPER_CORETEXT_AVAILABLE"
,
"-DSK_SHAPER_CORETEXT_AVAILABLE"
,
"-DSK_BUILD_FOR_MAC"
,
"-DSK_BUILD_FOR_MAC"
,
"-DSK_METAL"
,
"-DSK_METAL"
,
...
@@ -248,6 +250,7 @@ tasks.withType(CppCompile::class.java).configureEach {
...
@@ -248,6 +250,7 @@ tasks.withType(CppCompile::class.java).configureEach {
"-fvisibility=hidden"
,
"-fvisibility=hidden"
,
"-fvisibility-inlines-hidden"
,
"-fvisibility-inlines-hidden"
,
"-I$jdkHome/include/linux"
,
"-I$jdkHome/include/linux"
,
"-I$includeDir"
,
"-DSK_BUILD_FOR_LINUX"
,
"-DSK_BUILD_FOR_LINUX"
,
"-DSK_R32_SHIFT=16"
,
"-DSK_R32_SHIFT=16"
,
*
buildType
.
clangFlags
*
buildType
.
clangFlags
...
@@ -258,6 +261,7 @@ tasks.withType(CppCompile::class.java).configureEach {
...
@@ -258,6 +261,7 @@ tasks.withType(CppCompile::class.java).configureEach {
compilerArgs
.
addAll
(
compilerArgs
.
addAll
(
listOf
(
listOf
(
"-I$jdkHome/include/win32"
,
"-I$jdkHome/include/win32"
,
"-I$includeDir"
,
"-DSK_BUILD_FOR_WIN"
,
"-DSK_BUILD_FOR_WIN"
,
"-D_CRT_SECURE_NO_WARNINGS"
,
"-D_CRT_SECURE_NO_WARNINGS"
,
"-D_HAS_EXCEPTIONS=0"
,
"-D_HAS_EXCEPTIONS=0"
,
...
...
skiko/src/jvmMain/cpp/
common
/jni_helpers.h
→
skiko/src/jvmMain/cpp/
include
/jni_helpers.h
View file @
37d8787a
File moved
skiko/src/jvmMain/cpp/linux/drawlayer.cc
View file @
37d8787a
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#include <cstdlib>
#include <cstdlib>
#include <unistd.h>
#include <unistd.h>
#include <stdio.h>
#include <stdio.h>
#include "
../common/
jni_helpers.h"
#include "jni_helpers.h"
typedef
GLXContext
(
*
glXCreateContextAttribsARBProc
)(
Display
*
,
GLXFBConfig
,
GLXContext
,
Bool
,
const
int
*
);
typedef
GLXContext
(
*
glXCreateContextAttribsARBProc
)(
Display
*
,
GLXFBConfig
,
GLXContext
,
Bool
,
const
int
*
);
...
...
skiko/src/jvmMain/cpp/linux/redrawer.cc
View file @
37d8787a
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#include <cstdlib>
#include <cstdlib>
#include <unistd.h>
#include <unistd.h>
#include <stdio.h>
#include <stdio.h>
#include "
../common/
jni_helpers.h"
#include "jni_helpers.h"
typedef
GLXContext
(
*
glXCreateContextAttribsARBProc
)(
Display
*
,
GLXFBConfig
,
GLXContext
,
Bool
,
const
int
*
);
typedef
GLXContext
(
*
glXCreateContextAttribsARBProc
)(
Display
*
,
GLXFBConfig
,
GLXContext
,
Bool
,
const
int
*
);
...
...
skiko/src/jvmMain/cpp/windows/drawlayer.cc
View file @
37d8787a
#define WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#include <jawt_md.h>
#include <jawt_md.h>
#include "
../common/
jni_helpers.h"
#include "jni_helpers.h"
extern
"C"
extern
"C"
{
{
...
...
skiko/src/jvmMain/cpp/windows/redrawer.cc
View file @
37d8787a
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#include <gl/GL.h>
#include <gl/GL.h>
#include <jawt_md.h>
#include <jawt_md.h>
#include <dwmapi.h>
#include <dwmapi.h>
#include "
../common/
jni_helpers.h"
#include "jni_helpers.h"
extern
"C"
extern
"C"
{
{
...
...
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