[Dunelegacy-commit] SF.net SVN: dunelegacy: [276] branches/dunks

[<dv...@us...>]

Revision: 276
          http://dunelegacy.svn.sourceforge.net/dunelegacy/?rev=276&view=rev
Author:   dvalin
Date:     2008-05-27 14:00:17 -0700 (Tue, 27 May 2008)

Log Message:
-----------
don't bundle libsamplerate, link against external library in stead

Modified Paths:
--------------
    branches/dunks/SConstruct
    branches/dunks/src/SConscript
    branches/dunks/src/pakfile/sound/Vocfile.cpp
    branches/dunks/src/pakfile/sound/adl/adl.cpp

Removed Paths:
-------------
    branches/dunks/include/pakfile/sound/IntegratedLibSampleRate/
    branches/dunks/src/pakfile/sound/IntegratedLibSampleRate/

Modified: branches/dunks/SConstruct
===================================================================
--- branches/dunks/SConstruct	2008-05-27 16:34:45 UTC (rev 275)
+++ branches/dunks/SConstruct	2008-05-27 21:00:17 UTC (rev 276)
@@ -23,7 +23,7 @@
 env.Append(CPPPATH="#include")
 
 if sys.platform != "win32":
-	env.ParseConfig('sdl-config --cflags --libs')
+	env.ParseConfig('pkg-config --cflags sdl samplerate')
 	env.Append(CCFLAGS=["-Wall", "-pedantic", "-O0"]) #, "-Werror"])
 	#env.Append(CCFLAGS=["-Wall", "-Werror", "-O2", "-ffast-math", "-funroll-loops"])
 	#env.Append(LINKFLAGS = ["-ffast-math"])
@@ -39,6 +39,7 @@
                     	"SDL_mixer",
                     	"SDL_net",
                     	"SDL_ttf",
+						"samplerate",
                   ])
 
 

Modified: branches/dunks/src/SConscript
===================================================================
--- branches/dunks/src/SConscript	2008-05-27 16:34:45 UTC (rev 275)
+++ branches/dunks/src/SConscript	2008-05-27 21:00:17 UTC (rev 276)
@@ -39,10 +39,6 @@
 				"pakfile/Animation.cpp",
 				"pakfile/Stringfile.cpp",
 				"pakfile/sound/Vocfile.cpp",
-				"pakfile/sound/IntegratedLibSampleRate/samplerate.c",
-				"pakfile/sound/IntegratedLibSampleRate/src_linear.c",
-				"pakfile/sound/IntegratedLibSampleRate/src_sinc.c",
-				"pakfile/sound/IntegratedLibSampleRate/src_zoh.c",
 				"pakfile/sound/adl/adl.cpp",
 				"pakfile/sound/adl/emuopl.cpp",
 				"pakfile/sound/adl/fmopl.cpp"
@@ -79,11 +75,7 @@
                      "State.cpp",
                      "TopLevelState.cpp",
 					 "SoundPlayerClass.cpp",
-					 "pakfile/Vocfile.cpp",
-					 "pakfile/IntegratedLibSampleRate/samplerate.c",
-					 "pakfile/IntegratedLibSampleRate/src_linear.c",
-					 "pakfile/IntegratedLibSampleRate/src_sinc.c",
-					 "pakfile/IntegratedLibSampleRate/src_zoh.c"
+					 "pakfile/Vocfile.cpp"
                   ]
 
 #gamelib = env.StaticLibrary("dune_game", all_sources)

Modified: branches/dunks/src/pakfile/sound/Vocfile.cpp
===================================================================
--- branches/dunks/src/pakfile/sound/Vocfile.cpp	2008-05-27 16:34:45 UTC (rev 275)
+++ branches/dunks/src/pakfile/sound/Vocfile.cpp	2008-05-27 21:00:17 UTC (rev 276)
@@ -19,7 +19,7 @@
  */
 
 #include "pakfile/sound/Vocfile.h"
-#include "pakfile/sound/IntegratedLibSampleRate/samplerate.h"
+#include <samplerate.h>
 #include <string>
 #include <SDL_mixer.h>
 #include <math.h>

Modified: branches/dunks/src/pakfile/sound/adl/adl.cpp
===================================================================
--- branches/dunks/src/pakfile/sound/adl/adl.cpp	2008-05-27 16:34:45 UTC (rev 275)
+++ branches/dunks/src/pakfile/sound/adl/adl.cpp	2008-05-27 21:00:17 UTC (rev 276)
@@ -57,7 +57,7 @@
 #include "pakfile/sound/adl/adl.h"
 #include "pakfile/sound/adl/emuopl.h"
 
-#include "pakfile/sound/IntegratedLibSampleRate/samplerate.h"
+#include <samplerate.h>
 
 #define BUFSIZE 65536     // Sound buffer size in samples
 #define NUM_SAMPLES_OF_SILENCE	10


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