X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=9ae5156047f6205ea41d5bed190796cd7c795bb7;hp=046c7bcffb71560e42b24b3b9e9f5d74c971946d;hb=eceb970628068ae621ef9523a669a2b66a82fd8a;hpb=382626aad0a683ed8642a6a807eea743db45f7f8 diff --git a/src/Main.cc b/src/Main.cc index 046c7bc..9ae5156 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -221,35 +221,35 @@ void Main::printInfo(int argc, char* argv[]) << " Compiler: " << COMPILER_STRING << std::endl << " Assets: " << assets << std::endl << "Build options: " -#ifndef HAVE_CLOCK_GETTIME +#if !USE_CLOCK_GETTIME << "-" #endif << "clock_gettime " -#ifdef NDEBUG +#if !DEBUG << "-" #endif << "debug " -#ifndef USE_DOUBLE_PRECISION +#if !USE_DOUBLE_PRECISION << "-" #endif << "double-precision " -#ifndef USE_GTK +#if !USE_GTK << "-" #endif << "gtk " -#ifndef USE_HOTLOADING +#if !USE_HOTLOADING << "-" #endif << "hotloading " -#ifndef PROFILING_ENABLED +#if !PROFILING_ENABLED << "-" #endif << "profile " -#ifndef USE_QT4 +#if !USE_QT4 << "-" #endif << "qt4 " -#ifndef USE_THREADS +#if !USE_THREADS << "-" #endif << "threads" << std::endl @@ -272,20 +272,9 @@ void goodbye() } -#include -#include -#include - - int main(int argc, char* argv[]) { - //moof::backend backend; - //moof::resource::add_search_paths(Main::getSearchPath()); - - //moof::image hey("textures/AlienWarrior.png"); - - //return 0; - + moof::backend backend; // FIXME: This is temporary. moof::timer reloadTimer(boost::bind(&moof::resource::reload_as_needed), @@ -324,8 +313,10 @@ int main(int argc, char* argv[]) //iconPath = moof::resource::find_file(iconPath); //moof::image icon(iconPath); //icon.set_as_icon(); - moof::image_handle icon(PACKAGE".png"); + moof::image_handle icon(PACKAGE, "png"); if (icon) icon->set_as_icon(); + else moof::log_error("no icon loaded"); + icon.unload(); class moof::video::attributes attributes(settings); moof::video video(PACKAGE_STRING, attributes);