| @@ -31,7 +31,7 @@ POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl | |||||
| WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) | WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) | ||||
| WIN_32BIT_FLAGS = $(32BIT_FLAGS) | WIN_32BIT_FLAGS = $(32BIT_FLAGS) | ||||
| WIN_64BIT_FLAGS = $(64BIT_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 | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -30,7 +30,7 @@ POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl | |||||
| WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) | WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) | ||||
| WIN_32BIT_FLAGS = $(32BIT_FLAGS) | WIN_32BIT_FLAGS = $(32BIT_FLAGS) | ||||
| WIN_64BIT_FLAGS = $(64BIT_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 | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -18,6 +18,12 @@ | |||||
| #ifndef CARLA_INCLUDES_H | #ifndef CARLA_INCLUDES_H | ||||
| #define CARLA_INCLUDES_H | #define CARLA_INCLUDES_H | ||||
| #ifdef __WINE__ | |||||
| # define Q_CORE_EXPORT | |||||
| # define Q_GUI_EXPORT | |||||
| # define QT_NO_STL | |||||
| #endif | |||||
| #include <QtCore/Qt> | #include <QtCore/Qt> | ||||
| // TESTING - remove later | // TESTING - remove later | ||||
| @@ -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 <string.h> | |||||
| #ifdef _WIN32 | |||||
| -# define _WIN32_WINNT 0x0600 /* for CreateSymbolicLink */ | |||||
| # include <windows.h> | |||||
| # include <direct.h> | |||||
| # include <io.h> | |||||
| @@ -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 | |||||
| @@ -29,7 +29,6 @@ | |||||
| #include <string.h> | #include <string.h> | ||||
| #ifdef _WIN32 | #ifdef _WIN32 | ||||
| # define _WIN32_WINNT 0x0600 /* for CreateSymbolicLink */ | |||||
| # include <windows.h> | # include <windows.h> | ||||
| # include <direct.h> | # include <direct.h> | ||||
| # include <io.h> | # include <io.h> | ||||
| @@ -426,7 +425,7 @@ lilv_symlink(const char* oldpath, const char* newpath) | |||||
| int ret = 0; | int ret = 0; | ||||
| if (strcmp(oldpath, newpath)) { | if (strcmp(oldpath, newpath)) { | ||||
| #ifdef _WIN32 | #ifdef _WIN32 | ||||
| ret = !CreateSymbolicLink(newpath, oldpath, 0); | |||||
| ret = 0; | |||||
| #else | #else | ||||
| ret = symlink(oldpath, newpath); | ret = symlink(oldpath, newpath); | ||||
| #endif | #endif | ||||