qw-ctf · dsvensson · May 31, 2020 · Jun 1, 2020 · Jun 1, 2020 · Jun 1, 2020
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,77 @@
+name: ezquake
+
+on: [push, workflow_dispatch]
+
+jobs:
+  windows-build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - uses: microsoft/setup-msbuild@v1.1
+
+      - run: msbuild -m -p:Configuration=rls-all,Platform=x64
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ezquake-latest-windows
+          path: |
+            ezquake.exe
+  linux-build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get number of CPU cores
+        uses: SimenB/github-actions-cpu-cores@v1
+        id: cpu-cores
+
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: "Install dependencies"
+        run: |
+          sudo apt-get -qq update
+          sudo apt-get -qq install --no-install-recommends gcc make libsdl2-dev libsndfile-dev libjansson-dev libspeex-dev libexpat1-dev libspeexdsp-dev libcurl4-openssl-dev libjpeg-dev libpng-dev
+
+      - name: "Build"
+        run: |
+          make -j${{ steps.cpu-cores.outputs.count }}
+          make strip
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ezquake-latest-linux
+          path: |
+            ezquake-linux-x86_64-camquake
+  macos-build:
+    runs-on: macos-12
+
+    steps:
+      - name: Get number of CPU cores
+        uses: SimenB/github-actions-cpu-cores@v1
+        id: cpu-cores
+
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install dependencies
+        run: .github/workflows/scripts/homebrew.sh install-intel
+
+      - name: Build
+        run: .github/workflows/scripts/homebrew.sh build-intel
+
+      - name: Create Bundle
+        run: .github/workflows/scripts/homebrew.sh create-bundle
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ezquake-latest-macos-x86_64
+          path: |
+            artifact
diff --git a/.github/workflows/scripts/homebrew.sh b/.github/workflows/scripts/homebrew.sh
@@ -54,6 +54,8 @@ function install_intel() {
 }
 
 function create_bundle() {
+    mv ezquake-darwin-x86_64-camquake ezquake-darwin-x86_64
+
     sh misc/install/create_osx_bundle.sh
 
     echo

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/qwprot"]
 	path = src/qwprot
-	url = https://github.com/QW-Group/qwprot.git
+	url = https://github.com/qw-ctf/qwprot.git
diff --git a/Makefile b/Makefile
@@ -570,6 +570,21 @@ else
 	CFLAGS_c += -Iminizip
 endif
 
+CAMQUAKE = 1
+
+ifdef CAMQUAKE
+    EZ_POSTFIX := "-camquake"
+    OBJS_c += $(SRC_DIR)/camquake/camquake.o
+    OBJS_c += $(SRC_DIR)/camquake/camquake_path.o
+    OBJS_c += $(SRC_DIR)/camquake/camquake_setup.o
+    OBJS_c += $(SRC_DIR)/camquake/camquake_command.o
+    OBJS_c += $(SRC_DIR)/camquake/camquake_glc.o
+    OBJS_c += $(SRC_DIR)/camquake/camquake_input.o
+    OBJS_c += $(SRC_DIR)/camquake/camquake_2d.o
+    OBJS_c += $(SRC_DIR)/camquake/camquake_event.o
+    CFLAGS += -DCAMQUAKE
+endif
+
 ### Targets ###
 
 ifdef CONFIG_WINDOWS

diff --git a/README.md b/README.md
@@ -1,217 +1,12 @@
-# ezQuake — Modern QuakeWorld Client
-[![Build Status](https://travis-ci.org/ezQuake/ezquake-source.svg?branch=master)](https://travis-ci.org/ezQuake/ezquake-source)
+# camQuake
 
-Homepage: [https://ezquake.com][homepage]
+Some very sharp corners.
 
-Community discord: [http://discord.quake.world][discord]
+## Introduction
 
-This is the right place to start playing QuakeWorld&reg; — the fastest first
-person shooter action game ever.
+ * [misc/cfg/camquake.cfg](misc/cfg/camquake.cfg)
+ * https://www.youtube.com/@jogihoogi1
 
-Combining the features of all modern QuakeWorld® clients, ezQuake makes
-QuakeWorld&reg; easier to start and play. The immortal first person shooter
-Quake&reg; in the brand new skin with superb graphics and extremely fast
-gameplay.
+## Downloads
 
-## Features
-
- * Modern graphics
- * [QuakeTV][qtv] support
- * Rich menus
- * Multiview support
- * Tons of features to serve latest pro-gaming needs
- * Built in server browser & MP3 player control
- * Recorded games browser
- * Customization of all possible graphics elements of the game including Heads Up Display
- * All sorts of scripting possibilities
- * Windows, Linux, MacOSX and FreeBSD platforms supported (SDL2).
-
-Our client comes only with bare minimum of game media. If you want to
-experience ezQuake with modern graphics and other additional media including
-custom configurations, maps, textures and more, try using the [nQuake][nQuake]-installer.
-
-## Support
-
-Need help with using ezQuake? Try #dev-corner on [discord][discord]
-
-Or (less populated these days) visit us on IRC at QuakeNet, channel #ezQuake: [webchat][webchat] or [IRC][IRC].
-
-Sometimes help from other users of ezQuake might be more useful to you so you
-can also try visiting the [quakeworld.nu Client Talk-forums][forum].
-
-If you have found a bug, please report it [here][issues]
-
-## Installation guide
-
-To play Quakeworld you need the files *pak0.pak* and *pak1.pak* from the original Quake-game.
-
-### Install ezQuake to an existing Quake-installation
-If you have an existing Quake-installation simply extract the ezQuake executable into your Quake-directory.
-
-A typical error message when installing ezQuake into a pre-existing directory is about *glide2x.dll* missing.
-To get rid of this error, remove the file *opengl32.dll* from your Quake directory.
-
-### Upgrade an nQuake-installation
-If you have a version of [nQuake][nQuake] already installed you can upgrade ezQuake by extracting the new executable into the nQuake-directory.
-
-### Minimal clean installation
-If you want to make a clean installation of ezQuake you can do this by following these steps:
-
-1. Create a new directory
-2. Extract the ezQuake-executable into this directory
-3. Create a subdirectory called *id1*
-4. Copy *pak0.pak* and *pak1.pak* into this subdirectory
-
-## Compiling
-
-### Compiling a Windows binary
-
-#### Using Ubuntu Bash (WSL)
-
-You can use the new Ubuntu Bash feature in Windows 10 to compile ezQuake for Windows.
-
-To enable Bash for Windows, press the `Start` button and type `Turn Windows f` and select `Turn Windows features on or off`. Scroll down to `Windows Subsystem for Linux (Beta)` and enable it.
-
-Now press WINDOWS+I, go to `Update & security` and then to the `For developers` tab. Enable `Developer mode`.
-
-Now press the `Start` button again and enter `bash`. Click it and install Bash.
-
-Enter the following command to install all required prerequisites to build ezQuake:
-
-```
-sudo apt-get install -y git mingw-w64 build-essential libspeexdsp-dev dos2unix pkg-config
-```
-
-Now clone the ezQuake source code:
-
-```
-git clone --recurse-submodules https://github.com/ezQuake/ezquake-source.git ezquake
-```
-
-Make sure line endings are not CRLF:
-
-```
-dos2unix *.sh
-```
-
-Now build the ezQuake executable:
-
-```
-EZ_CONFIG_FILE=.config_windows make
-```
-
-Copy the compiled binary to your Quake folder, the binary is called `ezquake.exe`.
-
-#### Using a Linux system
-
-Initialize/update git submodules:
-```
-git submodule update --init --recursive --remote
-```
-
-Make sure you have mingw32 toolchain installed. On Arch Linux it's `mingw-w64` (select complete group).
-
-Build an executable using the following command:
-
-```
-EZ_CONFIG_FILE=.config_windows make
-```
-
-You can add `-jN` as a parameter to `make` to build in parallell. Use number of cpu cores plus 1 (e.g. `-j5` if you have a quad core processor).
-
-### Compiling a Linux binary
-
-_These instructions were tested on Ubuntu_
-
-Make sure you have the dependencies installed:
-
-(You may skip installing dependencies if you are going to use the build-linux.sh script included in the repository, this will take care of installing packages for you.)
-
-- For *Ubuntu 16.10+*
-```
-sudo apt install git build-essential libsdl2-dev libjansson-dev libexpat-dev libcurl4-openssl-dev libpng-dev libjpeg-dev libsndfile-dev libspeex-dev libspeexdsp-dev libxxf86vm-dev
-```
-- For *openSUSE Tumbleweed*
-```
-sudo zypper install -t pattern devel_C_C++
-sudo zypper install git pcre-devel Mesa-libGL-devel SDL2-devel libjansson-devel libexpat-devel libcurl-devel libpng16-devel libpng16-compat-devel libjpeg8-devel libjpeg-turbo libsndfile-devel speex-devel speexdsp-devel libXxf86vm-devel
-```
-- For *Fedora*
-```
-sudo dnf group install 'C Development Tools and Libraries'
-sudo dnf install git pcre-devel mesa-libEGL-devel SDL2-devel jansson-devel expat-devel libcurl-devel libpng-devel libjpeg-turbo-devel libsndfile-devel speex-devel speexdsp-devel libXxf86vm-devel
-```
-
-Clone the git repository:
-```
-git clone --recurse-submodules https://github.com/ezQuake/ezquake-source.git
-```
-
-Switch to `ezquake-source` path:
-```
-cd ~/ezquake-source/
-```
-
-Initialize/update git submodules:
-```
-git submodule update --init --recursive --remote
-```
-
-Run the compilation (replace 5 with the number of cpu cores you have +1):
-```
-make -j5
-```
-You can add `-jN` as a parameter to `make` to build in parallell. Use number of cpu cores plus 1 (e.g. `-j5` if you have a quad core processor).
-
-Copy the compiled binary to your Quake folder, on 64bit linux the binary will be called `ezquake-linux-x86_64`.
-
-### Compiling an OS X binary
-
-_These instructions were tested on Mac OS X 10.10._
-
-Get [Homebrew](http://brew.sh)
-
-Run exactly as it says on the front page:
-
-```
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-```
-
-Make sure you run the `brew doctor` as instructed before doing anything else.
-
-Then run:
-
-```
-brew install sdl2 sdl2_net sdl2_image sdl2_gfx sdl2_mixer pcre jansson pkg-config speex speexdsp libsndfile
-```
-
-When it's done, just run `make` and it should compile without errors.
-
-
-#### Creating an app bundle
-
-Call from main ezquake-source directory, e.g. you probably do something like this:
-
-```
-make
-sh misc/install/create_osx_bundle.sh
-```
-
-Current directory should have an `ezQuake.app` folder which is the app.
-
-There will also be an `ezquake.zip` which basically just zips up the .app.
-
-## Nightly builds
-
-Nightly builds for Windows can be found [here][nightly]
-
- [nQuake]: http://nquake.com/
- [webchat]: http://webchat.quakenet.org/?channels=#ezquake
- [IRC]: irc://irc.quakenet.org/#ezquake
- [forum]: http://www.quakeworld.nu/forum/8
- [qtv]: http://qtv.quakeworld.nu/
- [nightly]: http://uttergrottan.localghost.net/ezquake/dev/nightlybuilds/win32/
- [releases]: https://github.com/ezQuake/ezquake-source/releases
- [issues]: https://github.com/ezQuake/ezquake-source/issues
- [homepage]: https://ezquake.com
- [discord]: http://discord.quake.world/
+Latest build for Windows, macOS and Linux can be found as a logged in GitHub user in the [Actions](https://github.com/qw-ctf/camQuake/actions) tab.
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,8 @@ function install_intel() { @@
     }
     function create_bundle() {
+        mv ezquake-darwin-x86_64-camquake ezquake-darwin-x86_64
         sh misc/install/create_osx_bundle.sh
         echo
@@ Expand Down @@