pkg-config libs parsing bugfix

diff --git a/INSTALL b/INSTALL
index 207efba42719a47fde3638aca3b00426c9f7c110..a9438a116b123d002a13075ce920f62531dbb09f 100644 (file)
--- 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 8c88e5bbb72917cce7472d6dcb48151e57e1dc2d..49127e4614b5d124be37ae374446a91d87a1c88f 100755 (executable)
--- 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 2518bdf7971c339739c018f7e8e87835cc6747b6..d696f5ebdf851a0276f625f5c886eddb3dfd7594 100644 (file)
--- 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 fb442d33ceb8cc2181be21559be625472d3ea090..2992ea052a7ded280725439b183a97b8da0c5b0f 100644 (file)
--- 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 05c9d6e1c9760351cf7f8e91dc9a66cf8bd6c48b..837340f242eb7bef7999e7dd7ab1913d3a0cf3c3 100644 (file)
--- 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 1c09d6ea4cc620d125cab4633becd37273f0574c..62e68c8fa2ae4b0b8dcb7acbb6197e5656b60908 100644 (file)
--- 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 01dfc624795afe3d10c9e90fceca0f6663f62918..c5139f27e06bb7dd95ae9c9a2915adcd5a897180 100644 (file)
--- 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 7608cda61508e68cf8f4a435e718915044e1e5be..04cc13e9c72bfac4e7196cf6ae6b3df2299a76d7 100644 (file)
--- 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 4ae53114c998a28cae5d19db205f18faaf5d5a8f..0440b7df5749760861dfdfc4a5c913220258a450 100644 (file)
--- 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 e31e49fdfb23a567ff857e46c4932e483d921fe3..b5c55ff528f6f3c6205afbb128a8615acc882f09 100644 (file)
--- 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 caf96bb9a45c1f621d79a08683d62c0b52ad1871..6a417ad9823ef60a21f7e604a7b69d5ceb8bd54e 100644 (file)
--- 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