Updated to latest HEAD

No need for winmm or libsphinxad in python

Author: nshmyrev

example.py

@@ -9,7 +9,7 @@
 # Create a decoder with certain model
 config = Decoder.default_config()
 config.set_string('-hmm', path.join(MODELDIR, 'en-us/en-us'))
-config.set_string('-lm', path.join(MODELDIR, 'en-us/en-us.lm.dmp'))
+config.set_string('-lm', path.join(MODELDIR, 'en-us/en-us.lm.bin'))
 config.set_string('-dict', path.join(MODELDIR, 'en-us/cmudict-en-us.dict'))
 decoder = Decoder(config)
 

pocketsphinx

@@ -55,14 +55,12 @@
 PY2 = sys.version_info[0] == 2
 
 libsphinxbase = (
-    [s for s in glob('sphinxbase/src/libsphinxbase/lm/*.c') if 'lm3g_templates.c' not in s] +
+    glob('sphinxbase/src/libsphinxbase/lm/*.c') +
     glob('sphinxbase/src/libsphinxbase/feat/*.c') +
     glob('sphinxbase/src/libsphinxbase/util/*.c') +
     glob('sphinxbase/src/libsphinxbase/fe/*.c')
 )
 
-libsphinxad = []
-
 libpocketsphinx = glob('pocketsphinx/src/libpocketsphinx/*.c')
 
 sb_include_dirs = ['sphinxbase/include', 'sphinxbase/include/sphinxbase']
@@ -82,9 +80,6 @@
 extra_compile_args = []
 
 if sys.platform.startswith('linux'):
-    libsphinxad.extend([
-        'sphinxbase/src/libsphinxad/ad_oss.c'
-    ])
     sb_include_dirs.extend(['include'])
     extra_compile_args.extend([
         '-Wno-unused-label',
@@ -94,11 +89,7 @@
         '-Wno-unused-variable'
     ])
 elif sys.platform.startswith('win'):
-    libsphinxad.extend([
-        'sphinxbase/src/libsphinxad/ad_win32.c'
-    ])
     sb_include_dirs.extend(['sphinxbase/include/win32'])
-    libraries.append('winmm')
     define_macros.extend([
         ('WIN32', None),
         ('_WINDOWS', None),
@@ -112,19 +103,17 @@
         '/wd4018'
     ])
 elif sys.platform.startswith('darwin'):
-    pass
+    sb_include_dirs.extend(['include'])
 else:
     pass
 
 sb_sources = (
     libsphinxbase +
-    libsphinxad +
     ['sphinxbase/swig/sphinxbase.i']
 )
 
 ps_sources = (
     libsphinxbase +
-    libsphinxad +
     libpocketsphinx +
     ['pocketsphinx/swig/pocketsphinx.i']
 )
@@ -147,14 +136,14 @@
 
 setup(
     name='pocketsphinx',
-    version='0.0.4',
+    version='0.0.5',
     description='Python interface to CMU SphinxBase and PocketSphinx libraries',
     long_description=__doc__,
     author='Dmitry Prazdnichnov',
     author_email='[email protected]',
     maintainer='Dmitry Prazdnichnov',
     maintainer_email='[email protected]',
-    url='https://github.com/bambocher/pocketsphinx-python',
+    url='https://github.com/cmusphinx/pocketsphinx-python',
     download_url='https://pypi.python.org/pypi/pocketsphinx',
     packages=['sphinxbase', 'pocketsphinx'],
     ext_modules=[