Skip to content

Commit fdfdfa0

Browse files
committed
libs: clip: remove x11
1 parent 1a1b74a commit fdfdfa0

4 files changed

Lines changed: 7 additions & 1139 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ if(WIN32)
292292
)
293293
elseif(APPLE)
294294
target_sources(clip PRIVATE src/libs/clip/clip_osx.mm)
295-
elseif(UNIX)
296-
target_sources(clip PRIVATE src/libs/clip/clip_x11.cpp)
295+
else()
296+
target_sources(clip PRIVATE src/libs/clip/clip_none.cpp)
297297
endif()
298298

299299
if(MSVC)
@@ -304,18 +304,9 @@ elseif(MINGW)
304304
target_link_libraries(clip PUBLIC shlwapi windowscodecs)
305305
endif()
306306

307-
if(UNIX AND NOT APPLE)
308-
pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb)
309-
pkg_check_modules(LIBPNG REQUIRED IMPORTED_TARGET libpng)
310-
target_link_libraries(
311-
clip
312-
PRIVATE PkgConfig::XCB Threads::Threads PkgConfig::LIBPNG
313-
)
314-
endif()
315-
316307
target_include_directories(clip PUBLIC include/libs/clip)
317308
target_compile_features(clip PRIVATE cxx_std_20)
318-
target_compile_definitions(clip PUBLIC CLIP_ENABLE_IMAGE=1 CLIP_X11_WITH_PNG=1 HAVE_PNG_H=1)
309+
target_compile_definitions(clip PUBLIC CLIP_ENABLE_IMAGE=1)
319310
set_target_properties(
320311
clip
321312
PROPERTIES

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ endif
2020
UNAME_S := $(shell uname -s)
2121
ifeq ($(UNAME_S),Linux)
2222
LDLIBS += -lGL
23-
CXXFLAGS += `pkg-config --static --cflags gio-2.0 appindicator3-0.1 libpng` -DCLIP_ENABLE_IMAGE=1 -DCLIP_X11_WITH_PNG=1 -DHAVE_PNG_H=1
24-
LDLIBS += `pkg-config --static --libs gio-2.0 appindicator3-0.1 libpng x11 xrandr`
23+
CXXFLAGS += `pkg-config --static --cflags gio-2.0 appindicator3-0.1 x11` -DCLIP_ENABLE_IMAGE=1
24+
LDLIBS += `pkg-config --static --libs gio-2.0 appindicator3-0.1 x11 xrandr`
2525

2626
else ifeq ($(UNAME_S),Darwin) #APPLE
2727
LDFLAGS += -L/usr/local/lib -L/opt/local/lib -L/opt/homebrew/lib

src/libs/clip/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CXX ?= g++
22
CXXSTD ?= c++20
3-
CXXFLAGS = -I../../../include/libs/clip -std=$(CXXSTD) $(LTO_FLAGS) -fvisibility=default -fvisibility-inlines-hidden -fPIC -DCLIP_ENABLE_IMAGE=1 -DCLIP_X11_WITH_PNG=1 -DHAVE_PNG_H=1
3+
CXXFLAGS = -I../../../include/libs/clip -std=$(CXXSTD) $(LTO_FLAGS) -fvisibility=default -fvisibility-inlines-hidden -fPIC -DCLIP_ENABLE_IMAGE=1
44

55
ifeq ($(DEBUG),1)
66
CXXFLAGS := -ggdb3 -Wall -Wextra -pedantic -Wno-unused-parameter \
@@ -20,7 +20,7 @@ ifeq ($(findstring NT,$(UNAME_S)),NT)
2020
endif
2121
else
2222
CXXFLAGS += -Wall -Wextra
23-
SRC += clip_x11.cpp
23+
SRC += clip_none.cpp
2424
endif
2525

2626
LIBNAME = libclip.a

0 commit comments

Comments
 (0)