Maintaining compatibility with existing Windows build/makefiles

lib_jtag_core/build/linux/Makefile

@@ -27,7 +27,7 @@ LDFLAGS +=-arch i386 -dynamiclib -current_version 2.0 -install_name @executable_
 EXEC=libjtag_core.dylib
 endif
 
-LIB_JTAG_CORE = jtag_core.o dbg_logs.o bsdl_loader.o jtag_bsdl.o bsdl_strings.o drv_loader.o script.o env.o fs.o os_interface.o network.o
+LIB_JTAG_CORE = jtag_core.o dbg_logs.o bsdl_loader.o bsdl_strings.o drv_loader.o script.o env.o fs.o os_interface.o network.o
 PROBES_DRIVERS = drivers_list.o jlink_jtag_drv.o linux_gpio_jtag_drv.o #lpt_jtag_drv.o ftdi_jtag_drv.o
 PROTOCOLS_DRIVERS = i2c_over_jtag.o mdio_over_jtag.o spi_over_jtag.o memory_over_jtag.o
 NATSORT = strnatcmp.o
@@ -55,9 +55,6 @@ dbg_logs.o: $(BASEDIR)/dbg_logs.c
 bsdl_loader.o: $(BASEDIR)/bsdl_parser/bsdl_loader.c
  $(CC) -o $@ -c $< $(CFLAGS)
 
-jtag_bsdl.o: $(BASEDIR)/bsdl_parser/jtag_bsdl.c
- $(CC) -o $@ -c $< $(CFLAGS)
-
 bsdl_strings.o: $(BASEDIR)/bsdl_parser/bsdl_strings.c
  $(CC) -o $@ -c $< $(CFLAGS)
 

lib_jtag_core/src/CMakeLists.txt

@@ -3,6 +3,7 @@ set(JTAG_BSDL_SRC
  bsdl_parser/jtag_bsdl.c
  bsdl_parser/bsdl_strings.c
  natsort/strnatcmp.c
+ dbg_logs.c
 )
 
 add_library(jtag_bsdl ${JTAG_BSDL_SRC})

lib_jtag_core/src/bsdl_parser/bsdl_loader.c

@@ -40,6 +40,7 @@
 #include "../dbg_logs.h"
 #define DEBUG 1
 
+#include "jtag_bsdl.cc"
 
 jtag_bsdl * load_bsdlfile(jtag_core * jc,char *filename)
 {