diff --git a/c++/carla-bridge/Makefile b/c++/carla-bridge/Makefile index e268534..4749437 100644 --- a/c++/carla-bridge/Makefile +++ b/c++/carla-bridge/Makefile @@ -31,7 +31,7 @@ POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) WIN_32BIT_FLAGS = $(32BIT_FLAGS) WIN_64BIT_FLAGS = $(64BIT_FLAGS) -WIN_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) -mwindows -L../carla-jackbridge +WIN_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) -mwindows -L../carla-jackbridge -lpthread # -------------------------------------------------------------- diff --git a/c++/carla-bridge/Makefile.dbg b/c++/carla-bridge/Makefile.dbg index 5447f84..fb93ad4 100644 --- a/c++/carla-bridge/Makefile.dbg +++ b/c++/carla-bridge/Makefile.dbg @@ -30,7 +30,7 @@ POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) WIN_32BIT_FLAGS = $(32BIT_FLAGS) WIN_64BIT_FLAGS = $(64BIT_FLAGS) -WIN_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) -mwindows -L../carla-jackbridge +WIN_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) -mwindows -L../carla-jackbridge -lpthread # -------------------------------------------------------------- diff --git a/c++/carla-includes/carla_includes.h b/c++/carla-includes/carla_includes.h index 5900c22..293ca67 100644 --- a/c++/carla-includes/carla_includes.h +++ b/c++/carla-includes/carla_includes.h @@ -18,6 +18,12 @@ #ifndef CARLA_INCLUDES_H #define CARLA_INCLUDES_H +#ifdef __WINE__ +# define Q_CORE_EXPORT +# define Q_GUI_EXPORT +# define QT_NO_STL +#endif + #include // TESTING - remove later diff --git a/c++/carla-lilv/custom-patches/lilv_fix-mingw-build.patch b/c++/carla-lilv/custom-patches/lilv_fix-mingw-build.patch new file mode 100644 index 0000000..d728f68 --- /dev/null +++ b/c++/carla-lilv/custom-patches/lilv_fix-mingw-build.patch @@ -0,0 +1,20 @@ +diff -U 3 -H -b -B -d -r -N -- lilv-0.14.4.old/src/util.c lilv-0.14.4/src/util.c +--- lilv-0.14.4.old/src/util.c 2012-08-09 21:51:00.000000000 +0100 ++++ lilv-0.14.4/src/util.c 2012-09-15 01:20:07.908701939 +0100 +@@ -29,7 +29,6 @@ + #include + + #ifdef _WIN32 +-# define _WIN32_WINNT 0x0600 /* for CreateSymbolicLink */ + # include + # include + # include +@@ -426,7 +425,7 @@ + int ret = 0; + if (strcmp(oldpath, newpath)) { + #ifdef _WIN32 +- ret = !CreateSymbolicLink(newpath, oldpath, 0); ++ ret = 0; + #else + ret = symlink(oldpath, newpath); + #endif diff --git a/c++/carla-lilv/lilv-0.14.4/src/util.c b/c++/carla-lilv/lilv-0.14.4/src/util.c index 6286446..f21383b 100644 --- a/c++/carla-lilv/lilv-0.14.4/src/util.c +++ b/c++/carla-lilv/lilv-0.14.4/src/util.c @@ -29,7 +29,6 @@ #include #ifdef _WIN32 -# define _WIN32_WINNT 0x0600 /* for CreateSymbolicLink */ # include # include # include @@ -426,7 +425,7 @@ lilv_symlink(const char* oldpath, const char* newpath) int ret = 0; if (strcmp(oldpath, newpath)) { #ifdef _WIN32 - ret = !CreateSymbolicLink(newpath, oldpath, 0); + ret = 0; #else ret = symlink(oldpath, newpath); #endif