Ticket #53: configdir.patch

libs/csutil/win32/instpath.cpp

@@ -263 +263 @@
   // 1. CRYSTAL environment variable
   // 2. this machine's system registry
   // 3. if current working directory contains 'vfs.cfg' use this dir.
-  // 4. The dir where the app is
-  // 5. A "CrystalSpace" subfolder under the "Program Files" dir.
-  // 6. hard-wired default path
+  // 4. CS_CONFIGPATH if defined and on Cygwin
+  // 5. The dir where the app is
+  // 6. A "CrystalSpace" subfolder under the "Program Files" dir.
+  // 7. hard-wired default path
 
   // try env variable first
   // we check this before we check registry, so that one app can putenv() to
@@ -297 +297 @@
 
   // No luck to fetch a config setting. Add in order:
   // - current directory
+  // - CS_CONFIGDIR if defined and on Cygwin
   // - application directory
   // - %ProgramFiles%\CrystalSpace
   // - C:\Program Files\CrystalSpace
 
   paths->AddUniqueExpanded (".");
+#ifdef __CYGWIN__
+#ifdef CS_CONFIGDIR
+  paths->AddUniqueExpanded (CS_CONFIGDIR);
+#endif
+#endif
 
   {
     char apppath[MAX_PATH + 1];