fix the build script
This commit is contained in:
parent
74857ddb6e
commit
5d3ad99270
2
Makefile
2
Makefile
|
@ -7,7 +7,7 @@ include options.mk
|
|||
include toggle.mk
|
||||
|
||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMATOGGLE) $(BDTOGGLE) $(PANGOTOGGLE) $(IMLIB2TOGGLE)
|
||||
CFLAGS = -std=c99 -pedantic -Wall $(OPT) $(INCS) $(CPPFLAGS)
|
||||
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations $(OPT) $(INCS) $(CPPFLAGS)
|
||||
LDFLAGS = $(LIBS)
|
||||
INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)`
|
||||
LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)` $(BDLIBS) $(IMLIB2LIBS)
|
||||
|
|
8
build.sh
8
build.sh
|
@ -81,6 +81,10 @@ build() {
|
|||
bdlibs="-lfribidi"
|
||||
bdinc="$INCDIR/fribidi"
|
||||
bdtoggle="-DRTL"
|
||||
else
|
||||
bdlibs=""
|
||||
bdinc=""
|
||||
bdtoggle=""
|
||||
fi
|
||||
|
||||
make clean
|
||||
|
@ -99,7 +103,7 @@ build() {
|
|||
BDLIBS="$bdlibs" \
|
||||
BDINC="$bdinc" \
|
||||
BDTOGGLE="$bdtoggle" \
|
||||
FREETYPEINC="$freetypeinc" \
|
||||
FREETYPEINC="$FREETYPEINC" \
|
||||
X11LIB="$X11LIB" \
|
||||
X11INC="$X11INC"
|
||||
}
|
||||
|
@ -120,7 +124,7 @@ install() {
|
|||
BDLIBS="$bdlibs" \
|
||||
BDINC="$bdinc" \
|
||||
BDTOGGLE="$bdtoggle" \
|
||||
FREETYPEINC="$freetypeinc" \
|
||||
FREETYPEINC="$FREETYPEINC" \
|
||||
X11LIB="$X11LIB" \
|
||||
X11INC="$X11INC"
|
||||
}
|
||||
|
|
|
@ -2,7 +2,9 @@ void
|
|||
eventloop(void)
|
||||
{
|
||||
XEvent ev;
|
||||
#if USEIMAGE
|
||||
int noimg = 0;
|
||||
#endif
|
||||
|
||||
while (!XNextEvent(dpy, &ev)) {
|
||||
if (XFilterEvent(&ev, win))
|
||||
|
@ -15,11 +17,15 @@ eventloop(void)
|
|||
exit(1);
|
||||
case ButtonPress:
|
||||
buttonpress(&ev);
|
||||
#if USEIMAGE
|
||||
noimg = 0;
|
||||
#endif
|
||||
break;
|
||||
case MotionNotify:
|
||||
motionevent(&ev.xbutton);
|
||||
noimg = 1;
|
||||
#if USEIMAGE
|
||||
noimg = 0;
|
||||
#endif
|
||||
break;
|
||||
case Expose:
|
||||
if (ev.xexpose.count == 0)
|
||||
|
|
Loading…
Reference in a new issue