[Commit] xrtest Makefile,1.1,1.2 xrfreq.c,1.1,1.2

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/xrtest
In directory home.keithp.com:/tmp/cvs-serv17868

Modified Files:
	Makefile xrfreq.c 
Log Message:
Fixed up Makefile

Index: Makefile
===================================================================
RCS file: /local/src/CVS/xrtest/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	17 Apr 2003 20:41:17 -0000	1.1
+++ Makefile	25 Apr 2003 20:31:20 -0000	1.2
@@ -1,7 +1,7 @@
 CFLAGS=-g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls `pkg-config --cflags Xr`
-LDFLAGS=-L/usr/X11R6/lib -lXrender `pkg-config --libs Xr`
+LDFLAGS=`pkg-config --libs Xr`
 
-PROGS=xrtest xrspline xrknockout
+PROGS=xrtest xrspline xrknockout xrfreq
 
 all: $(PROGS)
 

Index: xrfreq.c
===================================================================
RCS file: /local/src/CVS/xrtest/xrfreq.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xrfreq.c	8 Jan 2003 18:49:46 -0000	1.1
+++ xrfreq.c	25 Apr 2003 20:31:20 -0000	1.2
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <math.h>
 
-#include <X11/Xr/Xr.h>
+#include <Xr.h>
 
 #define EPSILON (1.0 / (2<<16))
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
@@ -103,10 +103,10 @@
 
     XFillRectangle(dpy, win->pix, win->gc, 0, 0, win->width, win->height);
 
-    xrs = XrCreate(dpy);
+    xrs = XrCreate();
 
-    XrSetDrawable(xrs, drawable);
-    XrSetVisual(xrs, DefaultVisual(win->dpy, win->scr));
+    XrSetTargetDrawable(xrs, dpy, drawable);
+    XrSetRGBColor(xrs, 1, 1, 1);
 
     cx = win->width / 2.0;
     cy = win->height / 2.0;