-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
0 parents
commit 61ed504
Showing
22 changed files
with
548 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# Заставляем 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
name: CI/CD | ||
|
||
on: | ||
push: | ||
pull_request: | ||
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 -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 | ||
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 -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[@]}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# https://git-scm.com/docs/gitignore | ||
# https://www.atlassian.com/ru/git/tutorials/saving-changes/gitignore | ||
|
||
# Игнорируем папки, которые создаёт VS Code | ||
/.vscode/ | ||
/build/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
[submodule "external/dviglo2d"] | ||
path = external/dviglo2d | ||
url = https://github.com/dviglo2d/dviglo2d | ||
[submodule "external/dv_big_int"] | ||
path = external/dv_big_int | ||
url = https://github.com/dviglo2d/dv_big_int |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Путь к исходникам движка | ||
set(engine_dir "${CMAKE_SOURCE_DIR}/external/dviglo2d") | ||
|
||
# Указываем минимальную версию CMake | ||
include(${engine_dir}/cmake/cmake_min_version.cmake) | ||
cmake_minimum_required(VERSION ${dv_cmake_min_version}) | ||
|
||
# Название проекта | ||
project(stuff) | ||
|
||
include(${engine_dir}/cmake/common.cmake) | ||
|
||
# Папка для скомпилированных проектов | ||
set(result_dir "${CMAKE_BINARY_DIR}/result") | ||
|
||
# Создаём папку result | ||
file(MAKE_DIRECTORY ${result_dir}) | ||
|
||
# Указываем папку для следующих скомпилированных экзешников | ||
dv_set_bin_dir(${result_dir}) | ||
|
||
# Подключаем библиотеки | ||
add_subdirectory(external) | ||
|
||
add_subdirectory(games) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/bin/sh | ||
|
||
repo_dir=$(dirname "$0") | ||
|
||
git -C "$repo_dir" submodule add https://github.com/dviglo2d/dviglo2d external/dviglo2d | ||
git -C "$repo_dir" submodule add https://github.com/dviglo2d/dv_big_int external/dv_big_int | ||
git -C "$repo_dir" submodule update --init --recursive |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#!/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") | ||
|
||
# Генерируем проект | ||
cmake "$repo_dir" -B "$repo_dir/../build" -G "Unix Makefiles" $build_type $compiler | ||
|
||
# Компилируем проект | ||
cmake --build "$repo_dir/../build" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
:: Удаляем обратный слэш в конце | ||
set "repo_dir=%repo_dir:~0,-1%" | ||
|
||
:: Генерируем проект | ||
cmake "%repo_dir%" -B "%repo_dir%/../build_mingw" -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=%build_type% | ||
|
||
:: Компилируем проект | ||
cmake --build "%repo_dir%/../build_mingw" | ||
|
||
:: Ждём нажатие Enter перед закрытием консоли | ||
pause |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
:: Удаляем обратный слэш в конце | ||
set "repo_dir=%repo_dir:~0,-1%" | ||
|
||
:: Генерируем проект | ||
cmake "%repo_dir%" -B "%repo_dir%/../build_vs" -G "%generator%" -A x64 | ||
|
||
:: Компилируем проект | ||
cmake --build "%repo_dir%/../build_vs" --config %build_type% | ||
|
||
:: Ждём нажатие Enter перед закрытием консоли | ||
pause |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
add_subdirectory(dv_big_int EXCLUDE_FROM_ALL) | ||
add_subdirectory(dviglo2d EXCLUDE_FROM_ALL) |
Submodule dv_big_int
added at
36c116
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# Помещаем игры в отдельный проект | ||
project(games) | ||
|
||
# В IDE таргеты будут отображаться в папке игры | ||
set(CMAKE_FOLDER игры) | ||
|
||
# Создаём папку result | ||
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/result) | ||
|
||
# Указываем папку для следующих скомпилированных экзешников | ||
dv_set_bin_dir(${result_dir}) | ||
|
||
# Добавляем все папки | ||
dv_add_all_subdirs() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
# Название таргета | ||
set(target_name clicker) | ||
|
||
# Создаём список файлов | ||
file(GLOB_RECURSE source_files src/*.cpp src/*.hpp) | ||
|
||
# Создаём приложение | ||
add_executable(${target_name} ${source_files}) | ||
|
||
if(NOT DV_WIN32_CONSOLE) | ||
# Используем точку входа WinMain() | ||
set_property(TARGET ${target_name} PROPERTY WIN32_EXECUTABLE TRUE) | ||
endif() | ||
|
||
# Отладочная версия приложения будет иметь суффикс _d | ||
set_property(TARGET ${target_name} PROPERTY DEBUG_POSTFIX _d) | ||
|
||
# Подключаем библиотеки | ||
target_link_libraries(${target_name} PRIVATE dviglo dv_big_int) | ||
|
||
# Копируем динамические библиотеки в папку с приложением | ||
dv_copy_shared_libs_to_bin_dir(${target_name} ${result_dir} copy_shared_libs_to_app_dir) | ||
|
||
# Список папок с ресурсами движка для копирования в result | ||
set(dir_names engine_data samples_data) | ||
|
||
# Копируем папки с ресурсами движка в result, если нужно | ||
foreach(dir_name ${dir_names}) | ||
if(NOT EXISTS ${result_dir}/${dir_name}) | ||
dv_create_dir_link(${engine_dir}/result/${dir_name} ${result_dir}/${dir_name}) | ||
endif() | ||
endforeach() | ||
|
||
# Заставляем VS отображать дерево каталогов | ||
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src FILES ${source_files}) | ||
|
||
# Добавляем приложение в список тестируемых | ||
add_test(NAME ${target_name} COMMAND ${target_name} -duration 5) |
Oops, something went wrong.