Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
This commit is contained in:
commit
6990c31ed5
@ -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"
|
||||||
>
|
>
|
||||||
|
@ -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();
|
||||||
|
@ -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 "$(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>
|
||||||
<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"
|
||||||
|
Loading…
Reference in New Issue
Block a user