X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=9ae5156047f6205ea41d5bed190796cd7c795bb7;hp=adda533e40fcc595e8cf5784d3be4de6361a9bad;hb=eceb970628068ae621ef9523a669a2b66a82fd8a;hpb=1da520638918096276158ecdfaeebc14a3d70be7

diff --git a/src/Main.cc b/src/Main.cc
index adda533..9ae5156 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -216,40 +216,40 @@ void Main::printInfo(int argc, char* argv[])
 #ifdef YOINK_GITHEAD
 			  << "       Commit: "YOINK_GITHEAD << std::endl
 #endif
-			  << "      Version: "PACKAGE_VERSION << std::endl
+			  << "      Version: " << PACKAGE_VERSION << std::endl
 			  << "        Built: " << COMPILE_TIME << std::endl
-			  << "     Compiler: "COMPILER_STRING << std::endl
+			  << "     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
@@ -274,6 +274,8 @@ void goodbye()
 
 int main(int argc, char* argv[])
 {
+	moof::backend backend;
+
 	// FIXME: This is temporary.
 	moof::timer reloadTimer(boost::bind(&moof::resource::reload_as_needed),
 							SCALAR(2.0),
@@ -307,10 +309,14 @@ int main(int argc, char* argv[])
 
 	try
 	{
-		std::string iconPath(PACKAGE".png");
-		iconPath = moof::resource::find_file(iconPath);
-		moof::image icon(iconPath);
-		icon.set_as_icon();
+		//std::string iconPath(PACKAGE".png");
+		//iconPath = moof::resource::find_file(iconPath);
+		//moof::image icon(iconPath);
+		//icon.set_as_icon();
+		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);