Ubuntu: Fixed dsFluidSynth build

Also, check that the required dependency GLib 2.0 is available.
skyjake · Jul 15, 2012 · 82d9ec8 · 82d9ec8
1 parent 73bb010
commit 82d9ec8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/doomsday/dep_glib.pri b/doomsday/dep_glib.pri
@@ -1,6 +1,10 @@
 # Build configuration for glib.
 unix {
+    # Is the GLib development files installed?
+    !system(pkg-config --exists gthread-2.0) {
+        error(Missing dependency: FluidSynth requires GLib 2.0 development files)
+    }
+
     QMAKE_CFLAGS += $$system(pkg-config --cflags gthread-2.0 glib-2.0)
-    LIBS += $$system(pkg-config --libs gthread-2.0 glib-2.0)
+            LIBS += $$system(pkg-config --libs   gthread-2.0 glib-2.0)
 }
-
diff --git a/doomsday/plugins/fluidsynth/fluidsynth.pro b/doomsday/plugins/fluidsynth/fluidsynth.pro
@@ -12,7 +12,7 @@ win32|macx: TARGET = dsFluidSynth
 CONFIG -= qt
 
 # Define this to get debug messages.
-DEFINES += DENG_DSFLUIDSYNTH_DEBUG
+deng_debug: DEFINES += DENG_DSFLUIDSYNTH_DEBUG
 
 win32 {
     RC_FILE = res/fluidsynth.rc

diff --git a/doomsday/plugins/fluidsynth/src/driver_fluidsynth.cpp b/doomsday/plugins/fluidsynth/src/driver_fluidsynth.cpp
@@ -22,6 +22,7 @@
 #include "driver_fluidsynth.h"
 #include "sys_audiod.h"
 #include <stdio.h>
+#include <string.h>
 
 #include "doomsday.h"
 

diff --git a/doomsday/plugins/fmod/fmod.pro b/doomsday/plugins/fmod/fmod.pro
@@ -10,7 +10,7 @@ win32|macx: TARGET = dsFMOD
 
 VERSION = $$FMOD_VERSION
 
-DEFINES += DENG_DSFMOD_DEBUG
+deng_debug: DEFINES += DENG_DSFMOD_DEBUG
 
 INCLUDEPATH += include