[webkit-changes] cvs commit:
JavaScriptCore/JavaScriptCore.vcproj/testkjs testkjs.vcproj
David
hyatt at opensource.apple.com
Fri Jan 6 14:21:06 PST 2006
hyatt 06/01/06 14:21:06
Modified: JavaScriptCore.vcproj JavaScriptCore.sln JavaScriptCore.suo
JavaScriptCore.vcproj/JavaScriptCore JavaScriptCore.vcproj
JavaScriptCore.vcproj/dftables dftables.vcproj
Added: JavaScriptCore.vcproj/testkjs testkjs.vcproj
Log:
Check in the remaining project changes for building with VC 2005
Revision Changes Path
1.3 +9 -0 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
Index: JavaScriptCore.sln
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaScriptCore.sln 29 Dec 2005 08:58:50 -0000 1.2
+++ JavaScriptCore.sln 6 Jan 2006 22:21:05 -0000 1.3
@@ -8,6 +8,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dftables", "dftables\dftables.vcproj", "{BC2981C0-67A5-4A3C-879B-784BCBDE2541}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testkjs", "testkjs\testkjs.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -22,6 +27,10 @@
{BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.Build.0 = Debug|Win32
{BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.ActiveCfg = Release|Win32
{BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.Build.0 = Release|Win32
+ {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32
+ {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32
+ {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
1.3 +229 -102 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.suo
<<Binary file>>
1.3 +38 -64 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
Index: JavaScriptCore.vcproj
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaScriptCore.vcproj 29 Dec 2005 08:58:50 -0000 1.2
+++ JavaScriptCore.vcproj 6 Jan 2006 22:21:05 -0000 1.3
@@ -17,15 +17,15 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(OutputDir)\$(ConfigurationName)"
- IntermediateDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
- ConfigurationType="2"
+ OutputDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
+ IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
+ ConfigurationType="4"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
- Description="Constructing chartables.c"
- CommandLine="mkdir "$(OutputDir)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources"
"$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe" "$(OutputDir)JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c""
+ Description="Constructing generated files..."
+ CommandLine="if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate"
if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)"
if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources"

"$(WebkitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe"
; "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c"

"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\array_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\array_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\bool_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\bool_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\date_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\Java
ScriptCore.intermediate\DerivedSources\date_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\error_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\error_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\function_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\function_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\math_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\math_object.lut.h" -i

;"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\number_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\number_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\object_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\object_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\regexp_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\regexp_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create
_hash_table" "$(InputDir)\..\..\kjs\string_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\string_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\keywords.table" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\lexer.lut.h" -i
"$(WebKitToolsDir)\bison.exe" -d -p kjsyy "$(InputDir)\..\..\kjs\grammar.y" -o "$(InputDir)\..\..\kjs\grammar.cpp"
move "$(InputDir)\..\..\kjs\grammar.hpp" "$(InputDir)\..\..\kjs\grammar.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -43,18 +43,21 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="
"
Optimization="0"
- AdditionalIncludeDirectories=""$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
- PreprocessorDefinitions="HAVE_CONFIG_H"
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+ PreprocessorDefinitions="HAVE_CONFIG_H; WIN32; __STD_C"
MinimalRebuild="true"
ExceptionHandling="0"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
- WarningLevel="0"
- Detect64BitPortabilityProblems="true"
+ WarningLevel="1"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
+ DisableSpecificWarnings="4138; 4996; 4355"
+ ForcedIncludeFiles=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -66,19 +69,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -88,27 +84,23 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
+ Description="Copying ICU DLLS..."
+ CommandLine="cp ..\..\..\icu\bin\icudt34.dll "$(WebKitOutputDir)\$(ConfigurationName)"
cp ..\..\..\icu\bin\icuuc34.dll "$(WebKitOutputDir)\$(ConfigurationName)""
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(OutputDir)\$(ConfigurationName)"
- IntermediateDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
- ConfigurationType="2"
+ OutputDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
+ IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
+ ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- Description="Constructing chartables.c"
- CommandLine="mkdir "$(OutputDir)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
mkdir "$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources"
"$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe" "$(OutputDir)JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c""
+ Description="Constructing generated files..."
+ CommandLine="if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate"
if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)"
if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate"
if not exist "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate" mkdir "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources"

"$(WebkitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\dftables.exe"
; "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\chartables.c"

"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\array_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\array_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\bool_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\bool_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\date_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\Java
ScriptCore.intermediate\DerivedSources\date_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\error_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\error_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\function_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\function_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\math_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\math_object.lut.h" -i

;"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\number_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\number_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\object_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\object_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\regexp_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\regexp_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create
_hash_table" "$(InputDir)\..\..\kjs\string_object.cpp" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\string_object.lut.h" -i
"$(WebKitToolsDir)\perl.exe" "$(InputDir)\..\..\kjs\create_hash_table" "$(InputDir)\..\..\kjs\keywords.table" > "$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\lexer.lut.h" -i
"$(WebKitToolsDir)\bison.exe" -d -p kjsyy "$(InputDir)\..\..\kjs\grammar.y" -o "$(InputDir)\..\..\kjs\grammar.cpp"
move "$(InputDir)\..\..\kjs\grammar.hpp" "$(InputDir)\..\..\kjs\grammar.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -126,15 +118,18 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
- PreprocessorDefinitions="HAVE_CONFIG_H"
+ AdditionalOptions="
"
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
+ PreprocessorDefinitions="HAVE_CONFIG_H; WIN32; __STD_C"
ExceptionHandling="0"
RuntimeLibrary="2"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
- WarningLevel="0"
- Detect64BitPortabilityProblems="true"
+ WarningLevel="1"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4138; 4996; 4355"
+ ForcedIncludeFiles=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -146,21 +141,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -170,13 +156,9 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
+ Description="Copying ICU DLLS..."
+ CommandLine="cp ..\..\..\icu\bin\icudt34.dll "$(WebKitOutputDir)\$(ConfigurationName)"
cp ..\..\..\icu\bin\icuuc34.dll "$(WebKitOutputDir)\$(ConfigurationName)""
/>
</Configuration>
</Configurations>
@@ -554,22 +536,6 @@
RelativePath="..\..\kxmlcore\RefPtr.h"
>
</File>
- <File
- RelativePath="..\..\kxmlcore\TCPageMap.h"
- >
- </File>
- <File
- RelativePath="..\..\kxmlcore\TCSpinLock.h"
- >
- </File>
- <File
- RelativePath="..\..\kxmlcore\TCSystemAlloc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kxmlcore\TCSystemAlloc.h"
- >
- </File>
</Filter>
<Filter
Name="PCRE"
@@ -667,6 +633,14 @@
>
</File>
</Filter>
+ <Filter
+ Name="Generated Files"
+ >
+ <File
+ RelativePath="..\..\kjs\grammar.cpp"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
1.2 +4 -4 JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj
Index: dftables.vcproj
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dftables.vcproj 29 Dec 2005 08:58:50 -0000 1.1
+++ dftables.vcproj 6 Jan 2006 22:21:05 -0000 1.2
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
- IntermediateDirectory="$(OutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
+ OutputDirectory="$(WebKitDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
+ IntermediateDirectory="$(WebKitDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
ConfigurationType="1"
CharacterSet="1"
>
@@ -92,8 +92,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(OutputDir)\$(ConfigurationName)"
- IntermediateDirectory="$(OutputDir)\dftables.intermediate\$(ConfigurationName)"
+ OutputDirectory="$(WebKitDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
+ IntermediateDirectory="$(WebKitDir)\JavaScriptCore.intermediate\$(ConfigurationName)\dftables.intermediate\"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
1.1 JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
Index: testkjs.vcproj
===================================================================
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="testkjs"
ProjectGUID="{C59E5129-B453-49B7-A52B-1E104715F76E}"
RootNamespace="testkjs"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(WebKitOutputDir)\$(ConfigurationName)"
IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\testkjs.intermediate\"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="1"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib" ..\..\..\icu\lib\icuuc.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description=""
CommandLine=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(WebKitOutputDir)\$(ConfigurationName)"
IntermediateDirectory="$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\testkjs.intermediate\"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../kxmlcore/;../../../icu/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="1"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""$(WebKitOutputDir)\JavaScriptCore.intermediate\$(ConfigurationName)\JavaScriptCore.intermediate\JavaScriptCore.lib" ..\..\..\icu\lib\icuuc.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description=""
CommandLine=""
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\..\kjs\testkjs.cpp"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
More information about the webkit-changes
mailing list