Skip to content

Commit c90ef55

Browse files
committed
test loading meshIO
1 parent 3989ddd commit c90ef55

4 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/java_bindings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
ls -al ./build/src/
4747
cp ./build/src/libmanifold.dylib ./bindings/java/src/main/resources/manifold3d/natives/mac-arm64/
4848
cp ./build/bindings/c/libmanifoldc.dylib ./bindings/java/src/main/resources/manifold3d/natives/mac-arm64/
49+
cp ./build/extras/libmeshIO.dylib ./bindings/java/src/main/resources/manifold3d/natives/mac-arm64/
4950
cd bindings/java/
5051
mvn test --file pom.xml --no-transfer-progress
5152
- name: Upload native libraries
@@ -160,6 +161,7 @@ jobs:
160161
echo "Copy existing files..."
161162
cp build\lib\Release\manifold.dll bindings\java\src\main\resources\manifold3d\natives\win-x86_64\manifold.dll
162163
cp build\lib\Release\manifoldc.dll bindings\java\src\main\resources\manifold3d\natives\win-x86_64\manifoldc.dll
164+
cp ./build/extras/libmeshIO.dll bindings\java\src\main\resources\manifold3d\natives\win-x86_64\libmeshIO.dll
163165
cd bindings\java
164166
mvn test --file pom.xml --no-transfer-progress
165167
cd ..

bindings/java/scripts/linux/buildC-arm.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ ls -al ./build/src/*
1414
mkdir -p ./bindings/java/src/main/resources/manifold3d/natives/linux-arm64/
1515
cp ./build/src/libmanifold.so ./bindings/java/src/main/resources/manifold3d/natives/linux-arm64/
1616
cp ./build/bindings/c/libmanifoldc.so ./bindings/java/src/main/resources/manifold3d/natives/linux-arm64/
17+
cp ./build/extras/libmeshIO.so ./bindings/java/src/main/resources/manifold3d/natives/linux-arm64/

bindings/java/scripts/linux/buildC.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ ls -al ./build/src/*
1414
mkdir -p ./bindings/java/src/main/resources/manifold3d/natives/linux-x86_64/
1515
cp ./build/src/libmanifold.so ./bindings/java/src/main/resources/manifold3d/natives/linux-x86_64/
1616
cp ./build/bindings/c/libmanifoldc.so ./bindings/java/src/main/resources/manifold3d/natives/linux-x86_64/
17+
cp ./build/extras/libmeshIO.so ./bindings/java/src/main/resources/manifold3d/natives/linux-x86_64/

bindings/java/src/main/java/com/cadoodlecad/manifold/ManifoldBindings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ private static void loadNativeLibrary(String libName, File cacheDirectory) throw
109109
public static void loadNativeLibrarys(File cacheDirectory) throws Exception {
110110
loadNativeLibrary("libmanifold", cacheDirectory);
111111
loadNativeLibrary("libmanifoldc", cacheDirectory);
112+
loadNativeLibrary("libmeshIO", cacheDirectory);
112113
}
113114

114115
public ManifoldBindings() throws Exception {
@@ -117,8 +118,7 @@ public ManifoldBindings() throws Exception {
117118

118119
public ManifoldBindings(File cacheDirectory) throws Exception {
119120
if (!isNativeLibraryLoaded()) {
120-
loadNativeLibrary("libmanifold", cacheDirectory);
121-
loadNativeLibrary("libmanifoldc", cacheDirectory);
121+
loadNativeLibrarys(cacheDirectory);
122122
}
123123

124124
this.library = SymbolLookup.loaderLookup();

0 commit comments

Comments
 (0)