Fix

Author: Lecrapouille

.github/workflows/non_regression.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   non_regression_linux:
     name: Non regression tests on Linux
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Install system packages
         run: |
@@ -30,9 +30,9 @@ jobs:
           V=1 sudo make install
       - name: Download, configure and install Google test
         run: |
-          wget https://github.com/google/googletest/archive/release-1.11.0.tar.gz
-          tar xf release-1.11.0.tar.gz
-          cd googletest-release-1.11.0
+          wget https://github.com/google/googletest/archive/v1.17.0.tar.gz
+          tar xf v1.17.0.tar.gz
+          cd googletest-1.17.0
           cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
           sudo make install
       - name: Do non regression tests
@@ -69,15 +69,15 @@ jobs:
           V=1 make -j`sysctl -n hw.logicalcpu`
       - name: Download, configure and install Google test
         run: |
-          wget https://github.com/google/googletest/archive/release-1.11.0.tar.gz
-          tar xf release-1.11.0.tar.gz
-          cd googletest-release-1.11.0
+          wget https://github.com/google/googletest/archive/v1.17.0.tar.gz
+          tar xf v1.17.0.tar.gz
+          cd googletest-1.17.0
           cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
           sudo make install
       - name: Do non regression tests
         run: |
           cd tests
-          V=1 check -j`sysctl -n hw.logicalcpu`
+          V=1 make -j`sysctl -n hw.logicalcpu`
           ../build/TimedPetriNetEditor-UnitTest
       - name: Create the DMG file
         run: |

src/Editor/Backends/Makefile

@@ -112,19 +112,21 @@ ifeq ($(DEAR_IMGUI_BACKEND),RayLib)
     INCLUDES += $(THIRD_PARTIES_DIR)/rlImGui
     GUI_FILES += $(THIRD_PARTIES_DIR)/rlImGui/rlImGui.cpp
     INCLUDES += $(THIRD_PARTIES_DIR)/raylib/src
-    GUI_THIRD_PARTIES_LIBS += $(THIRD_PARTIES_DIR)/raylib/src/$(OS)/libraylib.a
+    ifeq ($(OS),Emscripten)
+        GUI_THIRD_PARTIES_LIBS += $(THIRD_PARTIES_DIR)/raylib/src/$(OS)/libraylib.web.a
+    else
+        GUI_THIRD_PARTIES_LIBS += $(THIRD_PARTIES_DIR)/raylib/src/$(OS)/libraylib.a
+    endif
     ifeq ($(OS),Emscripten)
         ifdef EXAEQUOS
             LINKER_FLAGS += -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sFULL_ES3
             PKG_LIBS += exa-wayland --static raylib
         else
-            # We tell the linker that the game/library uses GLFW3
-            # library internally, it must be linked automatically
-            # (emscripten provides the implementation)
+            # We tell the linker that the game/library uses GLFW3 library internally,
+            # it must be linked automatically (emscripten provides the implementation)
             LINKER_FLAGS += -s USE_GLFW=3
-            # All webs need a "shell" structure to load and run the game,
-            # by default emscripten has a `shell.html` but we can provide
-            # our own.
+            # All webs need a "shell" structure to load and run the game, by default
+            # emscripten has a `shell.html` but we can provide our own.
             LINKER_FLAGS += --shell-file $(THIRD_PARTIES_DIR)/raylib/src/minshell.html
         endif
     endif
@@ -173,4 +175,4 @@ endif
 INCLUDES += $(P)/src/Editor/Remote
 INCLUDES += $(P)/src
 GUI_FILES += $(wildcard $(P)/src/Editor/*.cpp)
-GUI_FILES += $(GUI_REMOTE_FILES)
+GUI_FILES += $(GUI_REMOTE_FILES)

src/Editor/Makefile

@@ -32,6 +32,13 @@ TARGET_NAME := TimedPetriGUI
 TARGET_DESCRIPTION := Library Editor for Petri nets
 include $(M)/project/Makefile
 
+###################################################
+# Depends on TimedPetriNet (required when linking the macOS dylib).
+#
+LIB_TPNE_NET := $(call internal-lib,TimedPetriNet)
+INTERNAL_LIBS := $(LIB_TPNE_NET)
+DIRS_WITH_MAKEFILE := $(P)/src/PetriNet
+
 ###################################################
 # Set json library.
 #

src/PetriNet/Makefile

@@ -82,6 +82,12 @@ LIB_FILES += $(call rwildcard,$(P)/src/PetriNet,*.c)
 USER_CXXFLAGS += -Wno-cast-qual -Wno-float-equal
 USER_CCFLAGS += -Wno-sign-conversion -Wno-float-equal -Wno-nan-infinity-disabled
 
+###################################################
+# Public headers installed under
+# $(PREFIX)/include/TimedPetriNetEditor/$(PROJECT_VERSION)/.
+#
+HEADER_FILES += $(call rwildcard,$(P)/src/PetriNet,*.hpp)
+
 ###################################################
 # Generic Makefile rules
 #