*
**************************************************************************/
-#include "../config.h"
+#include "config.h"
#include <cstdlib> // atexit
#include <exception>
// 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;
// 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 += ":";
#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
<< " Assets: " << assets << std::endl
try
{
std::string iconPath(PACKAGE".png");
- moof::resource::find(iconPath);
+ iconPath = moof::resource::find_file(iconPath);
moof::image icon(iconPath);
icon.set_as_icon();