MacOS X

Lecrapouille · May 3, 2024 · 87ab3c6 · 87ab3c6
1 parent 73505bf
commit 87ab3c6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/.github/workflows/non_regression.yml b/.github/workflows/non_regression.yml
@@ -60,6 +60,8 @@ jobs:
         with:
           submodules: true
       - name: Compile TimedPetriNetEditor
+        env:
+          LD_LIBRARY_PATH: $LD_LIBRARY_PATH:/usr/local/lib
         run: |
           make download-external-libs
           make compile-external-libs

diff --git a/src/Editor/DearImGui/Makefile.imgui b/src/Editor/DearImGui/Makefile.imgui
@@ -78,4 +78,19 @@ GUI_OBJS += implot_items.o implot.o
 #
 VPATH += $(THIRDPART)/ImGuiFileDialog
 INCLUDES += -I$(THIRDPART)/ImGuiFileDialog
-GUI_OBJS += ImGuiFileDialog.o
+GUI_OBJS += ImGuiFileDialog.o
+
+###################################################
+# OpenGL: glfw and glew libraries
+#
+ifeq ($(ARCHI),Darwin)
+LINKER_FLAGS += -framework Cocoa
+LINKER_FLAGS += -framework OpenGL
+LINKER_FLAGS += -framework IOKit
+LINKER_FLAGS += -lglfw
+else ifeq ($(ARCHI),Linux)
+LINKER_FLAGS += -lGL
+PKG_LIBS += --static glfw3
+else ifneq ($(ARCHI),Emscripten)
+$(error Unknown architecture $(ARCHI) for OpenGL)
+endif