Merge pull request #15 from AKuHAK/master

Various fixes
ps2homebrew · Jul 9, 2024 · 5b5f9ac · 5b5f9ac
2 parents 247cfa5 + 9779a91
commit 5b5f9ac
Show file tree

Hide file tree

Showing 32 changed files with 1,923 additions and 820 deletions.
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -11,57 +11,121 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup msbuild
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Build
         run: msbuild /p:PlatformToolset=v142 /p:Configuration=Release
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: PMAP.exe
+          name: PMAP-wincli
           path: Release/PMAP.exe
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: PMAP-win.exe
+          name: PMAP-wingui
           path: Release/PMAP-win.exe
 
-      - name: Create release
+  build-macos:
+    name: PMAP macos compilation
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Build
+        run: |
+          cd PMAP-unix
+          make
+          tar -zcvf PMAP-macos.tar.gz pmap
+
+      - name: Build id
+        run: |
+          cd PMAP-unix
+          make clean
+          make ID_MANAGEMENT=1
+          tar -zcvf PMAP-macos-id.tar.gz pmap
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: PMAP-macos
+          path: PMAP-unix/PMAP-macos.tar.gz
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: PMAP-macos-id
+          path: PMAP-unix/PMAP-macos-id.tar.gz
+
+  build-linux:
+    name: PMAP linux compilation
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Build
+        run: |
+          cd PMAP-unix
+          make
+          tar -zcvf PMAP-linux.tar.gz pmap
+
+      - name: Build id
+        run: |
+          cd PMAP-unix
+          make clean
+          make ID_MANAGEMENT=1
+          tar -zcvf PMAP-linux-id.tar.gz pmap
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: PMAP-linux
+          path: PMAP-unix/PMAP-linux.tar.gz
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: PMAP-linux-id
+          path: PMAP-unix/PMAP-linux-id.tar.gz
+
+  create-release:
+    name: Create release
+    runs-on: ubuntu-latest
+    needs: [build-win, build-macos, build-linux]
+    steps:
+      - uses: actions/download-artifact@v4
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Create release for master/main
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
         uses: marvinpinto/action-automatic-releases@latest
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "latest"
           title: "Latest development build"
-          files: Release/PMAP.exe
+          files: |
+            ./PMAP-wincli/PMAP.exe
+            ./PMAP-wingui/PMAP-win.exe
+            ./PMAP-macos/PMAP-macos.tar.gz
+            ./PMAP-macos-id/PMAP-macos-id.tar.gz
+            ./PMAP-linux/PMAP-linux.tar.gz
+            ./PMAP-linux-id/PMAP-linux-id.tar.gz
 
-      - name: Create release
+      - name: Create release for tagged versions
         if: startsWith(github.ref, 'refs/tags/v')
         uses: marvinpinto/action-automatic-releases@latest
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: "${{ contains(github.ref, '-rc') }}"
           title: PMAP-${{ github.ref }}
-          files: Release/PMAP.exe
-
-  # build-linux:
-  #   name: PMAP linux compilation
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: Checkout Repository
-  #       uses: actions/checkout@v3
-
-  #     - name: Build
-  #       run: |
-  #         cd PMAP-linux
-  #         make
-  #         tar -zcvf pmap.tar.gz pmap
-
-  #     - uses: actions/upload-artifact@v3
-  #       with:
-  #         name: PMAP
-  #         path: linux/pmap.tar.gz
+          files: |
+            ./release/win/PMAP.exe
+            ./release/win/PMAP-win.exe
+            ./release/macos/PMAP-macos.tar.gz
+            ./release/macos/PMAP-macos-id.tar.gz
+            ./release/linux/PMAP-linux.tar.gz
+            ./release/linux/PMAP-linux-id.tar.gz
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,8 @@
 .vs
 Debug
 Release
+PMAP-unix/pmap
+PMAP-linux/pmap
 
 !.github
 !.editorconfig

diff --git a/PMAP-linux/Makefile b/PMAP-linux/Makefile
diff --git a/PMAP-linux/platform-linux.c b/PMAP-linux/platform-linux.c
diff --git a/PMAP-linux/platform.h b/PMAP-linux/platform.h
diff --git a/PMAP-unix/Makefile b/PMAP-unix/Makefile
@@ -0,0 +1,18 @@
+VPATH = ./:../base/
+
+ELF = pmap
+CFLAGS ?= -O2
+CPPFLAGS = -I.
+OBJS += eeprom-main.o eeprom.o elect.o elect-main.o mecha-main.o mecha.o updates.o platform-unix.o
+OBJS += main.o
+# Add -DID_MANAGEMENT when ID_MANAGEMENT is defined
+ifdef ID_MANAGEMENT
+CPPFLAGS += -DID_MANAGEMENT
+OBJS += eeprom-id.o id-main.o
+endif
+
+$(ELF): $(OBJS)
+	$(CC) -o $(ELF) $(OBJS)
+
+clean:
+	rm -f $(ELF) $(OBJS) eeprom-id.o id-main.o