performous-commit Mailing List for Performous (Page 123)

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 .. 121 122 123 124 125 .. 163 > >> (Page 123 of 163)

[Performous-commit] Vincent Le Ligeour : Bump version, Added screenshot by pressing F11 ( need tweak)

From: Peque <ms...@us...> - 2009-12-02 01:12:05

Module: performous
Branch: menu
Commit: 34f294fd5556b38499f24e65bdbcb3a7390e6fef

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Nov 28 17:46:34 2009 +0100

Bump version, Added screenshot by pressing F11 (need tweak)

---

 CMakeLists.txt       |    2 +-
 game/main.cc         |   14 ++++++++++++++
 game/video_driver.cc |   26 ++++++++++++++++++++++++++
 game/video_driver.hh |    2 ++
 4 files changed, 43 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)
diff --git a/game/main.cc b/game/main.cc
index dcfa16a..3d42c90 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -31,6 +31,8 @@
 
 volatile bool g_quit = false;
 
+bool g_take_screenshot = false;
+
 extern "C" void quit(int) {
 	g_quit = true;
 }
@@ -68,6 +70,9 @@ static void checkEvents_SDL(ScreenManager& sm, Window& window) {
 				config["graphic/fullscreen"].b() = !config["graphic/fullscreen"].b();
 				continue; // Already handled here...
 			}
+			if (keypressed ==  SDLK_F11 ) {
+				g_take_screenshot = true;
+			}
 			if (keypressed == SDLK_F4 && modifier & KMOD_ALT) {
 				sm.finished();
 				continue; // Already handled here...
@@ -156,6 +161,15 @@ void mainLoop(std::string const& songlist) {
 		boost::xtime time = now();
 		unsigned frames = 0;
 		while (!sm.isFinished()) {
+			if( g_take_screenshot ) {
+				try {
+					window.screenshot();
+					std::cout << ">>> Screenshot taken" << std::endl;
+				} catch (std::exception& e) {
+					std::cerr << "ERROR: " << e.what() << std::endl;
+				}
+				g_take_screenshot = false;
+			}
 			try {
 				checkEvents_SDL(sm, window);
 				window.blank();
diff --git a/game/video_driver.cc b/game/video_driver.cc
index 0fb7ddb..ac6a69d 100644
--- a/game/video_driver.cc
+++ b/game/video_driver.cc
@@ -5,7 +5,9 @@
 #include "fs.hh"
 #include "util.hh"
 #include "joystick.hh"
+
 #include <SDL.h>
+#include <Magick++.h>
 
 namespace {
 	unsigned s_width;
@@ -54,6 +56,30 @@ bool Window::getFullscreen() {
 	return m_fullscreen;
 }
 
+void Window::screenshot() {
+	static unsigned int count = 0;
+	unsigned width = m_fullscreen ? m_fsW : m_windowW;
+	unsigned height = m_fullscreen ? m_fsH : m_windowH;
+
+	std::vector<char> buffer(width*height*3);
+	glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, &buffer[0]);
+	Magick::Blob blob( &buffer[0], width*height*3);
+
+	Magick::Image image;
+	char geometry[16];
+	sprintf(geometry,"%dx%d",width,height);
+	image.size(geometry);
+	image.depth(8);
+	image.magick( "RGB" );
+	image.read(blob);
+	image.flip();
+	char filename[256];
+	sprintf(filename,"/tmp/performous_screenshot_%u.png",count);
+	image.write(filename);
+	count++;
+}
+
+
 void Window::resize() {
 	unsigned width = m_fullscreen ? m_fsW : m_windowW;
 	unsigned height = m_fullscreen ? m_fsH : m_windowH;
diff --git a/game/video_driver.hh b/game/video_driver.hh
index 38ac892..4ac703e 100644
--- a/game/video_driver.hh
+++ b/game/video_driver.hh
@@ -33,6 +33,8 @@ class Window {
 	void setFullscreen(bool _fs);
 	/// gets fullscreen state
 	bool getFullscreen();
+	/// take a screenshot
+	void screenshot();
 
   private:
 	SDL_Surface* screen;

[Performous-commit] Vincent Le Ligeour : Fixed ubuntu karmic depends list

From: Peque <ms...@us...> - 2009-12-02 01:12:02

Module: performous
Branch: menu
Commit: 5de31abdd2ef21474dbbe8e3828a9685c1cb5b26

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Nov 28 14:27:05 2009 +0100

Fixed ubuntu karmic depends list

---

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

diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index d987ed5..d88f286 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -60,7 +60,7 @@ if(UNIX)
 			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-thread1.35.0, libboost-program-options1.35.0, libboost-regex1.35.0, libboost-filesystem1.35.0, libboost-date-time1.35.0, libavcodec52, libavformat52, libswscale0, libmagick++1, libxml++2.6-2, libglew1.5")
 		endif("${LSB_DISTRIB}" MATCHES "Ubuntu9.04")
 		if("${LSB_DISTRIB}" MATCHES "Ubuntu9.10")
-			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-thread1.38.0, libboost-program-options1.38.0, libboost-regex1.38.0, libboost-filesystem1.38.0, libboost-date-time1.38.0, libavcodec52, libavformat52, libswscale0, libmagick++1, libxml++2.6-2, libglew1.5")
+			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-thread1.38.0, libboost-program-options1.38.0, libboost-regex1.38.0, libboost-filesystem1.38.0, libboost-date-time1.38.0, libavcodec52, libavformat52, libswscale0, libmagick++2, libxml++2.6-2, libglew1.5")
 		endif("${LSB_DISTRIB}" MATCHES "Ubuntu9.10")
 		if("${LSB_DISTRIB}" MATCHES "Debian5.*")
 			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-dev, libavcodec51, libavformat52, libswscale0, libmagick++10, libxml++2.6-2, libglew1.5")

[Performous-commit] Tapio Vierros : Make 3d tappable note state a bit clearer.

From: Peque <ms...@us...> - 2009-12-02 01:12:00

Module: performous
Branch: menu
Commit: d542e2ec073acde323985b1f7259a644be8df1d4

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Nov 28 14:04:58 2009 +0200

Make 3d tappable note state a bit clearer.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 1499eab..9f19f97 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -517,12 +517,11 @@ void GuitarGraph::drawNote(int fret, glutil::Color c, float tBeg, float tEnd, fl
 		}
 	}
 	if (tappable) {
-		float l = std::max(0.5, m_correctness.get());
+		float l = std::max(0.3, m_correctness.get());
 		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 : Improved instrument help

From: Peque <ms...@us...> - 2009-12-02 01:11:58

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:56

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:54

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:53

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:52

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:49

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:47

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:45

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:44

Module: performous
Branch: menu
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: Peque <ms...@us...> - 2009-12-02 01:11:42

Module: performous
Branch: menu
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] Lasse Karkkainen : Fix indent of plugin. hpp and add init hack to the registry, perhaps allowing this to work on Windows...

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-12-02 01:11:29

Module: performous
Branch: master
Commit: f60a372a9feeeec83550869cf1e4758658564298

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Dec  2 03:11:16 2009 +0200

Fix indent of plugin.hpp and add init hack to the registry, perhaps allowing this to work on Windows...

---

 libs/libda/include/libda/audio_dev.hpp    |    4 +
 libs/plugin++/include/plugin++/plugin.hpp |  235 +++++++++++++++--------------
 2 files changed, 126 insertions(+), 113 deletions(-)

[Performous-commit] Lasse Karkkainen : Removed dllhelper, libda and plugin++ can only compile as static on Windows, libda plugins should get proper DLL declarations

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-12-02 00:53:49

Module: performous
Branch: master
Commit: 92cac693dc33e725e35833ff98670be8acf40c94

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Dec  2 02:53:28 2009 +0200

Removed dllhelper, libda and plugin++ can only compile as static on Windows, libda plugins should get proper DLL declarations

---

 libs/libda/include/libda/audio.hpp           |   13 +++++++------
 libs/libda/include/libda/audio_dev.hpp       |    4 ++++
 libs/libda/plugins/CMakeLists.txt            |    5 +----
 libs/libda/src/audio.cpp                     |    4 +---
 libs/plugin++/include/plugin++/dll.hpp       |    5 +++--
 libs/plugin++/include/plugin++/dllhelper.hpp |   24 ------------------------
 libs/plugin++/include/plugin++/plugin.hpp    |   21 +++++++++++++++++++--
 libs/plugin++/src/dll.cc                     |    2 --
 8 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/libs/libda/include/libda/audio.hpp b/libs/libda/include/libda/audio.hpp
index 4626f36..e2828f8 100644
--- a/libs/libda/include/libda/audio.hpp
+++ b/libs/libda/include/libda/audio.hpp
@@ -14,7 +14,6 @@ future versions (which hopefully will bring API and ABI compatibility).
 #include "sample.hpp"
 #include <boost/function.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <plugin++/dllhelper.hpp>
 #include <cmath>
 #include <cstddef>
 #include <iosfwd>
@@ -22,6 +21,8 @@ future versions (which hopefully will bring API and ABI compatibility).
 #include <string>
 #include <vector>
 
+#define LIBDA_API
+
 namespace da {
 
 	class init_impl;
@@ -31,7 +32,7 @@ namespace da {
 	* so that you can create multiple da::initialize objects.
 	* Do not, however, destroy the object while audio devices are still in use!
 	**/
-	class DLL_PUBLIC initialize {
+	class LIBDA_API initialize {
 		init_impl* m_impl;
 	  public:
 		initialize();
@@ -73,8 +74,8 @@ namespace da {
 	typedef boost::function<bool (pcm_data& it)> callback_t;
 
 	struct settings {
-		DLL_PUBLIC static const std::size_t low;
-		DLL_PUBLIC static const std::size_t high;
+		LIBDA_API static const std::size_t low;
+		LIBDA_API static const std::size_t high;
 		settings(std::string const& devstr = ""):
 		  m_channels(high),
 		  m_channels_near(true),
@@ -143,7 +144,7 @@ namespace da {
 		bool special() const { return !m_name.empty() && m_name[0] == '~'; }
 	};
 	
-	class DLL_PUBLIC record {
+	class LIBDA_API record {
 	  public:
 		typedef std::vector<devinfo> devlist_t;
 		static devlist_t devices();
@@ -154,7 +155,7 @@ namespace da {
 		dev* m_handle;
 	};
 
-	class DLL_PUBLIC playback {
+	class LIBDA_API playback {
 	  public:
 		typedef std::vector<devinfo> devlist_t;
 		static devlist_t devices();
diff --git a/libs/libda/include/libda/audio_dev.hpp b/libs/libda/include/libda/audio_dev.hpp
index 10970f2..b27412f 100644
--- a/libs/libda/include/libda/audio_dev.hpp
+++ b/libs/libda/include/libda/audio_dev.hpp
@@ -8,6 +8,10 @@ This requires linking with libda and the ABI is not stable yet. The API might
 also change.
 **/
 
+#ifdef BUILDING_DA
+#define PLUGIN_MASTER
+#endif
+
 #include <libda/audio.hpp>
 #include <plugin++/plugin.hpp>
 
diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index 0686be3..4606599 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -165,10 +165,7 @@ if(PLUGIN_TESTING)
 	add_library(da_audio_dev_tone MODULE audio_dev_tone.cpp)
 	install(TARGETS da_audio_dev_tone DESTINATION ${LibDA_PLUGIN_DIR})
 	if(APPLE OR WIN32)
-		target_link_libraries(da_audio_dev_tone da)
-		if(WIN32)
-			target_link_libraries(da_audio_dev_tone plugin++)
-		endif(WIN32)
+		target_link_libraries(da_audio_dev_tone da plugin++)
 	endif(APPLE OR WIN32)
 endif(PLUGIN_TESTING)
 
diff --git a/libs/libda/src/audio.cpp b/libs/libda/src/audio.cpp
index 5dfb894..e1a8ecc 100644
--- a/libs/libda/src/audio.cpp
+++ b/libs/libda/src/audio.cpp
@@ -1,7 +1,5 @@
-#define BUILDING_DLL   // So that we get dllexports everywhere instead of dllimports (this is some Windows crap)
+#define BUILDING_DA
 #include <libda/audio_dev.hpp>
-#undef BUILDING_DLL
-
 #include <libda/config.h>
 #include <plugin++/loader.hpp>
 #include <ostream>
diff --git a/libs/plugin++/include/plugin++/dll.hpp b/libs/plugin++/include/plugin++/dll.hpp
index 39aa091..51de65e 100644
--- a/libs/plugin++/include/plugin++/dll.hpp
+++ b/libs/plugin++/include/plugin++/dll.hpp
@@ -2,10 +2,11 @@
 #ifndef DLL_HPP_INCLUDED
 #define DLL_HPP_INCLUDED
 
-#include "dllhelper.hpp"
 #include <stdexcept>
 #include <string>
 
+#define Plugin_API
+
 namespace plugin {
 
 	/// \brief Exception class for signaling runtime errors from class dll
@@ -15,7 +16,7 @@ namespace plugin {
 	};
 
     /// \brief Dynamic library loader
-    class DLL_PUBLIC dll {
+    class Plugin_API dll {
         void* lib;
     public:
     	/// Open a dynamic library
diff --git a/libs/plugin++/include/plugin++/dllhelper.hpp b/libs/plugin++/include/plugin++/dllhelper.hpp
deleted file mode 100644
index 612ab08..0000000
--- a/libs/plugin++/include/plugin++/dllhelper.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#undef DLL_PUBLIC
-
-#if defined _WIN32 || defined __CYGWIN__
-
-// A hack to allow static library build (for now) -Tronic
-#define DLL_PUBLIC
-#if 0
-#ifdef BUILDING_DLL
-#define DLL_PUBLIC __declspec(dllexport)
-#else
-#define DLL_PUBLIC __declspec(dllimport)
-#endif
-#endif
-
-#else
-
-#if __GNUC__ >= 4
-#define DLL_PUBLIC __attribute__ ((visibility("default")))
-#else
-#define DLL_PUBLIC
-#endif
-
-#endif
-
diff --git a/libs/plugin++/include/plugin++/plugin.hpp b/libs/plugin++/include/plugin++/plugin.hpp
index 3222e79..6c635c6 100644
--- a/libs/plugin++/include/plugin++/plugin.hpp
+++ b/libs/plugin++/include/plugin++/plugin.hpp
@@ -2,11 +2,28 @@
 #ifndef PLUGIN_HPP_INCLUDED
 #define PLUGIN_HPP_INCLUDED
 
-#include "dllhelper.hpp"
 #include <map>
 #include <stdexcept>
 #include <string>
 
+#if defined _WIN32 || defined __CYGWIN__
+
+#ifdef PLUGIN_MASTER
+#define PLUGIN_REGISTRY_API __declspec(dllexport)
+#else
+#define PLUGIN_REGISTRY_API __declspec(dllimport)
+#endif
+
+#else
+
+#if __GNUC__ >= 4
+#define PLUGIN_REGISTRY_API __attribute__ ((visibility("default")))
+#else
+#define PLUGIN_REGISTRY_API
+#endif
+
+#endif
+
 namespace plugin {
 
     /**
@@ -25,7 +42,7 @@ namespace plugin {
     template <typename Base,
       typename Arg = std::string const&,
       typename Key = std::string>
-    class DLL_PUBLIC registry {
+    class PLUGIN_REGISTRY_API registry {
       public:
         typedef Base base_type;
         typedef Arg arg_type;
diff --git a/libs/plugin++/src/dll.cc b/libs/plugin++/src/dll.cc
index e6dcef8..21e69b8 100644
--- a/libs/plugin++/src/dll.cc
+++ b/libs/plugin++/src/dll.cc
@@ -1,6 +1,4 @@
-#define BUILDING_DLL
 #include <plugin++/dll.hpp>
-#undef BUILDING_DLL
 
 #include <stdexcept>

[Performous-commit] Lasse Karkkainen : config.h for plugin++

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-12-02 00:53:47

Module: performous
Branch: master
Commit: c7e7d586beeac8fd187c348b5377b73e8320ca43

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Dec  2 02:17:03 2009 +0200

config.h for plugin++

---

 libs/plugin++/CMakeLists.txt    |    9 +++++++--
 libs/plugin++/cmake/config.h.in |    9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index d311340..3821706 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -48,14 +48,19 @@ set_target_properties(plugin++ PROPERTIES
 	INSTALL_RPATH_USE_LINK_PATH TRUE
 )
 
+# Store version data in config.h
+set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/plugin++/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/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++)
-
+	install(FILES ${HEADER_FILES} ${CONFIG_H} DESTINATION include/plugin++)
+	
 	# Install/generate CMake files for finding Plugin++
 	add_subdirectory(cmake)
 endif()
diff --git a/libs/plugin++/cmake/config.h.in b/libs/plugin++/cmake/config.h.in
new file mode 100644
index 0000000..27e42cd
--- /dev/null
+++ b/libs/plugin++/cmake/config.h.in
@@ -0,0 +1,9 @@
+#ifndef PLUGIN_CONFIG_H
+#define PLUGIN_CONFIG_H
+
+#define PLUGIN_VERSION "@Plugin++_VERSION@"
+#define PLUGIN_VERSION_MAJOR @Plugin++_VERSION_MAJOR@
+#define PLUGIN_VERSION_MINOR @Plugin++_VERSION_MINOR@
+
+#endif
+

[Performous-commit] Xaldyz : Added Win32 HOWTO compile (draft)

From: Stefano A. <xa...@us...> - 2009-12-01 23:42:25

Module: performous
Branch: master
Commit: 77bb4c3177e18a6cef5eba0e4d9b966959898128

Author: Xaldyz <xa...@us...>
Date:   Wed Dec  2 00:41:01 2009 +0100

Added Win32 HOWTO compile (draft)

---

 win32/README                       |   40 ++++
 win32/gettext-0.17-variables.patch |   12 ++
 win32/install.sh                   |  349 +++++++++++++++++++++++++++++++++
 win32/mingw-cwchar.patch           |   21 ++
 win32/mingw-libstdc++.patch        |   15 ++
 win32/pkg-config.exe               |  Bin 0 -> 1387520 bytes
 win32/portaudio - Copia.patch      |  380 ++++++++++++++++++++++++++++++++++++
 win32/portaudio.patch              |  175 +++++++++++++++++
 win32/wget.exe                     |  Bin 0 -> 162816 bytes
 9 files changed, 992 insertions(+), 0 deletions(-)

[Performous-commit] Xaldyz : Fixed library detection (under Windows) if DLLs are in PATH

From: Stefano A. <xa...@us...> - 2009-12-01 23:04:20

Module: performous
Branch: master
Commit: 3714d473e1b11f1b30ae23dd6450b8e0c562a352

Author: Xaldyz <xa...@us...>
Date:   Wed Dec  2 00:04:02 2009 +0100

Fixed library detection (under Windows) if DLLs are in PATH

---

 cmake/Modules/FindAVCodec.cmake  |    2 +-
 cmake/Modules/FindAVFormat.cmake |    2 +-
 cmake/Modules/FindAVUtil.cmake   |    2 +-
 cmake/Modules/FindSWScale.cmake  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/FindAVCodec.cmake b/cmake/Modules/FindAVCodec.cmake
index cdd8f69..400ac58 100644
--- a/cmake/Modules/FindAVCodec.cmake
+++ b/cmake/Modules/FindAVCodec.cmake
@@ -38,7 +38,7 @@ if(AVCodec_INCLUDE_DIR)
 endif(AVCodec_INCLUDE_DIR)
 
 find_library(AVCodec_LIBRARY
-  NAMES avcodec
+  NAMES libavcodec.dll.a avcodec
   PATHS ${AVCodec_PKGCONF_LIBRARY_DIRS}
 )
 
diff --git a/cmake/Modules/FindAVFormat.cmake b/cmake/Modules/FindAVFormat.cmake
index 7c04c60..b02d2a6 100644
--- a/cmake/Modules/FindAVFormat.cmake
+++ b/cmake/Modules/FindAVFormat.cmake
@@ -36,7 +36,7 @@ if(AVFormat_INCLUDE_DIR)
 endif(AVFormat_INCLUDE_DIR)
 
 find_library(AVFormat_LIBRARY
-  NAMES avformat
+  NAMES libavformat.dll.a avformat
   PATHS ${AVFormat_PKGCONF_LIBRARY_DIRS}
 )
 
diff --git a/cmake/Modules/FindAVUtil.cmake b/cmake/Modules/FindAVUtil.cmake
index 8d4fb4e..99bfbfb 100644
--- a/cmake/Modules/FindAVUtil.cmake
+++ b/cmake/Modules/FindAVUtil.cmake
@@ -34,7 +34,7 @@ if(AVUtil_INCLUDE_DIR)
 endif(AVUtil_INCLUDE_DIR)
 
 find_library(AVUtil_LIBRARY
-  NAMES avutil
+  NAMES libavutil.dll.a avutil
   PATHS ${AVUtil_PKGCONF_LIBRARY_DIRS}
 )
 
diff --git a/cmake/Modules/FindSWScale.cmake b/cmake/Modules/FindSWScale.cmake
index ecd8da0..e675a51 100644
--- a/cmake/Modules/FindSWScale.cmake
+++ b/cmake/Modules/FindSWScale.cmake
@@ -36,7 +36,7 @@ if(SWScale_INCLUDE_DIR)
 endif(SWScale_INCLUDE_DIR)
 
 find_library(SWScale_LIBRARY
-  NAMES swscale
+  NAMES libswscale.dll.a swscale
   PATHS ${SWScale_PKGCONF_LIBRARY_DIRS}
 )

[Performous-commit] Xaldyz : libs/libda/plugins/CMakeLists.txt: fixed dll linkage problems

From: Stefano A. <xa...@us...> - 2009-12-01 21:32:06

Module: performous
Branch: master
Commit: cf5cfe82618c8ecaf5193ead411fb3c57acb4c99

Author: Xaldyz <xa...@us...>
Date:   Tue Dec  1 22:31:03 2009 +0100

libs/libda/plugins/CMakeLists.txt: fixed dll linkage problems

---

 libs/libda/plugins/CMakeLists.txt |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index 9dbd2f6..0686be3 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -166,6 +166,9 @@ if(PLUGIN_TESTING)
 	install(TARGETS da_audio_dev_tone DESTINATION ${LibDA_PLUGIN_DIR})
 	if(APPLE OR WIN32)
 		target_link_libraries(da_audio_dev_tone da)
+		if(WIN32)
+			target_link_libraries(da_audio_dev_tone plugin++)
+		endif(WIN32)
 	endif(APPLE OR WIN32)
 endif(PLUGIN_TESTING)

[Performous-commit] Lasse Karkkainen : Fix libtiff detection

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-12-01 21:07:56

Module: performous
Branch: master
Commit: e9b5f8122e10c885d3ab84582804631457e52bb9

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Dec  1 23:07:45 2009 +0200

Fix libtiff detection

---

 cmake/Modules/FindTiff.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cmake/Modules/FindTiff.cmake b/cmake/Modules/FindTiff.cmake
index dcc7988..bc4f92d 100644
--- a/cmake/Modules/FindTiff.cmake
+++ b/cmake/Modules/FindTiff.cmake
@@ -18,7 +18,7 @@ find_path(Tiff_INCLUDE_DIR
 )
 
 find_library(Tiff_LIBRARY
-  NAMES libtiff
+  NAMES tiff
   PATHS ${Tiff_PKGCONF_LIBRARY_DIRS}
 )

[Performous-commit] unknown : Merge branch 'master' of ssh://git.performous.org/gitroot/ performous/performous

From: Stefano A. <xa...@us...> - 2009-12-01 20:55:58

Module: performous
Branch: master
Commit: 1c2bb6d2f15ea46e0cc597dfd19293202634f8ed

Author: unknown <Alde@.(none)>
Date:   Tue Dec  1 21:54:48 2009 +0100

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

---

[Performous-commit] unknown : Fixed GLEW to detect under MinGW

From: Stefano A. <xa...@us...> - 2009-12-01 20:55:55

Module: performous
Branch: master
Commit: 5bbc7b330e828975e27c4a6a9ef39c2b1a70c1d6

Author: unknown <Alde@.(none)>
Date:   Tue Dec  1 21:26:46 2009 +0100

Fixed GLEW to detect under MinGW
Fixed OpenGL to detect under MinGW
Updated CMakeLists.txt in game folder to build correct dependencies under Windows
Updated lib/libda/CMakeLists.txt to link with Boost system and filesystem (fix for Windows)
Updated CMakeLists.txt in lib/libda/plugins/CMakeLists.txt to link with libplugin++.a
Fixed libs/libda/plugins/audio_dev_pa19.cpp with #include<stdint.h>
Fixed tools/CMakeLists.txt to add correct dependencies under Windows

---

 cmake/Modules/FindGLEW.cmake          |    5 +++--
 cmake/Modules/FindOpenGL.cmake        |    4 ++--
 game/CMakeLists.txt                   |    2 +-
 libs/libda/CMakeLists.txt             |    2 +-
 libs/libda/plugins/CMakeLists.txt     |    3 +++
 libs/libda/plugins/audio_dev_pa19.cpp |    1 +
 tools/CMakeLists.txt                  |    6 +++---
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/cmake/Modules/FindGLEW.cmake b/cmake/Modules/FindGLEW.cmake
index 7fb93a1..8040c33 100644
--- a/cmake/Modules/FindGLEW.cmake
+++ b/cmake/Modules/FindGLEW.cmake
@@ -14,12 +14,13 @@ include(LibFindMacros)
 libfind_pkg_check_modules(OpenGL_PKGCONF gl)
 
 find_path(GLEW_INCLUDE_DIR
-  NAMES GL/glew.h
+  NAMES glew.h
   PATHS ${OpenGL_INCLUDE_DIRS}
+  PATH_SUFFIXES GL
 )
 
 find_library(GLEW_LIBRARY
-  NAMES GLEW GLEW32
+  NAMES GLEW GLEW32.a GLEW32
   PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
 )
 
diff --git a/cmake/Modules/FindOpenGL.cmake b/cmake/Modules/FindOpenGL.cmake
index c37c380..7ac1128 100644
--- a/cmake/Modules/FindOpenGL.cmake
+++ b/cmake/Modules/FindOpenGL.cmake
@@ -20,12 +20,12 @@ find_path(OpenGL_INCLUDE_DIR
 )
 
 find_library(OpenGL_GL_LIBRARY
-  NAMES GL OpenGL32
+  NAMES GL libOpenGL32.a OpenGL32
   PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
 )
 
 find_library(OpenGL_GLU_LIBRARY
-  NAMES GLU GLU32
+  NAMES GLU libGLU32.a GLU32
   PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
 )
 
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index b2c5dd8..4e48a6c 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -20,7 +20,7 @@ else()
 endif()
 
 # Find all the libs that don't require extra parameters
-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL)
+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL Z Jpeg Tiff Png)
 	find_package(${lib} REQUIRED)
 	include_directories(${${lib}_INCLUDE_DIRS})
 	list(APPEND LIBS ${${lib}_LIBRARIES})
diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index 76fe7eb..e6ea492 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -56,7 +56,7 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 
 set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_MULTITHREAD ON)
-find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time)
+find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time system filesystem)
 include_directories(${Boost_INCLUDE_DIRS})
 
 if(SLAVE_LIB)
diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index 3abb7ff..9dbd2f6 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -148,6 +148,9 @@ if(PLUGIN_PORTAUDIO)
 	install(TARGETS da_audio_dev_pa${Portaudio_VERSION} DESTINATION ${LibDA_PLUGIN_DIR})
 	if(APPLE OR WIN32)
 		target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} da)
+		if(WIN32)
+			target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} plugin++)
+		endif(WIN32)
 	endif(APPLE OR WIN32)
 endif(PLUGIN_PORTAUDIO)
 
diff --git a/libs/libda/plugins/audio_dev_pa19.cpp b/libs/libda/plugins/audio_dev_pa19.cpp
index 2383c13..cdebacd 100644
--- a/libs/libda/plugins/audio_dev_pa19.cpp
+++ b/libs/libda/plugins/audio_dev_pa19.cpp
@@ -1,4 +1,5 @@
 #include <libda/audio_dev.hpp>
+#include <stdint.h>
 #include <portaudio.h>
 #include <ostream>
 #include <sstream>
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 5798c96..16c32ee 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(Boost 1.34 REQUIRED COMPONENTS filesystem program_options)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # Find all the libs that don't require extra parameters
-foreach(lib LibXML++ Magick++)
+foreach(lib LibXML++ Magick++ Z Jpeg Tiff Png Freetype)
 	find_package(${lib})
 	if (${lib}_FOUND)
 		include_directories(${${lib}_INCLUDE_DIRS})
@@ -25,7 +25,7 @@ if (LibXML++_FOUND)
 	if (Boost_FOUND)
 		if (Magick++_FOUND)
 			add_executable(ss_extract ss_extract.cpp pak.cpp ipu_conv.cpp ss_cover.cpp)
-			target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES})
+			target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
 			set(targets ${targets} ss_extract)
 		else (Magick++_FOUND)
 			message("No Magick++ found, not building ss_extract")
@@ -36,7 +36,7 @@ if (LibXML++_FOUND)
 
 	if (Magick++_FOUND)
 		add_executable(ss_cover_conv cover_conv.cpp pak.cpp ss_cover.cpp)
-		target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES})
+		target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
 		set(targets ${targets} ss_cover_conv)
 	else (Magick++_FOUND)
 		message("No Magick++ found, not building ss_cover_conv")

[Performous-commit] unknown : Merge branch 'master' of ssh://git.performous.org/gitroot/ performous/performous

From: Stefano A. <xa...@us...> - 2009-12-01 20:55:53

Module: performous
Branch: master
Commit: ea955dbc1dd1e42c84567c9ba3e2cddf88fcbf02

Author: unknown <Alde@.(none)>
Date:   Mon Nov 30 21:47:17 2009 +0100

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

---

[Performous-commit] unknown : Fixed problem compilation under Windows

From: Stefano A. <xa...@us...> - 2009-12-01 20:55:53

Module: performous
Branch: master
Commit: feb20cfc17bb9a99c44a4c94998d8b97830adad8

Author: unknown <Alde@.(none)>
Date:   Sat Nov 28 15:34:08 2009 +0100

Fixed problem compilation under Windows

---

 libs/plugin++/src/dll.cc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/libs/plugin++/src/dll.cc b/libs/plugin++/src/dll.cc
index 73662e6..e6dcef8 100644
--- a/libs/plugin++/src/dll.cc
+++ b/libs/plugin++/src/dll.cc
@@ -17,7 +17,12 @@ dll::dll(std::string const& filename): lib(LoadLibrary(filename.c_str())) {
 dll::~dll() { FreeLibrary(static_cast<HINSTANCE>(lib)); }
 
 void* dll::sym(char const* sym) {
-	return GetProcAddress(static_cast<HINSTANCE>(lib), sym);
+	union{
+		void* ptr;
+		FARPROC fptr;
+	}conv;
+	conv.fptr = GetProcAddress(static_cast<HINSTANCE>(lib), sym);
+	return conv.ptr;
 }
 
 #else

[Performous-commit] Lasse Karkkainen : Remove CIA.vc to avoid Nigerian spammers

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2009-12-01 17:28:45

Module: web
Branch: master
Commit: 81555e92ebbd4afed4f46258a69ff670eb72a0e8

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Dec  1 19:28:35 2009 +0200

Remove CIA.vc to avoid Nigerian spammers

---

 htdocs-source/AWC-cfg.txt |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/htdocs-source/AWC-cfg.txt b/htdocs-source/AWC-cfg.txt
index ed32a72..1f1e28c 100644
--- a/htdocs-source/AWC-cfg.txt
+++ b/htdocs-source/AWC-cfg.txt
@@ -13,7 +13,6 @@
 .http://sourceforge.net/projects/performous/forums/forum/871563 Forum
 .http://sourceforge.net/projects/performous/ SF.net
 .http://www.ohloh.net/projects/performous Ohloh.net
-.http://cia.vc/stats/project/performous CIA.vc
 .http://www.facebook.com/performous Facebook
 .awstats/awstats.pl Site stats
 % Competitors

Flat | Threaded

<< < 1 .. 121 122 123 124 125 .. 163 > >> (Page 123 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