build system enhancements

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index 070912e7ce1a0c7acb8fb7c3e1f75adf6cb151eb..a674bbcb0dd9675a560cd2e6564f8c17da1aa7b4 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -17,10 +17,10 @@
 #include <iostream>
 #include <string>
 
-#if !defined(__WIN32)
-#include <termios.h>
-#else
+#if PLATFORM_WIN32
 inline int isatty(int dummy) { return 0; }
+#else
+#include <termios.h>
 #endif
 
 #include <stlplus/portability/file_system.hpp>
@@ -36,7 +36,6 @@ inline int isatty(int dummy) { return 0; }
 #include <moof/video.hh>
 
 #include "Main.hh"
-#include "version.h"
 
 
 Main::Main(moof::settings& settings) :
@@ -122,6 +121,8 @@ std::string Main::search_paths()
                path += ":";
        }
        path += YOINK_DATADIR;
+       path += ":";
+       path += "data";
 
        return path;
 }
@@ -136,7 +137,7 @@ std::string Main::config_paths()
 
        std::string path = moof::resource::find_file("yoinkrc");
 
-#if !defined(_WIN32)
+#if PLATFORM_POSIX
        path += ":/etc/yoinkrc";
 #endif
        path += ":$HOME/.yoinkrc";
@@ -209,94 +210,14 @@ void Main::print_usage()
                          << "See documentation for more options." << std::endl;
 }
 
-
 void Main::print_info(int argc, char* argv[])
 {
-       bool color = (isatty(1) == 1);
-
-       stlplus::env_vector environment;
-
-       std::string assets;
-       assets.assign(YOINK_DATADIR);
-       if (!stlplus::file_readable(assets))
-       {
-               assets += " ";
-               if (color) assets += "\033[1;91m";
-               assets += "(no access)";
-               if (color) assets += "\033[0m";
-       }
-
-       std::string datadir = environment["YOINK_DATADIR"];
-       if (!datadir.empty())
-       {
-               if (!stlplus::folder_readable(datadir))
-               {
-                       datadir += " ";
-                       if (color) datadir += "\033[1;91m";
-                       datadir += "(no access)";
-                       if (color) datadir += "\033[0m";
-               }
-       }
-
-       std::string rc_file = environment["YOINKRC"];
-       if (!rc_file.empty())
-       {
-               if (!stlplus::file_readable(rc_file)) rc_file += " (no access)";
-       }
-
-       std::cout << "   Executable: " << argv[0] << std::endl
-#ifdef YOINK_GITHEAD
-                         << "       Commit: "YOINK_GITHEAD << std::endl
-#endif
-                         << "      Version: " << PACKAGE_VERSION << std::endl
-                         << "        Built: " << COMPILE_TIME << std::endl
-                         << "     Compiler: " << COMPILER_STRING << std::endl
-                         << "       Assets: " << assets << std::endl
-                         << "Build options: ";
-
-#if ENABLE_CLOCK_GETTIME
-       print_option("clock_gettime", true);
-#else
-       print_option("clock_gettime", false);
-#endif
-#if DEBUG
-       print_option("debug", true);
-#else
-       print_option("debug", false);
-#endif
-#if ENABLE_DOUBLE_PRECISION
-       print_option("double", true);
-#else
-       print_option("double", false);
-#endif
-#if WITH_GTK
-       print_option("gtk", true);
-#else
-       print_option("gtk", false);
-#endif
-#if ENABLE_HOTLOADING
-       print_option("hotload", true);
+#if INCLUDE_CONFIG_FILE
+       extern char data_config_mk[];
+       std::cout << data_config_mk;
 #else
-       print_option("hotload", false);
+       std::cout << std::endl << "Configuration not included." << std::endl;
 #endif
-#if ENABLE_PROFILING
-       print_option("profile", true);
-#else
-       print_option("profile", false);
-#endif
-#if WITH_QT4
-       print_option("qt4", true);
-#else
-       print_option("qt4", false);
-#endif
-#if ENABLE_THREADS
-       print_option("threads", true);
-#else
-       print_option("threads", false);
-#endif
-       std::cout << std::endl;
-       std::cout << "      YOINKRC: " << rc_file << std::endl
-                         << "YOINK_DATADIR: " << datadir << std::endl;
 }
 
 void Main::print_option(const std::string& option, bool enabled)
@@ -331,8 +252,6 @@ void goodbye()
 
 int main(int argc, char* argv[])
 {
-       moof::backend backend;
-
        if (argc > 1)
        {
                std::string arg(argv[1]);
@@ -351,6 +270,8 @@ int main(int argc, char* argv[])
        hello();
        atexit(goodbye);
 
+       moof::backend backend;
+
        moof::resource::set_search_paths(Main::search_paths());
 
        moof::settings settings(argc, argv, Main::config_paths());
@@ -361,7 +282,7 @@ int main(int argc, char* argv[])
 
        try
        {
-               moof::image_handle icon(PACKAGE, "png");
+               moof::image_handle icon("yoink", "png");
                if (icon) icon->set_as_icon();
                else moof::log_error("no icon loaded");
                icon.unload();