]>
Commit | Line | Data |
---|---|---|
ca938e3a JR |
1 | diff -urNp -x '*.orig' frozen-bubble-2.2.0.org/Makefile frozen-bubble-2.2.0/Makefile |
2 | --- frozen-bubble-2.2.0.org/Makefile 2008-11-08 15:47:24.000000000 +0100 | |
3 | +++ frozen-bubble-2.2.0/Makefile 2021-05-07 23:01:33.552106730 +0200 | |
4 | @@ -15,7 +15,6 @@ prepare: | |
5 | ||
6 | dirs: | |
7 | @if ! perl -e 'use SDL'; then echo -e "\n *** I need perl-SDL installed"; false; fi | |
8 | - @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 | |
9 | @for n in . $(DIRS); do \ | |
10 | [ "$$n" = "." ] || $(MAKE) -C $$n || exit $$? ;\ | |
11 | done | |
12 | diff -urNp -x '*.orig' frozen-bubble-2.2.0.org/c_stuff/Makefile.PL frozen-bubble-2.2.0/c_stuff/Makefile.PL | |
13 | --- frozen-bubble-2.2.0.org/c_stuff/Makefile.PL 2008-07-02 23:07:14.000000000 +0200 | |
14 | +++ frozen-bubble-2.2.0/c_stuff/Makefile.PL 2021-05-07 23:01:33.552106730 +0200 | |
15 | @@ -77,6 +77,6 @@ WriteMakefile( | |
1a3d2454 JB |
16 | 'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION |
17 | 'OBJECT' => 'fb_c_stuff.o', | |
fb240d49 | 18 | 'INC' => chomp_(`sdl-config --cflags`) . ' ' . chomp_(`pkg-config SDL_Pango --cflags`) . ' -I.', |
1a3d2454 | 19 | - 'OPTIMIZE' => '-O2 -Wall', |
96e53fd0 | 20 | 'MAKEFILE' => 'Makefile_c', |
1a3d2454 JB |
21 | + 'FIRST_MAKEFILE' => 'Makefile_c', |
22 | ); | |
ca938e3a JR |
23 | diff -urNp -x '*.orig' frozen-bubble-2.2.0.org/server/Makefile frozen-bubble-2.2.0/server/Makefile |
24 | --- frozen-bubble-2.2.0.org/server/Makefile 2008-07-02 23:07:28.000000000 +0200 | |
25 | +++ frozen-bubble-2.2.0/server/Makefile 2021-05-07 23:01:33.552106730 +0200 | |
00478201 | 26 | @@ -1,6 +1,6 @@ |
27 | include ../settings.mk | |
816e4010 | 28 | |
00478201 | 29 | -CFLAGS ?= -g -Wall -Werror -pipe |
30 | +CFLAGS ?= -Wall -Werror -pipe | |
31 | CPPFLAGS += -I. `pkg-config glib-2.0 --cflags` -DVERSION=\"$(shell cat ../VERSION)\" | |
32 | LDLIBS = `pkg-config glib-2.0 --libs` | |
816e4010 | 33 | |
ca938e3a | 34 | @@ -8,9 +8,9 @@ ALLSRC = fb-server.c log.c tools.c game. |
816e4010 | 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 |