Skip to content

Commit 47fae82

Browse files
committed
Fix
1 parent f6a5b24 commit 47fae82

2 files changed

Lines changed: 17 additions & 8 deletions

File tree

src/Editor/Backends/Makefile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,21 @@ ifeq ($(DEAR_IMGUI_BACKEND),RayLib)
112112
INCLUDES += $(THIRD_PARTIES_DIR)/rlImGui
113113
GUI_FILES += $(THIRD_PARTIES_DIR)/rlImGui/rlImGui.cpp
114114
INCLUDES += $(THIRD_PARTIES_DIR)/raylib/src
115-
GUI_THIRD_PARTIES_LIBS += $(THIRD_PARTIES_DIR)/raylib/src/$(OS)/libraylib.a
115+
ifeq ($(OS),Emscripten)
116+
GUI_THIRD_PARTIES_LIBS += $(THIRD_PARTIES_DIR)/raylib/src/$(OS)/libraylib.web.a
117+
else
118+
GUI_THIRD_PARTIES_LIBS += $(THIRD_PARTIES_DIR)/raylib/src/$(OS)/libraylib.a
119+
endif
116120
ifeq ($(OS),Emscripten)
117121
ifdef EXAEQUOS
118122
LINKER_FLAGS += -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sFULL_ES3
119123
PKG_LIBS += exa-wayland --static raylib
120124
else
121-
# We tell the linker that the game/library uses GLFW3
122-
# library internally, it must be linked automatically
123-
# (emscripten provides the implementation)
125+
# We tell the linker that the game/library uses GLFW3 library internally,
126+
# it must be linked automatically (emscripten provides the implementation)
124127
LINKER_FLAGS += -s USE_GLFW=3
125-
# All webs need a "shell" structure to load and run the game,
126-
# by default emscripten has a `shell.html` but we can provide
127-
# our own.
128+
# All webs need a "shell" structure to load and run the game, by default
129+
# emscripten has a `shell.html` but we can provide our own.
128130
LINKER_FLAGS += --shell-file $(THIRD_PARTIES_DIR)/raylib/src/minshell.html
129131
endif
130132
endif
@@ -173,4 +175,4 @@ endif
173175
INCLUDES += $(P)/src/Editor/Remote
174176
INCLUDES += $(P)/src
175177
GUI_FILES += $(wildcard $(P)/src/Editor/*.cpp)
176-
GUI_FILES += $(GUI_REMOTE_FILES)
178+
GUI_FILES += $(GUI_REMOTE_FILES)

src/Editor/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ TARGET_NAME := TimedPetriGUI
3232
TARGET_DESCRIPTION := Library Editor for Petri nets
3333
include $(M)/project/Makefile
3434

35+
###################################################
36+
# Depends on TimedPetriNet (required when linking the macOS dylib).
37+
#
38+
LIB_TPNE_NET := $(call internal-lib,TimedPetriNet)
39+
INTERNAL_LIBS := $(LIB_TPNE_NET)
40+
DIRS_WITH_MAKEFILE := $(P)/src/PetriNet
41+
3542
###################################################
3643
# Set json library.
3744
#

0 commit comments

Comments
 (0)