Skip to content

Commit 814ad59

Browse files
committed
conan: emscripten: no wayland stuff
1 parent 15128a7 commit 814ad59

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ include prorab-install-dbgsrc.mk
77
# =====================================
88
# === wayland shell client protocol ===
99

10-
ifeq ($(os), linux)
10+
ifeq ($(config), emsc)
11+
else ifeq ($(os), linux)
1112
this_out_dir := out/
1213

1314
this_name := xdg-shell-client-protocol
@@ -57,7 +58,9 @@ define ruisapp_rules
5758

5859
ifeq ($2,sdl)
5960
this_ldlibs += -l SDL2
61+
6062
this_cxxflags += -D RUISAPP_BACKEND_SDL
63+
6164
else ifeq ($(os), linux)
6265
# use -isystem instead of -I to prevent clang-tidy follow the includes from these locations
6366
this_cxxflags += $$(patsubst -I%,-isystem%,$$(shell pkg-config --cflags gdk-3.0))
@@ -75,16 +78,19 @@ define ruisapp_rules
7578
this_ldlibs += -l wayland-cursor
7679
this_ldlibs += $(wayland_shell_protocol_lib)
7780
this_ldlibs += -l xkbcommon
81+
7882
this_cxxflags += -isystem $(dir $(wayland_shell_protocol_header))
7983
this_cxxflags += -D RUISAPP_BACKEND_WAYLAND
8084
else ifeq ($2,xorg)
8185
this_ldlibs += -l X11
8286
else
8387
endif
88+
8489
else ifeq ($(os), windows)
8590
this_ldlibs += -l gdi32
8691
this_ldlibs += -l opengl32
8792
this_ldlibs += -l glew32
93+
8894
else ifeq ($(os), macosx)
8995
this_ldlibs += -l GLEW
9096
this_ldlibs += -framework Cocoa

0 commit comments

Comments
 (0)