diff options
| -rw-r--r-- | db/db.vcproj | 36 | ||||
| -rw-r--r-- | s/dbgrid.vcproj | 8 |
2 files changed, 40 insertions, 4 deletions
diff --git a/db/db.vcproj b/db/db.vcproj index a5392ade05d..8adbd8c7d11 100644 --- a/db/db.vcproj +++ b/db/db.vcproj @@ -123,15 +123,15 @@ Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""..\pcre-7.4";"c:\Program Files\boost\boost_1_35_0";"c:\program files\java\jdk\include";"c:\program files\java\jdk\include\win32""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC"
+ AdditionalIncludeDirectories="..\..\js\src;"..\pcre-7.4";"c:\Program Files\boost\boost_1_35_0";"c:\program files\java\jdk\include";"c:\program files\java\jdk\include\win32""
+ PreprocessorDefinitions="OLDJS;STATIC_JS_API;XP_WIN;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
WarningLevel="3"
DebugInformationFormat="3"
- DisableSpecificWarnings="4355"
+ DisableSpecificWarnings="4355;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -290,7 +290,7 @@ WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
- DisableSpecificWarnings="4355,4800"
+ DisableSpecificWarnings="4355;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -352,6 +352,26 @@ <File
RelativePath="..\..\js\js\Debug\js.lib"
>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\js\js\Release\js.lib"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="C:\Program Files\Java\jdk\lib\jvm.lib"
@@ -1784,6 +1804,14 @@ UsePrecompiledHeader="0"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
</File>
</Filter>
</Files>
diff --git a/s/dbgrid.vcproj b/s/dbgrid.vcproj index 2135cd26063..f2fef641e99 100644 --- a/s/dbgrid.vcproj +++ b/s/dbgrid.vcproj @@ -508,6 +508,14 @@ />
</FileConfiguration>
<FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="release_nojni|Win32"
>
<Tool
|