diff options
| author | John Emmas <john@creativepost.co.uk> | 2020-02-07 11:27:22 +0000 |
|---|---|---|
| committer | John Emmas <john@creativepost.co.uk> | 2020-02-07 11:27:22 +0000 |
| commit | 40cca52bbb047720b7f448759fbde56a298d8a8e (patch) | |
| tree | 38f3f47863cf3607c1a1552d489788db7ac9d4cc /libs/pbd | |
| parent | 8242478da50e02afe9fb4449ce092197250141d7 (diff) | |
Changes needed for building with MSVC
Mostly these are to do with TLSF which I hadn't in fact been building!! Hopefully there won't be any problems for the gcc builds.
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/MSVCpbd/pbd.vcproj | 8 | ||||
| -rw-r--r-- | libs/pbd/tlsf.cc | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj index c6867c1e05..5d1b4f0e7e 100644 --- a/libs/pbd/MSVCpbd/pbd.vcproj +++ b/libs/pbd/MSVCpbd/pbd.vcproj @@ -471,6 +471,10 @@ > </File> <File + RelativePath="..\tlsf.cc" + > + </File> + <File RelativePath="..\transmitter.cc" > </File> @@ -833,6 +837,10 @@ > </File> <File + RelativePath="..\pbd\tlsf.h" + > + </File> + <File RelativePath="..\pbd\tokenizer.h" > </File> diff --git a/libs/pbd/tlsf.cc b/libs/pbd/tlsf.cc index 40c5864c41..3fe8674f0f 100644 --- a/libs/pbd/tlsf.cc +++ b/libs/pbd/tlsf.cc @@ -52,8 +52,10 @@ //#define TLSF_STATISTIC 1 #ifndef USE_PRINTF +#if TLSF_STATISTIC #define USE_PRINTF (1) #endif +#endif #include <assert.h> #include <stdlib.h> @@ -138,9 +140,11 @@ # define ERROR_MSG(fmt, args...) printf(fmt, ## args) #else # if !defined(PRINT_MSG) -# define PRINT_MSG(fmt, args...) +# if TLSF_STATISTIC +# define PRINT_MSG(fmt, args...) +# endif # endif -# if !defined(ERROR_MSG) +# if !defined(ERROR_MSG) && !defined(COMPILER_MSVC) # define ERROR_MSG(fmt, args...) # endif #endif |