summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlisu2010-09-13 14:11:28 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit4c849fa7b24a208e67b191691773c30fb16d06b2 (patch)
treeb42ab82e5a51c50c0e7a7e3a8c4db3283eba0a1a
parent2910589b953334a858b554f29a639d6d8aff15fd (diff)
downloadedgar-4c849fa7b24a208e67b191691773c30fb16d06b2.zip
edgar-4c849fa7b24a208e67b191691773c30fb16d06b2.tar.gz
Changed files: edgar-makefile.patch -> 1.7 edgar.spec -> 1.30
-rw-r--r--edgar-makefile.patch12
-rw-r--r--edgar.spec4
2 files changed, 8 insertions, 8 deletions
diff --git a/edgar-makefile.patch b/edgar-makefile.patch
index ad62dab..434e557 100644
--- a/edgar-makefile.patch
+++ b/edgar-makefile.patch
@@ -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)
diff --git a/edgar.spec b/edgar.spec
index c6ebde0..8a3c1cd 100644
--- a/edgar.spec
+++ b/edgar.spec
@@ -1,12 +1,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