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
|
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)
|
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)
|
LDFLAGS = $(LIBS)
|
||||||
INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)`
|
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)
|
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"
|
bdlibs="-lfribidi"
|
||||||
bdinc="$INCDIR/fribidi"
|
bdinc="$INCDIR/fribidi"
|
||||||
bdtoggle="-DRTL"
|
bdtoggle="-DRTL"
|
||||||
|
else
|
||||||
|
bdlibs=""
|
||||||
|
bdinc=""
|
||||||
|
bdtoggle=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
make clean
|
make clean
|
||||||
|
@ -99,7 +103,7 @@ build() {
|
||||||
BDLIBS="$bdlibs" \
|
BDLIBS="$bdlibs" \
|
||||||
BDINC="$bdinc" \
|
BDINC="$bdinc" \
|
||||||
BDTOGGLE="$bdtoggle" \
|
BDTOGGLE="$bdtoggle" \
|
||||||
FREETYPEINC="$freetypeinc" \
|
FREETYPEINC="$FREETYPEINC" \
|
||||||
X11LIB="$X11LIB" \
|
X11LIB="$X11LIB" \
|
||||||
X11INC="$X11INC"
|
X11INC="$X11INC"
|
||||||
}
|
}
|
||||||
|
@ -120,7 +124,7 @@ install() {
|
||||||
BDLIBS="$bdlibs" \
|
BDLIBS="$bdlibs" \
|
||||||
BDINC="$bdinc" \
|
BDINC="$bdinc" \
|
||||||
BDTOGGLE="$bdtoggle" \
|
BDTOGGLE="$bdtoggle" \
|
||||||
FREETYPEINC="$freetypeinc" \
|
FREETYPEINC="$FREETYPEINC" \
|
||||||
X11LIB="$X11LIB" \
|
X11LIB="$X11LIB" \
|
||||||
X11INC="$X11INC"
|
X11INC="$X11INC"
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,9 @@ void
|
||||||
eventloop(void)
|
eventloop(void)
|
||||||
{
|
{
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
#if USEIMAGE
|
||||||
int noimg = 0;
|
int noimg = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
while (!XNextEvent(dpy, &ev)) {
|
while (!XNextEvent(dpy, &ev)) {
|
||||||
if (XFilterEvent(&ev, win))
|
if (XFilterEvent(&ev, win))
|
||||||
|
@ -15,11 +17,15 @@ eventloop(void)
|
||||||
exit(1);
|
exit(1);
|
||||||
case ButtonPress:
|
case ButtonPress:
|
||||||
buttonpress(&ev);
|
buttonpress(&ev);
|
||||||
|
#if USEIMAGE
|
||||||
noimg = 0;
|
noimg = 0;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case MotionNotify:
|
case MotionNotify:
|
||||||
motionevent(&ev.xbutton);
|
motionevent(&ev.xbutton);
|
||||||
noimg = 1;
|
#if USEIMAGE
|
||||||
|
noimg = 0;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case Expose:
|
case Expose:
|
||||||
if (ev.xexpose.count == 0)
|
if (ev.xexpose.count == 0)
|
||||||
|
|
Loading…
Reference in a new issue