From 9985ec1e66549747b1a37daa3ac6def8909bdd7f Mon Sep 17 00:00:00 2001 From: electronstudio Date: Sun, 4 Jul 2021 00:07:55 +0100 Subject: [PATCH] mac build --- build-java.sh | 2 +- raymath.h | 1 + run-test-jar.sh | 4 ++-- src/com/raylib/RaylibConfig.java | 6 +++--- src/com/raylib/raymath.h | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) create mode 120000 raymath.h create mode 120000 src/com/raylib/raymath.h diff --git a/build-java.sh b/build-java.sh index 518cd0d..b77cd63 100755 --- a/build-java.sh +++ b/build-java.sh @@ -11,7 +11,7 @@ cd .. mkdir -p gen/com/raylib mv src/com/raylib/RaylibConfig.class gen/com/raylib #cp -R lib/* gen/ -cp raylib.h gen/com/raylib +cp *.h gen/com/raylib cd gen echo "STEP 2 - compile Raylib.java" java -jar ../javacpp.jar -Dplatform.compiler.foo='// /Oi /O2 /EHsc /Gy /GL /MT /LD' -nodelete com/raylib/Raylib.java diff --git a/raymath.h b/raymath.h new file mode 120000 index 0000000..e8243f1 --- /dev/null +++ b/raymath.h @@ -0,0 +1 @@ +raylib/src/raymath.h \ No newline at end of file diff --git a/run-test-jar.sh b/run-test-jar.sh index dd08e7e..ae659aa 100755 --- a/run-test-jar.sh +++ b/run-test-jar.sh @@ -1,5 +1,5 @@ #!/bin/bash javac -cp jaylib-$VERSION.jar:jaylib-natives-$PLATFORM-$VERSION.jar -sourcepath src src/com/raylib/Test.java -d build -java -cp jaylib-$VERSION.jar:jaylib-natives-$PLATFORM-$VERSION.jar com/raylib/Test +java -cp jaylib-$VERSION.jar:jaylib-natives-$PLATFORM-$VERSION.jar com/raylib/Test -#-XstartOnFirstThread com/raylib/Test +#-XstartOnFirstThread diff --git a/src/com/raylib/RaylibConfig.java b/src/com/raylib/RaylibConfig.java index 6686e31..81eb3f1 100644 --- a/src/com/raylib/RaylibConfig.java +++ b/src/com/raylib/RaylibConfig.java @@ -22,10 +22,10 @@ ), @Platform( value = {"macosx-x86_64"}, - linkpath = {"/Users/richard/IdeaProjects/jaylib/lib/mac"}, + //linkpath = {"."}, link = {"raylib"}, - includepath = {"/Users/richard/IdeaProjects/jaylib"}, - include = {"raylib.h"} + //includepath = {"/Users/richard/IdeaProjects/jaylib"}, + include = {"raylib.h", "rlgl.h", "raymath.h"} ), @Platform( diff --git a/src/com/raylib/raymath.h b/src/com/raylib/raymath.h new file mode 120000 index 0000000..a7a70ba --- /dev/null +++ b/src/com/raylib/raymath.h @@ -0,0 +1 @@ +../../../raymath.h \ No newline at end of file