Add files via upload

.github/workflows/cicd.yml

@@ -12,8 +12,8 @@ jobs:
     steps:
     - name: Update apt index
       run: sudo apt-get update -qq
-    - name: Install SFML
-      run: sudo apt-get install libsfml-dev
+    - name: Install SDL2
+      run: sudo apt-get install libsdl2-dev
     - name: Checkout EmptyEpsilon
       uses: actions/checkout@v2
     - name: Build and test
@@ -29,8 +29,9 @@ jobs:
       - name: SeriousProton Checkout
         uses: actions/checkout@v2
         with:
-          repository: daid/SeriousProton
+          repository: tsht/SeriousProton
           path: SeriousProton  
+          ref: master
       - name: EmptyEpsilon Checkout
         uses: actions/checkout@v2
         with:
@@ -39,21 +40,20 @@ jobs:
         run: |
           mkdir -p _build_win32
           cd _build_win32
-          cmake ../EmptyEpsilon -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_TOOLCHAIN_FILE=../EmptyEpsilon/cmake/mingw.toolchain -DSERIOUS_PROTON_DIR=../SeriousProton
+          cmake ../EmptyEpsilon -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_TOOLCHAIN_FILE=../EmptyEpsilon/cmake/mingw.toolchain -DSERIOUS_PROTON_DIR=../SeriousProton -DWARNING_IS_ERROR=1
           ninja package
   macos:
-    # https://github.com/actions/virtual-environments/issues/841
-    # Mac builds are flaky, disable for now.
     name: MacOS
     runs-on: macos-latest
     steps:
       - name: Dependencies
-        run: brew install cmake sfml ninja
+        run: brew install cmake sdl2 ninja
       - name: SeriousProton Checkout
         uses: actions/checkout@v2
         with:
-          repository: daid/SeriousProton
+          repository: tsht/SeriousProton
           path: SeriousProton  
+          ref: master 
       - name: EmptyEpsilon Checkout
         uses: actions/checkout@v2
         with:
@@ -62,10 +62,12 @@ jobs:
         run: |
           mkdir -p _build_macos
           cd _build_macos
-          cmake ../EmptyEpsilon -G Ninja -DSERIOUS_PROTON_DIR=../SeriousProton -DCMAKE_INSTALL_PREFIX=.
+          cmake ../EmptyEpsilon -G Ninja -DSERIOUS_PROTON_DIR=../SeriousProton -DCMAKE_INSTALL_PREFIX=. -DWARNING_IS_ERROR=1
           ninja
           ninja install
   windows:
+    #Je garde pour au cas ou
+    if: ${{ false }}
     name: Windows
     runs-on: windows-latest
     strategy:
@@ -74,29 +76,65 @@ jobs:
     steps:
       - name: Dependencies
         run: |
-          $sfml_link = “https://www.sfml-dev.org/files/SFML-2.5.1-windows-vc15-32-bit.zip”
-          $sfml_zip = "${{github.workspace}}/sfml-dev.zip"
-          (new-object System.Net.WebClient).DownloadFile($sfml_link, $sfml_zip)
-          Expand-Archive -LiteralPath $sfml_zip -DestinationPath "${{github.workspace}}/externals"
+          $sdl_version = "2.0.16"
+          $sdl_link = "https://libsdl.org/release/SDL2-devel-$sdl_version-VC.zip"
+          $sdl_zip = "$env:GITHUB_WORKSPACE/sdl-dev.zip"
+          (new-object System.Net.WebClient).DownloadFile($sdl_link, $sdl_zip)
+          Expand-Archive -LiteralPath $sdl_zip -DestinationPath "$env:GITHUB_WORKSPACE/externals"
+          $sdl_config = @"
+          set(flavor x86)
+          if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+              set(flavor x64)
+          endif()
+          set(_SDL2_prefix "`${CMAKE_CURRENT_LIST_DIR}/SDL2-$sdl_version")
+
+          add_library(SDL2::SDL2main STATIC IMPORTED)
+          set_target_properties(SDL2::SDL2main PROPERTIES
+          IMPORTED_LOCATION "`${_SDL2_prefix}/lib/`${flavor}/SDL2main.lib"
+          )
+
+          add_library(SDL2::SDL2 SHARED IMPORTED)
+          set_target_properties(SDL2::SDL2 PROPERTIES
+          IMPORTED_LOCATION "`${_SDL2_prefix}/lib/`${flavor}/SDL2.dll"
+          IMPORTED_IMPLIB "`${_SDL2_prefix}/lib/`${flavor}/SDL2.lib"
+          INTERFACE_INCLUDE_DIRECTORIES "`${_SDL2_prefix}/include"
+          )
+
+          target_link_libraries(SDL2::SDL2 INTERFACE SDL2::SDL2main)
+          "@
+          Set-Content -Path "$env:GITHUB_WORKSPACE/externals/sdl2-config.cmake" -Value $sdl_config
+          Get-Content "$env:GITHUB_WORKSPACE/externals/sdl2-config.cmake"
       - name: EmptyEpsilon Checkout
         uses: actions/checkout@v2
         with:
           path: EmptyEpsilon
       - name: SeriousProton Checkout
         uses: actions/checkout@v2
         with:
-          repository: daid/SeriousProton
+          repository: tsht/SeriousProton
           path: SeriousProton
+          ref: master
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
       - name: Configure CMake
         working-directory: ${{github.workspace}}/build
         run: >
           cmake ../EmptyEpsilon
-          -G "Visual Studio 16 2019" -A Win32
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-          -DSFML_ROOT="../externals/SFML-2.5.1"
+          -G "Visual Studio 17 2022" -A Win32
+          -DSDL2_DIR:PATH="$env:GITHUB_WORKSPACE/externals"
           -DSERIOUS_PROTON_DIR="../SeriousProton"
       - name: Build
         working-directory: ${{github.workspace}}/build
         run: cmake --build . --config ${{ matrix.build_type }} --target package 
+  luatest:
+    name: LuaTest
+    runs-on: ubuntu-latest
+    steps:
+    - name: Update apt index
+      run: sudo apt-get update -qq
+    - name: Install dependencies
+      run: sudo apt-get install lua5.3
+    - name: Checkout EmptyEpsilon
+      uses: actions/checkout@v2
+    - name: Test if lua scripts parse
+      run: find scripts/ -iname "*.lua" | xargs -P 4 -n 1 luac -p

.github/workflows/releases.yml

@@ -0,0 +1,99 @@
+---
+name: "Tagged Release"
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build-linux:
+    name: Linux Tagged Release Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dependencies
+        run: |
+          sudo apt update -qq
+          sudo apt install build-essential cmake ninja-build zip unzip libsdl2-dev
+      - name: SeriousProton Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: tsht/SeriousProton
+          path: SeriousProton  
+      - name: EmptyEpsilon Checkout
+        uses: actions/checkout@v2
+        with:
+          path: EmptyEpsilon
+      - name: Build
+        run: |
+          mkdir -p _build_linux
+          cd _build_linux
+          cmake ../EmptyEpsilon -G Ninja -DSERIOUS_PROTON_DIR=../SeriousProton
+          ninja package
+          cd .. 
+      - name: Upload Linux build
+        uses: actions/upload-artifact@v2
+        with:
+          name: linux-build
+          path: _build_linux/*.deb
+  build-windows:
+    name: Windows (Cross-Compile) Tagged Release Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dependencies
+        run: |
+          sudo apt update -qq
+          sudo apt install build-essential cmake python3-minimal mingw-w64 ninja-build p7zip-full
+      - name: SeriousProton Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: tsht/SeriousProton
+          path: SeriousProton  
+      - name: EmptyEpsilon Checkout
+        uses: actions/checkout@v2
+        with:
+          path: EmptyEpsilon
+      - name: Build
+        run: |
+          mkdir -p _build_win32
+          cd _build_win32
+          cmake ../EmptyEpsilon -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_TOOLCHAIN_FILE=../EmptyEpsilon/cmake/mingw.toolchain -DSERIOUS_PROTON_DIR=../SeriousProton
+          ninja package
+          cd .. 
+      - name: Upload Win build
+        uses: actions/upload-artifact@v2
+        with:
+          name: windows-build
+          path: _build_win32/*.zip
+
+  tagged-release-update:
+    name: "Tagged Release"
+    runs-on: ubuntu-latest
+    needs: [build-linux, build-windows]
+    steps:
+      - uses: actions/download-artifact@v2
+        name: Download Linux build
+        with:
+          name: linux-build
+      - uses: actions/download-artifact@v2
+        name: Download Windows build
+        with:
+          name: windows-build
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          files: |
+            *.zip
+            *.deb
+      - uses: geekyeggo/delete-artifact@v2
+        name: Delete Linux build
+        with:
+          name: linux-build
+          failOnError: false
+      - uses: geekyeggo/delete-artifact@v2
+        name: Delete Windows build
+        with:
+          name: windows-build
+          failOnError: false
+

.gitignore

@@ -2,7 +2,7 @@
 *.slo
 *.lo
 *.o
-*.obj
+#*.obj
 
 # Compiled Dynamic libraries
 *.so
@@ -34,9 +34,24 @@ thumbs.db
 # vim
 *.swp
 
+# gettext temp files
+*.po~
+
 options.ini
+keybindings.json
 
 
 .vscode
-logs
+*.html
 *.log
+EmptyEpsilon.cscope_file_list
+
+#build directories and temp directories
+_*
+*.orig
+logs
+_debug
+build*/
+_build*/
+cmake/_win32/
+cmake/android/

.tinyci

@@ -6,23 +6,44 @@ directory = _build_native
 commands =
     rm -rf script_reference.html
     cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_BUILD_TYPE=RelWithDebInfo
-    cmake --build . --target package
+    ninja -j 2 package
 artifacts = EmptyEpsilon.deb
 
 [build-win32]
 directory = _build_win32
 commands =
     rm -rf script_reference.html
     cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw.toolchain -DCMAKE_BUILD_TYPE=RelWithDebInfo
-    cmake --build . --target package
+    ninja -j 2 package
 artifacts = EmptyEpsilon.zip
 
+[build-linux-steam]
+directory = _build_native_steam
+commands =
+    rm -rf script_reference.html
+    cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTEAMSDK=/data/steamsdk/
+    ninja -j 2 package
+
+[build-win32-steam]
+directory = _build_win32_steam
+commands =
+    rm -rf script_reference.html
+    cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw.toolchain -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTEAMSDK=/data/steamsdk/
+    ninja -j 2 package
+
 [build-android]
 directory = _build_android
 commands =
     cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain -DCMAKE_BUILD_TYPE=Release
-    cmake --build .
-artifacts = EmptyEpsilon.apk
+    ninja -j 2
+artifacts = EmptyEpsilon-armeabi-v7a.apk
+
+[build-android64]
+directory = _build_android64
+commands =
+    cmake .. -G Ninja -DSERIOUS_PROTON_DIR=../../SeriousProton -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI=arm64-v8a
+    ninja -j 2
+artifacts = EmptyEpsilon-arm64-v8a.apk
 
 [repos-daid/SeriousProton]
 required = True