+2008-01-14 Steve Falkenburg <sfalken@apple.com>
+
+ Use shared vsprops for most vcproj properties.
+
+ Reviewed by Darin.
+
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Add missing Debug_Internal config.
+ * JavaScriptCore.vcproj/WTF/WTF.vcproj: Add missing Debug_Internal config.
+ * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
+
2008-01-14 Adam Roben <aroben@apple.com>
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Added
<Configuration\r
Name="Debug|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="4"\r
- InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops"\r
CharacterSet="1"\r
- DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders""\r
- PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4018;4127;4355;4389;4510;4512;4610;4706;4800;4996"\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
ForcedIncludeFiles=""\r
/>\r
<Tool\r
<Tool\r
Name="VCLibrarianTool"\r
AdditionalDependencies="winmm.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configuration\r
Name="Release|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
- DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders""\r
- PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;NDEBUG;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- ExceptionHandling="0"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4018;4127;4355;4389;4510;4512;4610;4706;4800;4996"\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
+ ForcedIncludeFiles=""\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ AdditionalDependencies="winmm.lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\wtf\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\wtf\unicode\icu\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\os-win32\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\kjs\*.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\kjs\create_hash_table" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\pcre\pcre.h" "$(WebKitOutputDir)\include\JavaScriptCore"

xcopy /y /d "$(ProjectDir)\..\..\bindings\npruntime.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\bindings\npapi.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\bindings\npruntime_internal.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\bindings\npruntime_impl.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\bindings\NP_jsobject.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\bindings\runtime_object.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\bindings\runtime_root.h" "$(WebKitOutputDir)\include\JavaScriptCore"
xcopy /y /d "$(ProjectDir)\..\..\bindings\runtime.h" "$(WebKitOutputDir)\include\JavaScriptCore"
"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Debug_Internal|Win32"\r
+ OutputDirectory="$(WebKitOutputDir)\lib"\r
+ ConfigurationType="4"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ CommandLine=""\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ Description=""\r
+ CommandLine=""\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders""\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
ForcedIncludeFiles=""\r
/>\r
<Tool\r
<Tool\r
Name="VCLibrarianTool"\r
AdditionalDependencies="winmm.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configuration\r
Name="Debug|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
- DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""\r
- PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4510;4512;4610;4706;4996"\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
ForcedIncludeFiles=""\r
/>\r
<Tool\r
<Configuration\r
Name="Release|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
- DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""\r
- PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;NDEBUG;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- ExceptionHandling="0"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4510;4512;4610;4706;4996"\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
+ ForcedIncludeFiles=""\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Debug_Internal|Win32"\r
+ OutputDirectory="$(WebKitOutputDir)\lib"\r
+ ConfigurationType="4"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ Description=""\r
+ CommandLine=""\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads""\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
ForcedIncludeFiles=""\r
/>\r
<Tool\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="2"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4510;4512;4610;4706;4800;4996"\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";..\..\..\icu\lib"\r
- DelayLoadDLLs="icuuc36$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
+ AdditionalLibraryDirectories=""\r
+ DelayLoadDLLs=""\r
SubSystem="1"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;NDEBUG;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- ExceptionHandling="0"\r
- RuntimeLibrary="2"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4510;4512;4610;4706;4800;4996"\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
- LinkIncremental="1"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";..\..\..\icu\lib"\r
- DelayLoadDLLs="icuuc36$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
+ AdditionalLibraryDirectories=""\r
+ DelayLoadDLLs=""\r
SubSystem="1"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Debug_Internal|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="2"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4510;4512;4610;4706;4800;4996"\r
+ PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";..\..\..\icu\lib"\r
- DelayLoadDLLs="icuuc36$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
+ AdditionalLibraryDirectories=""\r
+ DelayLoadDLLs=""\r
SubSystem="1"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
+2008-01-14 Steve Falkenburg <sfalken@apple.com>
+
+ Use shared vsprops for most vcproj properties.
+
+ Reviewed by Darin.
+
+ * WebCore.vcproj/QTMovieWin.vcproj:
+ * WebCore.vcproj/WebCore.vcproj:
+ * platform/graphics/win/QTMovieWin.cpp:
+ (QTMovieWin::initializeQuickTime): Fix compiler warning.
+
2008-01-14 Eric Seidel <eric@webkit.org>
Reviewed by mjs.
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(ProgramFiles)/QuickTime SDK/cincludes";"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QTMOVIEWIN_EXPORTS"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="3"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="4"\r
+ PreprocessorDefinitions="_USRDLL;QTMOVIEWIN_EXPORTS"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- AdditionalIncludeDirectories="$(IntDir)\include"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
Name="VCLinkerTool"\r
AdditionalDependencies=""$(ProgramFiles)\QuickTime SDK\Libraries\QTMLClient.lib" WTF$(WebKitConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib Msimg32.lib user32.lib advapi32.lib"\r
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";$(WebKitLibrariesDir)\lib"\r
- IgnoreAllDefaultLibraries="false"\r
+ AdditionalLibraryDirectories=""\r
DelayLoadDLLs=""\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(ProgramFiles)/QuickTime SDK/cincludes";"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QTMOVIEWIN_EXPORTS"\r
- RuntimeLibrary="2"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="3"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
+ PreprocessorDefinitions="_USRDLL;QTMOVIEWIN_EXPORTS"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- AdditionalIncludeDirectories="$(IntDir)\include"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
Name="VCLinkerTool"\r
AdditionalDependencies=""$(ProgramFiles)\QuickTime SDK\Libraries\QTMLClient.lib" WTF$(WebKitConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib Msimg32.lib user32.lib advapi32.lib"\r
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"\r
- LinkIncremental="1"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";$(WebKitLibrariesDir)\lib"\r
+ AdditionalLibraryDirectories=""\r
DelayLoadDLLs=""\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
- ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Debug_Internal|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(ProgramFiles)/QuickTime SDK/cincludes";"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QTMOVIEWIN_EXPORTS"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="3"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="4"\r
+ PreprocessorDefinitions="_USRDLL;QTMOVIEWIN_EXPORTS"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- AdditionalIncludeDirectories="$(IntDir)\include"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
Name="VCLinkerTool"\r
AdditionalDependencies=""$(ProgramFiles)\QuickTime SDK\Libraries\QTMLClient.lib" WTF$(WebKitConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib Msimg32.lib user32.lib advapi32.lib"\r
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";$(WebKitLibrariesDir)\lib"\r
- IgnoreAllDefaultLibraries="false"\r
+ AdditionalLibraryDirectories=""\r
DelayLoadDLLs=""\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configuration\r
Name="Debug|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
- DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\win";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";$(WebKitOutputDir)\include\QtMovieWin"\r
- PreprocessorDefinitions="WIN32;__WIN32__;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME;ENABLE_VIDEO"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- RuntimeTypeInfo="false"\r
+ PreprocessorDefinitions="__WIN32__;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME;ENABLE_VIDEO"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="WebCorePrefix.h"\r
- WarningLevel="4"\r
WarnAsError="false"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4099;4100;4127;4138;4189;4244;4510;4512;4610;4706;4800;4996;4355;4291;4068;6011;6031;6211;6246;6255;6387"\r
ForcedIncludeFiles="WebCorePrefix.h"\r
/>\r
<Tool\r
/>\r
<Tool\r
Name="VCLibrarianTool"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configuration\r
Name="Release|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
- DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\win";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";$(WebKitOutputDir)\include\QtMovieWin"\r
- PreprocessorDefinitions="NDEBUG;WIN32;__WIN32__;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME;ENABLE_VIDEO"\r
- ExceptionHandling="0"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
+ PreprocessorDefinitions="__WIN32__;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME;ENABLE_VIDEO"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="WebCorePrefix.h"\r
- WarningLevel="4"\r
WarnAsError="false"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4099;4100;4127;4138;4189;4244;4510;4512;4610;4706;4800;4996;4355;4291;4068;6011;6031;6211;6246;6255;6387"\r
ForcedIncludeFiles="WebCorePrefix.h"\r
/>\r
<Tool\r
/>\r
<Tool\r
Name="VCLibrarianTool"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configuration\r
Name="Debug_Internal|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
CharacterSet="1"\r
- DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\rendering";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\dom";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\win";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\page";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\network\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\cg";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\xbm";"$(ProjectDir)..\platform\image-decoders\zlib";"$(ProjectDir)..\xml";"$(WebKitOutputDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\platform\cairo\pixman\src";"$(ProjectDir)..\platform\cairo\cairo\src";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\graphics\cg";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\kcanvas";"$(ProjectDir)..\kcanvas\device";"$(ProjectDir)..\kcanvas\device\quartz";"$(ProjectDir)..\svg";"$(ProjectDir)..\storage";"$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\iconv";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";$(WebKitOutputDir)\include\QtMovieWin"\r
- PreprocessorDefinitions="WIN32;__WIN32__;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME;ENABLE_VIDEO"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- RuntimeTypeInfo="false"\r
+ PreprocessorDefinitions="__WIN32__;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME;ENABLE_VIDEO"\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="WebCorePrefix.h"\r
- WarningLevel="4"\r
WarnAsError="false"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4099;4100;4127;4138;4189;4244;4510;4512;4610;4706;4800;4996;4355;4291;4068;6011;6031;6211;6246;6255;6387"\r
ForcedIncludeFiles="WebCorePrefix.h"\r
/>\r
<Tool\r
/>\r
<Tool\r
Name="VCLibrarianTool"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
initialized = true;
// Initialize and check QuickTime version
OSErr result = InitializeQTML(0);
- SInt32 version;
+ SInt32 version = 0;
if (result == noErr)
result = Gestalt(gestaltQuickTime, &version);
if (result != noErr) {
+2008-01-14 Steve Falkenburg <sfalken@apple.com>
+
+ Use shared vsprops for most vcproj properties.
+
+ Reviewed by Darin.
+
+ * WebKit.vcproj/Interfaces.vcproj:
+ * WebKit.vcproj/WebKit.vcproj:
+ * WebKit.vcproj/WebKitGUID.vcproj: Add missing Debug_Internal config.
+
2008-01-11 Steve Falkenburg <sfalken@apple.com>
Share common files across projects.
<Configuration\r
Name="Debug|Win32"\r
OutputDirectory="$(WebKitOutputDir)\include\WebKit"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="__PRODUCTION__=0$(PRODUCTION)"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\WebKit\DerivedSources";..\Interfaces"\r
- WarningLevel="1"\r
- WarnAsError="true"\r
GenerateTypeLibrary="false"\r
TypeLibraryName="$(ProjectDir)\WebKit.tlb"\r
OutputDirectory="$(WebKitOutputDir)\obj\WebKit\$(ProjectName)"\r
- HeaderFileName="$(OutDir)\$(InputName).h"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
<Configuration\r
Name="Release|Win32"\r
OutputDirectory="$(WebKitOutputDir)\include\WebKit"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="__PRODUCTION__=0$(PRODUCTION)"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\WebKit\DerivedSources";..\Interfaces"\r
- WarningLevel="1"\r
- WarnAsError="true"\r
GenerateTypeLibrary="false"\r
TypeLibraryName="$(ProjectDir)\WebKit.tlb"\r
OutputDirectory="$(WebKitOutputDir)\obj\WebKit\$(ProjectName)"\r
- HeaderFileName="$(OutDir)\$(InputName).h"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include\WebKit";"$(WebKitOutputDir)\Include";"$(WebKitLibrariesDir)\Include";"$(WebKitOutputDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\icu";"$(WebKitLibrariesDir)\Include\icu";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(ProjectDir)\..";"$(ProjectDir)";"$(IntDir)\include";"$(WebKitOutputDir)\obj\WebKit\DerivedSources""\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__PRODUCTION__=0$(PRODUCTION)"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4512;4800"\r
- ForcedIncludeFiles="CodeAnalysisConfig.h"\r
+ PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit"\r
+ ForcedIncludeFiles=""\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- AdditionalIncludeDirectories="$(IntDir)\include"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib"\r
OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""\r
+ AdditionalLibraryDirectories=""\r
ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include\WebKit";"$(WebKitOutputDir)\Include";"$(WebKitLibrariesDir)\Include";"$(WebKitOutputDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\icu";"$(WebKitLibrariesDir)\Include\icu";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(ProjectDir)\..";"$(ProjectDir)";"$(IntDir)\include";"$(WebKitOutputDir)\obj\WebKit\DerivedSources""\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__PRODUCTION__=0$(PRODUCTION)"\r
- ExceptionHandling="0"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4512;4800"\r
- ForcedIncludeFiles="CodeAnalysisConfig.h"\r
+ PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit"\r
+ ForcedIncludeFiles=""\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- AdditionalIncludeDirectories="$(IntDir)\include"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib"\r
OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
- LinkIncremental="1"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""\r
+ AdditionalLibraryDirectories=""\r
ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
- ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Debug_Internal|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include\WebKit";"$(WebKitOutputDir)\Include";"$(WebKitLibrariesDir)\Include";"$(WebKitOutputDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\icu";"$(WebKitLibrariesDir)\Include\icu";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility";"$(ProjectDir)\..";"$(ProjectDir)";"$(IntDir)\include";"$(WebKitOutputDir)\obj\WebKit\DerivedSources""\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__PRODUCTION__=0$(PRODUCTION)"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
+ PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit"\r
Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127;4355;4512;4800"\r
- ForcedIncludeFiles="CodeAnalysisConfig.h"\r
+ ForcedIncludeFiles=""\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- AdditionalIncludeDirectories="$(IntDir)\include"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib"\r
OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""\r
+ AdditionalLibraryDirectories=""\r
ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configuration\r
Name="Debug|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories="$(WebKitOutputDir)\$(ConfigurationName)\WebKit"\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKITGUID_EXPORTS;_WIN32_WINNT=0x500"\r
- MinimalRebuild="true"\r
- ExceptionHandling="0"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
+ PreprocessorDefinitions="_USRDLL;WEBKITGUID_EXPORTS"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLibrarianTool"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configuration\r
Name="Release|Win32"\r
OutputDirectory="$(WebKitOutputDir)\lib"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories="$(WebKitOutputDir)\$(ConfigurationName)\WebKit"\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBKITGUID_EXPORTS;_WIN32_WINNT=0x500"\r
- ExceptionHandling="0"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
+ PreprocessorDefinitions="_USRDLL;WEBKITGUID_EXPORTS"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ CommandLine=""\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Debug_Internal|Win32"\r
+ OutputDirectory="$(WebKitOutputDir)\lib"\r
+ ConfigurationType="4"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ AdditionalIncludeDirectories="Interfaces"\r
+ OutputDirectory="Debug"\r
+ HeaderFileName="$(InputName).h"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories="$(WebKitOutputDir)\$(ConfigurationName)\WebKit"\r
+ PreprocessorDefinitions="_USRDLL;WEBKITGUID_EXPORTS"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLibrarianTool"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
+2008-01-14 Steve Falkenburg <sfalken@apple.com>
+
+ Use shared vsprops for most vcproj properties.
+
+ Reviewed by Darin.
+
+ * win/tools/vsprops/common.vsprops:
+ * win/tools/vsprops/debug.vsprops:
+ * win/tools/vsprops/debug_internal.vsprops:
+ * win/tools/vsprops/release.vsprops:
+
2008-01-11 Steve Falkenburg <sfalken@apple.com>
Share common files across projects.
ProjectType="Visual C++"
Version="8.00"
Name="common"
+ OutputDirectory="$(WebKitOutputDir)\bin"
+ IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_WIN32_WINNT=0x500;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;__PRODUCTION__=0$(PRODUCTION);_HAS_EXCEPTIONS=0"
+ ExceptionHandling="0"
+ RuntimeTypeInfo="false"
+ WarningLevel="4"
+ WarnAsError="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4189;4244;4275;4291;4355;4389;4510;4512;4610;4706;4800;4996;6011;6031;6211;6246;6255;6387"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
+ AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="__PRODUCTION__=0$(PRODUCTION)"
+ WarnAsError="true"
+ HeaderFileName="$(OutDir)\$(InputName).h"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(IntDir)\include""
+ />
</VisualStudioPropertySheet>
Version="8.00"
Name="debug"
>
- <UserMacro
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ />
+ <UserMacro
Name="WebKitConfigSuffix"
Value="_debug"
PerformEnvironmentSet="true"
/>
- <UserMacro
+ <UserMacro
Name="LibraryConfigSuffix"
Value=""
PerformEnvironmentSet="true"
/>
- <UserMacro
+ <UserMacro
Name="WebKitDLLConfigSuffix"
Value=""
/>
Version="8.00"
Name="debug_internal"
>
- <Tool
+ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="USE_DEBUG_SAFARI_THEME"
+ RuntimeLibrary="3"
/>
- <UserMacro
+ <UserMacro
Name="WebKitConfigSuffix"
Value="_debug"
PerformEnvironmentSet="true"
/>
- <UserMacro
+ <UserMacro
Name="LibraryConfigSuffix"
Value="_debug"
PerformEnvironmentSet="true"
/>
- <UserMacro
+ <UserMacro
Name="WebKitDLLConfigSuffix"
Value="_debug"
/>
Version="8.00"
Name="release"
>
- <UserMacro
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="NDEBUG"
+ RuntimeLibrary="2"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ StripPrivateSymbols="$(WebKitOutputDir)\public\sym\$(TargetName).pdb"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ />
+ <UserMacro
Name="WebKitConfigSuffix"
Value=""
PerformEnvironmentSet="true"
/>
- <UserMacro
+ <UserMacro
Name="LibraryConfigSuffix"
Value=""
PerformEnvironmentSet="true"
/>
- <UserMacro
+ <UserMacro
Name="WebKitDLLConfigSuffix"
Value=""
/>
+2008-01-14 Steve Falkenburg <sfalken@apple.com>
+
+ Use shared vsprops for most vcproj properties.
+
+ Reviewed by Darin.
+
+ * Drosera/win/Drosera.vcproj/Drosera.vcproj:
+ * DumpRenderTree/win/DumpRenderTree.vcproj:
+ * DumpRenderTree/win/ImageDiff.vcproj:
+ * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj:
+ * FindSafari/FindSafari.vcproj:
+
2008-01-14 Stephanie <slewis@apple.com>
Reviewed by NOBODY.
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(IntDir)\include""\r
- PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE;__APPLICATION_NAME__=\"$(ProjectName)\""\r
- MinimalRebuild="true"\r
- ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
+ PreprocessorDefinitions="STRICT;__APPLICATION_NAME__=\"$(ProjectName)\""\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="DroseraPrefix.h"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127"\r
ForcedIncludeFiles="DroseraPrefix.h"\r
/>\r
<Tool\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
- CommandLine="xcopy /y /d "$(WebKitOutputDir)\obj\Drosera\$(ConfigurationName)\vc80.*" "$(WebKitOutputDir)\lib""\r
+ CommandLine=""\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
LinkLibraryDependencies="false"\r
AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""\r
IgnoreAllDefaultLibraries="false"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/EHsc"\r
- InlineFunctionExpansion="1"\r
AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(IntDir)\include""\r
- PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_DEPRECATE;__APPLICATION_NAME__=\"$(ProjectName)\""\r
- ExceptionHandling="0"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
+ PreprocessorDefinitions="STRICT;__APPLICATION_NAME__=\"$(ProjectName)\""\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="DroseraPrefix.h"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127"\r
ForcedIncludeFiles="DroseraPrefix.h"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
LinkLibraryDependencies="false"\r
AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""\r
DelayLoadDLLs=""\r
</Configuration>\r
<Configuration\r
Name="Debug_Internal|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(IntDir)\include""\r
- PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE;__APPLICATION_NAME__=\"$(ProjectName)\""\r
- MinimalRebuild="true"\r
- ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="2"\r
- RuntimeTypeInfo="false"\r
+ PreprocessorDefinitions="STRICT;__APPLICATION_NAME__=\"$(ProjectName)\""\r
UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="DroseraPrefix.h"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="false"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4127"\r
ForcedIncludeFiles="DroseraPrefix.h"\r
/>\r
<Tool\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
- CommandLine="xcopy /y /d "$(WebKitOutputDir)\obj\Drosera\$(ConfigurationName)\vc80.*" "$(WebKitOutputDir)\lib""\r
+ CommandLine=""\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
LinkLibraryDependencies="false"\r
AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""\r
IgnoreAllDefaultLibraries="false"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"

xcopy /y /d "$(ProjectDir)\..\ForwardingHeaders\wtf\*.h" "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf""\r
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"

xcopy /y /d "$(ProjectDir)\..\ForwardingHeaders\wtf\*.h" "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"
"\r
/>\r
<Tool\r
Name="VCCustomBuildTool"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)\.";"$(ProjectDir)\..";"$(ProjectDir)\..\cg";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitOutputDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore""\r
- PreprocessorDefinitions="WIN32;_CONSOLE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="2"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="1"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
+ PreprocessorDefinitions="_CONSOLE"\r
+ DisableSpecificWarnings="4146"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";"$(WebKitOutputDir)\bin""\r
- DelayLoadDLLs="CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
+ AdditionalLibraryDirectories=""\r
+ DelayLoadDLLs=""\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"

xcopy /y /d "$(ProjectDir)\..\ForwardingHeaders\wtf\*.h" "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf""\r
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"

xcopy /y /d "$(ProjectDir)\..\ForwardingHeaders\wtf\*.h" "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"
"\r
/>\r
<Tool\r
Name="VCCustomBuildTool"\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(ProjectDir)\.";"$(ProjectDir)\..";"$(ProjectDir)\..\cg";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitOutputDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore""\r
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- RuntimeLibrary="2"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="1"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
+ PreprocessorDefinitions="_CONSOLE"\r
+ DisableSpecificWarnings="4146"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
- LinkIncremental="1"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";"$(WebKitOutputDir)\bin""\r
- DelayLoadDLLs="CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
+ AdditionalLibraryDirectories=""\r
+ DelayLoadDLLs=""\r
SubSystem="1"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
TargetMachine="1"\r
/>\r
<Tool\r
</Configuration>\r
<Configuration\r
Name="Debug_Internal|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
CharacterSet="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
- CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"

xcopy /y /d "$(ProjectDir)\..\ForwardingHeaders\wtf\*.h" "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf""\r
+ CommandLine="mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders"
mkdir 2>NUL "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"

xcopy /y /d "$(ProjectDir)\..\ForwardingHeaders\wtf\*.h" "$(WebKitOutputDir)\include\DumpRenderTree\ForwardingHeaders\wtf"
"\r
/>\r
<Tool\r
Name="VCCustomBuildTool"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(ProjectDir)\.";"$(ProjectDir)\..";"$(ProjectDir)\..\cg";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitOutputDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore""\r
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="1"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
+ PreprocessorDefinitions="_CONSOLE"\r
+ DisableSpecificWarnings="4146"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
- LinkIncremental="2"\r
- AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";"$(WebKitOutputDir)\bin""\r
- DelayLoadDLLs="CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
- GenerateDebugInformation="true"\r
+ AdditionalLibraryDirectories=""\r
+ DelayLoadDLLs=""\r
SubSystem="1"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="2"\r
>\r
<Tool\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="4"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
- AdditionalDependencies="CoreGraphics.lib CoreFoundation.lib"\r
- AdditionalLibraryDirectories="$(WebKitOutputDir)\lib;$(WebKitLibrariesDir)\lib"\r
- GenerateDebugInformation="true"\r
- TargetMachine="1"\r
+ AdditionalDependencies="CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"\r
+ AdditionalLibraryDirectories=""\r
+ SubSystem="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops"\r
CharacterSet="2"\r
WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include""\r
- PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
- RuntimeLibrary="2"\r
- WarningLevel="4"\r
- WarnAsError="true"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- LinkLibraryDependencies="false"\r
- AdditionalDependencies="CoreGraphics.lib CoreFoundation.lib"\r
- AdditionalLibraryDirectories="$(WebKitOutputDir)\lib;$(WebKitLibrariesDir)\lib"\r
- GenerateDebugInformation="true"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
- TargetMachine="1"\r
+ AdditionalDependencies="CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"\r
+ AdditionalLibraryDirectories=""\r
+ SubSystem="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin\TestNetscapePlugin$(WebKitConfigSuffix)"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
CharacterSet="1"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(ProjectDir)..\..\TestNetscapePlugin.subproj""\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTNETSCAPEPLUGIN_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;snprintf=_snprintf"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="3"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4267"\r
+ PreprocessorDefinitions="_USRDLL;TESTNETSCAPEPLUGIN_EXPORTS;snprintf=_snprintf"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- ShowProgress="0"\r
OutputFile="$(OutDir)\np$(ProjectName)$(WebKitConfigSuffix).dll"\r
- LinkIncremental="2"\r
- GenerateManifest="false"\r
ModuleDefinitionFile="TestNetscapePlugin.def"\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin\TestNetscapePlugin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="2"\r
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalIncludeDirectories=""$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(ProjectDir)..\..\TestNetscapePlugin.subproj""\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTNETSCAPEPLUGIN_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;snprintf=_snprintf"\r
- RuntimeLibrary="2"\r
- UsePrecompiledHeader="0"\r
- WarningLevel="3"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
- DisableSpecificWarnings="4267"\r
+ PreprocessorDefinitions="_USRDLL;TESTNETSCAPEPLUGIN_EXPORTS;snprintf=_snprintf"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
OutputFile="$(OutDir)\np$(ProjectName)$(WebKitConfigSuffix).dll"\r
- LinkIncremental="1"\r
- GenerateManifest="false"\r
ModuleDefinitionFile="TestNetscapePlugin.def"\r
- GenerateDebugInformation="true"\r
- SubSystem="2"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
- TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
CharacterSet="1"\r
>\r
<Tool\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- WarningLevel="3"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="4"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="shlwapi.lib advapi32.lib ole32.lib"\r
- GenerateDebugInformation="true"\r
- TargetMachine="1"\r
+ SubSystem="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|Win32"\r
- OutputDirectory="$(WebKitOutputDir)\bin"\r
- IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
ConfigurationType="1"\r
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops"\r
CharacterSet="1"\r
WholeProgramOptimization="1"\r
>\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- RuntimeLibrary="2"\r
- WarningLevel="3"\r
- Detect64BitPortabilityProblems="true"\r
- DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="shlwapi.lib advapi32.lib ole32.lib"\r
- GenerateDebugInformation="true"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
- TargetMachine="1"\r
+ SubSystem="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
git://git.webkit.org / WebKit-https.git / commitdiff