ardour/livetrax
13
0
Fork 0
Code

Some minor changes in preparation for building the newer Vamp plugins

Browse Source
This commit is contained in:
John Emmas 2017-02-05 15:05:32 +00:00
parent ea2b00c263
commit 5dabe45341
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/pbd/pbd/msvc_pbd.h
View File

@ -142,7 +142,7 @@ LIBPBD_API char* PBD_APICALLTYPE dlerror () __THROW;
/* For whatever reason, Ardour's 'libevoral' refuses to build as a DLL if we include both 'rpc.h' */
/* and 'WinSock2.h'. It doesn't seem to matter which order we #include them. Given that we can't */
/* edit 'rpc.h' or 'WinSock2.h', just make sure we don't #include them when building libevoral. */
#ifndef BUILDING_EVORAL
#if !defined(BUILDING_EVORAL) && !defined(BUILDING_VAMPPLUGINS)
#include <rpc.h>
typedef int (FAR PBDEXTN_APICALLTYPE *CYGINIT_API)(unsigned int);
#endif

2
libs/vamp-plugins/BarBeatTrack.cpp
View File

@ -25,7 +25,7 @@ using std::vector;
using std::cerr;
using std::endl;
#ifndef __GNUC__
#if !defined(__GNUC__) && !defined(_MSC_VER)
#include <alloca.h>
#endif

2
msvc_extra_headers/ardourext/sys/time.h.input
View File

@ -7,7 +7,7 @@
typedef long __suseconds_t;
typedef __suseconds_t suseconds_t;
#endif
#ifndef BUILDING_EVORAL
#if !defined(BUILDING_EVORAL) && !defined(BUILDING_VAMPPLUGINS)
#include <WinSock2.h> /* gets 'struct timeval' - Changed by JE - 23-07-2013. Was formerly. . . #include <WinSock.h> */
/* For whatever reason, Ardour's 'libevoral' refuses to build as a DLL if we include both 'rpc.h' */
/* and 'WinSock2.h'. It doesn't seem to matter which order we #include them. Given that we can't */