Author: Miriam Ruiz <little_miry@yahoo.es> Description: compile against the system portaudio instead of the removed embedded one --- a/game2/gameSource/sound/SoundPlayer.h +++ b/game2/gameSource/sound/SoundPlayer.h @@ -52,8 +52,7 @@ #include "SoundFilter.h" #include "PlayableSound.h" -#include "minorGems/sound/portaudio/pa_common/portaudio.h" -#include "minorGems/sound/portaudio/pablio/pablio.h" +#include <portaudio.h> #include "minorGems/util/SimpleVector.h" --- a/game2/Makefile.common +++ b/game2/Makefile.common @@ -43,7 +43,6 @@ OPTIMIZE_FLAG = ${OPTIMIZE_ON_FLAG} -PORT_AUDIO_PATH = ${ROOT_PATH}/minorGems/sound/portaudio # common to all platforms @@ -52,7 +51,7 @@ -COMPILE_FLAGS = -Wall -Wwrite-strings -Wchar-subscripts -Wparentheses ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH} -I${PORT_AUDIO_PATH}/pa_common +COMPILE_FLAGS = -Wall -Wwrite-strings -Wchar-subscripts -Wparentheses ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH} COMPILE = ${GXX} ${COMPILE_FLAGS} -c --- a/runToBuild +++ b/runToBuild @@ -16,15 +16,6 @@ ./configure -echo "Building portaudio..." - -cd ../minorGems/sound/portaudio -chmod u+x ./configure -./configure -make -cd ../../../game2 - - echo "Building Cultivation..." cd gameSource --- a/game2/Makefile.GnuLinux +++ b/game2/Makefile.GnuLinux @@ -20,7 +20,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 ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread -lpng +PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lportaudio -lpthread -lpng # All platforms but OSX support g++ and need no linker hacks --- a/game2/build/source/runToBuild +++ b/game2/build/source/runToBuild @@ -16,15 +16,6 @@ ./configure -echo "Building portaudio..." - -cd ../minorGems/sound/portaudio -chmod u+x ./configure -./configure -make -cd ../../../game2 - - echo "Building Cultivation..." cd gameSource