Merging revision 30126:30261 from trunk.
authorJoerg Mueller <nexyon@gmail.com>
Tue, 13 Jul 2010 11:14:49 +0000 (11:14 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 13 Jul 2010 11:14:49 +0000 (11:14 +0000)
1  2 
source/gameengine/Ketsji/KX_PythonInit.cpp

index 73d45eb97aac19936d35f28eacd1c04585540f5a,7327b9c08ff5f338b317af8d386f467924969baa..04edec7c106161a0b5c16fe49185d472229f93f5
@@@ -1993,11 -1989,7 +1993,8 @@@ void setupGamePython(KX_KetsjiEngine* k
        initGeometry();
        initBGL();
        initBLF();
- #ifdef WITH_FFMPEG
 +      AUD_initPython();
        initVideoTexture();
- #endif
  
        /* could be done a lot more nicely, but for now a quick way to get bge.* working */
        PyRun_SimpleString("__import__('sys').modules['bge']=[mod for mod in (type(__builtins__)('bge'), ) if mod.__dict__.update({'logic':__import__('GameLogic'), 'render':__import__('Rasterizer'), 'events':__import__('GameKeys'), 'constraints':__import__('PhysicsConstraints'), 'types':__import__('GameTypes')}) is None][0]");