From a064278450e1daad1dfd4fee036d5d97ecd133ee Mon Sep 17 00:00:00 2001 From: Ian C Date: Wed, 17 May 2017 19:57:35 +0000 Subject: Fixed compilation warnings and Makefile for FreeBSD. --- Makefile | 4 ++-- xd.c | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c07fefb..4ea98ea 100644 --- a/Makefile +++ b/Makefile @@ -29,9 +29,9 @@ HEADERS = OBJECTS = $(SOURCES:.c=.o) -LIBS = -lX11 -lm +LIBS = -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lm -FLAGS = -g -I/usr/X11R6/include -L/usr/X11R6/lib +CFLAGS = -g -I/usr/X11R6/include -I/usr/local/include $(TARGET): $(OBJECTS) $(CC) $(FLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) diff --git a/xd.c b/xd.c index c64251c..fe4dcc7 100644 --- a/xd.c +++ b/xd.c @@ -30,6 +30,9 @@ static const char id[]="$Id$"; #include #include #include +#include + +#include #include #include @@ -286,7 +289,7 @@ static unsigned long blue; static int mouse_x; static int mouse_y; -static int mouse_b; +static unsigned int mouse_b; static double sintab[3600]; static double costab[3600]; @@ -1830,8 +1833,8 @@ static void TunnelDemo(void) for(f=0;fx[f]=(RND(radius>>1)+radius>>1)*si[f]; - new->y[f]=(RND(radius>>1)+radius>>1)*co[f]; + new->x[f]=(RND(radius/2)+radius/2)*si[f]; + new->y[f]=(RND(radius/2)+radius/2)*co[f]; } new->r=radius; -- cgit v1.2.3