[cairo-commit] cairo-demo/gameoflife .cvsignore, 1.1, 1.2 ChangeLog, 1.1, 1.2 Makefile, 1.4, 1.5 cgolwin.cpp, 1.6, 1.7

[Behdad Esfahbod]

Committed by: behdad

Update of /cvs/cairo/cairo-demo/gameoflife
In directory gabe:/tmp/cvs-serv7362

Modified Files:
	.cvsignore ChangeLog Makefile cgolwin.cpp 
Log Message:
2005-07-29  Behdad Esfahbod  <behdad at behdad.org>

        * cgolwin.cpp: Fixed bug that was introduced when blindly changing
        function names.  Passing correct parameters to
        cairo_xlib_surface_create now.



Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo-demo/gameoflife/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	17 Nov 2003 20:55:39 -0000	1.1
+++ .cvsignore	29 Jul 2005 21:16:12 -0000	1.2
@@ -1 +1 @@
-gameoflife
+cgol

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/gameoflife/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 Jul 2005 05:40:44 -0000	1.1
+++ ChangeLog	29 Jul 2005 21:16:12 -0000	1.2
@@ -1,4 +1,10 @@
 2005-07-29  Behdad Esfahbod  <behdad at behdad.org>
 
+	* cgolwin.cpp: Fixed bug that was introduced when blindly changing
+	function names.  Passing correct parameters to
+	cairo_xlib_surface_create now.
+
+2005-07-29  Behdad Esfahbod  <behdad at behdad.org>
+
 	* cgolwin.cpp: Updated to cairo 0.6.0 API.
 

Index: Makefile
===================================================================
RCS file: /cvs/cairo/cairo-demo/gameoflife/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	23 Dec 2003 18:38:05 -0000	1.4
+++ Makefile	29 Jul 2005 21:16:12 -0000	1.5
@@ -1,14 +1,18 @@
+APPS = cgol
 
-CFLAGS = `pkg-config --cflags cairo`
-LDFLAGS =`pkg-config --libs cairo`
-
-SOURCES = cgol.cpp ctk.cpp main.cpp cgolwin.cpp 
+OBJECTS = cgol.o ctk.o main.o cgolwin.o
 HEADERS = ctk.h cgolwin.h cgol.h
 
-all: cgol
+CXXFLAGS  = -g -Wall
 
-cgol: $(HEADERS) $(SOURCES)
-	g++ -Wall -o cgol $(SOURCES) $(CFLAGS) $(LDFLAGS)
+CXXFLAGS  += `pkg-config cairo --cflags`
+LDFLAGS += `pkg-config cairo --libs`
+
+all: $(APPS)
+
+$(OBJETS): $(HEADERS)
+$(APPS): $(OBJECTS)
+	$(CXX) $(LDFLAGS) -o $@ $^
 
 clean:
-	rm -f cgol
+	$(RM) *.o $(APPS)

Index: cgolwin.cpp
===================================================================
RCS file: /cvs/cairo/cairo-demo/gameoflife/cgolwin.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cgolwin.cpp	29 Jul 2005 05:40:44 -0000	1.6
+++ cgolwin.cpp	29 Jul 2005 21:16:12 -0000	1.7
@@ -43,9 +43,9 @@
 
 	surface = cairo_xlib_surface_create(dpy, cellpix, 
 			DefaultVisual(dpy, DefaultScreen(dpy)),
-			CAIRO_FORMAT_RGB24, DefaultColormap(dpy, DefaultScreen(dpy)));
-	if (surface == NULL)
-		exit(1); // no mem
+			wi, h);
+	if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
+		exit(1);
 	cr = cairo_create(surface);
 	
 	XGCValues xgcv;