Merge branch 'andrei-drexler:master' into aspect-ratio-desktop-fullsc…

…reen
andrei-drexler · May 23, 2024 · f15b9fa · f15b9fa
2 parents 3135fc0 + b444798
commit f15b9fa
Show file tree

Hide file tree

Showing 64 changed files with 11,934 additions and 1,045 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,3 +3,4 @@ root = true
 [*]
 indent_style = tab
 indent_size = 4
+cpp_space_before_function_open_parenthesis = insert
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         compiler: ["clang", "gcc"]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: sudo apt update && sudo apt install libcurl4-openssl-dev libmad0-dev libsdl2-dev libvorbis-dev
     - name: Build

diff --git a/.github/workflows/macos_ci.yml b/.github/workflows/macos_ci.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: brew install libvorbis mad sdl2
     - name: Build

diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         platform: [x64, Win32]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set environment variables
       run: |
         $gitrev = $(git describe --always)
@@ -49,7 +49,7 @@ jobs:
             copy Quakespasm-Music.txt $zipdir
             copy LICENSE.txt $zipdir
     - name: Upload archive
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.BUILD_ARTIFACT }}
         path: artifact/*
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 Windows/VisualStudio/.vs/
 Windows/VisualStudio/Build-*/
+Windows/VisualStudio/ironwail.vcxproj.user
 Quake/*.o
 Quake/*.d
 Quake/*.res

diff --git a/Quake/Makefile b/Quake/Makefile
@@ -56,7 +56,9 @@ CPUFLAGS=
 LDFLAGS?=
 DFLAGS ?=
 CFLAGS ?= -Wall -Wno-trigraphs
+CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += $(call check_gcc,-std=gnu11,)
+CFLAGS += $(call check_gcc,-Werror=format,)
 CFLAGS += $(CPUFLAGS)
 ifneq ($(DEBUG),0)
 DFLAGS += -DDEBUG

diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
@@ -53,7 +53,9 @@ CPUFLAGS=
 LDFLAGS?= -m32 -mwindows -static-libgcc
 DFLAGS ?=
 CFLAGS ?= -m32 -Wall -Wno-trigraphs
+CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += $(call check_gcc,-std=gnu11,)
+CFLAGS += $(call check_gcc,-Werror=format,)
 CFLAGS += $(CPUFLAGS)
 ifneq ($(DEBUG),0)
 DFLAGS += -DDEBUG

diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
@@ -51,7 +51,9 @@ CPUFLAGS=
 LDFLAGS?= -m64 -mwindows -static-libgcc
 DFLAGS ?=
 CFLAGS ?= -m64 -Wall -Wno-trigraphs
+CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += $(call check_gcc,-std=gnu11,)
+CFLAGS += $(call check_gcc,-Werror=format,)
 CFLAGS += $(CPUFLAGS)
 ifneq ($(DEBUG),0)
 DFLAGS += -DDEBUG