Skip to content

Commit 64698a0

Browse files
committed
updates
1 parent 298688e commit 64698a0

File tree

5 files changed

+11
-20
lines changed

5 files changed

+11
-20
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
os-version: [2019, 2022]
11+
os-version: [2022]
1212
build-config: [debug, release, relwithdebinfo]
1313
build-arch: [Win32, x64]
1414
build-tool: ["", "-T ClangCL"]
@@ -64,33 +64,23 @@ jobs:
6464
install: gcc-13 g++-13
6565
}
6666
- {
67-
cc: clang-12,
68-
cxx: clang++-12,
69-
install: clang-12
70-
}
71-
- {
72-
cc: clang-13,
73-
cxx: clang++-13,
74-
install: clang-13
75-
}
76-
- {
77-
cc: clang-14,
78-
cxx: clang++-14,
79-
install: clang-14
67+
cc: clang-15,
68+
cxx: clang++-15,
69+
install: clang-15
8070
}
8171

8272
steps:
8373
- name: Install packages
8474
run: |
8575
sudo apt-get update
86-
sudo apt-get install -y xorg-dev nasm ${{ matrix.compiler.install }}
76+
sudo apt-get install -y xorg-dev nasm libssl-dev ${{ matrix.compiler.install }}
8777
8878
- name: Versions
8979
run: |
9080
cmake --version
81+
git --version
9182
${{ matrix.compiler.cc }} --version
9283
${{ matrix.compiler.cxx }} --version
93-
git --version
9484
9585
- uses: actions/checkout@v3
9686
with:
@@ -105,4 +95,4 @@ jobs:
10595
- name: Build
10696
run: |
10797
cd build
108-
cmake --build . --config ${{ matrix.build-config }} -- -j3
98+
cmake --build . -- -j3

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.22)
22
project(cage-template CXX C)
33

4-
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/externals/cage/cmake)
4+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cage/cmake")
55
include(cage_all)
66
cage_default_init()
77
cage_assets_add_data_path("${CMAKE_CURRENT_SOURCE_DIR}/data")

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 uCPU
3+
Copyright (c) 2024 Tomáš Malý
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

externals/cage

Submodule cage updated 262 files

sources/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ target_link_libraries(cage-template cage-simple)
99
cage_ide_category(cage-template cage-template)
1010
cage_ide_sort_files(cage-template)
1111
cage_ide_working_dir_in_place(cage-template)
12+
cage_ide_startup_project(cage-template)

0 commit comments

Comments
 (0)