Commit 37d8787a authored by Igor Demin's avatar Igor Demin

Set $projectDir/src/jvmMain/cpp/include as include folder

parent 0499e314
......@@ -228,6 +228,7 @@ tasks.withType(CppCompile::class.java).configureEach {
"-DSK_UNICODE_AVAILABLE",
*buildType.flags
))
val includeDir = "$projectDir/src/jvmMain/cpp/include"
when (targetOs) {
OS.MacOS -> {
compilerArgs.addAll(
......@@ -235,6 +236,7 @@ tasks.withType(CppCompile::class.java).configureEach {
"-fvisibility=hidden",
"-fvisibility-inlines-hidden",
"-I$jdkHome/include/darwin",
"-I$includeDir",
"-DSK_SHAPER_CORETEXT_AVAILABLE",
"-DSK_BUILD_FOR_MAC",
"-DSK_METAL",
......@@ -248,6 +250,7 @@ tasks.withType(CppCompile::class.java).configureEach {
"-fvisibility=hidden",
"-fvisibility-inlines-hidden",
"-I$jdkHome/include/linux",
"-I$includeDir",
"-DSK_BUILD_FOR_LINUX",
"-DSK_R32_SHIFT=16",
*buildType.clangFlags
......@@ -258,6 +261,7 @@ tasks.withType(CppCompile::class.java).configureEach {
compilerArgs.addAll(
listOf(
"-I$jdkHome/include/win32",
"-I$includeDir",
"-DSK_BUILD_FOR_WIN",
"-D_CRT_SECURE_NO_WARNINGS",
"-D_HAS_EXCEPTIONS=0",
......
......@@ -7,7 +7,7 @@
#include <cstdlib>
#include <unistd.h>
#include <stdio.h>
#include "../common/jni_helpers.h"
#include "jni_helpers.h"
typedef GLXContext (*glXCreateContextAttribsARBProc)(Display *, GLXFBConfig, GLXContext, Bool, const int *);
......
......@@ -7,7 +7,7 @@
#include <cstdlib>
#include <unistd.h>
#include <stdio.h>
#include "../common/jni_helpers.h"
#include "jni_helpers.h"
typedef GLXContext (*glXCreateContextAttribsARBProc)(Display *, GLXFBConfig, GLXContext, Bool, const int *);
......
#define WIN32_LEAN_AND_MEAN
#include <jawt_md.h>
#include "../common/jni_helpers.h"
#include "jni_helpers.h"
extern "C"
{
......
......@@ -3,7 +3,7 @@
#include <gl/GL.h>
#include <jawt_md.h>
#include <dwmapi.h>
#include "../common/jni_helpers.h"
#include "jni_helpers.h"
extern "C"
{
......
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