Skip to content

Commit fb3d727

Browse files
authored
Merge pull request #218 from OpenBrickProtocolFoundation/add_java_wrapper
Add java wrapper
2 parents d3c86bd + 9d3dc91 commit fb3d727

File tree

5 files changed

+31
-9
lines changed

5 files changed

+31
-9
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,10 @@ jobs:
153153
if: matrix.config.os == 'macos'
154154
run: |
155155
brew update
156-
# TODO annotate with lld@19, after that is accepted, we don't want to use lld@20 without manually updating it !
157-
brew install llvm@19 lld
158-
echo "$(brew --prefix)/opt/llvm/bin" >> $GITHUB_PATH
159-
echo "LDFLAGS=-L$(brew --prefix)/opt/llvm/lib -L$(brew --prefix)/opt/llvm/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm/lib/c++" >> "$GITHUB_ENV"
160-
echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm/include" >> "$GITHUB_ENV"
156+
brew install llvm@19 lld@19
157+
echo "$(brew --prefix)/opt/llvm@19/bin:$(brew --prefix)/opt/lld@19/bin" >> $GITHUB_PATH
158+
echo "LDFLAGS=-L$(brew --prefix)/opt/llvm@19/lib -L$(brew --prefix)/opt/llvm@19/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm@19/lib/c++ -L$(brew --prefix)/opt/lld@19/lib" >> "$GITHUB_ENV"
159+
echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm@19/include -I$(brew --prefix)/opt/lld@19/include" >> "$GITHUB_ENV"
161160
echo "CC=clang" >> "$GITHUB_ENV"
162161
echo "CXX=clang++" >> "$GITHUB_ENV"
163162
echo "OBJC=clang" >> "$GITHUB_ENV"

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@
1414
path = wrapper/python
1515
url = https://github.com/Totto16/oopetris_wrapper_python.git
1616
ignore = dirty
17+
[submodule "wrapper/java"]
18+
path = wrapper/java
19+
url = https://github.com/Totto16/oopetris_wrapper_java.git
20+
ignore = dirty
21+
22+

wrapper/README.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,45 @@
22

33
## What is this
44

5-
This are wrappers of some OOPetris functionaility in other languages.
5+
These are wrappers of some OOPetris functionaility in other languages.
66
They are all in submodules alias in a seperate git repo.
77

88
They currently wrap this:
9+
910
- OOPetris Recordings
1011

1112
Planned:
13+
1214
- OOPetris AI support
1315

1416
## Languages
1517

16-
1718
Current:
19+
1820
- Node.js (C++ binding)
1921
- C (C++ binding)
2022
- Haskell (C binding)
2123
- Python (C++ binding)
24+
- Java (C++ binding)
2225

2326
Planned:
27+
2428
- Lua
25-
- Java
2629
- Rust
2730

31+
## OS Comaptibility table
32+
33+
| Language | Linux | Windows | macOS |
34+
| :------: | :---: | :-----: | :---: |
35+
| JS ||||
36+
| C ||||
37+
| Haskell |||[^1] |
38+
| Python ||| ⚠️[^2] |
39+
| Java ||||
40+
41+
[^1]: A needed dependency doesn't yet compile on macOS
42+
[^2]: Arm64 has some errors, that are related to the toolchain (pybind11)
43+
2844
## Other
2945

3046
For more information on how to get / build those, refer to the subfolders of the languages

wrapper/java

Submodule java added at 209d69f

0 commit comments

Comments
 (0)