Integrate Windows search of config files.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@231 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
parent
e2894fea5a
commit
aac7d66784
|
@ -37,6 +37,8 @@ avrdude_SOURCES = \
|
|||
avrpart.h \
|
||||
config.c \
|
||||
config.h \
|
||||
confwin.c \
|
||||
confwin.h \
|
||||
fileio.c \
|
||||
fileio.h \
|
||||
linux_ppdev.h \
|
||||
|
|
11
main.c
11
main.c
|
@ -44,6 +44,7 @@
|
|||
|
||||
#include "avr.h"
|
||||
#include "config.h"
|
||||
#include "confwin.h"
|
||||
#include "fileio.h"
|
||||
#include "par.h"
|
||||
#include "pindefs.h"
|
||||
|
@ -330,6 +331,14 @@ int main(int argc, char * argv [])
|
|||
do_cycles = 0;
|
||||
set_cycles = -1;
|
||||
|
||||
|
||||
#if defined(__CYGWIN__)
|
||||
|
||||
win_sys_config_set(sys_config);
|
||||
win_usr_config_set(usr_config);
|
||||
|
||||
#else
|
||||
|
||||
strcpy(sys_config, CONFIG_DIR);
|
||||
i = strlen(sys_config);
|
||||
if (i && (sys_config[i-1] != '/'))
|
||||
|
@ -346,6 +355,8 @@ int main(int argc, char * argv [])
|
|||
strcat(usr_config, ".avrduderc");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
len = strlen(progname) + 2;
|
||||
for (i=0; i<len; i++)
|
||||
progbuf[i] = ' ';
|
||||
|
|
Loading…
Reference in New Issue