[cairo-commit] cairo-demo/quartz .cvsignore, NONE, 1.1 Makefile, 1.1, 1.2 fdface.c, NONE, 1.1 fdhand.c, NONE, 1.1 fdlogo.c, NONE, 1.1 main.c, 1.1, 1.2

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-demo/quartz
In directory gabe:/tmp/cvs-serv1890

Modified Files:
	Makefile main.c 
Added Files:
	.cvsignore fdface.c fdhand.c fdlogo.c 
Log Message:
Added the rest of the missing source files. Fixed Makefile so fdclock actually builds now.

--- NEW FILE: .cvsignore ---
fdclock

Index: Makefile
===================================================================
RCS file: /cvs/cairo/cairo-demo/quartz/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	21 Jan 2005 03:07:56 -0000	1.1
+++ Makefile	21 Jan 2005 04:00:33 -0000	1.2
@@ -1,12 +1,17 @@
-CFLAGS+=-g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls `pkg-config --cflags cairo`
-LDFLAGS+=`pkg-config --libs cairo`
+WARN_FLAGS=-g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls
+CFLAGS=${WARN_FLAGS} `pkg-config --cflags cairo`
+LDFLAGS=${WARN_FLAGS} `pkg-config --libs cairo`
 
 all: fdclock
 
-fdclock: main.o
+fdface.o:  fdface.c fdface.h
 
-main.o: main.c fdface.h fdhand.h fdlogo.h
+fdhand.o: fdhand.c fdhand.h
 
-clean:
-	rm -f fdclock
+fdlogo.o: fdlogo.c fdlogo.h
+
+fdclock: main.o fdface.o fdhand.o fdlogo.o
+	${CC} ${LDFLAGS} -o $@ $^ -framework Carbon
 
+clean:
+	rm -f fdclock *.o

--- NEW FILE: fdface.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fdhand.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fdlogo.c ---
(This appears to be a binary file; contents omitted.)

Index: main.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/quartz/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.c	16 Jan 2005 16:44:12 -0000	1.1
+++ main.c	21 Jan 2005 04:00:33 -0000	1.2
@@ -22,17 +22,21 @@
 
 #include <Carbon/Carbon.h>
 
-#include <Cairo/cairo.h>
+#include <cairo.h>
+#include <cairo-quartz.h>
 
 #include "fdface.h"
 #include "fdhand.h"
-
+#include "fdlogo.h"
 
 Rect	    gRect;
 int	    width = 400;
 int	    height = 400;
 WindowRef   gTestWindow;
 
+pascal void RedrawTimerCallback(EventLoopTimerRef theTimer, void* userData);
+
+OSStatus CreateTestWindow(void);
 
 static pascal OSStatus TestWindowEventHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUserData )
 {