diff --git a/.github/workflows/non_regression.yml b/.github/workflows/non_regression.yml index 1cfe7e4..2cbdc48 100644 --- 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 index eb3f1a2..5cad093 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file