Merge pull request #819 from qw-ctf/vcpkg

BUILD: Vcpkg instead of vendored binary blobs in the repo.
QW-Group · Sep 18, 2023 · c24e00c · c24e00c
2 parents 2ad44c2 + 368b6a5
commit c24e00c
Show file tree

Hide file tree

Showing 473 changed files with 150 additions and 261,371 deletions.
diff --git a/.github/workflows/build-and-deploy-release.yml b/.github/workflows/build-and-deploy-release.yml
@@ -14,13 +14,17 @@ jobs:
          - target: windows-multi-x64
            config: rls-all
            platform: x64
+           triplet: x64-windows-static
 
     steps:
     - name: Check out code
       uses: actions/checkout@v3
       with:
         submodules: true
 
+    - name: Setup vcpkg (it does not install any package yet)
+      uses: lukka/run-vcpkg@v11
+
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
 
@@ -34,7 +38,10 @@ jobs:
       run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\
 
     - name: Build ezquake
-      run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }}
+      run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }} -property:VcpkgEnableManifest=true
+      env:
+        VcpkgConfiguration: Release
+        VcpkgTriplet: ${{ matrix.triplet }}
 
     - name: Create checksum
       run: |

diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml
@@ -12,13 +12,17 @@ jobs:
          - target: windows-multi-x64
            config: rls-all
            platform: x64
+           triplet: x64-windows-static
 
     steps:
     - name: Check out code
       uses: actions/checkout@v3
       with:
         submodules: true
 
+    - name: Setup vcpkg (it does not install any package yet)
+      uses: lukka/run-vcpkg@v11
+
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
 
@@ -32,7 +36,10 @@ jobs:
       run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\
 
     - name: Build ezquake
-      run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }}
+      run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }} -property:VcpkgEnableManifest=true
+      env:
+        VcpkgConfiguration: Release
+        VcpkgTriplet: ${{ matrix.triplet }}
 
     - name: Create checksum
       run: |

diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml
@@ -12,13 +12,17 @@ jobs:
          - target: windows-multi-x64
            config: rls-all
            platform: x64
+           triplet: x64-windows-static
 
     steps:
     - name: Check out code
       uses: actions/checkout@v3
       with:
         submodules: true
 
+    - name: Setup vcpkg (it does not install any package yet)
+      uses: lukka/run-vcpkg@v11
+
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
 
@@ -32,7 +36,10 @@ jobs:
       run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\
 
     - name: Build ezquake
-      run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }}
+      run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }} -property:VcpkgEnableManifest=true
+      env:
+        VcpkgConfiguration: Release
+        VcpkgTriplet: ${{ matrix.triplet }}
 
     - name: Archive client
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/scripts/homebrew.sh b/.github/workflows/scripts/homebrew.sh
@@ -16,6 +16,7 @@ dependencies=(
     libpng
     jpeg-turbo
     libmodplug
+    minizip
     mpg123
     speex
     speexdsp

diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,9 @@ ezQuake.aps
 SysPrintf.log
 .ezquake/
 .vs
+*.json.c
+*.glsl.c
+vcpkg_installed/
+src/.msversion.h
 
 !.gitignore
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,6 @@
 	path = src/qwprot
 	url = https://github.com/QW-Group/qwprot.git
 	branch = master
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/Microsoft/vcpkg
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+ <Import Project="$(MSBuildThisFileDirectory)vcpkg\scripts\buildsystems\msbuild\vcpkg.props" />
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,3 @@
+<Project>
+ <Import Project="$(MSBuildThisFileDirectory)vcpkg\scripts\buildsystems\msbuild\vcpkg.targets" />
+</Project>
diff --git a/Makefile b/Makefile
@@ -145,6 +145,11 @@ JANSSON_LIBS ?= $(shell pkg-config jansson --libs)
 CFLAGS += $(JANSSON_CFLAGS)
 LIBS_c += $(JANSSON_LIBS)
 
+MINIZIP_CFLAGS ?= $(shell pkg-config --cflags minizip)
+MINIZIP_LIBS ?= $(shell pkg-config --libs minizip)
+CFLAGS_c += $(MINIZIP_CFLAGS)
+LIBS_c += $(MINIZIP_LIBS)
+
 SPEEX_LIBS ?= $(shell pkg-config speex --libs) $(shell pkg-config speexdsp --libs)
 ifdef SPEEX_LIBS
     CFLAGS_c += $(shell pkg-config speex --cflags) $(shell pkg-config speexdsp --cflags) -DWITH_SPEEX
@@ -554,27 +559,13 @@ LIBS_c += -lm
     endif
 endif
 
-ifeq ($(SYS),NetBSD)
-    USE_SYSTEM_MINIZIP=1
-endif
-
 #ifdef CONFIG_OGG
 #    OGG_CFLAGS ?= $(shell pkg-config vorbisfile --cflags) -DWITH_OGG_VORBIS
 #    OGG_LIBS ?= $(shell pkg-config vorbisfile --libs)
 #    CFLAGS_c += $(OGG_CFLAGS)
 #    LIBS_c += $(OGG_LIBS)
 #endif
 
-ifeq ($(USE_SYSTEM_MINIZIP),1)
-	MINIZIP_CFLAGS ?= $(shell pkg-config --cflags minizip)
-	MINIZIP_LIBS ?= $(shell pkg-config --libs minizip)
-	CFLAGS_c += $(MINIZIP_CFLAGS)
-	LIBS_c += $(MINIZIP_LIBS)
-else
-	OBJS_c += $(SRC_DIR)/minizip/ioapi.o $(SRC_DIR)/minizip/unzip.o
-	CFLAGS_c += -I$(SRC_DIR)/minizip
-endif
-
 ### Targets ###
 
 ifdef CONFIG_WINDOWS

diff --git a/README.md b/README.md
@@ -72,6 +72,12 @@ Clone the ezQuake source code:
 ```
 git clone --recurse-submodules https://github.com/ezQuake/ezquake-source.git ezquake
 ```
+
+Initialize Vcpkg, and refresh submodules if needed:
+```
+bootstrap.bat
+```
+
 Load the solution into VS, and compile your preferred target.
 
 

diff --git a/bootstrap.bat b/bootstrap.bat
@@ -0,0 +1,2 @@
+git submodule update --init --recursive
+vcpkg/bootstrap-vcpkg.bat -disableMetrics
diff --git a/build-linux.sh b/build-linux.sh
@@ -9,10 +9,10 @@ NC='\e[0m'
 
 BUILD_LOG=/tmp/ezquake-build.log
 
-PKGS_DEB="git build-essential libsdl2-2.0-0 libsdl2-dev libjansson-dev libexpat1-dev libcurl4-openssl-dev libpng-dev libjpeg-dev libspeex-dev libspeexdsp-dev libfreetype6-dev libsndfile1-dev libpcre3-dev"
-PKGS_RPM="pcre-devel mesa-libGL-devel SDL2-devel make gcc jansson-devel expat-devel libcurl-devel libpng-devel libjpeg-turbo-devel speex-devel speexdsp-devel freetype-devel libsndfile-devel libXxf86vm-devel"
-PKGS_ARCH="base-devel libpng libjpeg-turbo sdl2 expat libcurl-compat freetype2 speex speexdsp jansson libsndfile"
-PKGS_VOID="base-devel SDL2-devel pcre-devel jansson-devel expat-devel libcurl-devel libpng-devel libjpeg-turbo-devel speex-devel speexdsp-devel freetype-devel libsndfile-devel libXxf86vm-devel"
+PKGS_DEB="git build-essential libsdl2-2.0-0 libsdl2-dev libjansson-dev libexpat1-dev libcurl4-openssl-dev libpng-dev libjpeg-dev libspeex-dev libspeexdsp-dev libfreetype6-dev libsndfile1-dev libpcre3-dev libminizip-dev"
+PKGS_RPM="pcre-devel mesa-libGL-devel SDL2-devel make gcc jansson-devel expat-devel libcurl-devel libpng-devel libjpeg-turbo-devel speex-devel speexdsp-devel freetype-devel libsndfile-devel libXxf86vm-devel minizip-devel"
+PKGS_ARCH="base-devel libpng libjpeg-turbo sdl2 expat libcurl-compat freetype2 speex speexdsp jansson libsndfile minizip"
+PKGS_VOID="base-devel SDL2-devel pcre-devel jansson-devel expat-devel libcurl-devel libpng-devel libjpeg-turbo-devel speex-devel speexdsp-devel freetype-devel libsndfile-devel libXxf86vm-devel minizip"
 
 CPU=$(uname -m | sed -e s/i.86/i386/ -e s/amd64/x86_64/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)