feat : windows compatibility

elebras1 · elebras1 · commit 9ef8b0251df2 · 2025-12-02T23:26:50.000+01:00
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -9,9 +9,29 @@ permissions:
   contents: read
 
 jobs:
-  build-and-publish:
-    name: Build and Publish to Maven Central
-    runs-on: ubuntu-latest
+  build-natives:
+    name: Build natives for ${{ matrix.platform }}-${{ matrix.arch }}
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: linux
+            arch: x64
+            lib: libflecs.so
+          - os: windows-latest
+            platform: windows
+            arch: x64
+            lib: flecs.dll
+          - os: macos-13
+            platform: macos
+            arch: x64
+            lib: libflecs.dylib
+          - os: macos-latest
+            platform: macos
+            arch: aarch64
+            lib: libflecs.dylib
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -23,28 +43,109 @@ jobs:
           java-version: '25'
           distribution: 'temurin'
 
-      - name: Install GCC
+      - name: Install GCC (Linux)
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y gcc build-essential
 
+      - name: Install GCC (Windows)
+        if: runner.os == 'Windows'
+        run: choco install mingw -y
+
+      - name: Grant execute permission for gradlew
+        if: runner.os != 'Windows'
+        run: chmod +x gradlew
+
+      - name: Build natives
+        run: ./gradlew copyFlecsNative -PNATIVE_ARCH=${{ matrix.platform }}-${{ matrix.arch }}
+        shell: bash
+
+      - name: Verify native library was built
+        run: |
+          echo "Checking for native library..."
+          ls -la build/natives/${{ matrix.platform }}-${{ matrix.arch }}/
+        shell: bash
+
+      - name: Upload natives artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: natives-${{ matrix.platform }}-${{ matrix.arch }}
+          path: build/natives/${{ matrix.platform }}-${{ matrix.arch }}/${{ matrix.lib }}
+          retention-days: 1
+
+  publish:
+    name: Publish to Maven Central
+    needs: build-natives
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+
+      - name: Download all natives
+        uses: actions/download-artifact@v4
+        with:
+          path: downloaded-natives
+
+      - name: Debug downloaded artifacts
+        run: |
+          echo "Downloaded artifacts structure:"
+          find downloaded-natives -type f
+
+      - name: Organize natives
+        run: |
+          mkdir -p build/natives
+          
+          # Copy each artifact to the correct structure
+          for artifact_dir in downloaded-natives/natives-*/; do
+            # Extract platform-arch from folder name (e.g. natives-linux-x64 -> linux-x64)
+            platform_arch=$(basename "$artifact_dir" | sed 's/^natives-//')
+          
+            echo "Processing $platform_arch..."
+            mkdir -p "build/natives/$platform_arch"
+          
+            # Copy library file from artifact
+            cp "$artifact_dir"/* "build/natives/$platform_arch/" 2>/dev/null || {
+              echo "Warning: No files found in $artifact_dir"
+            }
+          done
+          
+          echo ""
+          echo "Final native libraries structure:"
+          find build/natives -type f
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build project with natives
-        run: ./gradlew build -PNATIVE_ARCH=linux-x64 -x test
+      - name: Build final JAR with all natives
+        run: ./gradlew jar -x compileFlecsNative -x copyFlecsNative
 
       - name: Verify JAR contents
         run: |
           VERSION=${GITHUB_REF_NAME#v}
           echo "Verifying JAR for version $VERSION..."
-          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/linux-x64/libflecs.so" && echo "✓ Native library found" || echo "✗ Native NOT found"
-          jar tf build/libs/flecs-java-$VERSION.jar | grep "META-INF/services/javax.annotation.processing.Processor" && echo "✓ Processor found" || echo "✗ Processor NOT found"
+          echo ""
+          echo "All natives in JAR:"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/" | sort
+          echo ""
+          
+          # Check each platform
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/linux-x64/libflecs.so" && echo "✓ Linux x64" || echo "✗ Linux x64 MISSING"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/windows-x64/flecs.dll" && echo "✓ Windows x64" || echo "✗ Windows x64 MISSING"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/macos-x64/libflecs.dylib" && echo "✓ macOS x64" || echo "✗ macOS x64 MISSING"
+          jar tf build/libs/flecs-java-$VERSION.jar | grep "natives/macos-aarch64/libflecs.dylib" && echo "✓ macOS ARM64" || echo "✗ macOS ARM64 MISSING"
 
       - name: Publish to Maven Central
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PNATIVE_ARCH=linux-x64
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -47,10 +47,19 @@ val jextractExecutable = when {
     else -> "$userHome/.local/jextract/jextract-25/bin/jextract"
 }
 
-val nativeLibName = "libflecs.so"
+val nativeLibName = when {
+    os.isWindows -> "flecs.dll"
+    os.isMacOsX -> "libflecs.dylib"
+    else -> "libflecs.so"
+}
+
 val nativeArch = project.findProperty("NATIVE_ARCH") as String? ?: when {
     os.isLinux && System.getProperty("os.arch") in listOf("amd64", "x86_64") -> "linux-x64"
     os.isLinux && System.getProperty("os.arch") in listOf("aarch64", "arm64") -> "linux-aarch64"
+    os.isWindows && System.getProperty("os.arch") in listOf("amd64", "x86_64") -> "windows-x64"
+    os.isWindows && System.getProperty("os.arch") == "aarch64" -> "windows-aarch64"
+    os.isMacOsX && System.getProperty("os.arch") == "aarch64" -> "macos-aarch64"
+    os.isMacOsX && System.getProperty("os.arch") in listOf("amd64", "x86_64") -> "macos-x64"
     else -> "unknown"
 }
 
@@ -101,22 +110,47 @@ val compileFlecsNative by tasks.registering(Exec::class) {
     val outputNativeFile = File(flecsSourceDir, "distr/$nativeLibName")
     outputs.file(outputNativeFile)
 
-    val compileCommand = listOf(
-        "gcc",
-        "-shared",
-        "-fPIC",
-        "-o", outputNativeFile.absolutePath,
-        flecsCFile.absolutePath,
-        "-Ofast",
-        "-std=c99",
-        "-DFLECS_SHARED",
-        "-DNDEBUG",
-        "-D_POSIX_C_SOURCE=200809L",
-        "-D_DEFAULT_SOURCE",
-        "-lm",
-        "-lrt",
-        "-lpthread"
-    )
+    val compileCommand = when {
+        os.isWindows -> listOf(
+            "gcc",
+            "-shared",
+            "-o", outputNativeFile.absolutePath,
+            flecsCFile.absolutePath,
+            "-Ofast",
+            "-std=c99",
+            "-DFLECS_SHARED",
+            "-DNDEBUG",
+            "-lws2_32",
+            "-ldbghelp"
+        )
+        os.isMacOsX -> listOf(
+            "gcc",
+            "-dynamiclib",
+            "-o", outputNativeFile.absolutePath,
+            flecsCFile.absolutePath,
+            "-Ofast",
+            "-std=c99",
+            "-DFLECS_SHARED",
+            "-DNDEBUG",
+            "-framework", "CoreFoundation"
+        )
+        else -> listOf(
+            "gcc",
+            "-shared",
+            "-fPIC",
+            "-o", outputNativeFile.absolutePath,
+            flecsCFile.absolutePath,
+            "-Ofast",
+            "-std=c99",
+            "-DFLECS_SHARED",
+            "-DNDEBUG",
+            "-D_POSIX_C_SOURCE=200809L",
+            "-D_DEFAULT_SOURCE",
+            "-lm",
+            "-lrt",
+            "-lpthread"
+        )
+    }
     commandLine(compileCommand)
 }
 
diff --git a/src/main/generated/com/github/elebras1/flecs/flecs_h$shared.java b/src/main/generated/com/github/elebras1/flecs/flecs_h$shared.java
@@ -27,7 +27,7 @@ public class flecs_h$shared {
     public static final ValueLayout.OfDouble C_DOUBLE = (ValueLayout.OfDouble) Linker.nativeLinker().canonicalLayouts().get("double");
     public static final AddressLayout C_POINTER = ((AddressLayout) Linker.nativeLinker().canonicalLayouts().get("void*"))
             .withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, C_CHAR));
-    public static final ValueLayout.OfLong C_LONG = (ValueLayout.OfLong) Linker.nativeLinker().canonicalLayouts().get("long");
+    public static final ValueLayout.OfLong C_LONG = ValueLayout.JAVA_LONG;
 
     static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
 
diff --git a/src/main/java/com/github/elebras1/flecs/ObserverBuilder.java b/src/main/java/com/github/elebras1/flecs/ObserverBuilder.java
@@ -190,7 +190,7 @@ public FlecsObserver each(Query.EntityCallback callback) {
             MemorySegment entities = ecs_iter_t.entities(it);
 
             for (int i = 0; i < count; i++) {
-                long entityId = entities.getAtIndex(flecs_h$shared.C_LONG, i);
+                long entityId = entities.getAtIndex(ValueLayout.JAVA_LONG, i);
                 callback.accept(entityId);
             }
         }, this.world.arena());
diff --git a/src/main/java/com/github/elebras1/flecs/Query.java b/src/main/java/com/github/elebras1/flecs/Query.java
@@ -3,6 +3,7 @@
 import com.github.elebras1.flecs.collection.EcsLongList;
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
 
 public class Query implements AutoCloseable {
 
@@ -46,7 +47,7 @@ public void each(EntityCallback callback) {
             MemorySegment entities = ecs_iter_t.entities(iter);
 
             for (int i = 0; i < count; i++) {
-                long entityId = entities.getAtIndex(flecs_h$shared.C_LONG, i);
+                long entityId = entities.getAtIndex(ValueLayout.JAVA_LONG, i);
                 callback.accept(entityId);
             }
         }
diff --git a/src/main/java/com/github/elebras1/flecs/SystemBuilder.java b/src/main/java/com/github/elebras1/flecs/SystemBuilder.java
@@ -218,7 +218,7 @@ public FlecsSystem each(Query.EntityCallback callback) {
             MemorySegment entities = ecs_iter_t.entities(it);
             
             for (int i = 0; i < count; i++) {
-                long entityId = entities.getAtIndex(flecs_h$shared.C_LONG, i);
+                long entityId = entities.getAtIndex(ValueLayout.JAVA_LONG, i);
                 callback.accept(entityId);
             }
         }, this.world.arena());
diff --git a/src/main/java/com/github/elebras1/flecs/util/internal/FlecsLoader.java b/src/main/java/com/github/elebras1/flecs/util/internal/FlecsLoader.java
@@ -43,29 +43,30 @@ private static String getArchitecture() {
             return "aarch64";
         }
 
-        return osArch;
+        throw new UnsupportedOperationException("Unsupported architecture: " + osArch);
     }
 
     private static String getNativeLibraryPath() {
         String os = System.getProperty("os.name").toLowerCase();
         String arch = getArchitecture();
+
+        String osName;
         String libName;
 
         if (os.contains("win")) {
+            osName = "windows";
             libName = "flecs.dll";
         } else if (os.contains("mac")) {
+            osName = "macos";
             libName = "libflecs.dylib";
-        } else {
+        } else if (os.contains("linux") || os.contains("nux")) {
+            osName = "linux";
             libName = "libflecs.so";
+        } else {
+            throw new UnsupportedOperationException("Unsupported OS: " + os);
         }
 
-        // Try architecture-specific path first for Linux
-        if (os.contains("linux")) {
-            return "/natives/linux-" + arch + "/" + libName;
-        }
-
-        // Fallback to root for backward compatibility
-        return "/" + libName;
+        return String.format("/natives/%s-%s/%s", osName, arch, libName);
     }
 
     private static boolean loadFromResources(String libPath) {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public FlecsObserver each(Query.EntityCallback callback) {`
`190`	`190`	`MemorySegment entities = ecs_iter_t.entities(it);`
`191`	`191`
`192`	`192`	`for (int i = 0; i < count; i++) {`
`193`		`- long entityId = entities.getAtIndex(flecs_h$shared.C_LONG, i);`
	`193`	`+ long entityId = entities.getAtIndex(ValueLayout.JAVA_LONG, i);`
`194`	`194`	`callback.accept(entityId);`
`195`	`195`	`}`
`196`	`196`	`}, this.world.arena());`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import com.github.elebras1.flecs.collection.EcsLongList;`
`4`	`4`	`import java.lang.foreign.Arena;`
`5`	`5`	`import java.lang.foreign.MemorySegment;`
	`6`	`+import java.lang.foreign.ValueLayout;`
`6`	`7`
`7`	`8`	`public class Query implements AutoCloseable {`
`8`	`9`
`@@ -46,7 +47,7 @@ public void each(EntityCallback callback) {`
`46`	`47`	`MemorySegment entities = ecs_iter_t.entities(iter);`
`47`	`48`
`48`	`49`	`for (int i = 0; i < count; i++) {`
`49`		`- long entityId = entities.getAtIndex(flecs_h$shared.C_LONG, i);`
	`50`	`+ long entityId = entities.getAtIndex(ValueLayout.JAVA_LONG, i);`
`50`	`51`	`callback.accept(entityId);`
`51`	`52`	`}`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public FlecsSystem each(Query.EntityCallback callback) {`
`218`	`218`	`MemorySegment entities = ecs_iter_t.entities(it);`
`219`	`219`
`220`	`220`	`for (int i = 0; i < count; i++) {`
`221`		`- long entityId = entities.getAtIndex(flecs_h$shared.C_LONG, i);`
	`221`	`+ long entityId = entities.getAtIndex(ValueLayout.JAVA_LONG, i);`
`222`	`222`	`callback.accept(entityId);`
`223`	`223`	`}`
`224`	`224`	`}, this.world.arena());`