projects / packages / frozen-bubble.git / blame
| Commit | Line | Data |
|---|---|---|
| 816e4010 | 1 | diff -Nur frozen-bubble-2.0.0.orig/c_stuff/Makefile.PL frozen-bubble-2.0.0.make/c_stuff/Makefile.PL |
| 2 | --- frozen-bubble-2.0.0.orig/c_stuff/Makefile.PL 2006-10-19 23:46:35.000000000 +0300 | |
| 3 | +++ frozen-bubble-2.0.0.make/c_stuff/Makefile.PL 2006-10-29 03:52:06.000000000 +0300 | |
| fb240d49 | 4 | @@ -77,6 +77,6 @@ |
| 1a3d2454 JB |
5 | 'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION |
| 6 | 'OBJECT' => 'fb_c_stuff.o', | |
| fb240d49 | 7 | 'INC' => chomp_(`sdl-config --cflags`) . ' ' . chomp_(`pkg-config SDL_Pango --cflags`) . ' -I.', |
| 1a3d2454 | 8 | - 'OPTIMIZE' => '-O2 -Wall', |
| 96e53fd0 | 9 | 'MAKEFILE' => 'Makefile_c', |
| 1a3d2454 JB |
10 | + 'FIRST_MAKEFILE' => 'Makefile_c', |
| 11 | ); | |
| 816e4010 | 12 | diff -Nur frozen-bubble-2.0.0.orig/Makefile frozen-bubble-2.0.0.make/Makefile |
| 13 | --- frozen-bubble-2.0.0.orig/Makefile 2006-10-05 22:39:10.000000000 +0300 | |
| 14 | +++ frozen-bubble-2.0.0.make/Makefile 2006-10-29 03:52:06.000000000 +0300 | |
| fb240d49 | 15 | @@ -13,7 +13,6 @@ |
| ee98584c PS |
16 | |
| 17 | dirs: | |
| 18 | @if ! perl -e 'use SDL'; then echo -e "\n *** I need perl-SDL installed"; false; fi | |
| fb240d49 | 19 | - @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 0 if $$mj > 1 || $$mn >= 19; exit 1'; then echo -e "\n *** I need perl-SDL version 1.19.0 or upper"; false; fi |
| ee98584c PS |
20 | @for n in . $(DIRS); do \ |
| 21 | [ "$$n" = "." ] || $(MAKE) -C $$n ;\ | |
| 22 | done | |
| 816e4010 | 23 | diff -Nur frozen-bubble-2.0.0.orig/server/Makefile frozen-bubble-2.0.0.make/server/Makefile |
| 24 | --- frozen-bubble-2.0.0.orig/server/Makefile 2006-10-26 21:42:48.000000000 +0300 | |
| 25 | +++ frozen-bubble-2.0.0.make/server/Makefile 2006-10-29 03:54:14.000000000 +0300 | |
| 26 | @@ -1,22 +1,22 @@ | |
| 27 | PREFIX = /usr/local | |
| 28 | LIBDIR = $(PREFIX)/lib | |
| 29 | ||
| 30 | -CFLAGS ?= -g -Wall -Werror -pipe `pkg-config glib-2.0 --cflags` | |
| 31 | +CFLAGS ?= -Wall -Werror -pipe `pkg-config glib-2.0 --cflags` | |
| 32 | LIBS ?= `pkg-config glib-2.0 --libs` | |
| 33 | ||
| 34 | ALLSRC = fb-server.c log.c tools.c game.c net.c | |
| 35 | ALLOBJ = $(subst .c,.o,$(ALLSRC)) | |
| 36 | ||
| 37 | ifeq (1, $(DEBUG)) | |
| 38 | -CFLAGS := $(CFLAGS) $(ADDCFLAGS) -DDEBUG -g | |
| 39 | +CFLAGS := $(CFLAGS) $(OPTIMIZE) -DDEBUG -g | |
| 40 | else | |
| 41 | -CFLAGS := $(CFLAGS) $(ADDCFLAGS) | |
| 42 | +CFLAGS := $(CFLAGS) $(OPTIMIZE) | |
| 43 | endif | |
| 44 | ||
| 45 | all: .depend fb-server | |
| 46 | ||
| 47 | fb-server: $(ALLOBJ) | |
| 48 | - $(CC) $(LIBS) -o $@ $^ | |
| 49 | + $(CC) $(OTHERLDFLAGS) -o $@ $^ $(LIBS) | |
| 50 | ||
| 51 | .c.o: | |
| 52 | $(CC) -I. $(CFLAGS) -DVERSION=\"$(shell cat ../VERSION)\" -c $< |