1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
|
Description: Link to dynamic portaudio instead of static.
Author: Miriam Ruiz <miriam@debian.org>
--- a/Transcend/Makefile.GnuLinuxPPC
+++ b/Transcend/Makefile.GnuLinuxPPC
@@ -22,7 +22,7 @@
# various GL and X windows librariesneeded for linux
# also need portaudio library (which in turn needs pthreads)
-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu ${ROOT_PATH}/Transcend/portaudio/lib/libportaudio.a -lpthread
+PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu -lportaudio -lpthread
# All platforms but OSX support g++ and need no linker hacks
--- a/Transcend/Makefile.GnuLinuxX86
+++ b/Transcend/Makefile.GnuLinuxX86
@@ -22,7 +22,7 @@
# pthread library needed for linux
# also need portaudio library (which in turn needs pthreads)
-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu ${ROOT_PATH}/Transcend/portaudio/lib/libportaudio.a -lpthread
+PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu -lportaudio -lpthread
# All platforms but OSX support g++ and need no linker hacks
--- a/Transcend/Makefile.MacOSX
+++ b/Transcend/Makefile.MacOSX
@@ -22,7 +22,7 @@
# various frameworks to support OpenGL, GLUT, and portaudio
-PLATFORM_LINK_FLAGS = -framework Cocoa -framework OpenGL -framework GLUT -framework CoreAudio -framework AudioToolbox ${ROOT_PATH}/Transcend/portaudio/lib/libportaudio.a
+PLATFORM_LINK_FLAGS = -framework Cocoa -framework OpenGL -framework GLUT -framework CoreAudio -framework AudioToolbox -lportaudio
--- a/Transcend/Makefile.MinGW
+++ b/Transcend/Makefile.MinGW
@@ -20,7 +20,7 @@
PLATFORM_COMPILE_FLAGS = -DWIN_32
# need various GL libraries, winmm, and portaudio
-PLATFORM_LINK_FLAGS = -lopengl32 -lglut32 -lglu32 ${ROOT_PATH}/Transcend/portaudio/lib/libportaudio.a -lwinmm
+PLATFORM_LINK_FLAGS = -lopengl32 -lglut32 -lglu32 -lportaudio -lwinmm
# All platforms but OSX support g++ and need no linker hacks
--- a/Transcend/game/SoundPlayer.h
+++ b/Transcend/game/SoundPlayer.h
@@ -46,8 +46,7 @@
#include "SoundFilter.h"
#include "PlayableSound.h"
-#include "Transcend/portaudio/pa_common/portaudio.h"
-#include "Transcend/portaudio/pablio/pablio.h"
+#include <portaudio.h>
#include "minorGems/util/SimpleVector.h"
--- a/Transcend/game/SoundPlayerActive.h
+++ b/Transcend/game/SoundPlayerActive.h
@@ -16,8 +16,7 @@
#include "SoundSamples.h"
-#include "Transcend/portaudio/pa_common/portaudio.h"
-#include "Transcend/portaudio/pablio/pablio.h"
+#include <portaudio.h>
#include "minorGems/util/SimpleVector.h"
|