prepare for integrating ui48
This commit is contained in:
parent
27e7cb5957
commit
014c10a6bd
1 changed files with 9 additions and 1 deletions
10
Makefile
10
Makefile
|
@ -17,6 +17,12 @@ LIBS = -lm -lChf -lXm -lutil
|
||||||
X11CFLAGS = $(shell pkg-config --cflags x11 xext)
|
X11CFLAGS = $(shell pkg-config --cflags x11 xext)
|
||||||
X11LIBS = $(shell pkg-config --libs x11 xext xt)
|
X11LIBS = $(shell pkg-config --libs x11 xext xt)
|
||||||
|
|
||||||
|
SDLCFLAGS = $(shell pkg-config --cflags sdl2)
|
||||||
|
SDLLIBS = $(shell pkg-config --libs sdl2)
|
||||||
|
|
||||||
|
NCURSESCFLAGS = $(shell pkg-config --cflags ncursesw)
|
||||||
|
NCURSESDLLIBS = $(shell pkg-config --libs ncursesw)
|
||||||
|
|
||||||
FULL_WARNINGS = no
|
FULL_WARNINGS = no
|
||||||
|
|
||||||
DOTOS = src/cpu.o \
|
DOTOS = src/cpu.o \
|
||||||
|
@ -88,6 +94,8 @@ override CFLAGS := -std=c11 \
|
||||||
$(call cc-option,-Wno-unknown-warning-option) \
|
$(call cc-option,-Wno-unknown-warning-option) \
|
||||||
$(EXTRA_WARNING_FLAGS) \
|
$(EXTRA_WARNING_FLAGS) \
|
||||||
$(X11CFLAGS) \
|
$(X11CFLAGS) \
|
||||||
|
$(SDLCFLAGS) \
|
||||||
|
$(NCURSESCFLAGS) \
|
||||||
$(CFLAGS)
|
$(CFLAGS)
|
||||||
|
|
||||||
override CPPFLAGS := -I./src/ -D_GNU_SOURCE=1 \
|
override CPPFLAGS := -I./src/ -D_GNU_SOURCE=1 \
|
||||||
|
@ -102,7 +110,7 @@ libChf/libChf.a:
|
||||||
make -C libChf
|
make -C libChf
|
||||||
|
|
||||||
dist/saturn: $(DOTOS) libChf/libChf.a
|
dist/saturn: $(DOTOS) libChf/libChf.a
|
||||||
$(CC) $^ -o $@ $(CFLAGS) $(LIBS) $(X11LIBS)
|
$(CC) $^ -o $@ $(CFLAGS) $(LIBS) $(X11LIBS) $(SDLLIBS) $(NCURSESLIBS)
|
||||||
|
|
||||||
dist/pack: src/pack.o src/disk_io.o src/debug.o libChf/libChf.a
|
dist/pack: src/pack.o src/disk_io.o src/debug.o libChf/libChf.a
|
||||||
# UNUSED
|
# UNUSED
|
||||||
|
|
Loading…
Reference in a new issue