summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-01-23 07:07:02 +0000
committerkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-01-23 07:07:02 +0000
commita79adf1383e61bd5fe6d90518a4e34b4e3e592bc (patch)
tree0868e1eeeaa5fe5b30308754daf41c49b29b5124 /src/helper
parent4dcad0894077c903a8b94d3b2cb0feb8c9c8b224 (diff)
downloadopenocd_libswd-a79adf1383e61bd5fe6d90518a4e34b4e3e592bc.tar.gz
openocd_libswd-a79adf1383e61bd5fe6d90518a4e34b4e3e592bc.tar.bz2
openocd_libswd-a79adf1383e61bd5fe6d90518a4e34b4e3e592bc.tar.xz
openocd_libswd-a79adf1383e61bd5fe6d90518a4e34b4e3e592bc.zip
Search path fixes for MinGW builds. Courtesy of Dimitar Dimitrov <dinuxbg@gmail.com>
git-svn-id: svn://svn.berlios.de/openocd/trunk@1358 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/options.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/helper/options.c b/src/helper/options.c
index dd9f7138..7e738d73 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -80,6 +80,28 @@ int add_default_dirs(void)
strcat(strExePath, "\\..");
add_script_search_dir(strExePath);
}
+ /*
+ * Add support for the default (as of 20080121) layout when
+ * using autotools and cygwin to build native MinGW binary.
+ * Path separator is converted to UNIX style so that MinGW is
+ * pleased.
+ *
+ * bin/openocd.exe
+ * lib/openocd/event/at91eb40a_reset.cfg
+ * lib/openocd/target/at91eb40a.cfg
+ */
+ {
+ char strExePath [MAX_PATH];
+ char *p;
+ GetModuleFileName (NULL, strExePath, MAX_PATH);
+ *strrchr(strExePath, '\\')=0;
+ strcat(strExePath, "/../lib/"PACKAGE);
+ for(p=strExePath; *p; p++) {
+ if(*p == '\\')
+ *p = '/';
+ }
+ add_script_search_dir(strExePath);
+ }
#else
/* Add dir for openocd supplied scripts last so that user can over
ride those scripts if desired. */