# HG changeset patch
# User tomwalters
# Date 1279825431 0
# Node ID 7e1fe07d13dc3ae91c966db3f6aa0f5a7eac54b3
# Parent  c155e7fbe76e2c273e327c8053fa23b819b28230
- Windows python building magic

diff -r c155e7fbe76e -r 7e1fe07d13dc swig/aim_modules.i
--- a/swig/aim_modules.i	Thu Jul 22 04:24:55 2010 +0000
+++ b/swig/aim_modules.i	Thu Jul 22 19:03:51 2010 +0000
@@ -18,12 +18,6 @@
 %module aimc
 %include "std_string.i"
 %include stl.i
-%include "std_vector.i"
-
-namespace std {
-   %template(FloatVector) vector<float>;
-}
-
 %{
 #include "Support/Common.h"
 #include "Support/Module.h"
@@ -38,11 +32,9 @@
 #include "Modules/SSI/ModuleSSI.h"
 #include "Modules/Profile/ModuleSlice.h"
 #include "Modules/Profile/ModuleScaler.h"
-#include "Modules/Features/ModuleGaussians.h"
 %}
 
 %include "Support/Parameters.h"
-using namespace std;
 %include "Support/SignalBank.h"
 
 namespace aimc {
@@ -53,8 +45,7 @@
  public:
   explicit Module(Parameters *parameters);
   virtual ~Module();
-  virtual bool Initialize(const SignalBank &input,
-                          Parameters *global_parameters);
+  virtual bool Initialize(const SignalBank &input);
   bool initialized() const;
   bool AddTarget(Module* target_module);
   bool RemoveTarget(Module* target_module);
@@ -78,4 +69,3 @@
 %include "Modules/SSI/ModuleSSI.h"
 %include "Modules/Profile/ModuleSlice.h"
 %include "Modules/Profile/ModuleScaler.h"
-%include "Modules/Features/ModuleGaussians.h"
diff -r c155e7fbe76e -r 7e1fe07d13dc swig/setup.py
--- a/swig/setup.py	Thu Jul 22 04:24:55 2010 +0000
+++ b/swig/setup.py	Thu Jul 22 19:03:51 2010 +0000
@@ -28,7 +28,6 @@
                                    '../src/Support/Parameters.cc',
                                    '../src/Support/SignalBank.cc', 
                                    '../src/Support/Module.cc',
-                                   '../src/Modules/Features/ModuleGaussians.cc',
                                    '../src/Modules/BMM/ModuleGammatone.cc',
                                    '../src/Modules/BMM/ModulePZFC.cc',
                                    '../src/Modules/NAP/ModuleHCL.cc',
@@ -36,10 +35,8 @@
                                    '../src/Modules/Strobes/ModuleLocalMax.cc',
                                    '../src/Modules/SAI/ModuleSAI.cc',
                                    '../src/Modules/SSI/ModuleSSI.cc',
-                                   '../src/Modules/SNR/ModuleNoise.cc',
                                    '../src/Modules/Profile/ModuleSlice.cc',
-                                   '../src/Modules/Profile/ModuleScaler.cc',
-                                   '../src/Modules/Output/FileOutputHTK.cc'],
+                                   '../src/Modules/Profile/ModuleScaler.cc'],
                         swig_opts = ['-c++','-I../src/'], 
                         include_dirs=['../src/', '/opt/local/include/']
                         )
@@ -50,4 +47,4 @@
        description = """SWIG wrapper round the core of aimc""",
        ext_modules = [aimc_module],
        py_modules = ["aimc"],
-       )
\ No newline at end of file
+       )