From 0ca05c54dd814f294617eda286ef175f01baa542 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Wed, 7 Feb 2024 21:25:56 +0000 Subject: Introduce .gitlab-ci.yml This just checks that the client compiles on Ubuntu for now. Also fixed a PhysicsFS linker issue introduced in ffa8ea13fbf50ad59d9fc4cea71b9aec4aca8bac... --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++++ src/CMakeLists.txt | 3 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..915a8151 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,27 @@ +stages: + - build + +default: + image: ubuntu:22.04 + +ubuntu-build: + stage: build + script: + - apt update + - apt install -y + build-essential + cmake + gettext + libcurl4-openssl-dev + libguichan-dev + libphysfs-dev + libpng-dev + libsdl2-dev + libsdl2-gfx-dev + libsdl2-image-dev + libsdl2-mixer-dev + libsdl2-net-dev + libsdl2-ttf-dev + libxml2-dev + - cmake . + - cmake --build . --parallel diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f2ba1221..c24bd350 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -640,11 +640,10 @@ TARGET_LINK_LIBRARIES(mana ${INTERNAL_LIBRARIES} ${SDL2_LIBRARIES} ${PNG_LIBRARIES} - ${PHYSFS_LIBRARY} + ${PHYSFS_LIBRARIES} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${GUICHAN_LIBRARIES} - ${X11_LIBRARIES} ${OPENGL_LIBRARIES} ${LIBINTL_LIBRARIES} ${EXTRA_LIBRARIES}) -- cgit v1.2.3-70-g09d2