Skip to content

Commit 67fafdf

Browse files
authored
Merge pull request #10 from danoli3/danoli3-patch-1
V3.19.1 - Updates
2 parents 2a77aa4 + 3c7631b commit 67fafdf

File tree

857 files changed

+357093
-69267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

857 files changed

+357093
-69267
lines changed

.github/workflows/cmake.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ jobs:
2222
- windows-msvc
2323
- windows-mingw
2424
cppstandard:
25+
- 11
2526
- 17
2627
- 20
28+
- 23
29+
cstandard:
30+
- 17
2731
configuration:
2832
- Debug
2933
include:
@@ -45,11 +49,11 @@ jobs:
4549
- name: Configure (${{ matrix.configuration }})
4650
run: |
4751
if [ "${{ matrix.compiler }}" == "msvc" ]; then
48-
cmake -S . -B build -DBUILD_TESTS=ON -DCMAKE_CXX_STANDARD=${{ matrix.cppstandard }}
52+
cmake -S . -B build -DBUILD_TESTS=ON -DCMAKE_CXX_STANDARD=${{ matrix.cppstandard }} -DCMAKE_C_STANDARD=${{ matrix.cstandard }}
4953
elif [ "${{ matrix.compiler }}" == "mingw" ]; then
50-
cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DBUILD_TESTS=ON -DCMAKE_CXX_STANDARD=${{ matrix.cppstandard }} -G "MinGW Makefiles"
54+
cmake -S . -B build -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DBUILD_TESTS=ON -DCMAKE_CXX_STANDARD=${{ matrix.cppstandard }} -DCMAKE_C_STANDARD=${{ matrix.cstandard }} -G "MinGW Makefiles"
5155
else
52-
cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DBUILD_TESTS=ON -DCMAKE_CXX_STANDARD=${{ matrix.cppstandard }}
56+
cmake -S . -B build -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DBUILD_TESTS=ON -DCMAKE_CXX_STANDARD=${{ matrix.cppstandard }} -DCMAKE_C_STANDARD=${{ matrix.cstandard }}
5357
fi
5458
- name: Build with ${{ matrix.compiler }}
5559
run: |

CMakeLists.txt

Lines changed: 583 additions & 10 deletions
Large diffs are not rendered by default.

FreeImage.2003.sln

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)