some cmake changes

- everything finished except mac os x bundle creation

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1930 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 51 insertions, 35 deletions

diff --git a/cmake/dists/gentoo/ultrastardx-1.1_alpha.ebuild b/cmake/dists/gentoo/ultrastardx-1.1.0_alpha1.ebuild
index 7170fcdb..2b2ea032 100644
--- a/cmake/dists/gentoo/ultrastardx-1.1_alpha.ebuild
+++ b/cmake/dists/gentoo/ultrastardx-1.1.0_alpha1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header $
 
-inherit eutils games
+inherit cmake-utils games
 
 SONGS_PKG=USDX-SongPackage
 SONGS_VER=01
@@ -19,7 +19,7 @@ LICENSE="GPL-2
 	)"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="projectm debug songs"
+IUSE="projectm debug songs plugins"
 
 RDEPEND="virtual/opengl
 	virtual/glu
@@ -33,33 +33,46 @@ RDEPEND="virtual/opengl
 	projectm? ( media-libs/libprojectm )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=dev-lang/fpc-2.2.0"
+	>=dev-lang/fpc-2.2.2"
 
 S=${WORKDIR}/${P}-src
 
 pkg_setup() {
-    games_pkg_setup
-    built_with_use media-libs/libsdl opengl \
-        || die "You need to compile media-libs/libsdl with USE=opengl."
+	games_pkg_setup
+	built_with_use media-libs/libsdl opengl \
+		|| die "You need to compile media-libs/libsdl with USE=opengl."
 }
 
 src_compile() {
-	egamesconf \
-		$(use_with projectm libprojectM) \
-		$(use_enable debug) \
-		|| die
-	emake || die "emake failed"
+	# set build-type as the "Gentoo" build-type does not work with
+	# Pascal (no optimization, etc.)
+	if use debug ; then
+		CMAKE_BUILD_TYPE="Debug"
+	else
+		CMAKE_BUILD_TYPE="Release"
+	fi
+
+	# set PREFIX so that CMAKE_INSTALL_PREFIX will be set to GAMES_PREFIX
+	PREFIX="${GAMES_PREFIX}"
+
+	# configure flags
+	local mycmakeargs="$(cmake-utils_use_enable projectm PROJECTM) \
+		$(cmake-utils_use_build plugins PLUGINS) \
+		-DBINDIR=${GAMES_BINDIR} \
+		-DDATADIR=${GAMES_DATADIR}/${PN}"
+
+	cmake-utils_src_compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	cmake-utils_src_install
 
 	if use songs; then
 		insinto "${GAMES_DATADIR}"/${PN}/songs
 		doins -r ${WORKDIR}/Songs/* || die "doins songs failed"
 	fi
 
-	dodoc AUTHORS.txt ChangeLog.german.txt ChangeLog.txt README.txt
+	dodoc AUTHORS.txt ChangeLog.GERMAN.txt ChangeLog.txt README.txt
 
 	doicon icons/${PN}-icon.svg
 	make_desktop_entry ${PN} "UltraStar Deluxe"
diff --git a/cmake/dists/gentoo/ultrastardx-9999.ebuild b/cmake/dists/gentoo/ultrastardx-9999.ebuild
index b1ffb5a4..51c8c91b 100644
--- a/cmake/dists/gentoo/ultrastardx-9999.ebuild
+++ b/cmake/dists/gentoo/ultrastardx-9999.ebuild
@@ -9,7 +9,7 @@ SONGS_VER=01
 
 DESCRIPTION="An open-source karaoke game"
 HOMEPAGE="http://www.ultrastardeluxe.org/"
-ESVN_REPO_URI="https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk"
+ESVN_REPO_URI="https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/branches/experimental/cmake"
 ESVN_PROJECT="ultrastardx"
 SRC_URI="songs? ( mirror://sourceforge/${PN}/${SONGS_PKG}-${SONGS_VER}.zip )"
 
@@ -20,7 +20,7 @@ LICENSE="GPL-2
 	)"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="projectm debug songs"
+IUSE="projectm debug songs plugins"
 
 RDEPEND="virtual/opengl
 	virtual/glu
@@ -39,45 +39,48 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-src
 
 pkg_setup() {
-    games_pkg_setup
-    built_with_use media-libs/libsdl opengl \
-        || die "You need to compile media-libs/libsdl with USE=opengl."
+	games_pkg_setup
+	built_with_use media-libs/libsdl opengl \
+		|| die "You need to compile media-libs/libsdl with USE=opengl."
 }
 
 src_unpack() {
-	unpack ${A}
+	if use songs; then
+		unpack ${A}
+	fi
 	subversion_src_unpack
 }
 
 src_compile() {
-	if use projectm ; then
-		enable_projectm="ON"
-	else
-		enable_projectm="OFF"
-	fi
+	# set build-type as the "Gentoo" build-type does not work with
+	# Pascal (no optimization, etc.)
 	if use debug ; then
-		build_type="Debug"
+		CMAKE_BUILD_TYPE="Debug"
 	else
-		build_type="Release"
+		CMAKE_BUILD_TYPE="Release"
 	fi
-	cmake \
-		-DCMAKE_BUILD_TYPE=$build_type \
-		-DENABLE_PROJECTM=$enable_projectm \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-		. \
-		|| die "cmake failed"
-	emake || die "emake failed"
+
+	# set PREFIX so that CMAKE_INSTALL_PREFIX will be set to GAMES_PREFIX
+	PREFIX="${GAMES_PREFIX}"
+
+	# configure flags
+	local mycmakeargs="$(cmake-utils_use_enable projectm PROJECTM) \
+		$(cmake-utils_use_build plugins PLUGINS) \
+		-DBINDIR=${GAMES_BINDIR} \
+		-DDATADIR=${GAMES_DATADIR}/${PN}"
+
+	cmake-utils_src_compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	cmake-utils_src_install
 
 	if use songs; then
 		insinto "${GAMES_DATADIR}"/${PN}/songs
 		doins -r ${WORKDIR}/Songs/* || die "doins songs failed"
 	fi
 
-	dodoc AUTHORS.txt ChangeLog.german.txt ChangeLog.txt README.txt
+	dodoc AUTHORS.txt ChangeLog.GERMAN.txt ChangeLog.txt README.txt
 
 	doicon icons/${PN}-icon.svg
 	make_desktop_entry ${PN} "UltraStar Deluxe"