Skip to content

Commit

Permalink
fix cross compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
ii8 committed Jun 11, 2020
1 parent 9fef663 commit 7c46140
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
20 changes: 9 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
WAYLAND_PROTOCOLS_DIR != pkg-config --variable=pkgdatadir wayland-protocols
WAYLAND_SCANNER := wayland-scanner

SCANNER := wayland-scanner
PROTDATADIR != pkg-config --variable=datarootdir wayland-protocols
PROTDIR := $(PROTDATADIR)/wayland-protocols
PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin

PREFIX=/usr/local
BINDIR=$(PREFIX)/bin
CFLAGS ?= -Wall -Wextra -Wno-unused-parameter -Wno-parentheses

CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wno-parentheses

VPATH=$(PROTDIR)/stable/xdg-shell
VPATH=$(WAYLAND_PROTOCOLS_DIR)/stable/xdg-shell
LIBS=-lrt -lm -lutil -lwayland-client -lwayland-cursor -lxkbcommon -Ltsm -lhtsm
OBJ=xdg-shell.o gtk-primary-selection.o glyph.o main.o
GEN=xdg-shell.c xdg-shell.h gtk-primary-selection.c gtk-primary-selection.h
Expand All @@ -29,12 +27,12 @@ clean:
$(OBJ): $(GEN)

%.c: %.xml
$(SCANNER) private-code < $< > $@
$(WAYLAND_SCANNER) private-code < $< > $@

%.h: %.xml
$(SCANNER) client-header < $< > $@
$(WAYLAND_SCANNER) client-header < $< > $@

tsm:
$(MAKE) -C $@

.PHONY: install clean tsm uninstall
.PHONY: install uninstall clean tsm
3 changes: 1 addition & 2 deletions tsm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-sign-compare
CFLAGS ?= -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-sign-compare

OBJ=wcwidth.o shl-htable.o\
tsm-render.o tsm-screen.o tsm-selection.o\
Expand Down

0 comments on commit 7c46140

Please sign in to comment.