diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-11 09:59:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-11 09:59:59 -0400 |
| commit | 6990c31ed52c1c2491c19fc68c402acb4abc10e8 (patch) | |
| tree | a2a2d6ab088ee5341a023bade9dfbf19cbe7e139 /libs | |
| parent | 7464b3f9fab1398d93a486e8d4c5469f9b8f7fcb (diff) | |
| parent | 15de7aa4337440de2ab874fd2d8cc906c8445e7a (diff) | |
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/pbd/MSVCpbd/pbd.vcproj | 8 | ||||
| -rw-r--r-- | libs/pbd/pbd/md5.h | 4 | ||||
| -rw-r--r-- | libs/timecode/MSVCtimecode/timecode.vcproj | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj index d41933286b..3c6d962df3 100644 --- a/libs/pbd/MSVCpbd/pbd.vcproj +++ b/libs/pbd/MSVCpbd/pbd.vcproj @@ -358,6 +358,10 @@ > </File> <File + RelativePath="..\md5.cc" + > + </File> + <File RelativePath="..\mountpoint.cc" > </File> @@ -688,6 +692,10 @@ > </File> <File + RelativePath="..\pbd\md5.h" + > + </File> + <File RelativePath="..\pbd\memento_command.h" > </File> diff --git a/libs/pbd/pbd/md5.h b/libs/pbd/pbd/md5.h index cf0d0e80eb..80f45bc8ea 100644 --- a/libs/pbd/pbd/md5.h +++ b/libs/pbd/pbd/md5.h @@ -26,7 +26,9 @@ #include <string.h> #include <stdint.h> -class MD5 +#include "pbd/libpbd_visibility.h" + +class LIBPBD_API MD5 { public: MD5(); diff --git a/libs/timecode/MSVCtimecode/timecode.vcproj b/libs/timecode/MSVCtimecode/timecode.vcproj index ac1046bc51..97ce3d16e2 100644 --- a/libs/timecode/MSVCtimecode/timecode.vcproj +++ b/libs/timecode/MSVCtimecode/timecode.vcproj @@ -60,6 +60,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="$(DllPrefix)pbd32D.lib" OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32D.dll" AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib" GenerateDebugInformation="true" @@ -88,7 +89,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy /Y "$(OutDir)\$(TargetName).dll" "$(Debug32TargetFolder)\$(TargetName).dll"
copy /Y "$(OutDir)\$(TargetName).dll" "$(Debug32TestSuiteFolder)\$(TargetName).dll"
copy /Y "$(OutDir)\$(TargetName).lib" "$(GenericWin32LibraryFolder)\$(TargetName).lib"" + CommandLine="copy /Y "$(OutDir)\$(TargetName).dll" "$(Debug32TargetFolder)\$(TargetName).dll"
copy /Y "$(OutDir)\$(TargetName).dll" "$(Debug32TestSuiteFolder)\$(TargetName).dll"
copy /Y "$(OutDir)\$(TargetName).lib" "$(GenericWin32LibraryFolder)\$(TargetName).lib"
" /> </Configuration> <Configuration @@ -139,6 +140,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="$(DllPrefix)pbd32.lib" OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32.dll" AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib" SubSystem="2" @@ -218,6 +220,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="$(DllPrefix)pbd32RDC.lib" OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32RDC.dll" AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib" GenerateDebugInformation="true" |