diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops')
| -rw-r--r-- | WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops b/WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops index 6b373b6..629ea2d 100644 --- a/WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops +++ b/WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops @@ -1,28 +1,20 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="QTMovieWinCommon"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\include\private\JavaScriptCore";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitLibrariesDir)\QTInternalSDK\CIncludes";"$(WebKitLibrariesDir)\QuickTime SDK\CIncludes";"$(ProgramFiles)/QuickTime SDK/cincludes";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private""
- PreprocessorDefinitions="_USRDLL;QTMOVIEWIN_EXPORTS;TARGET_OS_WIN32"
- DisableSpecificWarnings="4819"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QTMLClient.lib CVClient.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib Msimg32.lib user32.lib advapi32.lib"
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
- AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\QTInternalSDK\Libraries";"$(WebKitLibrariesDir)\QuickTime SDK\Libraries";"$(ProgramFiles)\QuickTime SDK\Libraries""
- IgnoreDefaultLibraryNames="LIBCMT"
- />
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c

if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\QTMovieWin"
xcopy /y /d "$(ProjectDir)..\platform\graphics\win\QTMovieWin.h" "$(WebKitOutputDir)\include\QTMovieWin"

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="QTMovieWinCommon" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\include\private\JavaScriptCore";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitLibrariesDir)\QTInternalSDK\CIncludes";"$(WebKitLibrariesDir)\QuickTime SDK\CIncludes";"$(ProgramFiles)/QuickTime SDK/cincludes";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private"" + PreprocessorDefinitions="_USRDLL;QTMOVIEWIN_EXPORTS;TARGET_OS_WIN32" + DisableSpecificWarnings="4819" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="QTMLClient.lib CVClient.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib Msimg32.lib user32.lib advapi32.lib" + OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll" + AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\QTInternalSDK\Libraries";"$(WebKitLibrariesDir)\QuickTime SDK\Libraries";"$(ProgramFiles)\QuickTime SDK\Libraries"" + IgnoreDefaultLibraryNames="LIBCMT" + /> +</VisualStudioPropertySheet> |