Склеенные коммиты

dviglo2d-learn · Nov 11, 2024 · 2aa521c · 2aa521c
commit 2aa521c
Show file tree

Hide file tree

Showing 45 changed files with 5,789 additions and 0 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+# Заставляем VS и другие IDE сохранять файлы в кодировке UTF-8
+# https://editorconfig.org
+
+# В родительских папках .editorconfig искаться не будет
+root = true
+
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+# Не меняет формат концов строк. Может возникнуть конфликт с настройками git
+#end_of_line = lf
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,8 @@
+# Автоматически нормализуем концы строк, если у пользователя не настроен параметр autocrlf
+# https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings
+# https://www.aleksandrhovhannisyan.com/blog/crlf-vs-lf-normalizing-line-endings-in-git/
+* text=auto
+
+# Батники с юниксовыми концами строк глючат
+*.bat text eol=crlf
+*.cmd text eol=crlf
diff --git a/.github/workflows/big_int.yml b/.github/workflows/big_int.yml
@@ -0,0 +1,122 @@
+name: BigInt
+
+on:
+  push:
+    paths: 'libs/big_int/**'
+  pull_request:
+    paths: 'libs/big_int/**'
+  workflow_dispatch:
+
+jobs:
+  linux:
+    runs-on: ubuntu-24.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+        - {
+            id: gcc,
+            c: gcc-13,
+            cxx: g++-13,
+          }
+        - {
+            id: clang,
+            c: clang-16,
+            cxx: clang++-16,
+          }
+        build_type: [debug, release]
+
+    name: 🐧-${{ matrix.compiler.id }}-${{ matrix.build_type }}
+
+    steps:
+    - name: Скачиваем репозиторий
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+        path: repo
+
+    - name: Генерируем проекты
+      run: |
+        cmake repo/libs/big_int -B build -G "Unix Makefiles" \
+          -D CMAKE_C_COMPILER=${{ matrix.compiler.c }} -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
+          -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
+
+    - name: Компилируем
+      run: |
+        cmake --build build
+
+    - name: CTest
+      run: |
+        ctest --verbose --test-dir build --timeout 60
+
+  windows:
+    runs-on: windows-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [vs, mingw]
+        build_type: [debug, release]
+
+    name: 🔲-${{ matrix.compiler }}-${{ matrix.build_type }}
+
+    steps:
+    - name: Устанавливаем MinGW
+      if: matrix.compiler == 'mingw'
+      uses: msys2/setup-msys2@v2
+      with:
+        update: true
+        install: mingw-w64-x86_64-toolchain
+
+    - name: Добавляем в PATH путь к MinGW
+      if: matrix.compiler == 'mingw'
+      shell: bash
+      run: echo "${RUNNER_TEMP}/msys64/mingw64/bin" >> $GITHUB_PATH
+
+    - name: Скачиваем репозиторий
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+        path: repo
+
+    - name: Генерируем проекты
+      shell: bash
+      run: |
+        args=(repo/libs/big_int -B build)
+
+        if [ "${{ matrix.compiler }}" == "vs" ]
+        then
+          args+=(-G "Visual Studio 17 2022")
+        else
+          args+=(-G "MinGW Makefiles")
+          args+=(-D CMAKE_BUILD_TYPE=${{ matrix.build_type }})
+        fi
+
+        cmake "${args[@]}"
+
+    - name: Компилируем
+      shell: bash
+      run: |
+        args=(--build build)
+
+        if [ "${{ matrix.compiler }}" == "vs" ]
+        then
+          args+=(--config ${{ matrix.build_type }})
+        fi
+
+        cmake "${args[@]}"
+
+    - name: CTest
+      shell: bash
+      run: |
+        args=(--verbose --test-dir build --timeout 60)
+
+        if [ "${{ matrix.compiler }}" == "vs" ]
+        then
+          args+=(-C ${{ matrix.build_type }})
+        fi
+
+        ctest "${args[@]}"
diff --git a/.github/workflows/clicker.yml b/.github/workflows/clicker.yml
@@ -0,0 +1,143 @@
+name: Clicker
+
+on:
+  push:
+    paths: 'games/clicker/**'
+  pull_request:
+    paths: 'games/clicker/**'
+  workflow_dispatch:
+
+jobs:
+  linux:
+    runs-on: ubuntu-24.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+        - {
+            id: gcc,
+            c: gcc-13,
+            cxx: g++-13,
+          }
+        - {
+            id: clang,
+            c: clang-16,
+            cxx: clang++-16,
+          }
+        build_type: [debug, release]
+
+    name: 🐧-${{ matrix.compiler.id }}-${{ matrix.build_type }}
+
+    steps:
+    - name: Устанавливаем зависимости
+      run: |
+        sudo apt update
+        sudo apt install libgl1-mesa-dev libxrandr-dev
+
+    - name: Скачиваем репозиторий
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+        path: repo
+
+    - name: Генерируем проекты
+      run: |
+        cmake repo/games/clicker -B build -G "Unix Makefiles" \
+          -D CMAKE_C_COMPILER=${{ matrix.compiler.c }} -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
+          -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          -D DV_ALL_WARNINGS=1 -D DV_CTEST=1
+
+    - name: Компилируем
+      run: |
+        cmake --build build
+
+    - name: CTest
+      shell: bash
+      run: |
+        xvfb-run ctest --verbose --test-dir build --timeout 60
+
+  windows:
+    runs-on: windows-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [vs, mingw]
+        build_type: [debug, release]
+
+    name: 🔲-${{ matrix.compiler }}-${{ matrix.build_type }}
+
+    steps:
+    - name: Устанавливаем MinGW
+      if: matrix.compiler == 'mingw'
+      uses: msys2/setup-msys2@v2
+      with:
+        update: true
+        install: mingw-w64-x86_64-toolchain
+
+    - name: Добавляем в PATH путь к MinGW
+      if: matrix.compiler == 'mingw'
+      shell: bash
+      run: echo "${RUNNER_TEMP}/msys64/mingw64/bin" >> $GITHUB_PATH
+
+    - name: Скачиваем репозиторий
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+        path: repo
+
+    - name: Генерируем проекты
+      shell: bash
+      run: |
+        args=(repo/games/clicker -B build)
+
+        if [ "${{ matrix.compiler }}" == "vs" ]
+        then
+          args+=(-G "Visual Studio 17 2022")
+        else
+          args+=(-G "MinGW Makefiles")
+          args+=(-D CMAKE_BUILD_TYPE=${{ matrix.build_type }})
+        fi
+
+        args+=(-D DV_ALL_WARNINGS=1 -D DV_CTEST=1)
+
+        cmake "${args[@]}"
+
+    - name: Компилируем
+      shell: bash
+      run: |
+        args=(--build build)
+
+        if [ "${{ matrix.compiler }}" == "vs" ]
+        then
+          args+=(--config ${{ matrix.build_type }})
+        fi
+
+        cmake "${args[@]}"
+
+    - name: Качаем Mesa
+      shell: bash
+      run: |
+        curl.exe --location --output mesa.7z --url https://github.com/pal1000/mesa-dist-win/releases/download/22.2.3/mesa3d-22.2.3-release-msvc.7z
+        7z x mesa.7z -omesa
+        rm mesa.7z
+
+        mv mesa/x64/libgallium_wgl.dll build/result
+        mv mesa/x64/libglapi.dll build/result
+        mv mesa/x64/opengl32.dll build/result
+
+    - name: CTest
+      shell: bash
+      run: |
+        args=(--verbose --test-dir build --timeout 60)
+
+        if [ "${{ matrix.compiler }}" == "vs" ]
+        then
+          args+=(-C ${{ matrix.build_type }})
+        fi
+
+        export LIBGL_ALWAYS_SOFTWARE=true
+        ctest "${args[@]}"
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs/dviglo2d"]
+	path = libs/dviglo2d
+	url = https://github.com/dviglo2d/dviglo2d
diff --git a/add_submodules.sh b/add_submodules.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+repo_dir=$(dirname "$0")
+
+git -C "$repo_dir" submodule add https://github.com/dviglo2d/dviglo2d libs/dviglo2d
diff --git a/build_all_linux.sh b/build_all_linux.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+build_type="-D CMAKE_BUILD_TYPE=Debug"
+#build_type="-D CMAKE_BUILD_TYPE=Release"
+#build_type="-D CMAKE_BUILD_TYPE=MinSizeRel"
+#build_type="-D CMAKE_BUILD_TYPE=RelWithDebInfo"
+
+compiler="-D CMAKE_C_COMPILER=gcc-13 -D CMAKE_CXX_COMPILER=g++-13"
+#compiler="-D CMAKE_C_COMPILER=clang-15 -D CMAKE_CXX_COMPILER=clang++-15"
+
+repo_dir=$(dirname "$0")
+
+# BigInt
+cmake "$repo_dir/libs/big_int" -B "$repo_dir/../build/big_int" -G "Unix Makefiles" $build_type $compiler
+cmake --build "$repo_dir/../build/big_int"
+
+# Clicker
+cmake "$repo_dir/games/clicker" -B "$repo_dir/../build/clicker" -G "Unix Makefiles" $build_type $compiler
+cmake --build "$repo_dir/../build/clicker"
diff --git a/build_all_mingw.bat b/build_all_mingw.bat
@@ -0,0 +1,23 @@
+:: Меняем кодировку консоли на UTF-8
+chcp 65001
+
+:: Указываем путь к cmake.exe и MinGW. Без system32 в PATH ссылки на папки не создаются 
+set "PATH=%SystemRoot%\system32;c:\programs\cmake\bin;c:\msys64\ucrt64\bin"
+
+set build_type=Debug
+::set build_type=Release
+::set build_type=MinSizeRel
+::set build_type=RelWithDebInfo
+
+set "repo_dir=%~dp0"
+
+:: BigInt
+cmake "%repo_dir%libs/big_int" -B "%repo_dir%../build/big_int/mingw" -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=%build_type%
+cmake --build "%repo_dir%../build/big_int/mingw"
+
+:: Clicker
+cmake "%repo_dir%games/clicker" -B "%repo_dir%../build/clicker/mingw" -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=%build_type%
+cmake --build "%repo_dir%../build/clicker/mingw" --config %build_type%
+
+:: Ждём нажатие Enter перед закрытием консоли
+pause
diff --git a/build_all_vs.bat b/build_all_vs.bat
@@ -0,0 +1,25 @@
+:: Меняем кодировку консоли на UTF-8
+chcp 65001
+
+:: Указываем путь к cmake.exe. Без system32 в PATH ссылки на папки не создаются 
+set "PATH=%SystemRoot%\system32;c:\programs\cmake\bin"
+
+set build_type=Debug
+::set build_type=Release
+::set build_type=MinSizeRel
+::set build_type=RelWithDebInfo
+
+set "generator=Visual Studio 17"
+
+set "repo_dir=%~dp0"
+
+:: BigInt
+cmake "%repo_dir%libs/big_int" -B "%repo_dir%../build/big_int/vs" -G "%generator%" -A x64
+cmake --build "%repo_dir%../build/big_int/vs" --config %build_type%
+
+:: Clicker
+cmake "%repo_dir%games/clicker" -B "%repo_dir%../build/clicker/vs" -G "%generator%" -A x64
+cmake --build "%repo_dir%../build/clicker/vs" --config %build_type%
+
+:: Ждём нажатие Enter перед закрытием консоли
+pause