- Fix target library path problem w/Windows

git-svn-id: svn://svn.berlios.de/openocd/trunk@342 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/options.c b/src/helper/options.c
index b6b2c6dcc9302e882655f9c518ffb8b57e9d19ab..1e717be898973a319766112f3fe29ed991fbf809 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -123,10 +123,31 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
                exit(-1);\r
        }       \r
 \r
+#ifdef _WIN32\r
+       /* Add the parent of the directory where openocd.exe resides to the\r
+        * config script search path.\r
+        * Directory layout: \r
+        * bin\openocd.exe\r
+        * lib\openocd\r
+        * event\at91eb40a_reset.cfg\r
+        * target\at91eb40a.cfg\r
+        */\r
+       {\r
+               char strExePath [MAX_PATH];\r
+               GetModuleFileName (NULL, strExePath, MAX_PATH);\r
+               /* Either this code will *always* work or it will SEGFAULT giving\r
+                * excellent information on the culprit. \r
+                */\r
+               *strrchr(strExePath, '\\')=0;\r
+               strcat(strExePath, "\\..");\r
+               add_script_search_dir(strExePath);\r
+       }\r
+#else\r
        /* Add dir for openocd supplied scripts last so that user can over\r
           ride those scripts if desired. */\r
        add_script_search_dir(PKGDATADIR);\r
        add_script_search_dir(PKGLIBDIR);\r
+#endif\r
 \r
        return ERROR_OK;\r
 }\r