cleaned out idiotic commenting of FUNCDEF, which had been done when a strict compile

[feisty_meow.git] / nucleus / tools / clam_tools / write_build_config.cpp

diff --git a/nucleus/tools/clam_tools/write_build_config.cpp b/nucleus/tools/clam_tools/write_build_config.cpp
index 53cfa0a4d43a597961df28f87df95c8c79f8da94..6a9a30b5157a553d7f4c6e49889f4914066644a1 100644 (file)
--- a/nucleus/tools/clam_tools/write_build_config.cpp
+++ b/nucleus/tools/clam_tools/write_build_config.cpp
@@ -166,7 +166,7 @@ outcome write_build_config::output_decorated_macro(const astring &symbol_in,
 outcome write_build_config::output_definition_macro
     (const astring &embedded_value, astring &accumulator)
 {
-//  FUNCDEF("output_definition_macro");
+  FUNCDEF("output_definition_macro");
 //LOG(astring("into output def with: ") + embedded_value);
   variable_tokenizer t;
   t.parse(embedded_value);
@@ -226,7 +226,7 @@ int write_build_config::execute()
   SETUP_CONSOLE_LOGGER;  // override the file_logger from app_shell.
 
   // find our build ini file.
-  astring repodir = environment::get("REPOSITORY_DIR");
+  astring repodir = environment::get("FEISTY_MEOW_DIR");
 
   // the below code should never be needed for a properly configured build.
 #ifdef __WIN32__
@@ -245,19 +245,10 @@ int write_build_config::execute()
   // find our storage area for the build headers.  we know a couple build
   // configurations by now, but this should really be coming out of a config
   // file instead.
-  astring library_directory = repodir + "/source/lib_src/library";
+  astring library_directory = repodir + "/nucleus/library";
   if (!filename(library_directory).good()) {
-    library_directory = repodir + "/source/core/library";
-    if (!filename(library_directory).good()) {
-      library_directory = repodir + "/libraries/library";
-      if (!filename(library_directory).good()) {
-        library_directory = repodir + "/../../libraries/library";
-        if (!filename(library_directory).good()) {
-          non_continuable_error(static_class_name(), func,
-              astring("failed to locate the library folder storing the generated files."));
-        }
-      }
-    }
+    non_continuable_error(static_class_name(), func,
+        astring("failed to locate the library folder storing the generated files."));
   }
 
   // these are very specific paths, but they really are where we expect to