Additional changes required to get build working under VS2013.

I'll send the changes to libscorealign and portsmf upstream.
This commit is contained in:
lllucius 2014-10-06 05:55:35 +00:00
parent 439f5d00d6
commit 0933da5b60
5 changed files with 21 additions and 2 deletions

View File

@ -21,6 +21,16 @@
#endif
using namespace std;
#ifdef min
#undef min
#endif
#define min(x,y) ((x)<(y)?(x):(y))
#ifdef max
#undef max
#endif
#define max(x,y) ((x)>(y)?(x):(y))
//if 1, causes printing internally
#define PRINT_BIN_ENERGY 1

View File

@ -27,6 +27,11 @@ using namespace std;
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#define ROUND(x) ((int) ((x) + 0.5))
#ifdef max
#undef max
#endif
#define max(x,y) ((x)>(y)?(x):(y))
// 4311 is type cast ponter to long warning
// 4996 is warning against strcpy
// 4267 is size_t to long warning

View File

@ -26,6 +26,7 @@ typedef unsigned __int64 uint64_t;
/* Win32 doesn't seem to have these functions.
** Therefore implement inline versions of these functions here.
*/
#if (_MSC_VER == 1500)
__inline long int
lrint (double flt)
{ int intgr;
@ -73,6 +74,7 @@ llrintf (float flt)
return intgr ;
}
#endif
/* Nor does it have the snprintf function */
#define snprintf _snprintf

View File

@ -52,7 +52,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\lib-src\lv2\windows;..\..\..\lib-src\lv2\lilv;..\..\..\lib-src\lv2\lv2;..\..\..\lib-src\lv2\serd;..\..\..\lib-src\lv2\sord;..\..\..\lib-src\lv2\sratom;..\..\..\lib-src\lv2\sord\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;snprintf=_snprintf;LILV_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;snprintf=_snprintf;HAVE_FMAX;LILV_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -66,7 +66,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\lib-src\lv2\windows;..\..\..\lib-src\lv2\lilv;..\..\..\lib-src\lv2\lv2;..\..\..\lib-src\lv2\serd;..\..\..\lib-src\lv2\sord;..\..\..\lib-src\lv2\sratom;..\..\..\lib-src\lv2\sord\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;snprintf=_snprintf;LILV_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;snprintf=_snprintf;HAVE_FMAX;LILV_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

View File

@ -45,7 +45,9 @@
#define INSTALL_PREFIX "."
#if (_MSC_VER == 1500)
#define rint(x) (floor((x)+0.5f))
#endif
#ifdef _DEBUG
#ifdef _MSC_VER