Merge pull request #734 from nicolasnoble/memcard-undo

Memcard manager improvements

Author: nicolasnoble

Makefile

@@ -70,7 +70,7 @@ ifeq ($(UNAME_S),Darwin)
     LDFLAGS += -mmacosx-version-min=10.15
 else
     LDFLAGS += -lstdc++fs
-    LDFLAGS += -lGL -lX11
+    LDFLAGS += -lGL -lX11 -lxcb
 endif
 
 LDFLAGS += third_party/luajit/src/libluajit.a
@@ -90,6 +90,8 @@ SRCS += third_party/fmt/src/os.cc third_party/fmt/src/format.cc
 IMGUI_SRCS += $(wildcard third_party/imgui/*.cpp)
 SRCS += $(IMGUI_SRCS)
 SRCS += $(wildcard third_party/libelfin/*.cc)
+SRCS += third_party/clip/clip.cpp
+SRCS += third_party/clip/image.cpp
 SRCS += third_party/gl3w/GL/gl3w.c
 SRCS += third_party/imgui/backends/imgui_impl_opengl3.cpp
 SRCS += third_party/imgui/backends/imgui_impl_glfw.cpp
@@ -105,7 +107,9 @@ SRCS += third_party/zep/src/mcommon/animation/timer.cpp
 SRCS += third_party/zep/src/mcommon/file/path.cpp
 SRCS += third_party/zep/src/mcommon/string/stringutils.cpp
 ifeq ($(UNAME_S),Darwin)
-    SRCS += src/main/complain.mm
+    SRCS += src/main/complain.mm third_party/clip/clip_osx.mm
+else
+    SRCS += third_party/clip/clip_x11.cpp
 endif
 SUPPORT_SRCS := $(call rwildcard,src/support/,*.cc)
 SUPPORT_SRCS += third_party/fmt/src/os.cc third_party/fmt/src/format.cc