diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2015-01-02 14:33:35 +0000 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2015-01-02 15:31:39 +0000 |
| commit | 7f486e146d354cbf8b36d8762318dd21722474c6 (patch) | |
| tree | 585ca166c2b34bb1ab5c7e7a009899891119cf12 /libs/pbd | |
| parent | 50c4385b6b00daab8964938b7c2b97b40d27e923 (diff) | |
Accommodate some newly introduced source files for building with MSVC (libpbd)
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/MSVCpbd/pbd.vcproj | 16 | ||||
| -rw-r--r-- | libs/pbd/timing.cc | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj index 244328d41b..4e3866d01b 100644 --- a/libs/pbd/MSVCpbd/pbd.vcproj +++ b/libs/pbd/MSVCpbd/pbd.vcproj @@ -451,6 +451,14 @@ > </File> <File + RelativePath="..\timer.cc" + > + </File> + <File + RelativePath="..\timing.cc" + > + </File> + <File RelativePath="..\transmitter.cc" > </File> @@ -801,6 +809,14 @@ > </File> <File + RelativePath="..\pbd\timer.h" + > + </File> + <File + RelativePath="..\pbd\timing.h" + > + </File> + <File RelativePath="..\pbd\tokenizer.h" > </File> diff --git a/libs/pbd/timing.cc b/libs/pbd/timing.cc index b811c09f96..c6f76211c2 100644 --- a/libs/pbd/timing.cc +++ b/libs/pbd/timing.cc @@ -22,6 +22,11 @@ #include <sstream> #include <limits> +#ifdef COMPILER_MSVC +#undef min +#undef max +#endif + namespace PBD { bool |