X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=bcb7e3de49e2cb0b3058844f2559f336cfdc5a50;hp=c93475fea972e84985f82acfb08fb030018407bd;hb=20e1beb546c26eae3b1a61ab2051108a7dca221f;hpb=ce8b99f8d48b7783fd97f3959198f9c54cebec72 diff --git a/source/core/application.cpp b/source/core/application.cpp index c93475f..bcb7e3d 100644 --- a/source/core/application.cpp +++ b/source/core/application.cpp @@ -4,8 +4,10 @@ This file is part of libmspcore Copyright © 2006 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ + #include #include +#include #include "../debug/backtrace.h" #include "../debug/demangle.h" #include "../time/units.h" @@ -24,7 +26,7 @@ application throws a UsageError, the static usage() function is called. This function can only be called once. The global main() function provided by the library normally does it automatically at program startup. */ -int Application::run(int argc, char **argv) +int Application::run(int argc, char **argv, void *data) { static bool called=false; if(called) @@ -40,6 +42,8 @@ int Application::run(int argc, char **argv) return 126; } + data_=data; + try { try @@ -201,5 +205,6 @@ Application::RegBase::RegBase() Application *Application::app_=0; Application::RegBase *Application::reg_app_=0; +void *Application::data_=0; } // namespace Msp