Author: lisu Date: Wed Mar 4 12:35:49 2009 GMT Module: SOURCES Tag: HEAD ---- Log message: - works with 1.0 version
---- Files affected: SOURCES: tennix-makefile.patch (1.5 -> 1.6) , tennix-path.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/tennix-makefile.patch diff -u SOURCES/tennix-makefile.patch:1.5 SOURCES/tennix-makefile.patch:1.6 --- SOURCES/tennix-makefile.patch:1.5 Tue Feb 10 15:32:54 2009 +++ SOURCES/tennix-makefile.patch Wed Mar 4 13:35:42 2009 @@ -1,14 +1,22 @@ ---- tennix-0.7.0/makefile~ 2009-02-10 15:19:32.000000000 +0100 -+++ tennix-0.7.0/makefile 2009-02-10 15:24:38.000000000 +0100 -@@ -34,6 +34,7 @@ +--- tennix-1.0/makefile~ 2009-03-04 13:28:40.000000000 +0100 ++++ tennix-1.0/makefile 2009-03-04 13:28:00.000000000 +0100 +@@ -36,13 +36,14 @@ LIBS = - CFLAGS += -Wall -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\" + CFLAGS += -std=c99 -W -Wall -ansi -pedantic -Wcast-qual -Wwrite-strings -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\" -g +LDFLAGS = - ifeq ($(UPDRECTANGLE),1) - CFLAGS += -DDRAW_UPDATE_RECTANGLE -@@ -76,7 +77,7 @@ + USE_PYTHON ?= 1 + PYTHON_VERSION = 2.5 + + ifeq ($(USE_PYTHON),1) + CFLAGS += -I/usr/include/python$(PYTHON_VERSION)/ -DTENNIX_PYTHON +- LIBS += -lpython$(PYTHON_VERSION) ++ LIBS += -lpython + endif + + ifeq ($(NONFREE_LOCATIONS),1) +@@ -93,7 +94,7 @@ endif tennix: $(OBJ) tennix.tnx ================================================================ Index: SOURCES/tennix-path.patch diff -u SOURCES/tennix-path.patch:1.1 SOURCES/tennix-path.patch:1.2 --- SOURCES/tennix-path.patch:1.1 Tue Feb 10 15:33:22 2009 +++ SOURCES/tennix-path.patch Wed Mar 4 13:35:43 2009 @@ -1,11 +1,11 @@ ---- tennix-0.7.0/tennix.h~ 2009-02-06 00:38:26.000000000 +0100 -+++ tennix-0.7.0/tennix.h 2009-02-10 15:27:53.000000000 +0100 -@@ -34,7 +34,7 @@ +--- tennix-1.0/tennix.h~ 2009-03-04 13:25:47.000000000 +0100 ++++ tennix-1.0/tennix.h 2009-03-04 13:26:53.000000000 +0100 +@@ -37,7 +37,7 @@ + #ifdef MACOSX + # define ARCHIVE_FILE_INSTALLED "Tennix.app/Contents/Resources/" ARCHIVE_FILE + #else +-# define ARCHIVE_FILE_INSTALLED "/" PREFIX "/share/games/tennix/" ARCHIVE_FILE ++# define ARCHIVE_FILE_INSTALLED "/usr/share/tennix/tennix.tnx" #endif - #define ARCHIVE_FILE "tennix.tnx" --#define ARCHIVE_FILE_INSTALLED "/" PREFIX "share/tennix/" ARCHIVE_FILE -+#define ARCHIVE_FILE_INSTALLED "/usr/share/tennix/tennix.tnx" - - #define COPYRIGHT "Copyright 2003, 2007, 2008, 2009 Thomas Perl" - #define URL "http://icculus.org/tennix/"; + #ifdef WIN32 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tennix-makefile.patch?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tennix-path.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
