trying to fix .github, minor code refactor

dedztbh · Apr 21, 2024 · c793af3 · c793af3
1 parent ac89018
commit c793af3
Show file tree

Hide file tree

Showing 12 changed files with 227 additions and 220 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -29,7 +29,7 @@ runs:
   steps:
 # Android only
     - name: Android - Set up Java 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       if: ${{ inputs.platform == 'android' }}
       with:
         distribution: temurin
@@ -39,7 +39,7 @@ runs:
       uses: nttld/setup-ndk@v1
       if: ${{ inputs.platform == 'android' }}
       with:
-        ndk-version: r23c
+        ndk-version: r26
         link-to-sdk: true
 # Linux only
     - name: Linux - dependencies
@@ -51,7 +51,7 @@ runs:
 # Web only
     - name: Web - Set up Emscripten latest
       if: ${{ inputs.platform == 'web' }}
-      uses: mymindstorm/setup-emsdk@v13
+      uses: mymindstorm/setup-emsdk@v14
       with:
         version: ${{ inputs.em_version }}
         actions-cache-folder: ${{ inputs.em_cache_folder }}.${{ inputs.float-precision }}.${{ inputs.build-target-type }}

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  LIBNAME: example
+  LIBNAME: lifepvp
 
 jobs:
   build:
@@ -15,7 +15,7 @@ jobs:
           - platform: linux
             float-precision: single
             arch: x86_64
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: windows
             float-precision: single
             arch: x86_32
@@ -24,39 +24,39 @@ jobs:
             float-precision: single
             arch: x86_64
             os: windows-latest
-          - platform: macos
-            float-precision: single
-            arch: universal
-            os: macos-latest
+          # - platform: macos
+          #   float-precision: single
+          #   arch: universal
+          #   os: macos-latest
           - platform: android
             float-precision: single
             arch: arm64
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: android
             float-precision: single
             arch: arm32
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: android
             float-precision: single
             arch: x86_64
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: android
             float-precision: single
             arch: x86_32
-            os: ubuntu-20.04
-          - platform: ios
-            float-precision: single
-            arch: arm64
-            os: macos-latest
+            os: ubuntu-22.04
+          # - platform: ios
+          #   float-precision: single
+          #   arch: arm64
+          #   os: macos-latest
           - platform: web
             float-precision: single
             arch: wasm32
-            os: ubuntu-20.04
+            os: ubuntu-22.04
 
           - platform: linux
             float-precision: double
             arch: x86_64
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: windows
             float-precision: double
             arch: x86_32
@@ -65,34 +65,34 @@ jobs:
             float-precision: double
             arch: x86_64
             os: windows-latest
-          - platform: macos
-            float-precision: double
-            arch: universal
-            os: macos-latest
+          # - platform: macos
+          #   float-precision: double
+          #   arch: universal
+          #   os: macos-latest
           - platform: android
             float-precision: double
             arch: arm64
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: android
             float-precision: double
             arch: arm32
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: android
             float-precision: double
             arch: x86_64
-            os: ubuntu-20.04
+            os: ubuntu-22.04
           - platform: android
             float-precision: double
             arch: x86_32
-            os: ubuntu-20.04
-          - platform: ios
-            float-precision: double
-            arch: arm64
-            os: macos-latest
+            os: ubuntu-22.04
+          # - platform: ios
+          #   float-precision: double
+          #   arch: arm64
+          #   os: macos-latest
           - platform: web
             float-precision: double
             arch: wasm32
-            os: ubuntu-20.04
+            os: ubuntu-22.04
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -118,20 +118,20 @@ jobs:
           float-precision: ${{ matrix.float-precision }}
           build-target-type: template_release
 # Sign
-      - name: Mac Sign
-        # Disable sign if secrets are not set
-        if: ${{ matrix.platform == 'macos' && env.APPLE_CERT_BASE64 }}
-        env:
-          APPLE_CERT_BASE64: ${{ secrets.APPLE_CERT_BASE64 }}
-        uses: ./.github/actions/sign
-        with:
-          FRAMEWORK_PATH: bin/macos/macos.framework
-          APPLE_CERT_BASE64: ${{ secrets.APPLE_CERT_BASE64 }}
-          APPLE_CERT_PASSWORD: ${{ secrets.APPLE_CERT_PASSWORD }}
-          APPLE_DEV_PASSWORD: ${{ secrets.APPLE_DEV_PASSWORD }}
-          APPLE_DEV_ID: ${{ secrets.APPLE_DEV_ID }}
-          APPLE_DEV_TEAM_ID: ${{ secrets.APPLE_DEV_TEAM_ID }}
-          APPLE_DEV_APP_ID: ${{ secrets.APPLE_DEV_APP_ID }}
+      # - name: Mac Sign
+      #   # Disable sign if secrets are not set
+      #   if: ${{ matrix.platform == 'macos' && env.APPLE_CERT_BASE64 }}
+      #   env:
+      #     APPLE_CERT_BASE64: ${{ secrets.APPLE_CERT_BASE64 }}
+      #   uses: ./.github/actions/sign
+      #   with:
+      #     FRAMEWORK_PATH: bin/macos/macos.framework
+      #     APPLE_CERT_BASE64: ${{ secrets.APPLE_CERT_BASE64 }}
+      #     APPLE_CERT_PASSWORD: ${{ secrets.APPLE_CERT_PASSWORD }}
+      #     APPLE_DEV_PASSWORD: ${{ secrets.APPLE_DEV_PASSWORD }}
+      #     APPLE_DEV_ID: ${{ secrets.APPLE_DEV_ID }}
+      #     APPLE_DEV_TEAM_ID: ${{ secrets.APPLE_DEV_TEAM_ID }}
+      #     APPLE_DEV_APP_ID: ${{ secrets.APPLE_DEV_APP_ID }}
 
       - name: Windows - Delete compilation files
         if: ${{ matrix.platform == 'windows' }}

diff --git a/SConstruct b/SConstruct
@@ -50,7 +50,17 @@ env.Alias("compiledb", compilation_db)
 
 env = SConscript("godot-cpp/SConstruct", {"env": env, "customs": customs})
 
-env.Append(CXXFLAGS=["-std=c++20"])
+# Use user provided CXX if needed
+if "CXX" in os.environ:
+    env["CXX"] = os.environ["CXX"]
+
+if env["platform"] == "windows":
+    env.Append(CXXFLAGS=["/std:c++20"])
+else:
+    env.Append(CXXFLAGS=["-std=c++20"])
+
+print("Platform:", env["platform"])
+print("C++ Compiler:", env["CXX"])
 
 env.Append(CPPPATH=["src/"])
 sources = Glob("src/*.cpp")

diff --git a/game/License.gd b/game/License.gd
@@ -4,6 +4,7 @@ extends Label
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	text = Engine.get_license_text()
+	visible = false
 
 
 func _unhandled_input(event):

diff --git a/game/main.tscn b/game/main.tscn
@@ -17,8 +17,10 @@ offset_bottom = 31.0
 script = ExtResource("2_avnxl")
 
 [node name="License" type="Label" parent="CanvasLayer"]
-offset_right = 40.0
-offset_bottom = 23.0
+offset_left = 6.0
+offset_top = 42.0
+offset_right = 46.0
+offset_bottom = 65.0
 script = ExtResource("2_qsvb4")
 
 [node name="Camera2D" type="Camera2D" parent="."]

diff --git a/src/basic_engine.h b/src/basic_engine.h