From 811bb559a69f078717658d073b85c6a5a2961104 Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Thu, 18 Apr 2024 15:08:24 -0700 Subject: [PATCH 01/11] install xkbcommon --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10223fae..a44d2983 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install cmake pkg-config && sudo apt-get install mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev && sudo apt-get install libglew-dev libglfw3-dev libglm-dev && sudo apt-get install libao-dev libmpg123-dev + run: sudo apt-get update && sudo apt-get install cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev xkbcommon - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From 54831fc7906f3f89f5c9e72603f5156584c79845 Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Thu, 18 Apr 2024 15:10:00 -0700 Subject: [PATCH 02/11] libxkbcommon --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a44d2983..265b7ad1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev xkbcommon + run: sudo apt-get update && sudo apt-get install cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From 58b400630a4ed1d7fa8f332df6a2ee07bf3175ec Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Thu, 18 Apr 2024 15:11:17 -0700 Subject: [PATCH 03/11] libxkbcommon-dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 265b7ad1..1ba22133 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon + run: sudo apt-get update && sudo apt-get install cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From 0c22dc79620b6a96f1a79dbff240ba7f40f48511 Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Thu, 18 Apr 2024 15:15:05 -0700 Subject: [PATCH 04/11] fix missing --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ba22133..8a329d73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From c924a5dfee35011ceab1fbd23b1d2b0e1ab9e88b Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Sat, 20 Apr 2024 11:36:25 -0700 Subject: [PATCH 05/11] libxinerama-dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a329d73..b0e920ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From e71a0ea7034205080e8787b3b2cdd3d27a699b32 Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Sat, 20 Apr 2024 11:42:48 -0700 Subject: [PATCH 06/11] libxcursor-dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0e920ea..7efce4da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From 54c7ed7a8b9d3dda8670b1b6997f2bb7a12d96a1 Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Sat, 20 Apr 2024 11:49:05 -0700 Subject: [PATCH 07/11] libxi-dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7efce4da..e7e78b80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From 7ebd0f39c57d8a2fce7c8217b94306fdcf59ebf6 Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Sat, 20 Apr 2024 11:55:03 -0700 Subject: [PATCH 08/11] libgl1-mesa-dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7e78b80..5aadc913 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From 7f7e91642d29d9a4be194c7fb0ce3a6b099d928e Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Sat, 20 Apr 2024 11:59:07 -0700 Subject: [PATCH 09/11] xvfb --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5aadc913..d09bbdbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From 5121dba62f757fd8d8a0bf15da09c5eaf05e77aa Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Sat, 20 Apr 2024 12:07:35 -0700 Subject: [PATCH 10/11] bring other linux actions up to speed --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d09bbdbd..795ab84f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install OpenGL - run: sudo apt-get update && sudo apt-get install cmake pkg-config && sudo apt-get install mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev && sudo apt-get install libglew-dev libglfw3-dev libglm-dev && sudo apt-get install libao-dev libmpg123-dev + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ca0cb8f4..df085682 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,8 @@ jobs: name: Client on Linux (Ubuntu) runs-on: ubuntu-latest steps: + - name: Install OpenGL + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build @@ -46,6 +48,8 @@ jobs: name: Server on Linux (Ubuntu) runs-on: ubuntu-latest steps: + - name: Install OpenGL + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build @@ -69,6 +73,8 @@ jobs: name: Shared on Linux (Ubuntu) runs-on: ubuntu-latest steps: + - name: Install OpenGL + run: sudo apt-get update && sudo apt-get install --fix-missing cmake pkg-config mesa-utils libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev libxkbcommon-dev libxinerama-dev libxcursor-dev libxi-dev xvfb - uses: actions/checkout@v4 - name: Create build dir run: mkdir -p build From f36fece05ea7e28cf176976dcdf2b3b51213ef89 Mon Sep 17 00:00:00 2001 From: Anthony Tarbinian Date: Sat, 20 Apr 2024 12:13:31 -0700 Subject: [PATCH 11/11] add opengl deps to client unit tests --- src/client/tests/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/tests/CMakeLists.txt b/src/client/tests/CMakeLists.txt index 3c32fce9..fbe4eb69 100644 --- a/src/client/tests/CMakeLists.txt +++ b/src/client/tests/CMakeLists.txt @@ -21,8 +21,8 @@ target_link_libraries(${TARGET_NAME} Boost::serialization nlohmann_json::nlohmann_json ) -target_include_directories(${TARGET_NAME} PRIVATE ${GLM_LIBRARY_INCLUDES}) -target_link_libraries(${TARGET_NAME} PRIVATE glm::glm) +target_include_directories(${TARGET_NAME} PRIVATE ${OPENGL_INCLUDE_DIRS} glfw glm ${imgui-directory} "${CMAKE_BINARY_DIR}/_deps/glew-src/include") +target_link_libraries(${TARGET_NAME} PRIVATE glm glfw libglew_static) # setup make target set(RUN_TESTS_TARGET "run_${TARGET_NAME}")