diff options
| author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2006-07-17 14:13:27 +0000 |
|---|---|---|
| committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2006-07-17 14:13:27 +0000 |
| commit | 82d2633b5f550115e9e7c7d0520babb6680aa38f (patch) | |
| tree | fa9895a6117d4a238be1b76293edcc7de11a88c2 /src/Makefile.am | |
| parent | 1960973baf8022b4525e3ac94aed8dace7f9b478 (diff) | |
| download | openocd+libswd-82d2633b5f550115e9e7c7d0520babb6680aa38f.tar.gz openocd+libswd-82d2633b5f550115e9e7c7d0520babb6680aa38f.tar.bz2 openocd+libswd-82d2633b5f550115e9e7c7d0520babb6680aa38f.tar.xz openocd+libswd-82d2633b5f550115e9e7c7d0520babb6680aa38f.zip | |
- Added support for native MinGW builds (thanks to Spencer Oliver and Michael Fischer) - you still need to install GiveIO (not part of OpenOCD)
- Added state-move support to ftd2xx and bitbang JTAG drivers (required for XScale, possibly useful for other targets, too)
- various fixes
git-svn-id: svn://svn.berlios.de/openocd/trunk@78 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e1973827..2647fd5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,13 +10,19 @@ INCLUDES = -I$(top_srcdir)/src/helper \ openocd_LDFLAGS = $(all_libraries) SUBDIRS = helper jtag xsvf target server flash +if IS_MINGW +MINGWLDADD = -lwsock32 +else +MINGWLDADD = +endif + if FTDI2232 FTDI2232LIB = -lftdi else FTDI2232LIB = endif -if IS_CYGWIN +if IS_WIN32 if FTD2XXDIR FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib else @@ -37,4 +43,4 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \ $(top_builddir)/src/helper/libhelper.a \ $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \ $(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \ - $(FTDI2232LIB) $(FTD2XXLIB) + $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) |