From 5d034f9c03766131ad81b9386fadb21ce3522e54 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 15 Apr 2020 21:51:31 +0100
Subject: [PATCH] Fixup windows definition files and CI

Signed-off-by: falkTX <falktx@falktx.com>
---
 .travis/script-win32.sh                       |  7 ++++--
 .travis/script-win64.sh                       |  7 ++++--
 source/plugin/win-def/carla-lv2_dsp+ui.def    |  5 ++--
 source/plugin/win-def/carla-native-plugin.def | 23 ++++++++++---------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.travis/script-win32.sh b/.travis/script-win32.sh
index 392742cfa..6d4332846 100755
--- a/.travis/script-win32.sh
+++ b/.travis/script-win32.sh
@@ -14,11 +14,14 @@ export PATH=/opt/mingw32/${_PREFIX}/bin:/opt/mingw32/bin:${PATH}
 export PKG_CONFIG_PATH=/opt/mingw32/lib/pkgconfig:${PKG_CONFIG_PATH}
 export CROSS_COMPILING=true
 
+MAKE_ARGS="BUILDING_FOR_WINDOWS=true CROSS_COMPILING=true USING_JUCE=false"
+MAKE_ARGS="${MAKE_ARGS} HAVE_FLUIDSYNTH=false HAVE_LIBLO=false HAVE_QT5=false HAVE_SNDFILE=false"
+
 # Start clean
 make distclean >/dev/null
 
 # Print available features
-make features
+make ${MAKE_ARGS} features
 
 # Build native stuff
-make BUILDING_FOR_WINDOWS=true USING_JUCE=false
+make ${MAKE_ARGS}
diff --git a/.travis/script-win64.sh b/.travis/script-win64.sh
index 543cff9c4..72e0a0aef 100755
--- a/.travis/script-win64.sh
+++ b/.travis/script-win64.sh
@@ -14,11 +14,14 @@ export PATH=/opt/mingw64/${_PREFIX}/bin:/opt/mingw64/bin:${PATH}
 export PKG_CONFIG_PATH=/opt/mingw64/lib/pkgconfig:${PKG_CONFIG_PATH}
 export CROSS_COMPILING=true
 
+MAKE_ARGS="BUILDING_FOR_WINDOWS=true CROSS_COMPILING=true USING_JUCE=false"
+MAKE_ARGS="${MAKE_ARGS} HAVE_FLUIDSYNTH=false HAVE_LIBLO=false HAVE_QT5=false HAVE_SNDFILE=false"
+
 # Start clean
 make distclean >/dev/null
 
 # Print available features
-make features
+make ${MAKE_ARGS} features
 
 # Build native stuff
-make BUILDING_FOR_WINDOWS=true USING_JUCE=false
+make ${MAKE_ARGS}
diff --git a/source/plugin/win-def/carla-lv2_dsp+ui.def b/source/plugin/win-def/carla-lv2_dsp+ui.def
index 2893baa2c..48ec7f132 100644
--- a/source/plugin/win-def/carla-lv2_dsp+ui.def
+++ b/source/plugin/win-def/carla-lv2_dsp+ui.def
@@ -1,4 +1,5 @@
 LIBRARY     CarlaLV2
 DESCRIPTION 'Carla LV2 Plugin'
-EXPORTS lv2_descriptor
-EXPORTS lv2ui_descriptor
+EXPORTS
+    lv2_descriptor @1
+    lv2ui_descriptor @2
diff --git a/source/plugin/win-def/carla-native-plugin.def b/source/plugin/win-def/carla-native-plugin.def
index 79d7277d4..6757cd8b7 100644
--- a/source/plugin/win-def/carla-native-plugin.def
+++ b/source/plugin/win-def/carla-native-plugin.def
@@ -1,13 +1,14 @@
 LIBRARY     CarlaNativePlugin
 DESCRIPTION 'Carla Native Plugin'
-EXPORTS carla_get_native_rack_plugin
-EXPORTS carla_get_native_patchbay_plugin
-EXPORTS carla_get_native_patchbay16_plugin
-EXPORTS carla_get_native_patchbay32_plugin
-EXPORTS carla_get_native_patchbay64_plugin
-EXPORTS carla_get_native_patchbay_cv_plugin
-EXPORTS carla_create_native_plugin_host_handle
-EXPORTS carla_host_handle_free
-EXPORTS carla_get_native_plugin_engine
-EXPORTS carla_get_library_filename
-EXPORTS carla_get_library_folder
+EXPORTS
+    carla_get_native_rack_plugin @1
+    carla_get_native_patchbay_plugin @2
+    carla_get_native_patchbay16_plugin @3
+    carla_get_native_patchbay32_plugin @4
+    carla_get_native_patchbay64_plugin @5
+    carla_get_native_patchbay_cv_plugin @6
+    carla_create_native_plugin_host_handle @7
+    carla_host_handle_free @8
+    carla_get_native_plugin_engine @9
+    carla_get_library_filename @10
+    carla_get_library_folder @11