- zaklad pro DESTDIR (bereme ho v potaz stejne jako CMAKE_INSTALL_PREFIX [jedno kterej pouzijem])

- pridan ebuild pro gentoo
- oprava config.h kdy sem o5 neinkrementoval to cislo


git-svn-id: http://opensvn.csie.org/tuxanci_ng@105 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

4 files changed, 69 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5b7880..ed6fd23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,9 @@ MESSAGE ( "Configure for ${APPNAME} Started" )
 MESSAGE ( "<******************************>" )
 CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 )
 CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 FATAL_ERROR )
+#OSX
+#CMAKE_OSX_ARCHITECTURES=ppc;i386
+#CMAKE_OSX_SYSROOT
 
 SET ( CMAKE_COLOR_MAKEFILE ON )
 ## balickovani 
@@ -30,8 +33,12 @@ SET ( TUXANCI_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MI
 SET ( TUXANCI_VERSION_FULL "${KGTK_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}" )
 SET ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${KGTK_VERSION_FULL}" )
 INCLUDE ( CPack )
-SET ( CMAKE_BUILD_TYPE_SHARED_LIBS ON )
 
+SET ( CMAKE_BUILD_TYPE_SHARED_LIBS ON )
+#MESSAGE ( "PREFIX ${CMAKE_INSTALL_PREFIX}" )
+SET ( CMAKE_INSTALL_PREFIX ${DESTDIR} )
+#ADD_DEFINITIONS ( -DDESTDIR "${CMAKE_INSTALL_PREFIX}" )
+#MESSAGE ( "PREFIX ${CMAKE_INSTALL_PREFIX}" )
 # flagy
 SET( CMAKE_C_FLAGS $ENV{CFLAGS} )
 SET( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} )
diff --git a/config.h b/config.h
index eee68b9..ddfd07d 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,4 @@
 
-#define TUXANCI_NG_VERSION "svn102"
+#define TUXANCI_NG_VERSION "svn105"
 
 #define DESTDIR "/usr/local/"
diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild
new file mode 100644
index 0000000..b1db205
--- /dev/null
+++ b/packaging/gentoo/tuxanci-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games cmake-utils subversion
+
+DESCRIPTION="Tuxanci is first cushion shooter based on well-known Czech game Bulanci."
+HOMEPAGE="http://www.tuxanci.org/"
+#SRC_URI=""
+ESVN_REPO_URI="http://opensvn.csie.org/tuxanci_ng"
+LICENSE="GPL2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa dedicated"
+# alsa is used only when building client
+
+DEPEND="!dedicated? (
+			>=media-libs/libsdl-1.2.10
+        	>=media-libs/sdl-ttf-2.0.7
+			>=media-libs/sdl-image-1.2.6-r1
+			alsa? (
+				>=media-libs/sdl-mixer-1.2.7
+			)
+		)
+		"
+RDEPEND="${DEPEND}"
+S=${WORKDIR}/${PN}
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+	# setting proper prefix
+	sed -i \
+		-e "s:/usr/local/:${GAMES_PREFIX}/:" config.h \
+		|| die "sed config.h failed!"
+	sed -i \
+		-e "s:share/tuxanci-ng:${GAMES_DATADIR}/tuxanci-ng:" src/base/path.h \
+		|| die "sed config.h failed!"
+	sed -i \
+		-e "s:DESTDIR PATH_DIR:PATH_DIR:" src/base/path.h \
+		|| die "sed config.h failed!"
+	# setting proper install path
+	sed -i \
+		-e "s:CMAKE_INSTALL_DATADIR share/:CMAKE_INSTALL_DATADIR /usr/share/games/:" CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed!"
+	sed -i \
+		-e "s:CMAKE_INSTALL_BINDIR bin:CMAKE_INSTALL_BINDIR /usr/games/bin:" src/CMakeLists.txt \
+		|| die "sed src/CMakeLists.txt failed!"
+	sed -i \
+		-e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR /usr/games/lib:" src/CMakeLists.txt \
+		|| die "sed src/MakeLists.txt failed!"	
+}
+src_compile() {
+	local mycmakeargs
+	use alsa || mycmakeargs="${mycmakeargs} -DNO_Audio=1"
+	use dedicated && mycmakeargs="${mycmakeargs} -DNO_Server=1"
+	cmake-utils_src_compile
+}
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index f0de21f..265946f 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -236,7 +236,6 @@ void initArenaFile()
 
 	isArenaFileInit = TRUE;
 	listArenaFile  = newList();
-
 	p = loadDirector(PATH_ARENA);
 
 	for( i = 0 ; i < p->list->count ; i++ )