diff options
Diffstat (limited to 'src/ingen')
| -rw-r--r-- | src/ingen/ingen.cpp | 16 | ||||
| -rw-r--r-- | src/ingen/ingen.grind | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp index 3f68369c..a63b4196 100644 --- a/src/ingen/ingen.cpp +++ b/src/ingen/ingen.cpp @@ -36,9 +36,6 @@ #include "ingen/client/ThreadedSigClientInterface.hpp" #include "ingen/runtime_paths.hpp" #include "ingen/types.hpp" -#ifdef WITH_BINDINGS -#include "bindings/ingen_bindings.hpp" -#endif #ifdef HAVE_SOCKET #include "ingen/client/SocketClient.hpp" #endif @@ -193,18 +190,7 @@ main(int argc, char** argv) if (conf.option("gui").get<int32_t>()) { world->run_module("gui"); - } else if (conf.option("run").is_valid()) { - // Run a script -#ifdef WITH_BINDINGS - ingen_try(world->load_module("bindings"), - "Unable to load bindings module"); - - world->run("application/x-python", conf.option("run").ptr<char>()); -#else - cerr << "This build of ingen does not support scripting." << endl; -#endif - - } else if (world->engine() && !conf.option("gui").get<int32_t>()) { + } else if (world->engine()) { // Run engine main loop until interrupt while (world->engine()->main_iteration()) { Glib::usleep(125000); // 1/8 second diff --git a/src/ingen/ingen.grind b/src/ingen/ingen.grind index 9e597d44..9e60915b 100644 --- a/src/ingen/ingen.grind +++ b/src/ingen/ingen.grind @@ -1,5 +1,5 @@ #!/usr/bin/env sh -export INGEN_MODULE_PATH="`pwd`/../../libs/engine/.libs:`pwd`/../../libs/serialisation/.libs:`pwd`/../../libs/gui/.libs:`pwd`/../../libs/client/.libs:`pwd`/../../bindings/.libs" +export INGEN_MODULE_PATH="`pwd`/../../libs/engine/.libs:`pwd`/../../libs/gui/.libs:`pwd`/../../libs/client/.libs" export INGEN_GLADE_PATH="`pwd`/../../libs/gui/ingen_gui.glade" libtool --mode=execute valgrind ./ingen $@ |