From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Wed, 20 Jan 2010 20:09:14 +0000 (-0700)
Subject: cade lab fixes
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=3f6e44698c38b74bb622ad81ea9d2daa636981d2;p=chaz%2Fyoink

cade lab fixes
---

diff --git a/README b/README
index 6f5e024..3193449 100644
--- a/README
+++ b/README
@@ -36,6 +36,7 @@ libvorbis
 Lua
 OpenAL
 OpenGL
+pkgconfig (build-time dependency)
 SDL
 
 c) License
diff --git a/configure.ac b/configure.ac
index b52ea76..813b6b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,11 @@ AC_HEADER_STDBOOL
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stddef.h stdint.h stdlib.h string.h unistd.h])
 
+##### clock_gettime #####
+AC_SEARCH_LIBS([clock_gettime], [rt],
+			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
+						  [Define to 1 if you have the 'clock_gettime' function.])])
+
 
 #
 # Checks for build dependencies.
@@ -237,7 +242,7 @@ AC_CHECK_HEADERS([GL/gl.h GL/glu.h],,
 if test x$WIN32 = xyes
 then
 # autoconf library search macro doesn't find opengl32 on windows because it uses
-# different name hashing, but it links fine; assume it's there
+# different name hashing or something, but it links fine; assume it's there
 	LIBS="$LIBS -lglu32 -lopengl32"
 else
 	AC_SEARCH_LIBS([glEnable], [GL MesaGL],,
@@ -257,24 +262,6 @@ AC_SEARCH_LIBS([alEnable], [openal OpenAL32],,
 			   [missing=yes
 				echo "***** Missing libopenal ($website) *****"])
 
-##### libpng #####
-website="http://www.libpng.org/pub/png/libpng.html"
-AC_CHECK_HEADERS([png.h],,
-				 [missing=yes
-				  echo "***** Missing libpng header ($website) *****"])
-AC_SEARCH_LIBS([png_sig_cmp], [png],,
-			   [missing=yes
-				echo "***** Missing libpng ($website) *****"])
-
-##### libvorbis #####
-website="http://www.xiph.org/downloads/"
-AC_CHECK_HEADERS([vorbis/codec.h vorbis/vorbisfile.h],,
-				 [missing=yes
-				  echo "***** Missing vorbis headers ($website) *****"])
-AC_SEARCH_LIBS([ov_open], [vorbisfile],,
-			   [missing=yes
-				echo "***** Missing libvorbisfile ($website) *****"])
-
 ##### liblua #####
 website="http://www.lua.org/"
 AC_CHECK_HEADERS([lua.h],,
@@ -284,9 +271,27 @@ AC_SEARCH_LIBS([lua_load], [lua],,
 			   [missing=yes
 				echo "***** Missing liblua ($website) *****"])
 
+##### libpng #####
+website="http://www.libpng.org/pub/png/libpng.html"
+PKG_CHECK_MODULES([PNG], [libpng],
+				  [LIBS="$LIBS $PNG_LIBS"
+				   CFLAGS="$CFLAGS $PNG_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $PNG_CFLAGS"],
+				  [missing=yes
+				   echo "***** Missing libpng ($website) *****"])
+
+##### libvorbis #####
+website="http://www.xiph.org/downloads/"
+PKG_CHECK_MODULES([VORBIS], [vorbisfile],
+				  [LIBS="$LIBS $VORBIS_LIBS"
+				   CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $VORBIS_CFLAGS"],
+				  [missing=yes
+				   echo "***** Missing libvorbisfile ($website) *****"])
+
+##### GTK+ 2.0 #####
 if test x$gtk = xyes
 then
-	##### GTK+ 2.0 #####
 	website="http://www.gtk.org/"
 	PKG_CHECK_MODULES([GTK], [gtk+-2.0],
 					  [LIBS="$LIBS $GTK_LIBS"
@@ -296,9 +301,9 @@ then
 					   echo "***** Missing GTK+-2.0 ($website) *****"])
 fi
 
+##### QT4 #####
 if test x$qt4 = xyes
 then
-	##### QT4 #####
 	website="http://qt.nokia.com/"
 	PKG_CHECK_MODULES([QT], [QtGui],
 					  [LIBS="$LIBS $QT_LIBS"
@@ -308,15 +313,10 @@ then
 					   echo "***** Missing QT ($website) *****"])
 fi
 
-##### librt (optional) #####
-AC_SEARCH_LIBS([clock_gettime], [rt],
-			   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
-						  [Define to 1 if you have the 'clock_gettime' function.])])
-
 
 if test x$missing == xyes
 then
-	AC_MSG_WARN([You may be missing some dependencies--see messages above.])
+	AC_MSG_WARN([It looks like you're missing some dependencies--building may fail.])
 fi
 
 
diff --git a/src/Moof/Core.cc b/src/Moof/Core.cc
index cc86a91..9002730 100644
--- a/src/Moof/Core.cc
+++ b/src/Moof/Core.cc
@@ -368,7 +368,9 @@ class Backend_
 {
 public:
 
-	void init()
+	Backend_() :
+		mAlDevice(0),
+		mAlContext(0)
 	{
 #if defined(_WIN32) || defined(__WIN32__)
 		if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0)
@@ -429,7 +431,6 @@ public:
 		if (gRetainCount++ == 0)
 		{
 			gInstance = BackendP(new Backend_);
-			gInstance->init();
 		}
 	}
 
diff --git a/src/Moof/Image.cc b/src/Moof/Image.cc
index ba17769..51e7ad8 100644
--- a/src/Moof/Image.cc
+++ b/src/Moof/Image.cc
@@ -160,7 +160,7 @@ private:
 				break;
 
 			case PNG_COLOR_TYPE_GRAY:
-				if (bpp < 8) png_set_gray_1_2_4_to_8(pngObj);
+				if (bpp < 8) png_set_expand(pngObj);
 				break;
 
 			case PNG_COLOR_TYPE_GRAY_ALPHA: