CI: fixing Linux and Emscripten

Lecrapouille · Apr 15, 2024 · 9e41516 · 9e41516
1 parent bbb809e
commit 9e41516
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/non_regression.yml b/.github/workflows/non_regression.yml
@@ -17,6 +17,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install libdw-dev pkg-config libmosquitto-dev libx11-dev libxinerama-dev
           sudo apt-get install libasound2-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libxcursor-dev
+          sudo apt-get install libwayland-dev libxkbcommon-x11-dev libglfw3-dev
       - name: Checkout TimedPetriNetEditor
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/publish_web_version.yml b/.github/workflows/publish_web_version.yml
@@ -17,6 +17,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install pkg-config libmosquitto-dev libx11-dev libxinerama-dev
           sudo apt-get install libasound2-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libxcursor-dev libxinerama-dev
+          sudo apt-get install libwayland-dev libxkbcommon-x11-dev libglfw3-dev
       - name: Install Emscripten
         uses: mymindstorm/setup-emsdk@v11
       - name: Checkout TimedPetriNetEditor

diff --git a/Makefile b/Makefile
@@ -17,12 +17,17 @@ BACKEND ?= GLFW3
 # Check selected backend for dear im gui if compiled for html5
 #
 ifeq ($(ARCHI),Emscripten)
+$(warning ici 11)
 ifneq ($(BACKEND),RayLib)
-$(warning "Force RayLib backend for compiling with Emscripten")
-BACKEND := RayLib
+$(warning Force RayLib backend for compiling with Emscripten)
+BACKEND = RayLib
+else
+$(warning ici 22)
 endif
 endif
 
+$(warning GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGraphical Backend $(BACKEND) ($(ARCHI))
+
 ###################################################
 # Location of the project directory and Makefiles
 #