Trying to do Windows Implementation of Vmone

.github/workflows/release.yml

@@ -2,6 +2,8 @@ name: Release
 
 on:
   push:
+    branches:
+      - '**'
     tags:
       - '*'
 
@@ -122,61 +124,95 @@ jobs:
           retention-days: 1
 
   build-windows-x64:
-    if: false
     runs-on: windows-latest
     steps:
       - name: 'Checkout the JDK source'
         uses: actions/checkout@v4
+      - name: 'Set up JDK 11 Temurin'
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          architecture: 'x64'
+      - name: Set up MSYS2 environment
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            make
+            gcc
+            coreutils
+            unzip
       - name: 'Download libjdk.lib'
         uses: robinraju/release-downloader@v1
         with:
           repository: 'gluonhq/mobile'
           latest: true
           fileName: 'windows-x64.zip'
       - name: 'Build'
+        shell: msys2 {0}
         run: |
-          powershell -Command "Expand-Archive -Path windows-x64.zip -DestinationPath C:\temp\"
-          powershell -Command "Move-Item -Path C:\temp\windows-x64\libjdk.lib -Destination C:\temp\"
-          cd C:\temp
+          mkdir -p /c/temp
+          unzip windows-x64.zip -d /c/temp
+          mv /c/temp/windows-x64/libjdk.lib /c/temp/
+          export JAVA_HOME="/c/hostedtoolcache/windows/Java_Temurin-Hotspot_jdk/11.0.24-8/x64"
+          export PATH="$JAVA_HOME/bin:$PATH"
           make clean all
       - name: 'Upload static image artifact'
         uses: actions/upload-artifact@v4
         with:
           name: vmone-windows-x64
-          path: C:\temp\lib\windows\x64\staticjdk\lib\
+          path: lib\windows\staticjdk\lib\
           retention-days: 1
 
   build-windows-aarch64:
-    if: false
     runs-on: windows-latest
     steps:
       - name: 'Checkout the JDK source'
         uses: actions/checkout@v4
+      - name: 'Set up JDK 11 Temurin'
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          architecture: 'x64'
+      - name: Set up MSYS2 environment
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            make
+            gcc
+            coreutils
+            unzip
       - name: 'Download libjdk.lib'
         uses: robinraju/release-downloader@v1
         with:
           repository: 'gluonhq/mobile'
           latest: true
           fileName: 'windows-aarch64.zip'
       - name: 'Build'
+        shell: msys2 {0}
         run: |
-          powershell -Command "Expand-Archive -Path windows-aarch64.zip -DestinationPath C:\temp\"
-          powershell -Command "Move-Item -Path C:\temp\windows-aarch64\libjdk.lib -Destination C:\temp\"
-          cd C:\temp
+          mkdir -p /c/temp
+          unzip windows-aarch64.zip -d /c/temp
+          mv /c/temp/windows-aarch64/libjdk.lib /c/temp/
+          export JAVA_HOME="/c/hostedtoolcache/windows/Java_Temurin-Hotspot_jdk/11.0.24-8/x64"
+          export PATH="$JAVA_HOME/bin:$PATH"
           make clean all
       - name: 'Upload static image artifact'
         uses: actions/upload-artifact@v4
         with:
           name: vmone-windows-aarch64
-          path: C:\temp\lib\windows\aarch64\staticjdk\lib\
+          path: lib\windows\staticjdk\lib\
           retention-days: 1
 
   release:
     needs: [
         build-android, build-ios,
         build-linux-x64,
         build-macos-x64, build-macos-aarch64,
-        # build-windows-x64, build-windows-aarch64
+        build-windows-x64, build-windows-aarch64
     ]
     runs-on: ubuntu-22.04
     steps:
@@ -215,14 +251,12 @@ jobs:
         with:
           name: vmone-windows-x64
           path: ./dist/windows-x64/lib/
-        if: false
 
       - name: Download windows aarch64 artifacts
         uses: actions/download-artifact@v4
         with:
           name: vmone-windows-aarch64
           path: ./dist/windows-aarch64/lib/
-        if: false
 
       - name: Zip downloaded artifacts
         run: |
@@ -236,10 +270,10 @@ jobs:
           zip -r ../vmone-macos-x64.zip lib/
           cd $GITHUB_WORKSPACE/dist/macos-aarch64/
           zip -r ../vmone-macos-aarch64.zip lib/
-          # cd $GITHUB_WORKSPACE/dist/windows-x64/
-          # zip -r ../vmone-windows-x64.zip lib/
-          # cd $GITHUB_WORKSPACE/dist/windows-aarch64/
-          # zip -r ../vmone-windows-aarch64.zip lib/
+          cd $GITHUB_WORKSPACE/dist/windows-x64/
+          zip -r ../vmone-windows-x64.zip lib/
+          cd $GITHUB_WORKSPACE/dist/windows-aarch64/
+          zip -r ../vmone-windows-aarch64.zip lib/
 
       - name: Check zip files
         run: |

.gitignore

@@ -30,3 +30,8 @@ replay_pid*
 
 # Mac
 .DS_Store
+
+.vscode
+.vs
+
+x64

Makefile

@@ -16,10 +16,11 @@ else ifeq ($(shell uname), Darwin)
     OS := macosx
     CC = gcc
     CFLAGS = -DDARWIN $(INCLUDE_FLAGS) 
-else ifeq ($(shell uname), MINGW32_NT)
+else ifeq ($(findstring MINGW64_NT, $(shell uname)), MINGW64_NT)
     OS := windows
     CC = gcc
     CFLAGS = -DWIN32 -I$(JAVA)/include -I$(JAVA)/include/win32
+    CFLAGS += -D__int64="long long" -mavx -mxsave
 endif
 
 ifeq ($(TARGET), ios)
@@ -71,10 +72,10 @@ JDKLIB = /tmp/libjdk.a
 TEMP_DIR = /tmp/extractdir
 
 ifeq ($(OS), windows)
-    JDKLIB := C:/path/to/libjdk.lib
-    LIB = $(LIBDIR)/windows/staticjdk/lib/libvmone.lib
-    AR = lib
-    ARFLAGS = /OUT:
+    JDKLIB := C:/temp/libjdk.lib
+    LIB = $(LIBDIR)/$(OS)/staticjdk/lib/vmone.lib
+    AR = ar
+    ARFLAGS = rcs
 else
     LIB = $(LIBDIR)/$(OS)/staticjdk/lib/libvmone.a
     AR = ar
@@ -90,8 +91,12 @@ ifeq ($(OS), windows)
 		echo "Including $(JDKLIB) in lib"; \
 		TMPDIR=$(LIBDIR)/$(OS)/temp_objs; \
 		mkdir -p $$TMPDIR; \
+		$(AR) t $(JDKLIB) | xargs -n 1 dirname | sort -u > dirlist.txt; \
+		xargs mkdir -p < dirlist.txt; \
+		cp dirlist.txt $(LIBDIR)/$(OS)/staticjdk/lib; \
 		(cd $$TMPDIR && $(AR) x $(JDKLIB)); \
-		$(AR) $(ARFLAGS) $@ $$TMPDIR/*.o $^; \
+		find D:/a/mobile/mobile/build/windows-x64/support/native -type f -exec mv {} $$TMPDIR \; ; \
+		$(AR) $(ARFLAGS) $@ $$TMPDIR/*.* $^; \
 	else \
 		echo "Existing library not found. Creating static library with object files only."; \
 		$(AR) $(ARFLAGS) $@ $^; \
@@ -101,11 +106,11 @@ else
 		echo "Including $(JDKLIB) in lib"; \
 		TMPDIR=$(LIBDIR)/$(OS)/temp_objs; \
 		mkdir -p $$TMPDIR; \
-		(cd $$TMPDIR && ar x $(JDKLIB)); \
-		ar $(ARFLAGS) $@ $$TMPDIR/*.o $^; \
+		(cd $$TMPDIR && $(AR) x $(JDKLIB)); \
+		$(AR) $(ARFLAGS) $@ $$TMPDIR/*.o $^; \
 	else \
 		echo "Existing library not found. Creating static library with object files only."; \
-		ar $(ARFLAGS) $@ $^; \
+		$(AR) $(ARFLAGS) $@ $^; \
 	fi
 endif
 
@@ -114,6 +119,8 @@ debug:
 	@echo "SRCS: $(SRCS)"
 	@echo "OBJS: $(OBJS)"
 	@echo "OBJDIR: $(OBJDIR)"
+	@echo "JDKLIB: $(JDKLIB)"
+	@echo "JAVA_HOME: $(JAVA)"
 
 
 $(OBJDIR)/$(OS)/%.o: $(SRCDIR)/%.c
@@ -125,9 +132,5 @@ $(OBJDIR)/$(OS)/%.o: $(SRCDIR)/darwin/%.m
 	@mkdir -p $(OBJDIR)/$(OS)
 	$(CC) $(CFLAGS) -c $< -o $@
 
-#$(OBJDIR)/$(OS)/%.o: $(SRCDIR)/darwin/%.m
-#@mkdir -p $(OBJDIR)/$(OS)
-#$(CC) $(CFLAGS) -c $< -o $@
-
 clean:
-	rm -rf $(OBJDIR) $(LIBDIR)
+	rm -rf $(OBJDIR) $(LIBDIR)