[Wired-commits] SF.net SVN: wired: [1006] trunk/wired/src

[<hdo...@us...>]

Revision: 1006
          http://svn.sourceforge.net/wired/?rev=1006&view=rev
Author:   hdoomsday
Date:     2006-09-23 10:30:08 -0700 (Sat, 23 Sep 2006)

Log Message:
-----------
fixed bug when portaudio.h is not available on system and --enable-portaudio specified.

Modified Paths:
--------------
    trunk/wired/src/Makefile.am
    trunk/wired/src/engine/AudioEngine.h
    trunk/wired/src/engine/Device.h
    trunk/wired/src/plugins/akai_sampler/Makefile.am
    trunk/wired/src/plugins/beatbox/Makefile.am
    trunk/wired/src/plugins/loop_sampler/Makefile.am
    trunk/wired/src/samplerate/WiredSampleRate.h

Modified: trunk/wired/src/Makefile.am
===================================================================
--- trunk/wired/src/Makefile.am	2006-09-23 16:57:50 UTC (rev 1005)
+++ trunk/wired/src/Makefile.am	2006-09-23 17:30:08 UTC (rev 1006)
@@ -22,16 +22,14 @@
 
 DEPS_LIBS = libs/WiredWidgets/src/.libs/libWiredWidgets.so libs/WiredAkai/src/.libs/libWiredAkai.so
 
-wired_LDFLAGS = $(shell wx-config --libs) -lsndfile -lasound -Lmidi/portmidi $(DEPS_LIBS) -Lfileloader -lfileloader -L/usr/pkg/lib/ `xml2-config --libs` @SAMPLERATE_LIBS@
+wired_LDFLAGS = $(shell wx-config --libs) -lsndfile -lasound -Lmidi/portmidi $(DEPS_LIBS) -Lfileloader -lfileloader -L/usr/pkg/lib/ `xml2-config --libs` @SAMPLERATE_LIBS@ -lportaudio
 
+wired_CPPFLAGS = $(shell wx-config --cflags) -Igui -Iplugins -Ifileloader -I/opt/gnome/include -Isequencer -Iredist -Iaudio -Iengine -Imixer -Imidi -Imidi/portmidi/pm_common -Imidi/portmidi/porttime -I. -Iasm -Ieditmidi -Iundo -I.  -I/usr/pkg/include/libxml2/ -I/usr/pkg/include `xml2-config --cflags` @SAMPLERATE_CFLAGS@
+
 if PORTAUDIO
-wired_LDFLAGS += -Lportaudio/lib/.libs/ -lportaudio
-else
-wired_LDFLAGS += -lportaudio
+wired_LDFLAGS += -Lportaudio/lib/.libs/
 endif
 
-wired_CPPFLAGS = $(shell wx-config --cflags) -Igui -Iplugins -Ifileloader -I/opt/gnome/include -Isequencer -Iredist -Iaudio -Iengine -Imixer -Imidi -Imidi/portmidi/pm_common -Imidi/portmidi/porttime -I. -Iasm -Ieditmidi -Iundo -I.  -I/usr/pkg/include/libxml2/ -I/usr/pkg/include `xml2-config --cflags` @SAMPLERATE_CFLAGS@
-
 bin_PROGRAMS = wired
 
 wired_SOURCES =

Modified: trunk/wired/src/engine/AudioEngine.h
===================================================================
--- trunk/wired/src/engine/AudioEngine.h	2006-09-23 16:57:50 UTC (rev 1005)
+++ trunk/wired/src/engine/AudioEngine.h	2006-09-23 17:30:08 UTC (rev 1006)
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include <portaudio.h>
+#include "portaudio.h"
 #include <wx/thread.h>
 
 #include "Device.h"

Modified: trunk/wired/src/engine/Device.h
===================================================================
--- trunk/wired/src/engine/Device.h	2006-09-23 16:57:50 UTC (rev 1005)
+++ trunk/wired/src/engine/Device.h	2006-09-23 17:30:08 UTC (rev 1006)
@@ -6,7 +6,7 @@
 
 #include <iostream>
 #include <vector>
-#include <portaudio.h>
+#include "portaudio.h"
 #include <wx/wx.h>
 
 #define MIN	0

Modified: trunk/wired/src/plugins/akai_sampler/Makefile.am
===================================================================
--- trunk/wired/src/plugins/akai_sampler/Makefile.am	2006-09-23 16:57:50 UTC (rev 1005)
+++ trunk/wired/src/plugins/akai_sampler/Makefile.am	2006-09-23 17:30:08 UTC (rev 1006)
@@ -3,7 +3,7 @@
 CPPFLAGS = $(shell wx-config --cflags) -I../../libs/WiredAkai/include -I../../gui -I../../plugins -I../../fileloader -I/opt/gnome/include -I../../audio -I../../redist -I../../engine -I../../mixer -I../../midi -I../../midi/portmidi/pm_common -I../../midi/portmidi/porttime -I../../editmidi -I../../undo -I../../libs/WiredWidgets/src
 
 if PORTAUDIO
-CPPFLAGS += -I../portaudio/include
+CPPFLAGS += -I../../portaudio/include
 endif
 
 

Modified: trunk/wired/src/plugins/beatbox/Makefile.am
===================================================================
--- trunk/wired/src/plugins/beatbox/Makefile.am	2006-09-23 16:57:50 UTC (rev 1005)
+++ trunk/wired/src/plugins/beatbox/Makefile.am	2006-09-23 17:30:08 UTC (rev 1006)
@@ -3,7 +3,7 @@
 CPPFLAGS = $(shell wx-config --cflags) -I../../gui -I../../plugins -I../../fileloader -I/opt/gnome/include -I../../audio -I../../redist -I../../engine -I../../mixer -I../../midi -I../../midi/portmidi/pm_common -I../../midi/portmidi/porttime -I../../asm -I../../editmidi -I../../undo -I../../libs/WiredWidgets/src
 
 if PORTAUDIO
-CPPFLAGS += -I../portaudio/include
+CPPFLAGS += -I../../portaudio/include
 endif
 
 

Modified: trunk/wired/src/plugins/loop_sampler/Makefile.am
===================================================================
--- trunk/wired/src/plugins/loop_sampler/Makefile.am	2006-09-23 16:57:50 UTC (rev 1005)
+++ trunk/wired/src/plugins/loop_sampler/Makefile.am	2006-09-23 17:30:08 UTC (rev 1006)
@@ -3,7 +3,7 @@
 CPPFLAGS = $(shell wx-config --cflags) -I../../gui -I../../plugins -I../../fileloader -I/opt/gnome/include -I../../audio -I../../redist -I../../engine -I../../mixer -I../../midi -I../../midi/portmidi/pm_common -I../../midi/portmidi/porttime -I../../asm -I../../editmidi -I../../undo -I../../libs/WiredWidgets/src
 
 if PORTAUDIO
-CPPFLAGS += -I../portaudio/include
+CPPFLAGS += -I../../portaudio/include
 endif
 
 

Modified: trunk/wired/src/samplerate/WiredSampleRate.h
===================================================================
--- trunk/wired/src/samplerate/WiredSampleRate.h	2006-09-23 16:57:50 UTC (rev 1005)
+++ trunk/wired/src/samplerate/WiredSampleRate.h	2006-09-23 17:30:08 UTC (rev 1006)
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <sndfile.h>
 #include <samplerate.h>
-#include <portaudio.h>
+#include "portaudio.h"
 #include <wx/msgdlg.h>
 #include <wx/progdlg.h>
 #include <wx/choicdlg.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.