From 449366f5f32d24f2a2a6589da6e16b2bf0d61773 Mon Sep 17 00:00:00 2001
From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Mon, 14 Jun 2010 21:31:27 -0600
Subject: [PATCH 1/1] pkg-config libs parsing bugfix

---
 INSTALL                  | 6 +++---
 configure                | 8 ++++----
 src/GameLayer.cc         | 6 ++----
 src/Main.cc              | 4 ++--
 src/moof/debug.hh        | 2 +-
 src/moof/math.hh         | 9 +++------
 src/moof/modal_dialog.hh | 6 ++----
 src/moof/opengl.hh       | 6 ++----
 src/moof/packet.cc       | 2 ++
 src/moof/timer.cc        | 2 ++
 src/yoink.rc             | 1 +
 11 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/INSTALL b/INSTALL
index 207efba..a9438a1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,7 +47,7 @@ The longer, more detailed instructions:
    have specified in step 2.  You're done!
 
    If this step fails, you probably do not have correct filesystem
-   permissions to installed to your chosen.  Either do the install with
-   elevated privileges, or start at step 2 again and specify --prefix with
-   some directory that you have write access to, such as $HOME.
+   permissions to install to your chosen directory.  Either do the install
+   with elevated privileges, or start at step 2 again and specify --prefix
+   with some directory that you have write access to, such as $HOME/usr.
 
diff --git a/configure b/configure
index 8c88e5b..49127e4 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@
 
 project		= "Yoink"
 version		= "0.1"
-bugreport	= "chaz@dogcows.com"
+bugreport	= "onefriedrice@brokenzipper.com"
 
 
 function ShowHelp()
@@ -416,12 +416,12 @@ do
 	CFLAGS = CFLAGS.." "..pc_cflags
 	CXXFLAGS = CXXFLAGS.." "..pc_cflags
 
-	local pc_libs = ReadCommand(command.." --libs "..deps)
+	local pc_libs = " "..ReadCommand(command.." --libs "..deps)
 	if not pc_libs then Die("Couldn't determine LDFLAGS or LIBS.") end
-	for lib in pc_libs:gmatch("%-l%S+") do
+	for lib in pc_libs:gmatch("%s%-l%S+") do
 		LIBS = LIBS.." "..lib
 	end
-	for ldflag in pc_libs:gmatch("%-[^l]%S*") do
+	for ldflag in pc_libs:gmatch("%s%-[^l]%S*") do
 		LDFLAGS = LDFLAGS.." "..ldflag
 	end
 
diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 2518bdf..d696f5e 100644
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -9,6 +9,8 @@
 *
 **************************************************************************/
 
+#include "../config.h"
+
 #include <stdexcept>
 
 #include <moof/log.hh>
@@ -19,10 +21,6 @@
 
 #include "GameLayer.hh"
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 
 void GameLayer::loadSceneLoader()
 {
diff --git a/src/Main.cc b/src/Main.cc
index fb442d3..2992ea0 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -9,6 +9,8 @@
 *
 **************************************************************************/
 
+#include "../config.h"
+
 #include <cstdlib>		// atexit, getenv
 #include <exception>
 #include <functional>
@@ -26,8 +28,6 @@
 #include "GameLayer.hh"
 #include "Main.hh"
 #include "TitleLayer.hh"
-
-#include "../config.h"
 #include "version.h"
 
 
diff --git a/src/moof/debug.hh b/src/moof/debug.hh
index 05c9d6e..837340f 100644
--- a/src/moof/debug.hh
+++ b/src/moof/debug.hh
@@ -25,7 +25,7 @@
 
 
 #undef ASSERT
-#if NDEBUG
+#ifdef NDEBUG
 #define ASSERT(X)
 #else
 /**
diff --git a/src/moof/math.hh b/src/moof/math.hh
index 1c09d6e..62e68c8 100644
--- a/src/moof/math.hh
+++ b/src/moof/math.hh
@@ -17,15 +17,12 @@
  * General math-related types and functions.
  */
 
-#include <cmath>
+#include "../config.h"
 
-#include <SDL/SDL_opengl.h>
+#include <cmath>
 
 #include <cml/cml.h>
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <SDL/SDL_opengl.h>
 
 
 #if USE_DOUBLE_PRECISION
diff --git a/src/moof/modal_dialog.hh b/src/moof/modal_dialog.hh
index 01dfc62..c5139f2 100644
--- a/src/moof/modal_dialog.hh
+++ b/src/moof/modal_dialog.hh
@@ -18,11 +18,9 @@
  * supported, but only one can be used as determined at build time.
  */
 
-#include <string>
+#include "../config.h"
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <string>
 
 #if defined(_WIN32)
 #include <windows.h>
diff --git a/src/moof/opengl.hh b/src/moof/opengl.hh
index 7608cda..04cc13e 100644
--- a/src/moof/opengl.hh
+++ b/src/moof/opengl.hh
@@ -18,14 +18,12 @@
  * and matrices.
  */
 
+#include "../config.h"
+
 #include <SDL/SDL_opengl.h>
 
 #include <moof/math.hh>
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 
 // generic function arguments
 
diff --git a/src/moof/packet.cc b/src/moof/packet.cc
index 4ae5311..0440b7d 100644
--- a/src/moof/packet.cc
+++ b/src/moof/packet.cc
@@ -9,6 +9,8 @@
 *
 **************************************************************************/
 
+#include "../config.h"
+
 #include <algorithm>
 #if HAVE_BYTESWAP_H
 #include <byteswap.h>
diff --git a/src/moof/timer.cc b/src/moof/timer.cc
index e31e49f..b5c55ff 100644
--- a/src/moof/timer.cc
+++ b/src/moof/timer.cc
@@ -9,6 +9,8 @@
 *
 **************************************************************************/
 
+#include "../config.h"
+
 #include <cerrno>
 #include <ctime>
 #include <limits>
diff --git a/src/yoink.rc b/src/yoink.rc
index caf96bb..6a417ad 100644
--- a/src/yoink.rc
+++ b/src/yoink.rc
@@ -5,6 +5,7 @@
 //
 
 #include <winver.h>
+#include "../config.h"
 
 1 VERSIONINFO
 FILEVERSION		VERSION_MAJOR,VERSION_MINOR,VERSION_REVISION,0
-- 
2.43.0