--- Makefile | 4 ++-- liqcanvas_xv.c | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) --- liqbase.orig/Makefile +++ liqbase/Makefile @@ -2,11 +2,11 @@ PROG = liqbase VERS = 0.1.0 CC = gcc LD = gcc OPT_FLAGS = -O3 CFLAGS = -Wall `freetype-config --cflags` -LDFLAGS = -lX11 -lXext -lXv -lXsp -lm `freetype-config --libs` +OWN_LDFLAGS = -lX11 -lXext -lXv -lm `freetype-config --libs` RM = /bin/rm -f OBJS = liqbase.o liqapp.o liqcanvas_xv.o liqcanvas.o liqfont.o liqdialog.o liqstars.o liqbook.o liqreader.o liqart.o liqscroll.o liqtextbuffer.o liq_xsurface.o liqbirds.o liqdraw.o liqfontbrush.o liqed.o filebuf.o liqdoc.o liqdrawframe.o liqfloat.o liqfloatpic.o liqgame.o liqspeedtest.o PREFIX = $(DESTDIR)//usr ETCDIR = $(DESTDIR)//etc BINDIR = $(PREFIX)/bin @@ -18,11 +18,11 @@ DESKTOPDIR = $(PREFIX)/share/applicatio # call this before linkage : `echo $$(($$(cat APP_VER_BUILD) + 1)) > APP_VER_BUILD` \ .PHONY: clean distclean all: $(PROG) $(PROG): $(OBJS) - $(LD) $(LDFLAGS) \ + $(CC) $(LDFLAGS) $(OWN_LDFLAGS) \ -Wl,--defsym,__APP_VER_MAJOR=`cat APP_VER_MAJOR` \ -Wl,--defsym,__APP_VER_MINOR=`cat APP_VER_MINOR` \ -Wl,--defsym,__APP_VER_BUILD=`cat APP_VER_BUILD` \ -Wl,--defsym,__APP_BUILD_DATE=`date +"0x%Y%m%d"` \ -Wl,--defsym,__APP_BUILD_TIME=`date +"0x%H%M%S"` \ --- liqbase.orig/liqcanvas_xv.c +++ liqbase/liqcanvas_xv.c @@ -184,24 +184,10 @@ int ret; InputOutput, vinfo.visual, CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &xswa); - app_log("canvas XSP Raw Mouse init"); - XSPQueryExtension(dpy, - &xsp_event_base, - &xsp_error_base, - &xsp_major, - &xsp_minor); - - if (xsp_event_base < 0) - { - { return app_errorandfail(-1,"canvas XSP raw mouse init failed"); } - } - - XSPSetTSRawMode(dpy, True); - XStoreName(dpy, window, app.title); XSetIconName(dpy, window, app.title); XSelectInput(dpy, window, KeyPressMask | KeyReleaseMask | @@ -305,11 +291,10 @@ int xv_canvas_close() #else XShmDetach(dpy,&yuv_shminfo); #endif XFreeGC(dpy,gc); XUnmapWindow(dpy,window); - XSPSetTSRawMode(dpy, False); XDestroyWindow(dpy,window); return 0; }