packages: edgar/edgar-makefile.patch, edgar/edgar.spec - 0.70
lisu
lisu at pld-linux.org
Mon Sep 13 16:11:33 CEST 2010
Author: lisu Date: Mon Sep 13 14:11:33 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 0.70
---- Files affected:
packages/edgar:
edgar-makefile.patch (1.6 -> 1.7) , edgar.spec (1.29 -> 1.30)
---- Diffs:
================================================================
Index: packages/edgar/edgar-makefile.patch
diff -u packages/edgar/edgar-makefile.patch:1.6 packages/edgar/edgar-makefile.patch:1.7
--- packages/edgar/edgar-makefile.patch:1.6 Thu May 27 14:54:14 2010
+++ packages/edgar/edgar-makefile.patch Mon Sep 13 16:11:28 2010
@@ -1,5 +1,5 @@
---- edgar-0.57/makefile~ 2010-05-26 18:37:35.000000000 +0200
-+++ edgar-0.57/makefile 2010-05-27 09:52:00.852135096 +0200
+--- edgar-0.70/makefile~ 2010-09-13 16:06:28.767654569 +0200
++++ edgar-0.70/makefile 2010-09-13 16:06:32.781824438 +0200
@@ -24,7 +24,7 @@
CXX = gcc
@@ -15,15 +15,15 @@
-ifeq ($(DEV),1)
-CFLAGS = -Wall -g -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
--#CFLAGS = -Wall -Os -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\"
+-#CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\"
-else
--CFLAGS = -Wall -Os -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
+-CFLAGS = -Wall -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
-endif
+CFLAGS = $(OPTFLAGS) -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
ifeq ($(OS),Windows_NT)
LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lz -llibintl -lm
-@@ -92,7 +87,7 @@
+@@ -96,7 +91,7 @@
all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG)
makefile.dep : src/*/*.c src/*.c
@@ -32,7 +32,7 @@
# compiling other source files.
%.o:
-@@ -103,23 +98,23 @@
+@@ -107,23 +102,23 @@
# linking the program.
$(PROG): $(MAIN_OBJS) $(CORE_OBJS)
================================================================
Index: packages/edgar/edgar.spec
diff -u packages/edgar/edgar.spec:1.29 packages/edgar/edgar.spec:1.30
--- packages/edgar/edgar.spec:1.29 Mon Aug 16 10:07:30 2010
+++ packages/edgar/edgar.spec Mon Sep 13 16:11:28 2010
@@ -2,12 +2,12 @@
Summary: 2D Platform game
Summary(pl.UTF-8): Dwuwymiarowa gra platformowa
Name: edgar
-Version: 0.67
+Version: 0.70
Release: 1
License: GPL v2+
Group: X11/Applications/Games
Source0: http://www.parallelrealities.co.uk/download/edgar/%{name}-%{version}-1.tar.gz
-# Source0-md5: b1aeb1db8ea2416da926c9b4cc0fe946
+# Source0-md5: 5abe9d6ce269827a7129af278bbe47a4
Source1: %{name}.png
Patch0: %{name}-makefile.patch
Patch1: %{name}-useless_files.patch
@@ -71,6 +71,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2010/09/13 14:11:28 lisu
+- 0.70
+
Revision 1.29 2010/08/16 08:07:30 lisu
- 0.67
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/edgar/edgar-makefile.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/edgar/edgar.spec?r1=1.29&r2=1.30&f=u
More information about the pld-cvs-commit
mailing list