add -mno-cygwin when linking with the vscom api dll

[CanFestival-3.git] / drivers / can_vscom / Makefile.in

diff --git a/drivers/can_vscom/Makefile.in b/drivers/can_vscom/Makefile.in
index f23ff626f9149a074a25da864b95256e7376d9b9..81286fa31f4d5c9aee2c7e4d9683839c35024dc8 100755 (executable)
--- a/drivers/can_vscom/Makefile.in
+++ b/drivers/can_vscom/Makefile.in
@@ -27,20 +27,19 @@ CFLAGS = SUB_OPT_CFLAGS
 PROG_CFLAGS = SUB_PROG_CFLAGS
 PREFIX = SUB_PREFIX
 TARGET = SUB_TARGET
+OS = SUB_OS_NAME
 CAN_DRIVER = SUB_CAN_DRIVER
 TIMERS_DRIVER = SUB_TIMERS_DRIVER
 ENABLE_DLL_DRIVERS=SUB_ENABLE_DLL_DRIVERS
 CAN_DLL_CFLAGS=SUB_CAN_DLL_CFLAGS -L.
 
 # define target specific environment
-ifeq ($(TARGET),win32)
+ifeq ($(OS),CYGWIN)
 DLL_TYPE=dll
-CAN_MINGW_DLL_FLAGS=
-CAN_LINUX_DLL_FLAGS=
+CAN_VSCOM_DLL_FLAGS=-Wl,--export-all-symbols -Wl,--exclude-libs,ALL
 else
 DLL_TYPE=so
-CAN_MINGW_DLL_FLAGS=
-CAN_LINUX_DLL_FLAGS=-Wl,-soname,libcanfestival_$(CAN_DRIVER).so
+CAN_VSCOM_DLL_FLAGS=-Wl,-soname,libcanfestival_$(CAN_DRIVER).so
 endif
 
 INCLUDES = -I../../include -I../../include/$(TARGET) -I../../include/$(CAN_DRIVER)
@@ -62,6 +61,7 @@ vs_can_api.h:
        wget http://www.vscom.de/download/multiio/linux/driver/VSCAN_API_1_0.zip
        @if which unzip &> /dev/null; then \
        unzip VSCAN_API_1_0.zip; \
+       chmod +x vs_can_api.dll; \
        else \
        echo "No unzip found. Please decompress VSCAN_API_1_0.zip manually"; \
        exit 1; \
@@ -73,7 +73,7 @@ driver: vs_can_api.h $(DRIVER)
        $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
 
 libcanfestival_$(CAN_DRIVER).$(DLL_TYPE): $(OBJS)
-       $(CC) -shared $(CAN_LINUX_DLL_FLAGS) $(CAN_MINGW_DLL_FLAGS) -o $@ $< $(CAN_DLL_CFLAGS)
+       $(CC) $(PROG_CFLAGS) -shared $(CAN_VSCOM_DLL_FLAGS) -o $@ $< $(CAN_DLL_CFLAGS)
 
 install: libcanfestival_$(CAN_DRIVER).so
        mkdir -p $(PREFIX)/lib/