[Openocd-svn] r1358 - trunk/src/helper

[<kc...@ma...>]

Author: kc8apf
Date: 2009-01-23 08:07:02 +0100 (Fri, 23 Jan 2009)
New Revision: 1358

Modified:
   trunk/src/helper/options.c
Log:
Search path fixes for MinGW builds.  Courtesy of Dimitar Dimitrov <di...@gm...>

Modified: trunk/src/helper/options.c
===================================================================
--- trunk/src/helper/options.c	2009-01-23 07:05:04 UTC (rev 1357)
+++ trunk/src/helper/options.c	2009-01-23 07:07:02 UTC (rev 1358)
@@ -80,6 +80,28 @@
 		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. */