improved build tools

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index 8361b39d3dffe7a5e24eda753650e2722aad6092..9ae5156047f6205ea41d5bed190796cd7c795bb7 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -9,7 +9,7 @@
 *
 **************************************************************************/
 
-#include "../config.h"
+#include "config.h"
 
 #include <cstdlib>             // atexit
 #include <exception>
@@ -106,10 +106,8 @@ std::string Main::getSearchPath()
        // 1. YOINK_DATADIR (environment)
        // 2. YOINK_DATADIR (configure)
        
-       std::string                     path;
-       stlplus::env_vector     environment;
-
-       std::string datadir = environment["YOINK_DATADIR"];
+       std::string path;
+       std::string datadir = stlplus::env_vector()["YOINK_DATADIR"];
        if (!datadir.empty())
        {
                path += datadir;
@@ -128,17 +126,14 @@ std::string Main::getConfigPath()
        // 3. $HOME/.yoinkrc
        // 4. YOINKRC (environment)
 
-       std::string path("yoinkrc");
-       moof::resource::find(path);
-
-       stlplus::env_vector environment;
+       std::string path = moof::resource::find_file("yoinkrc");
 
 #if !defined(_WIN32)
        path += ":/etc/yoinkrc";
 #endif
        path += ":$HOME/.yoinkrc";
 
-       std::string rc_file = environment["YOINKRC"];
+       std::string rc_file = stlplus::env_vector()["YOINKRC"];
        if (!rc_file.empty())
        {
                path += ":";
@@ -221,40 +216,40 @@ void Main::printInfo(int argc, char* argv[])
 #ifdef YOINK_GITHEAD
                          << "       Commit: "YOINK_GITHEAD << std::endl
 #endif
-                         << "      Version: "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
@@ -277,112 +272,14 @@ void goodbye()
 }
 
 
-#include <moof/socket.hh>
-
-#include <fstream>
-
-class MyAsset
-{
-public:
-       MyAsset(const std::string& path)
-       {
-               moof::log_info("MyAsset loading:", path);
-
-               char buffer[1024];
-
-               std::ifstream stream(path.c_str());
-               stream.getline(buffer, sizeof(buffer));
-               str = buffer;
-               stream.close();
-
-               cool();
-       }
-
-       void cool()
-       {
-               moof::log_info("MyAsset COOL:", str);
-       }
-
-       void groovy()
-       {
-               moof::log_info("MyAsset GROOVY!!!!", str);
-       }
-
-       std::string str;
-};
-
-typedef moof::resource_handle<MyAsset> MyAsset_handle;
-
-class AnotherAsset
-{
-public:
-       AnotherAsset(const std::string& path, double d = 5.0)
-       {
-               moof::log_info("AnotherAsset loading:", path);
-               dude = d;
-       }
-
-
-       void cool()
-       {
-               moof::log_info("AnotherAsset cool", dude);
-       }
-
-       void groovy()
-       {
-               moof::log_info("AnotherAsset GROOVY!!!!", dude);
-       }
-
-       double dude;
-};
-
-
 int main(int argc, char* argv[])
 {
-       moof::resource::register_type<MyAsset>("mine");
-       
-       //moof::resource::add_type<AnotherAsset>("k");
-       
-       //{
-       //moof::resource_ptr myAsset = moof::resource::load(assetName,
-                       //"prefix", "mine");
-
-       //MyAsset_handle aCopy = myAsset;
-
-       //MyAsset_handle copy2 = moof::resource::load(assetName, "asdfas", "mine");
-
-       ////if (myAsset->check<MyAsset>()) myAsset->get<AnotherAsset>()->cool();
-       //myAsset->get<MyAsset>()->cool();
-       ////myAsset->get<AnotherAsset>()->groovy();
-       
-       //aCopy.get()->cool();
-       //copy2.get()->cool();
-
-       //log_info("rsrc ptr:", moof::resource::load(assetName, "", "mine"));
-       //}
-       //log_info("rsrc ptr:", moof::resource::load(assetName, "", "k"));
-       //moof::resource::load(assetName, "", "mine")->get<MyAsset>()->cool();
+       moof::backend backend;
 
-       ////if (myAsset) myAsset.get()->cool();
-       ////else moof::log_error("asset not obtained...");
-       
-       MyAsset_handle myAsset = moof::resource::load("/home/chaz/meh.mine");
-       MyAsset* asset = myAsset.get();
-       if (asset) asset->cool();
-       else moof::log_warning("no asset obtained!!");
-
-       //moof::timer reloadTimer(
-                       //boost::bind(&moof::resource::reload_as_needed),
-                       //SCALAR(2.0),
-                       //moof::timer::repeat);
-
-       for (;;)
-       {
-               if (myAsset) myAsset.get()->cool();
-               moof::resource::reload_as_needed();
-               sleep(1);
-       }
-       
+       // FIXME: This is temporary.
+       moof::timer reloadTimer(boost::bind(&moof::resource::reload_as_needed),
+                                                       SCALAR(2.0),
+                                                       moof::timer::repeat);
 
        if (argc > 1)
        {
@@ -412,10 +309,14 @@ int main(int argc, char* argv[])
 
        try
        {
-               std::string iconPath(PACKAGE".png");
-               moof::resource::find(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);