Added cmake build and project cleanup (#13)

* Moved sources under src directory. Removed obsolete VS projects

* Fixed meson build binaries. Plus further cleanup of directories

* Added cmake build files

* Fine tuned the cmake projects based on the meson build

* Added proper flags for x86 builds

* Further cleaning up

Author: tcsabina

.github/workflows/build-all-targets.yml

@@ -0,0 +1,34 @@
+name: build all targets with meson+ninja
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [linux-amd64, linux-i686, linux-armhf, linux-aarch64, windows-x64, windows-x86]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Prepare Build Environemnt
+        run: |
+             sudo apt-get update
+             sudo apt-get -y install build-essential python3-virtualenv python3-dev python3-pip ninja-build cmake gcc-i686-linux-gnu
+             sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+             sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686
+             virtualenv .venv --python=python3
+             . .venv/bin/activate
+             pip3 install --upgrade pip
+             pip3 install -r requirements.txt
+      - name: Build
+        run: |
+             ./.venv/bin/meson build-${{ matrix.target }} --buildtype=release --cross-file tools/cross-compilation/${{ matrix.target }}.txt
+             ninja -v -C build-${{ matrix.target }}
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.target }}
+          path: |
+                build-${{ matrix.target }}/qtv
+                build-${{ matrix.target }}/qtv.exe
+          if-no-files-found: ignore

.github/workflows/build-targets-cmake.yml

@@ -0,0 +1,29 @@
+name: build all targets with cmake
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [linux-amd64, linux-i686, linux-armhf, linux-aarch64, windows-x64, windows-x86]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Prepare Build Environemnt
+        run: |
+             sudo apt-get update
+             sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu
+             sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+             sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686
+      - name: Build
+        run: |
+             ./build_cmake.sh ${{ matrix.target }}
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.target }}
+          path: |
+                build/${{ matrix.target }}/qtv
+                build/${{ matrix.target }}/qtv.exe
+          if-no-files-found: ignore

.travis.yml

@@ -0,0 +1,82 @@
+cmake_minimum_required(VERSION 3.4.0)
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+# Set project name and languge.
+project(qtv C)
+
+
+######################################################################################################
+
+# Set where sources located.
+set(DIR_SRC "src")
+
+# Add sources
+set(SRC_COMMON
+	"${DIR_SRC}/ban.c"
+	"${DIR_SRC}/build.c"
+	"${DIR_SRC}/cl_cmds.c"
+	"${DIR_SRC}/cmd.c"
+	"${DIR_SRC}/crc.c"
+	"${DIR_SRC}/cvar.c"
+	"${DIR_SRC}/forward.c"
+	"${DIR_SRC}/forward_pending.c"
+	"${DIR_SRC}/fs.c"
+	"${DIR_SRC}/httpsv.c"
+	"${DIR_SRC}/httpsv_generate.c"
+	"${DIR_SRC}/info.c"
+	"${DIR_SRC}/main.c"
+	"${DIR_SRC}/mdfour.c"
+	"${DIR_SRC}/msg.c"
+	"${DIR_SRC}/net_utils.c"
+	"${DIR_SRC}/parse.c"
+	"${DIR_SRC}/qw.c"
+	"${DIR_SRC}/source.c"
+	"${DIR_SRC}/source_cmds.c"
+	"${DIR_SRC}/sys.c"
+	"${DIR_SRC}/token.c"
+	"${DIR_SRC}/sha3.c"
+	"${DIR_SRC}/udp.c"
+	)
+
+
+######################################################################################################
+
+# Set base compiler flags
+set(CFLAGS -Wall)
+set(LFLAGS)
+
+
+######################################################################################################
+
+# Set target
+add_executable(${PROJECT_NAME} ${SRC_COMMON})
+set_target_properties(${PROJECT_NAME}
+	PROPERTIES #PREFIX "" # Strip lib prefix.
+	C_VISIBILITY_PRESET hidden # Hide all symbols unless excplicitly marked to export.
+	)
+
+
+######################################################################################################
+
+# Set include directories
+target_include_directories(${PROJECT_NAME} PRIVATE)
+
+
+######################################################################################################
+
+# Check build target, and included sources and libs
+if(UNIX)
+else()
+	target_link_libraries(${PROJECT_NAME} ws2_32)
+	set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc")
+endif()
+
+
+######################################################################################################
+
+# Assign compiler flags
+target_compile_options(${PROJECT_NAME} PRIVATE ${CFLAGS})
+
+
+######################################################################################################

CMakeLists.txt

@@ -11,11 +11,11 @@ endif
 
 STRIPFLAGS=--strip-unneeded --remove-section=.comment
 
-OBJS = cmd.o crc.o cvar.o forward.o forward_pending.o info.o main.o mdfour.o \
-       msg.o net_utils.o parse.o qw.o source.o source_cmds.o sys.o build.o token.o httpsv.o httpsv_generate.o \
-       cl_cmds.o fs.o ban.o udp.o sha3.o
+OBJS = src/cmd.o src/crc.o src/cvar.o src/forward.o src/forward_pending.o src/info.o src/main.o src/mdfour.o \
+       src/msg.o src/net_utils.o src/parse.o src/qw.o src/source.o src/source_cmds.o src/sys.o src/build.o src/token.o src/httpsv.o src/httpsv_generate.o \
+       src/cl_cmds.o src/fs.o src/ban.o src/udp.o src/sha3.o
 
-qtv: $(OBJS) qtv.h qconst.h
+qtv: $(OBJS) src/qtv.h src/qconst.h
 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@.db -lm
 	$(STRIP) $(STRIPFLAGS) $@.db -o $@.bin
 

Makefile

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Useful if you willing to stop on first error, also prints what is executed.
+#set -ex
+
+BUILDIR="${BUILDIR:-build}" # Default build dir.
+
+# Define target platforms, feel free to comment out if you does not require some of it,
+# or you can call this script with plaforms list you willing to build on the command line.
+DEFAULT_PLATFORMS=(
+	linux-amd64
+	linux-aarch64
+	linux-armhf
+	linux-i686
+	windows-x64
+	windows-x86
+)
+PLATFORMS=("${@:-${DEFAULT_PLATFORMS[@]}}")
+
+
+# If V variable is not empty then provide -v argument to cmake --build command (verbose output).
+V="${V:-}"
+[ ! -z ${V} ] && V="-v"
+
+# Overwrite build type with B variable.
+B="${B:-Release}"
+[ ! -z ${B} ] && BUILD="-DCMAKE_BUILD_TYPE=${B}"
+
+# The maximum number of concurrent processes to use when building.
+export CMAKE_BUILD_PARALLEL_LEVEL="${CMAKE_BUILD_PARALLEL_LEVEL:-8}"
+
+# Use specified (with G variable) CMake generator or use default generator (most of the time its make) or ninja if found.
+G="${G:-}"
+[ -z "${G}" ] && hash ninja >/dev/null 2>&1 && G="Ninja"
+[ ! -z "${G}" ] && export CMAKE_GENERATOR="${G}"
+
+rm -rf ${BUILDIR}
+mkdir -p ${BUILDIR}
+
+# Build platforms one by one.
+for name in "${PLATFORMS[@]}"; do
+	P="${BUILDIR}/$name"
+	mkdir -p "${P}"
+	case "${name}" in
+	* ) # Build native library.
+		cmake -B "${P}" -S . ${BUILD} -DCMAKE_TOOLCHAIN_FILE="tools/cross-cmake/${name}.cmake"
+		cmake --build "${P}" ${V}
+	;;
+	esac
+done