From 64dccd7c3eb58943f76ed54d3926d58b2ae63fed Mon Sep 17 00:00:00 2001 From: scarab Date: Mon, 7 Jul 2008 11:07:30 +0000 Subject: - oprava tabu v ebuildu - pridan specific check na jablko -DApple=1 pro kompilaci na nem git-svn-id: http://opensvn.csie.org/tuxanci_ng@115 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- CMakeLists.txt | 9 +++++++-- config.h | 2 +- packaging/gentoo/tuxanci-9999.ebuild | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 120d5a3..c599c47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,14 @@ MESSAGE ( "<******************************>" ) CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 ) CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 FATAL_ERROR ) #OSX -SET ( CMAKE_OSX_ARCHITECTURES ppc i386 ) +#SET ( CMAKE_OSX_ARCHITECTURES ppc i386 ) #CMAKE_OSX_SYSROOT - +IF ( Apple ) + SET ( + CMAKE_OSX_ARCHITECTURES "ppc;i386" + CACHE_INTERNAL "OSX Architectures" FORCE + ) +ENDIF ( Apple ) SET ( CMAKE_COLOR_MAKEFILE ON ) ## balickovani SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" ) diff --git a/config.h b/config.h index 82dcca0..e3b52ef 100644 --- a/config.h +++ b/config.h @@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn113" +#define TUXANCI_NG_VERSION "svn114" diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild index 88c559d..0c4c385 100644 --- a/packaging/gentoo/tuxanci-9999.ebuild +++ b/packaging/gentoo/tuxanci-9999.ebuild @@ -16,7 +16,7 @@ IUSE="alsa dedicated" DEPEND="!dedicated? ( >=media-libs/libsdl-1.2.10 - >=media-libs/sdl-ttf-2.0.7 + >=media-libs/sdl-ttf-2.0.7 >=media-libs/sdl-image-1.2.6-r1 alsa? ( >=media-libs/sdl-mixer-1.2.7 -- cgit v1.2.3