From 004782017e80712a38d2fb491536b059b82ce962 Mon Sep 17 00:00:00 2001 From: sparky Date: Tue, 28 Nov 2006 03:28:44 +0000 Subject: [PATCH] - updated for 2.1.0, by Kamil Changed files: frozen-bubble-make.patch -> 1.6 --- frozen-bubble-make.patch | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/frozen-bubble-make.patch b/frozen-bubble-make.patch index fecfe5c..eda6ef8 100644 --- a/frozen-bubble-make.patch +++ b/frozen-bubble-make.patch @@ -1,4 +1,3 @@ -diff -Nur frozen-bubble-2.0.0.orig/c_stuff/Makefile.PL frozen-bubble-2.0.0.make/c_stuff/Makefile.PL --- frozen-bubble-2.0.0.orig/c_stuff/Makefile.PL 2006-10-19 23:46:35.000000000 +0300 +++ frozen-bubble-2.0.0.make/c_stuff/Makefile.PL 2006-10-29 03:52:06.000000000 +0300 @@ -77,6 +77,6 @@ @@ -9,7 +8,6 @@ diff -Nur frozen-bubble-2.0.0.orig/c_stuff/Makefile.PL frozen-bubble-2.0.0.make/ 'MAKEFILE' => 'Makefile_c', + 'FIRST_MAKEFILE' => 'Makefile_c', ); -diff -Nur frozen-bubble-2.0.0.orig/Makefile frozen-bubble-2.0.0.make/Makefile --- frozen-bubble-2.0.0.orig/Makefile 2006-10-05 22:39:10.000000000 +0300 +++ frozen-bubble-2.0.0.make/Makefile 2006-10-29 03:52:06.000000000 +0300 @@ -13,7 +13,6 @@ @@ -20,18 +18,17 @@ diff -Nur frozen-bubble-2.0.0.orig/Makefile frozen-bubble-2.0.0.make/Makefile @for n in . $(DIRS); do \ [ "$$n" = "." ] || $(MAKE) -C $$n ;\ done -diff -Nur frozen-bubble-2.0.0.orig/server/Makefile frozen-bubble-2.0.0.make/server/Makefile --- frozen-bubble-2.0.0.orig/server/Makefile 2006-10-26 21:42:48.000000000 +0300 +++ frozen-bubble-2.0.0.make/server/Makefile 2006-10-29 03:54:14.000000000 +0300 -@@ -1,22 +1,22 @@ - PREFIX = /usr/local - LIBDIR = $(PREFIX)/lib +@@ -1,6 +1,6 @@ + include ../settings.mk --CFLAGS ?= -g -Wall -Werror -pipe `pkg-config glib-2.0 --cflags` -+CFLAGS ?= -Wall -Werror -pipe `pkg-config glib-2.0 --cflags` - LIBS ?= `pkg-config glib-2.0 --libs` +-CFLAGS ?= -g -Wall -Werror -pipe ++CFLAGS ?= -Wall -Werror -pipe + CPPFLAGS += -I. `pkg-config glib-2.0 --cflags` -DVERSION=\"$(shell cat ../VERSION)\" + LDLIBS = `pkg-config glib-2.0 --libs` - ALLSRC = fb-server.c log.c tools.c game.c net.c +@@ -8,9 +8,9 @@ ALLOBJ = $(subst .c,.o,$(ALLSRC)) ifeq (1, $(DEBUG)) @@ -43,10 +40,3 @@ diff -Nur frozen-bubble-2.0.0.orig/server/Makefile frozen-bubble-2.0.0.make/serv endif all: .depend fb-server - - fb-server: $(ALLOBJ) -- $(CC) $(LIBS) -o $@ $^ -+ $(CC) $(OTHERLDFLAGS) -o $@ $^ $(LIBS) - - .c.o: - $(CC) -I. $(CFLAGS) -DVERSION=\"$(shell cat ../VERSION)\" -c $< -- 2.44.0