ardour/livetrax
13
0
Fork 0
Code

Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

Browse Source
This commit is contained in:
Paul Davis 2014-07-11 09:59:59 -04:00
commit 6990c31ed5
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/pbd/MSVCpbd/pbd.vcproj
View File

@ -357,6 +357,10 @@
RelativePath="..\malign.cc" RelativePath="..\malign.cc"
> >
</File> </File>
<File
RelativePath="..\md5.cc"
>
</File>
<File <File
RelativePath="..\mountpoint.cc" RelativePath="..\mountpoint.cc"
> >
@ -687,6 +691,10 @@
RelativePath="..\pbd\localtime_r.h" RelativePath="..\pbd\localtime_r.h"
> >
</File> </File>
<File
RelativePath="..\pbd\md5.h"
>
</File>
<File <File
RelativePath="..\pbd\memento_command.h" RelativePath="..\pbd\memento_command.h"
> >

4
libs/pbd/pbd/md5.h
View File

@ -26,7 +26,9 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
class MD5 #include "pbd/libpbd_visibility.h"
class LIBPBD_API MD5
{ {
public: public:
MD5(); MD5();

5
libs/timecode/MSVCtimecode/timecode.vcproj
View File

@ -60,6 +60,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(DllPrefix)pbd32D.lib"
OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32D.dll" OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32D.dll"
AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib" AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -88,7 +89,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy /Y &quot;$(OutDir)\$(TargetName).dll&quot; &quot;$(Debug32TargetFolder)\$(TargetName).dll&quot;&#x0D;&#x0A;copy /Y &quot;$(OutDir)\$(TargetName).dll&quot; &quot;$(Debug32TestSuiteFolder)\$(TargetName).dll&quot;&#x0D;&#x0A;copy /Y &quot;$(OutDir)\$(TargetName).lib&quot; &quot;$(GenericWin32LibraryFolder)\$(TargetName).lib&quot;" CommandLine="copy /Y &quot;$(OutDir)\$(TargetName).dll&quot; &quot;$(Debug32TargetFolder)\$(TargetName).dll&quot;&#x0D;&#x0A;copy /Y &quot;$(OutDir)\$(TargetName).dll&quot; &quot;$(Debug32TestSuiteFolder)\$(TargetName).dll&quot;&#x0D;&#x0A;copy /Y &quot;$(OutDir)\$(TargetName).lib&quot; &quot;$(GenericWin32LibraryFolder)\$(TargetName).lib&quot;&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -139,6 +140,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(DllPrefix)pbd32.lib"
OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32.dll" OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32.dll"
AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib" AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
SubSystem="2" SubSystem="2"
@ -218,6 +220,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(DllPrefix)pbd32RDC.lib"
OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32RDC.dll" OutputFile="$(OutDir)\$(DllPrefix)$(ProjectName)32RDC.dll"
AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib" AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"