performous-commit Mailing List for Performous (Page 128)

The All-in-One music game

Brought to you by: aave000, tronic, yoda-jm

performous-commit — SCM commits

You can subscribe to this list here.

2009	_Jan	_Feb	_Mar	_Apr	_May	_Jun (25)	_Jul (288)	_Aug (119)	_Sep (31)	_Oct (59)	_Nov (458)	_Dec (359)
2010	_Jan (268)	_Feb (26)	_Mar (36)	_Apr (48)	_May (119)	_Jun (37)	_Jul (173)	_Aug (429)	_Sep (137)	_Oct (156)	_Nov (59)	_Dec (45)
2011	_Jan (398)	_Feb (257)	_Mar (49)	_Apr (5)	_May (34)	_Jun (11)	_Jul (38)	_Aug (12)	_Sep (1)	_Oct (49)	_Nov (5)	_Dec (10)
2012	_Jan (21)	_Feb (32)	_Mar (20)	_Apr (1)	_May (2)	_Jun	_Jul (173)	_Aug	_Sep (25)	_Oct (6)	_Nov (44)	_Dec

Flat | Threaded

<< < 1 .. 126 127 128 129 130 .. 163 > >> (Page 128 of 163)

[Performous-commit] Lasse Karkkainen : Improved instrument help

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 10:49:26

Module: performous
Branch: master
Commit: 3b0a20932cd1f80d8a1d61dbca7d0c42514cf064

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 12:49:12 2009 +0200

Improved instrument help

---

 themes/default/instrumenthelp.svg |  203 +++++++++++++++++++++----------------
 1 files changed, 116 insertions(+), 87 deletions(-)

[Performous-commit] Lasse Karkkainen : More contrast for tap balls

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 10:36:15

Module: performous
Branch: master
Commit: db86e16169afbd21e8ab236897f5c16f2cdcbb23

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 12:35:53 2009 +0200

More contrast for tap balls

---

 game/guitargraph.cc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 8dafc88..1499eab 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -518,10 +518,12 @@ void GuitarGraph::drawNote(int fret, glutil::Color c, float tBeg, float tEnd, fl
 	}
 	if (tappable) {
 		float l = std::max(0.5, m_correctness.get());
-		glColor3f(l, l, l);
 		if (m_use3d) {
+			glColor3f(l, l, l);
 			m_tappableObj.draw(x, yBeg, 0.0f);
 		} else {
+			l = l * 2.0 - 1.0; // Full black to white range to overcome ambient lighting or something
+			glColor3f(l, l, l);
 			m_tap.dimensions.center(yBeg).middle(x);
 			m_tap.draw();
 		}

[Performous-commit] Lasse Karkkainen : Merge branch 'master' of ssh://tronic@git.performous.org /gitroot/performous/performous

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 10:36:13

Module: performous
Branch: master
Commit: 359cb375eb456f334904a7cf617653ff3135d969

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 12:32:04 2009 +0200

Merge branch 'master' of ssh://tronic@git.performous.org/gitroot/performous/performous

---

[Performous-commit] Lasse Karkkainen : Modified tap object.

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 10:36:11

Module: performous
Branch: master
Commit: dc2402af7985cc4966b8472645c6ba8b7af0b496

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 12:31:40 2009 +0200

Modified tap object.

---

 themes/default/fret_tap.obj |  678 ++++++-------------------------------------
 1 files changed, 84 insertions(+), 594 deletions(-)

[Performous-commit] Vincent Le Ligeour : Fixed latest packaging issues

From: Yoda-JM <yo...@us...> - 2009-11-28 10:11:02

Module: performous
Branch: master
Commit: 0729391d00e58edda6ade596972f2288380795fa

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Nov 28 11:09:48 2009 +0100

Fixed latest packaging issues

---

 cmake/performous-packaging.cmake                   |    1 -
 .../performous/performous-0.4.0.ebuild             |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index 8fe3e9f..d987ed5 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -6,7 +6,6 @@ set(CPACK_SOURCE_IGNORE_FILES
    "/.cvsignore"
    "/.gitignore"
    "/songs/"
-   "/libs/"
    "/build/"
    "/.svn/"
    "/.git/"
diff --git a/portage-overlay/games-arcade/performous/performous-0.4.0.ebuild b/portage-overlay/games-arcade/performous/performous-0.4.0.ebuild
index c692990..3bab746 100644
--- a/portage-overlay/games-arcade/performous/performous-0.4.0.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-0.4.0.ebuild
@@ -75,7 +75,7 @@ src_configure() {
 		$(cmake-utils_use_enable tools TOOLS)
 		$(cmake-utils_use_enable editor EDITOR)
 		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
-		-DSHARE_INSTALL=share/
+		-DSHARE_INSTALL=share/performous/
 		-DLIBDA_AUTODETECT_PLUGINS=false
 		-DLIBDA_PLUGIN_TESTING=false
 		-DCMAKE_BUILD_TYPE=Release"

[Performous-commit] Vincent Le Ligeour : Revert "Bump version number"

From: Yoda-JM <yo...@us...> - 2009-11-28 10:11:01

Module: performous
Branch: master
Commit: 35f7c53fbff5fecd288332d3dee3e80f395efb38

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Nov 28 10:39:33 2009 +0100

Revert "Bump version number"

This reverts commit b1ac859271ccef79392e2995458452d2db37b331.

---

 CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a549d2a..6437a8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(Performous CXX)
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.6)
-set(PROJECT_VERSION "0.4.0+")
+set(PROJECT_VERSION "0.4.0")
 
 # Avoid source tree pollution
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

[Performous-commit] Lasse Karkkainen : Tappable ball as a separate object of different color instead of flashing the entire note . Needs new fret_tap.obj.

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 09:54:28

Module: performous
Branch: master
Commit: 3e2dc6fd2035dea1793df7ca9c0b2298d77ce172

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 11:54:17 2009 +0200

Tappable ball as a separate object of different color instead of flashing the entire note. Needs new fret_tap.obj.

---

 game/guitargraph.cc |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 0b70d13..8dafc88 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -440,26 +440,12 @@ void GuitarGraph::draw(double time) {
 				glow = m_events[event - 1].glow.get();
 				whammy = m_events[event - 1].whammy.get();
 			}
-			/*
-			if (glow > 0.0f) {
-				glBlendFunc(GL_ONE, GL_ONE);
-				drawNote(fret, glutil::Color(glow, glow, glow), tBeg, tEnd);
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			}
-			*/
 			glutil::Color c = color(fret);
 			c.r += glow;
 			c.g += glow;
 			c.b += glow;
 			drawNote(fret, c, tBeg, tEnd, whammy, it->tappable);
 
-			if (!m_use3d && it->tappable) {
-				float l = std::max(0.5, m_correctness.get());
-				glColor3f(l, l, l);
-				float x = -2.0f + fret;
-				m_tap.dimensions.center(time2y(tBeg)).middle(x);
-				m_tap.draw();
-			}
 		}
 	}
 	glColor3f(1.0f, 1.0f, 1.0f);
@@ -475,8 +461,6 @@ namespace {
 }
 
 void GuitarGraph::drawNote(int fret, glutil::Color c, float tBeg, float tEnd, float whammy, bool tappable) {
-	Object3d* obj = &m_fretObj;
-	if (tappable) obj = &m_tappableObj;
 	float x = -2.0f + fret;
 	if (m_drums) x -= 0.5f;
 	if (m_drums && fret == 0) {
@@ -493,9 +477,8 @@ void GuitarGraph::drawNote(int fret, glutil::Color c, float tBeg, float tEnd, fl
 		if (m_use3d) {
 			y -= fretWid;
 			c.a = clamp(time2a(tBeg)*2.0f,0.0f,1.0f);
-			if (tappable && m_correctness.get() < .99) { c.r *= 0.5f; c.g *= 0.5f; c.b *= 0.5f; }
 			glColor4fv(c);
-			obj->draw(x, y, 0.0f);
+			m_fretObj.draw(x, y, 0.0f);
 			y -= fretWid;
 		} else {
 			UseTexture tblock(m_button_l);
@@ -526,13 +509,23 @@ void GuitarGraph::drawNote(int fret, glutil::Color c, float tBeg, float tEnd, fl
 		// Too short note: only render the ring
 		if (m_use3d) {
 			c.a = clamp(time2a(tBeg)*2.0f,0.0f,1.0f); glColor4fv(c);
-			obj->draw(x, time2y(tBeg), 0.0f);
+			m_fretObj.draw(x, time2y(tBeg), 0.0f);
 		} else {
 			c.a = time2a(tBeg); glColor4fv(c);
 			m_button.dimensions.center(time2y(tBeg)).middle(x);
 			m_button.draw();
 		}
 	}
+	if (tappable) {
+		float l = std::max(0.5, m_correctness.get());
+		glColor3f(l, l, l);
+		if (m_use3d) {
+			m_tappableObj.draw(x, yBeg, 0.0f);
+		} else {
+			m_tap.dimensions.center(yBeg).middle(x);
+			m_tap.draw();
+		}
+	}
 }
 
 void GuitarGraph::drawBar(double time, float h) {

[Performous-commit] Lasse Karkkainen : Bump version number

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 09:22:42

Module: performous
Branch: master
Commit: b1ac859271ccef79392e2995458452d2db37b331

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 11:22:29 2009 +0200

Bump version number

---

 CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6437a8e..a549d2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(Performous CXX)
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.6)
-set(PROJECT_VERSION "0.4.0")
+set(PROJECT_VERSION "0.4.0+")
 
 # Avoid source tree pollution
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

[Performous-commit] Lasse Karkkainen : Always draw cursor in 2D (even when using 3D notes)

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 09:20:33

Module: performous
Branch: master
Commit: b0ef12406605b91caee8c2640a5e9e00230d3e07

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 11:20:22 2009 +0200

Always draw cursor in 2D (even when using 3D notes)

---

 game/guitargraph.cc |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index f0a9916..0b70d13 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -407,6 +407,21 @@ void GuitarGraph::draw(double time) {
 			glTexCoord2f(1.0f, texCoord); glVertex2f(w, time2y(tEnd));
 		}
 	}
+	// Draw the cursor
+	float level = m_hit[0].get();
+	glColor3f(level, level, level);
+	drawBar(0.0, 0.01f);
+	// Fret buttons on cursor
+	for (int fret = m_drums; fret < 5; ++fret) {
+		float x = -2.0f + fret - 0.5f * m_drums;
+		float l = m_hit[fret + !m_drums].get();
+		glColor4fv(color(fret));
+		m_button.dimensions.center(time2y(0.0)).middle(x);
+		m_button.draw();
+		glColor3f(l, l, l);
+		m_tap.dimensions = m_button.dimensions;
+		m_tap.draw();
+	}
 	// Draw the notes
 	glutil::UseLighting lighting(m_use3d);
 	for (Chords::const_iterator it = m_chords.begin(); it != m_chords.end(); ++it) {
@@ -447,25 +462,6 @@ void GuitarGraph::draw(double time) {
 			}
 		}
 	}
-	// Draw the cursor
-	float level = m_hit[0].get();
-	glColor3f(level, level, level);
-	drawBar(0.0, 0.01f);
-	// Fret buttons on cursor
-	for (int fret = m_drums; fret < 5; ++fret) {
-		float x = -2.0f + fret - 0.5f * m_drums;
-		float l = m_hit[fret + !m_drums].get();
-		glColor4fv(color(fret));
-		if (m_use3d) {
-			m_fretObj.draw(x, time2y(0.0), (1.0-l)/8.0);
-		} else {
-			m_button.dimensions.center(time2y(0.0)).middle(x);
-			m_button.draw();
-			glColor3f(l, l, l);
-			m_tap.dimensions = m_button.dimensions;
-			m_tap.draw();
-		}
-	}
 	glColor3f(1.0f, 1.0f, 1.0f);
 }

[Performous-commit] Lasse Karkkainen : Install libda to performous dir

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 08:53:43

Module: performous
Branch: master
Commit: c6c4cd031628e321e25d753f27a34b0ba10dba94

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 10:53:30 2009 +0200

Install libda to performous dir

---

 libs/libda/CMakeLists.txt    |   17 +++++++++++++----
 libs/libda/cmake/config.h.in |    4 +++-
 libs/libda/src/audio.cpp     |    3 ++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index 5c8f5d4..76fe7eb 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -21,15 +21,24 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 set(LIB_SUFFIX "" CACHE STRING "Optional suffix to use on lib folders (e.g. 64 for lib64)")
 set(LibDA_CMAKE_DIR share/libda/cmake CACHE STRING "Relative path (from prefix) where to put CMake configuration files")
-set(LibDA_PLUGIN_DIR "lib${LIB_SUFFIX}/libda")
+
+if(SLAVE_LIB)
+	set(LibDA_PLUGIN_FOLDER "performous/libda-${LibDA_VERSION_MAJOR}")
+else()
+	set(LibDA_PLUGIN_FOLDER "libda-${LibDA_VERSION_MAJOR}")
+endif()
+
+set(LibDA_PLUGIN_DIR "lib${LIB_SUFFIX}/${LibDA_PLUGIN_FOLDER}")
 
 include_directories(include)
 
+# Store version data in config.h
+set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/libda/config.h)
+configure_file(cmake/config.h.in ${CONFIG_H} ESCAPE_QUOTES @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 if(NOT SLAVE_LIB)
 	include(cmake/libda-packaging.cmake)
-	# Store version data in config.h
-	set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-	configure_file(cmake/config.h.in ${CONFIG_H} ESCAPE_QUOTES @ONLY)
 	# Install include files
 	file(GLOB HEADER_FILES "include/libda/*")
 	install(FILES ${HEADER_FILES} ${CONFIG_H} DESTINATION include/libda)
diff --git a/libs/libda/cmake/config.h.in b/libs/libda/cmake/config.h.in
index b08238c..422b249 100644
--- a/libs/libda/cmake/config.h.in
+++ b/libs/libda/cmake/config.h.in
@@ -1,9 +1,11 @@
 #ifndef LIBDA_CONFIG_H
 #define LIBDA_CONFIG_H
 
+// Note C versions use all-capital LIBDA, while CMake has LibDA...
+
 #define LIBDA_VERSION "@LibDA_VERSION@"
 #define LIBDA_VERSION_MAJOR @LibDA_VERSION_MAJOR@
 #define LIBDA_VERSION_MINOR @LibDA_VERSION_MINOR@
-
+#define LIBDA_PLUGIN_FOLDER "@LibDA_PLUGIN_FOLDER@"
 #endif
 
diff --git a/libs/libda/src/audio.cpp b/libs/libda/src/audio.cpp
index 8374a66..5dfb894 100644
--- a/libs/libda/src/audio.cpp
+++ b/libs/libda/src/audio.cpp
@@ -2,6 +2,7 @@
 #include <libda/audio_dev.hpp>
 #undef BUILDING_DLL
 
+#include <libda/config.h>
 #include <plugin++/loader.hpp>
 #include <ostream>
 #include <limits>
@@ -13,7 +14,7 @@ namespace da {
 	class init_impl {
 		plugin::loader m_loader;
 	  public:
-		init_impl(): m_loader("libda") {}
+		init_impl(): m_loader(LIBDA_PLUGIN_FOLDER) {}
 	};
 
 	initialize::initialize(): m_impl(new init_impl) {}

[Performous-commit] Markus Raab : Packaging for plugin++ (Debian 5.*)

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:05:18

Module: performous
Branch: menu
Commit: 6a211f3778dcb876f6c5b59e88d21b1ca77b3c6a

Author: Markus Raab <un...@ma...>
Date:   Thu Nov 26 09:11:25 2009 +0100

Packaging for plugin++ (Debian 5.*)

---

 libs/plugin++/CMakeLists.txt                 |    2 +
 libs/plugin++/cmake/plugin++-packaging.cmake |   61 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index fca339f..4d2e22c 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -10,6 +10,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles")
 endif()
 
+include("${CMAKE_SOURCE_DIR}/cmake/plugin++-packaging.cmake")
+
 # Add a sensible build type default and warning because empty means no optimization and no debug info.
 if(NOT CMAKE_BUILD_TYPE)
 	message("WARNING: CMAKE_BUILD_TYPE is not defined!\n         Defaulting to CMAKE_BUILD_TYPE=Release. Use ccmake to set a proper value.")
diff --git a/libs/plugin++/cmake/plugin++-packaging.cmake b/libs/plugin++/cmake/plugin++-packaging.cmake
new file mode 100644
index 0000000..c0c192a
--- /dev/null
+++ b/libs/plugin++/cmake/plugin++-packaging.cmake
@@ -0,0 +1,61 @@
+set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
+set(CPACK_PACKAGE_VERSION "${Plugin++_VERSION}")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY " Plugin++ is a cross platform plug-in framework for C++ that uses XML to marshal data across the application and the shared library space.")
+set(CPACK_PACKAGE_CONTACT "http://sourceforge.net/projects/pluginpp/")
+set(CPACK_SOURCE_IGNORE_FILES
+   "/.cvsignore"
+   "/.gitignore"
+   "/songs/"
+   "/build/"
+   "/.svn/"
+   "/.git/"
+   "/osx-utils/"
+   "/portage-overlay/"
+)
+
+
+if("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+	set(CPACK_STRIP_FILES TRUE)
+endif("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+
+
+if(UNIX)
+	# Try to find architecture
+	execute_process(COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE)
+	string(STRIP "${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_ARCHITECTURE)
+	# Try to find distro name and distro-specific arch
+	execute_process(COMMAND lsb_release -is OUTPUT_VARIABLE LSB_ID)
+	execute_process(COMMAND lsb_release -rs OUTPUT_VARIABLE LSB_RELEASE)
+	string(STRIP "${LSB_ID}" LSB_ID)
+	string(STRIP "${LSB_RELEASE}" LSB_RELEASE)
+	set(LSB_DISTRIB "${LSB_ID}${LSB_RELEASE}")
+	if(NOT LSB_DISTRIB)
+		set(LSB_DISTRIB "unix")
+	endif(NOT LSB_DISTRIB)
+	# For Debian-based distros we want to create DEB packages.
+	if("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
+		set(CPACK_GENERATOR "DEB")
+		set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
+		set(CPACK_DEBIAN_PACKAGE_SECTION "universe/games")
+		set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "ultrastar-songs, ultrastar-songs-restricted, msttcorefonts")
+		# We need to alter the architecture names as per distro rules
+		if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+			set(CPACK_PACKAGE_ARCHITECTURE i386)
+		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+		if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+			set(CPACK_PACKAGE_ARCHITECTURE amd64)
+		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+		# Set the dependencies based on the distro version
+		if("${LSB_DISTRIB}" MATCHES "Debian5.*")
+			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-dev, libc6-dev")
+		endif("${LSB_DISTRIB}" MATCHES "Debian5.*")
+		if(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
+			message("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
+		endif(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
+	endif("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
+	set(CPACK_SYSTEM_NAME "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}")
+	message(STATUS "Detected ${CPACK_SYSTEM_NAME}. Use make package to build packages (${CPACK_GENERATOR}).")
+endif(UNIX)
+
+include(CPack)
+

[Performous-commit] Lasse Karkkainen : Merge branch 'master' into menu

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:04:09

Module: performous
Branch: menu
Commit: 8e45377114ff4092063dc8d778c5edae604b3ee5

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 07:02:19 2009 +0200

Merge branch 'master' into menu

Conflicts:
	docs/Compiling.txt

---

[Performous-commit] Lasse Karkkainen : The order DOES matter. Fixed the damn linking problem.

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:04:07

Module: performous
Branch: menu
Commit: 63eebb0036672ff682145ea5f5bd09cd52ccdaef

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 06:53:38 2009 +0200

The order DOES matter. Fixed the damn linking problem.

---

 game/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 1e9e60e..b2c5dd8 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND LIBS ${Boost_LIBRARIES})
 # Libraries are part of Performous build process (for now)
 set(SLAVE_LIBS TRUE)
 if(SLAVE_LIBS)
-	list(APPEND LIBS plugin++ da)
+	list(APPEND LIBS da plugin++)
 else()
 	set(OUR_LIBS Plugin++ LibDA)
 endif()

[Performous-commit] Lasse Karkkainen : Use static linkage on libs to avoid installing them, remove relative RPATHs

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:04:05

Module: performous
Branch: menu
Commit: d7a662fd6f74836c84b4548a1a0c5bdfb8feb74f

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Nov 27 16:31:32 2009 +0200

Use static linkage on libs to avoid installing them, remove relative RPATHs

---

 game/CMakeLists.txt           |    4 ++--
 libs/libda/src/CMakeLists.txt |    2 +-
 libs/plugin++/CMakeLists.txt  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 951e708..1e9e60e 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -48,9 +48,9 @@ target_link_libraries(performous ${LIBS})
 
 # Store library paths in executable
 if(APPLE)
-	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH "@loader_path/../lib${LIB_SUFFIX}:@loader_path/../../lib${LIB_SUFFIX}")
+	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 else()
-	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}:\$ORIGIN/../../lib${LIB_SUFFIX}")
+	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()
 
 # Generate config.hh
diff --git a/libs/libda/src/CMakeLists.txt b/libs/libda/src/CMakeLists.txt
index a767b7d..f98f903 100644
--- a/libs/libda/src/CMakeLists.txt
+++ b/libs/libda/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-add_library(da SHARED audio.cpp)
+add_library(da STATIC audio.cpp)
 target_link_libraries(da ${Boost_LIBRARIES} ${Plugin++_LIBRARIES})
 
 set_target_properties(da PROPERTIES
diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index b8e8b16..d311340 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -28,7 +28,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -Wextra")
 endif()
 
-add_library(plugin++ SHARED src/dll.cc src/execname.cc src/loader.cc)
+add_library(plugin++ STATIC src/dll.cc src/execname.cc src/loader.cc)
 
 find_package(DL REQUIRED)
 include_directories(${DL_INCLUDE_DIRS})

[Performous-commit] Lasse Karkkainen : Made libs part of performous build again

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:04:02

Module: performous
Branch: menu
Commit: c32b0e39924263b0c7727a269d7b7a0079be51e6

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Nov 27 16:19:53 2009 +0200

Made libs part of performous build again

---

 CMakeLists.txt                |    3 ++-
 docs/Compiling.txt            |   16 +++-------------
 game/CMakeLists.txt           |   16 ++++++++++++----
 libs/CMakeLists.txt           |    8 ++++++++
 libs/libda/CMakeLists.txt     |   30 +++++++++++++++++-------------
 libs/libda/src/CMakeLists.txt |    4 +++-
 libs/plugin++/CMakeLists.txt  |   16 +++++++++-------
 7 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35002bb..6437a8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles")
 endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 
-include("${CMAKE_SOURCE_DIR}/cmake/performous-packaging.cmake")
+include(cmake/performous-packaging.cmake)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
@@ -32,6 +32,7 @@ mark_as_advanced(SHARE_INSTALL)
 include_directories(libs/plugin++/include)
 include_directories(libs/libda/include)
 
+add_subdirectory(libs)
 add_subdirectory(themes)
 add_subdirectory(data)
 add_subdirectory(game)
diff --git a/docs/Compiling.txt b/docs/Compiling.txt
index 4327ad9..ef02a4b 100644
--- a/docs/Compiling.txt
+++ b/docs/Compiling.txt
@@ -2,21 +2,11 @@ To install from git:
 
 	# Checkout the git
 	git clone git://performous.git.sourceforge.net/gitroot/performous/performous
-	# Create separate build folder under trunk to avoid polluting the source three
+	# Create separate build folder under trunk to avoid polluting the source tree
 	mkdir performous/build
 	cd performous/build
-	# Compile and install libplugin++ (our C++ plugin/DLL library)
-	cmake ../libs/plugin++/
-	make
-	sudo make install
-	rm -rf *
-	# Compile and install libda (our audio library)
-	cmake ../libs/libda/
-	make
-	sudo make install
-	rm -rf *
-	# Compile the game itself
-	cmake ..
+	# Compile the game and its support libraries
+	cmake ../
 	make
 	sudo make install
 	# Run the game
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 66b61da..951e708 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -9,20 +9,28 @@ set(SOURCES ${SOURCE_FILES} ${HEADER_FILES})
 
 find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time program_options regex filesystem)
 include_directories(${Boost_INCLUDE_DIRS})
-set(LIBS ${LIBS} ${Boost_LIBRARIES})
+list(APPEND LIBS ${Boost_LIBRARIES})
+
+# Libraries are part of Performous build process (for now)
+set(SLAVE_LIBS TRUE)
+if(SLAVE_LIBS)
+	list(APPEND LIBS plugin++ da)
+else()
+	set(OUR_LIBS Plugin++ LibDA)
+endif()
 
 # Find all the libs that don't require extra parameters
-foreach(lib Plugin++ LibDA SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL)
+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL)
 	find_package(${lib} REQUIRED)
 	include_directories(${${lib}_INCLUDE_DIRS})
-	set(LIBS ${LIBS} ${${lib}_LIBRARIES})
+	list(APPEND LIBS ${${lib}_LIBRARIES})
 	add_definitions(${${lib}_DEFINITIONS})
 endforeach(lib)
 
 find_package(PortMidi)
 if(PortMidi_FOUND)
 	include_directories(PortMidi_INCLUDE_DIRS)
-	set(LIBS ${LIBS} ${PortMidi_LIBRARIES})
+	list(APPEND LIBS ${PortMidi_LIBRARIES})
 	add_definitions("-DHAVE_PORTMIDI")
 endif(PortMidi_FOUND)
 
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
new file mode 100644
index 0000000..679f8c3
--- /dev/null
+++ b/libs/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 2.6)
+
+# Make plugin++ and libda not install themselves on the system
+set(SLAVE_LIB TRUE)
+
+add_subdirectory(plugin++)
+add_subdirectory(libda)
+
diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index f151649..5c8f5d4 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -11,8 +11,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/cmake/libda-packaging.cmake")
-
 # Add a sensible build type default and warning because empty means no optimization and no debug info.
 if(NOT CMAKE_BUILD_TYPE)
 	message("WARNING: CMAKE_BUILD_TYPE is not defined!\n         Defaulting to CMAKE_BUILD_TYPE=Release. Use ccmake to set a proper value.")
@@ -27,13 +25,17 @@ set(LibDA_PLUGIN_DIR "lib${LIB_SUFFIX}/libda")
 
 include_directories(include)
 
-# Store version data in config.h
-set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(cmake/config.h.in ${CONFIG_H} ESCAPE_QUOTES @ONLY)
-
-# Install include files
-file(GLOB HEADER_FILES "include/libda/*")
-install(FILES ${HEADER_FILES} ${CONFIG_H} DESTINATION include/libda)
+if(NOT SLAVE_LIB)
+	include(cmake/libda-packaging.cmake)
+	# Store version data in config.h
+	set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+	configure_file(cmake/config.h.in ${CONFIG_H} ESCAPE_QUOTES @ONLY)
+	# Install include files
+	file(GLOB HEADER_FILES "include/libda/*")
+	install(FILES ${HEADER_FILES} ${CONFIG_H} DESTINATION include/libda)
+	# Generate CMake scripts for finding the library
+	add_subdirectory(cmake)
+endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
 	message(STATUS "GCC detected, adding compile flags")
@@ -48,11 +50,13 @@ set(Boost_USE_MULTITHREAD ON)
 find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time)
 include_directories(${Boost_INCLUDE_DIRS})
 
-find_package(Plugin++ REQUIRED)
-message(plugin++ ${Plugin++_INCLUDE_DIRS})
-include_directories(${Plugin++_INCLUDE_DIRS})
+if(SLAVE_LIB)
+	set(Plugin++_LIBRARIES da)
+else()
+	find_package(Plugin++ REQUIRED)
+	include_directories(${Plugin++_INCLUDE_DIRS})
+endif()
 
 add_subdirectory(src)
 add_subdirectory(plugins)
-add_subdirectory(cmake)
 
diff --git a/libs/libda/src/CMakeLists.txt b/libs/libda/src/CMakeLists.txt
index ba22301..a767b7d 100644
--- a/libs/libda/src/CMakeLists.txt
+++ b/libs/libda/src/CMakeLists.txt
@@ -11,5 +11,7 @@ set_target_properties(da PROPERTIES
 	INSTALL_RPATH_USE_LINK_PATH TRUE
 )
 
-install(TARGETS da EXPORT LibDA DESTINATION lib${LIB_SUFFIX})
+if(NOT SLAVE_LIB)
+	install(TARGETS da EXPORT LibDA DESTINATION lib${LIB_SUFFIX})
+endif()
 
diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index 4d2e22c..b8e8b16 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -10,8 +10,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/cmake/plugin++-packaging.cmake")
-
 # Add a sensible build type default and warning because empty means no optimization and no debug info.
 if(NOT CMAKE_BUILD_TYPE)
 	message("WARNING: CMAKE_BUILD_TYPE is not defined!\n         Defaulting to CMAKE_BUILD_TYPE=Release. Use ccmake to set a proper value.")
@@ -50,11 +48,15 @@ set_target_properties(plugin++ PROPERTIES
 	INSTALL_RPATH_USE_LINK_PATH TRUE
 )
 
-install(TARGETS plugin++ EXPORT Plugin++ DESTINATION lib${LIB_SUFFIX})
+if(NOT SLAVE_LIB)
+	include(cmake/plugin++-packaging.cmake)
+
+	install(TARGETS plugin++ EXPORT Plugin++ DESTINATION lib${LIB_SUFFIX})
 
-FILE(GLOB HEADER_FILES "include/plugin++/*")
-install(FILES ${HEADER_FILES} DESTINATION include/plugin++)
+	FILE(GLOB HEADER_FILES "include/plugin++/*")
+	install(FILES ${HEADER_FILES} DESTINATION include/plugin++)
 
-# Install/generate CMake files for finding Plugin++
-add_subdirectory(cmake)
+	# Install/generate CMake files for finding Plugin++
+	add_subdirectory(cmake)
+endif()

[Performous-commit] Lasse Karkkainen : Minor plugin++ cleanup

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:04:00

Module: performous
Branch: menu
Commit: bc84486eeedcc8af3579ec7426521f4df871da94

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Nov 27 05:43:37 2009 +0200

Minor plugin++ cleanup

---

 libs/plugin++/include/plugin++/execname.hpp |    4 ++++
 libs/plugin++/include/plugin++/loader.hpp   |    1 +
 libs/plugin++/include/plugin++/plugin.hpp   |   11 +----------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/libs/plugin++/include/plugin++/execname.hpp b/libs/plugin++/include/plugin++/execname.hpp
index 4c53315..e999cb9 100644
--- a/libs/plugin++/include/plugin++/execname.hpp
+++ b/libs/plugin++/include/plugin++/execname.hpp
@@ -1,4 +1,7 @@
 #pragma once
+#ifndef EXECNAME_HPP_INCLUDED
+#define EXECNAME_HPP_INCLUDED
+
 #include <boost/filesystem.hpp>
 
 namespace plugin {
@@ -7,3 +10,4 @@ namespace plugin {
 	boost::filesystem::path execname();
 }
 
+#endif
diff --git a/libs/plugin++/include/plugin++/loader.hpp b/libs/plugin++/include/plugin++/loader.hpp
index 5c551a9..4463cf6 100644
--- a/libs/plugin++/include/plugin++/loader.hpp
+++ b/libs/plugin++/include/plugin++/loader.hpp
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef LOADER_HPP_INCLUDED
 #define LOADER_HPP_INCLUDED
 
diff --git a/libs/plugin++/include/plugin++/plugin.hpp b/libs/plugin++/include/plugin++/plugin.hpp
index b1fa2f0..3222e79 100644
--- a/libs/plugin++/include/plugin++/plugin.hpp
+++ b/libs/plugin++/include/plugin++/plugin.hpp
@@ -1,13 +1,4 @@
-//  plugin.hpp - C++ plugin framework
-
-//  Copyright Lasse Karkkainen 2007-2008
-
-//  Use, modification, and distribution is subject to the Boost Software
-//  License, Version 1.0 or later. (See accompanying file LICENSE_1_0.txt or
-//  copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See library home page at http://www.boost.org/libs/plugin
-
+#pragma once
 #ifndef PLUGIN_HPP_INCLUDED
 #define PLUGIN_HPP_INCLUDED

[Performous-commit] Lasse Karkkainen : Omit libs dir from source package

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:03:58

Module: performous
Branch: menu
Commit: 3af6a7970126fecd8ee41d720fe35109fc4d8712

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Nov 26 17:58:43 2009 +0200

Omit libs dir from source package

---

 cmake/performous-packaging.cmake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index d987ed5..8fe3e9f 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -6,6 +6,7 @@ set(CPACK_SOURCE_IGNORE_FILES
    "/.cvsignore"
    "/.gitignore"
    "/songs/"
+   "/libs/"
    "/build/"
    "/.svn/"
    "/.git/"

[Performous-commit] Lasse Karkkainen : Merge branch 'master' of ssh://tronic@git.performous.org /gitroot/performous/performous

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:03:56

Module: performous
Branch: menu
Commit: 217deed21757a41d185176e44998aea42d570876

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Nov 26 16:54:23 2009 +0200

Merge branch 'master' of ssh://tronic@git.performous.org/gitroot/performous/performous

---

[Performous-commit] Lasse Karkkainen : LibDA header docs and config.h with version macros

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:03:54

Module: performous
Branch: menu
Commit: 8b318c7c2e81cd83f626ddf2796f3e2f96f48932

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Nov 26 16:31:36 2009 +0200

LibDA header docs and config.h with version macros

---

 libs/libda/CMakeLists.txt              |    9 +++++++--
 libs/libda/cmake/config.h.in           |    9 +++++++++
 libs/libda/include/libda/audio.hpp     |    7 +++----
 libs/libda/include/libda/audio_dev.hpp |    7 +++++++
 libs/libda/include/libda/mixer.hpp     |    5 ++++-
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index c856b95..763e8d7 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -25,8 +25,13 @@ set(LibDA_PLUGIN_DIR "lib${LIB_SUFFIX}/libda")
 
 include_directories(include)
 
-FILE(GLOB HEADER_FILES "include/libda/*")
-install(FILES ${HEADER_FILES} DESTINATION include/libda)
+# Store version data in config.h
+set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(cmake/config.h.in ${CONFIG_H} ESCAPE_QUOTES @ONLY)
+
+# Install include files
+file(GLOB HEADER_FILES "include/libda/*")
+install(FILES ${HEADER_FILES} ${CONFIG_H} DESTINATION include/libda)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
 	message(STATUS "GCC detected, adding compile flags")
diff --git a/libs/libda/cmake/config.h.in b/libs/libda/cmake/config.h.in
new file mode 100644
index 0000000..b08238c
--- /dev/null
+++ b/libs/libda/cmake/config.h.in
@@ -0,0 +1,9 @@
+#ifndef LIBDA_CONFIG_H
+#define LIBDA_CONFIG_H
+
+#define LIBDA_VERSION "@LibDA_VERSION@"
+#define LIBDA_VERSION_MAJOR @LibDA_VERSION_MAJOR@
+#define LIBDA_VERSION_MINOR @LibDA_VERSION_MINOR@
+
+#endif
+
diff --git a/libs/libda/include/libda/audio.hpp b/libs/libda/include/libda/audio.hpp
index 10e5cf5..4626f36 100644
--- a/libs/libda/include/libda/audio.hpp
+++ b/libs/libda/include/libda/audio.hpp
@@ -2,16 +2,15 @@
 #define LIBDA_AUDIO_HPP_INCLUDED
 
 /**
-@file audio.hpp LibDA public interface.
+@file audio.hpp LibDA audio I/O public interface
 
-Link with libda when you use this.
+Link with libda when you use this. ABI will change, API is likely to change in
+future versions (which hopefully will bring API and ABI compatibility).
 **/
 
 // Library version number, may be used to test whether a certain function is
 // available. Incremented by one each time a new release is done.
 
-#define LIBDA_VERSION 0
-
 #include "sample.hpp"
 #include <boost/function.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/libs/libda/include/libda/audio_dev.hpp b/libs/libda/include/libda/audio_dev.hpp
index ad8ab00..10970f2 100644
--- a/libs/libda/include/libda/audio_dev.hpp
+++ b/libs/libda/include/libda/audio_dev.hpp
@@ -1,6 +1,13 @@
 #ifndef AUDIO_DEV_HPP_INCLUDED
 #define AUDIO_DEV_HPP_INCLUDED
 
+/**
+@file audio_dev.hpp Audio plugin interface. Not very stable yet.
+
+This requires linking with libda and the ABI is not stable yet. The API might
+also change.
+**/
+
 #include <libda/audio.hpp>
 #include <plugin++/plugin.hpp>
 
diff --git a/libs/libda/include/libda/mixer.hpp b/libs/libda/include/libda/mixer.hpp
index 370056e..29ae38e 100644
--- a/libs/libda/include/libda/mixer.hpp
+++ b/libs/libda/include/libda/mixer.hpp
@@ -2,7 +2,10 @@
 #define LIBDA_MIXER_HPP_INCLUDED
 
 /**
-@file mixer.hpp LibDA mixer interface.
+@file mixer.hpp LibDA mixer interface, version 1.
+
+This appears to be too complex and will probably be removed in later release in
+favor of something easier and faster.
 
 Link with libda when you use this.
 **/

[Performous-commit] Markus Raab : libda packaging

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:03:52

Module: performous
Branch: menu
Commit: 5680d527e223e072cd9f0407fa21eb770fdad187

Author: Markus Raab <un...@ma...>
Date:   Thu Nov 26 10:28:52 2009 +0100

libda packaging

---

 libs/libda/CMakeLists.txt                    |    2 +
 libs/libda/cmake/LibDAConfig.cmake.in        |    2 +-
 libs/libda/cmake/LibDAConfigVersion.cmake.in |   10 ++--
 libs/libda/cmake/libda-packaging.cmake       |   61 ++++++++++++++++++++++++++
 libs/plugin++/cmake/plugin++-packaging.cmake |    2 +-
 5 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index c856b95..8404f91 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -11,6 +11,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles")
 endif()
 
+include("${CMAKE_SOURCE_DIR}/cmake/libda-packaging.cmake")
+
 # Add a sensible build type default and warning because empty means no optimization and no debug info.
 if(NOT CMAKE_BUILD_TYPE)
 	message("WARNING: CMAKE_BUILD_TYPE is not defined!\n         Defaulting to CMAKE_BUILD_TYPE=Release. Use ccmake to set a proper value.")
diff --git a/libs/libda/cmake/LibDAConfig.cmake.in b/libs/libda/cmake/LibDAConfig.cmake.in
index 29973af..17a77e4 100644
--- a/libs/libda/cmake/LibDAConfig.cmake.in
+++ b/libs/libda/cmake/LibDAConfig.cmake.in
@@ -6,5 +6,5 @@ if(NOT LibDA_FOUND)
 
 	include("@CMAKE_INSTALL_PREFIX@/@LibDA_CMAKE_DIR@/LibDA.cmake")
 	set(LibDA_LIBRARIES da)
-endif()
+endif(NOT LibDA_FOUND)
 
diff --git a/libs/libda/cmake/LibDAConfigVersion.cmake.in b/libs/libda/cmake/LibDAConfigVersion.cmake.in
index 2f5b3dd..12739be 100644
--- a/libs/libda/cmake/LibDAConfigVersion.cmake.in
+++ b/libs/libda/cmake/LibDAConfigVersion.cmake.in
@@ -1,13 +1,13 @@
-if ("${PACKAGE_VERSION}" VERSION_EQUAL "@LibDA_VERSION@")
+if ("${PACKAGE_VERSION}" EQUAL "@LibDA_VERSION@")
 	set(PACKAGE_VERSION_EXACT TRUE)
-else()
+else("${PACKAGE_VERSION}" EQUAL "@LibDA_VERSION@")
 	set(PACKAGE_VERSION_EXACT FALSE)
-endif()
+endif("${PACKAGE_VERSION}" EQUAL "@LibDA_VERSION@")
 
-if (PACKAGE_VERSION_EXACT OR "${PACKAGE_VERSION}" VERSION_LESS "@LibDA_VERSION@")
+if (PACKAGE_VERSION_EXACT OR "${PACKAGE_VERSION}" LESS "@LibDA_VERSION@")
 	set(PACKAGE_VERSION "@LibDA_VERSION@")
 	set(PACKAGE_VERSION_COMPATIBLE TRUE)
 	set(PACKAGE_VERSION_UNSUITABLE FALSE)
 	set(PACKAGE_VERSION_EXACT FALSE)
-endif()
+endif(PACKAGE_VERSION_EXACT OR "${PACKAGE_VERSION}" LESS "@LibDA_VERSION@")
 
diff --git a/libs/libda/cmake/libda-packaging.cmake b/libs/libda/cmake/libda-packaging.cmake
new file mode 100644
index 0000000..e107fad
--- /dev/null
+++ b/libs/libda/cmake/libda-packaging.cmake
@@ -0,0 +1,61 @@
+set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
+set(CPACK_PACKAGE_VERSION "${LibDA_VERSION}")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ digital audio I/O and processing library.")
+set(CPACK_PACKAGE_CONTACT "http://performous.org/")
+set(CPACK_SOURCE_IGNORE_FILES
+   "/.cvsignore"
+   "/.gitignore"
+   "/songs/"
+   "/build/"
+   "/.svn/"
+   "/.git/"
+   "/osx-utils/"
+   "/portage-overlay/"
+)
+
+
+if("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+	set(CPACK_STRIP_FILES TRUE)
+endif("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+
+
+if(UNIX)
+	# Try to find architecture
+	execute_process(COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE)
+	string(STRIP "${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_ARCHITECTURE)
+	# Try to find distro name and distro-specific arch
+	execute_process(COMMAND lsb_release -is OUTPUT_VARIABLE LSB_ID)
+	execute_process(COMMAND lsb_release -rs OUTPUT_VARIABLE LSB_RELEASE)
+	string(STRIP "${LSB_ID}" LSB_ID)
+	string(STRIP "${LSB_RELEASE}" LSB_RELEASE)
+	set(LSB_DISTRIB "${LSB_ID}${LSB_RELEASE}")
+	if(NOT LSB_DISTRIB)
+		set(LSB_DISTRIB "unix")
+	endif(NOT LSB_DISTRIB)
+	# For Debian-based distros we want to create DEB packages.
+	if("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
+		set(CPACK_GENERATOR "DEB")
+		set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
+		set(CPACK_DEBIAN_PACKAGE_SECTION "universe/games")
+		set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "ultrastar-songs, ultrastar-songs-restricted, msttcorefonts")
+		# We need to alter the architecture names as per distro rules
+		if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+			set(CPACK_PACKAGE_ARCHITECTURE i386)
+		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+		if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+			set(CPACK_PACKAGE_ARCHITECTURE amd64)
+		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+		# Set the dependencies based on the distro version
+		if("${LSB_DISTRIB}" MATCHES "Debian5.*")
+			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-dev, libasound2, libjack0")
+		endif("${LSB_DISTRIB}" MATCHES "Debian5.*")
+		if(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
+			message("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
+		endif(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
+	endif("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
+	set(CPACK_SYSTEM_NAME "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}")
+	message(STATUS "Detected ${CPACK_SYSTEM_NAME}. Use make package to build packages (${CPACK_GENERATOR}).")
+endif(UNIX)
+
+include(CPack)
+
diff --git a/libs/plugin++/cmake/plugin++-packaging.cmake b/libs/plugin++/cmake/plugin++-packaging.cmake
index c0c192a..68e8862 100644
--- a/libs/plugin++/cmake/plugin++-packaging.cmake
+++ b/libs/plugin++/cmake/plugin++-packaging.cmake
@@ -1,6 +1,6 @@
 set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
 set(CPACK_PACKAGE_VERSION "${Plugin++_VERSION}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY " Plugin++ is a cross platform plug-in framework for C++ that uses XML to marshal data across the application and the shared library space.")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Plugin++ is a cross platform plug-in framework for C++ that uses XML to marshal data across the application and the shared library space.")
 set(CPACK_PACKAGE_CONTACT "http://sourceforge.net/projects/pluginpp/")
 set(CPACK_SOURCE_IGNORE_FILES
    "/.cvsignore"

[Performous-commit] Markus Raab : Make Plugin++Config* cmake 2.6 compatible

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:03:50

Module: performous
Branch: menu
Commit: 4b22765913c319bb6ddf9ed511727c600fbc7a5d

Author: Markus Raab <un...@ma...>
Date:   Thu Nov 26 10:08:32 2009 +0100

Make Plugin++Config* cmake 2.6 compatible

---

 libs/plugin++/cmake/Plugin++Config.cmake.in        |    2 +-
 libs/plugin++/cmake/Plugin++ConfigVersion.cmake.in |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/plugin++/cmake/Plugin++Config.cmake.in b/libs/plugin++/cmake/Plugin++Config.cmake.in
index 8b539c8..34df072 100644
--- a/libs/plugin++/cmake/Plugin++Config.cmake.in
+++ b/libs/plugin++/cmake/Plugin++Config.cmake.in
@@ -6,5 +6,5 @@ if(NOT Plugin++_FOUND)
 
 	include("@CMAKE_INSTALL_PREFIX@/@Plugin++_CMAKE_DIR@/Plugin++.cmake")
 	set(Plugin++_LIBRARIES "plugin++")
-endif()
+endif(NOT Plugin++_FOUND)
 
diff --git a/libs/plugin++/cmake/Plugin++ConfigVersion.cmake.in b/libs/plugin++/cmake/Plugin++ConfigVersion.cmake.in
index f7c9948..2f2643c 100644
--- a/libs/plugin++/cmake/Plugin++ConfigVersion.cmake.in
+++ b/libs/plugin++/cmake/Plugin++ConfigVersion.cmake.in
@@ -1,13 +1,13 @@
-if ("${PACKAGE_VERSION}" VERSION_EQUAL "@Plugin++_VERSION@")
+if ("${PACKAGE_VERSION}" EQUAL "@Plugin++_VERSION@")
 	set(PACKAGE_VERSION_EXACT TRUE)
-else()
+else("${PACKAGE_VERSION}" EQUAL "@Plugin++_VERSION@")
 	set(PACKAGE_VERSION_EXACT FALSE)
-endif()
+endif("${PACKAGE_VERSION}" EQUAL "@Plugin++_VERSION@")
 
-if (PACKAGE_VERSION_EXACT OR "${PACKAGE_VERSION}" VERSION_LESS "@Plugin++_VERSION@")
+if (PACKAGE_VERSION_EXACT OR "${PACKAGE_VERSION}" LESS "@Plugin++_VERSION@")
 	set(PACKAGE_VERSION "@Plugin++_VERSION@")
 	set(PACKAGE_VERSION_COMPATIBLE TRUE)
 	set(PACKAGE_VERSION_UNSUITABLE FALSE)
 	set(PACKAGE_VERSION_EXACT FALSE)
-endif()
+endif(PACKAGE_VERSION_EXACT OR "${PACKAGE_VERSION}" LESS "@Plugin++_VERSION@")

[Performous-commit] knittl : fixed a typo in docs

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 05:03:45

Module: performous
Branch: menu
Commit: 295543e7d1e6b7d92ec9632925ca935c56c82d45

Author: knittl <knittl@kbook.(none)>
Date:   Wed Nov 25 17:45:15 2009 +0100

fixed a typo in docs

Compiling.txt had a wrong path in it

---

 docs/Compiling.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/Compiling.txt b/docs/Compiling.txt
index 4358721..4327ad9 100644
--- a/docs/Compiling.txt
+++ b/docs/Compiling.txt
@@ -16,7 +16,7 @@ To install from git:
 	sudo make install
 	rm -rf *
 	# Compile the game itself
-	cmake ../libs/libda/
+	cmake ..
 	make
 	sudo make install
 	# Run the game

[Performous-commit] Lasse Karkkainen : The order DOES matter. Fixed the damn linking problem.

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-11-28 04:53:49

Module: performous
Branch: master
Commit: 63eebb0036672ff682145ea5f5bd09cd52ccdaef

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 06:53:38 2009 +0200

The order DOES matter. Fixed the damn linking problem.

---

 game/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 1e9e60e..b2c5dd8 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND LIBS ${Boost_LIBRARIES})
 # Libraries are part of Performous build process (for now)
 set(SLAVE_LIBS TRUE)
 if(SLAVE_LIBS)
-	list(APPEND LIBS plugin++ da)
+	list(APPEND LIBS da plugin++)
 else()
 	set(OUR_LIBS Plugin++ LibDA)
 endif()

[Performous-commit] Miguel Sánchez de León Peque : Changed menu images organization (divided in layers); they need 'stetic' work...

From: Peque <ms...@us...> - 2009-11-27 23:52:06

Module: performous
Branch: menu
Commit: 2ef12741b689ec5681dafcb8b9f2d7808d4ee416

Author: Miguel SÃ¡nchez de LeÃ³n Peque <msd...@gm...>
Date:   Sat Nov 28 00:49:22 2009 +0100

Changed menu images organization (divided in layers); they need 'stetic' work...

---

 game/screen_intro.cc                              |   16 +-
 game/theme.cc                                     |   10 +-
 themes/default/intro.svg                          |  528 ---------------------
 themes/default/{prueba_intro.svg => intro_bg.svg} |    2 +-
 themes/default/intro_configure.svg                |  303 ++++++++++++
 themes/default/intro_practice.svg                 |  303 ++++++++++++
 themes/default/intro_quit.svg                     |  303 ++++++++++++
 themes/default/intro_sing.svg                     |  336 +++++++++++++
 themes/default/prueba_configure.svg               |  499 -------------------
 themes/default/prueba_practice.svg                |  499 -------------------
 themes/default/prueba_quit.svg                    |  499 -------------------
 themes/default/prueba_sing.svg                    |  499 -------------------
 12 files changed, 1253 insertions(+), 2544 deletions(-)

[Performous-commit] Miguel Sánchez de León Peque : Main menu controlled with arrows (and char keys) finished; working with a "basic" look, working on it...

From: Peque <ms...@us...> - 2009-11-27 23:27:20

Module: performous
Branch: menu
Commit: f9255ce019a2a913d628730bc5cf54e85d423e57

Author: Miguel SÃ¡nchez de LeÃ³n Peque <msd...@gm...>
Date:   Sat Nov 28 00:24:42 2009 +0100

Main menu controlled with arrows (and char keys) finished; working with a "basic" look, working on it...

---

 game/screen_intro.cc |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index fed0ae5..873920e 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -4,7 +4,8 @@
 #include "audio.hh"
 #include "record.hh"
 
-ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture): Screen(name), m_audio(audio), m_capture(capture) {}
+ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture):
+	Screen(name), m_audio(audio), m_capture(capture), selected() {}
 
 void ScreenIntro::enter() {
 	m_audio.playMusic(getThemePath("menu.ogg"), true);
@@ -37,10 +38,30 @@ void ScreenIntro::manageEvent(SDL_Event event) {
 		 * */
 		
 		else if (key == SDLK_DOWN) {
-			theme->sing.draw();
+			if (selected < 3) {
+				selected++;
+			} else selected = 0;
 		}
-		else if (key == SDLK_DOWN) {
-			theme->configure.draw();
+		else if (key == SDLK_UP) {
+			if (selected > 0) {
+				selected--;
+			} else selected = 3;
+		}
+		else if (key == SDLK_RETURN) {
+			switch (selected) {
+				case 0 :
+					sm->activateScreen("Songs");
+					break;
+				case 1 :
+					sm->activateScreen("Practice");
+					break;
+				case 2 :
+					sm->activateScreen("Configuration");
+					break;
+				case 3 :
+					sm->finished();
+					break;
+			}
 		}
 			
 		
@@ -57,6 +78,23 @@ void ScreenIntro::manageEvent(SDL_Event event) {
 
 void ScreenIntro::draw() {
 	theme->bg.draw();
+	switch (selected) {
+		case 0 :
+			theme->sing.draw();
+			break;
+		case 1 :
+			theme->practice.draw();
+			break;
+		case 2 :
+			theme->configure.draw();
+			break;
+		case 3 :
+			theme->quit.draw();
+			break;
+		default :
+			theme->sing.draw();
+	}
+	
 	//background->draw();
 	if (m_dialog) m_dialog->draw();
 }

Flat | Threaded

<< < 1 .. 126 127 128 129 130 .. 163 > >> (Page 128 of 163)

2009	Jan	Feb	Mar	Apr	May	Jun (25)	Jul (288)	Aug (119)	Sep (31)	Oct (59)	Nov (458)	Dec (359)
2010	Jan (268)	Feb (26)	Mar (36)	Apr (48)	May (119)	Jun (37)	Jul (173)	Aug (429)	Sep (137)	Oct (156)	Nov (59)	Dec (45)
2011	Jan (398)	Feb (257)	Mar (49)	Apr (5)	May (34)	Jun (11)	Jul (38)	Aug (12)	Sep (1)	Oct (49)	Nov (5)	Dec (10)
2012	Jan (21)	Feb (32)	Mar (20)	Apr (1)	May (2)	Jun	Jul (173)	Aug	Sep (25)	Oct (6)	Nov (44)	Dec