[Firebird-checkins] SF.net SVN: firebird:[61036] firebird/trunk/builds/win32/msvc10

[<ro...@us...>]

Revision: 61036
          http://sourceforge.net/p/firebird/code/61036
Author:   robocop
Date:     2015-03-21 03:01:48 +0000 (Sat, 21 Mar 2015)
Log Message:
-----------
Modified the MSVC10 build according to Alex's changes but still can't compile.

Modified Paths:
--------------
    firebird/trunk/builds/win32/msvc10/common.vcxproj
    firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/engine.vcxproj
    firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters

Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj	2015-03-21 00:15:33 UTC (rev 61035)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj	2015-03-21 03:01:48 UTC (rev 61036)
@@ -53,6 +53,7 @@
     <ClCompile Include="..\..\..\src\common\db_alias.cpp" />
     <ClCompile Include="..\..\..\src\common\dllinst.cpp" />
     <ClCompile Include="..\..\..\src\common\dsc.cpp" />
+    <ClCompile Include="..\..\..\src\common\DynamicStrings.cpp" />
     <ClCompile Include="..\..\..\src\common\enc.cpp" />
     <ClCompile Include="..\..\..\src\common\fb_exception.cpp" />
     <ClCompile Include="..\..\..\src\common\IntlParametersBlock.cpp" />
@@ -149,6 +150,7 @@
     <ClInclude Include="..\..\..\src\common\dsc.h" />
     <ClInclude Include="..\..\..\src\common\dsc_proto.h" />
     <ClInclude Include="..\..\..\src\common\dsc_pub.h" />
+    <ClInclude Include="..\..\..\src\common\DynamicStrings.h" />
     <ClInclude Include="..\..\..\src\common\dyntable.h" />
     <ClInclude Include="..\..\..\src\common\enc_proto.h" />
     <ClInclude Include="..\..\..\src\common\file_params.h" />
@@ -173,6 +175,7 @@
     <ClInclude Include="..\..\..\src\common\sdltable.h" />
     <ClInclude Include="..\..\..\src\common\sdl_proto.h" />
     <ClInclude Include="..\..\..\src\common\sha.h" />
+    <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h" />
     <ClInclude Include="..\..\..\src\common\StatementMetadata.h" />
     <ClInclude Include="..\..\..\src\common\StatusArg.h" />
     <ClInclude Include="..\..\..\src\common\StatusHolder.h" />

Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters	2015-03-21 00:15:33 UTC (rev 61035)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters	2015-03-21 03:01:48 UTC (rev 61036)
@@ -204,6 +204,9 @@
     <ClCompile Include="..\..\..\src\common\MsgMetadata.cpp">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\common\DynamicStrings.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\common\xdr_proto.h">
@@ -509,5 +512,11 @@
     <ClInclude Include="..\..\..\src\common\MsgMetadata.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\common\DynamicStrings.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/engine.vcxproj	2015-03-21 00:15:33 UTC (rev 61035)
+++ firebird/trunk/builds/win32/msvc10/engine.vcxproj	2015-03-21 03:01:48 UTC (rev 61036)
@@ -138,7 +138,6 @@
     <ClCompile Include="..\..\..\src\jrd\shut.cpp" />
     <ClCompile Include="..\..\..\src\jrd\sort.cpp" />
     <ClCompile Include="..\..\..\src\jrd\sqz.cpp" />
-    <ClCompile Include="..\..\..\src\jrd\status.cpp" />
     <ClCompile Include="..\..\..\src\jrd\svc.cpp" />
     <ClCompile Include="..\..\..\src\jrd\svc_tab.cpp" />
     <ClCompile Include="..\..\..\src\jrd\SysFunction.cpp" />
@@ -266,9 +265,9 @@
     <ClInclude Include="..\..\..\src\jrd\license.h" />
     <ClInclude Include="..\..\..\src\jrd\lls.h" />
     <ClInclude Include="..\..\..\src\jrd\Mapping.h" />
-    <ClInclude Include="..\..\..\src\jrd\Monitoring.h" />
     <ClInclude Include="..\..\..\src\jrd\met.h" />
     <ClInclude Include="..\..\..\src\jrd\met_proto.h" />
+    <ClInclude Include="..\..\..\src\jrd\Monitoring.h" />
     <ClInclude Include="..\..\..\src\jrd\mov_proto.h" />
     <ClInclude Include="..\..\..\src\jrd\msg.h" />
     <ClInclude Include="..\..\..\src\jrd\msg_encode.h" />

Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters	2015-03-21 00:15:33 UTC (rev 61035)
+++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters	2015-03-21 03:01:48 UTC (rev 61036)
@@ -351,9 +351,6 @@
     <ClCompile Include="..\..\..\src\jrd\sqz.cpp">
       <Filter>JRD files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\jrd\status.cpp">
-      <Filter>JRD files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\jrd\svc.cpp">
       <Filter>JRD files</Filter>
     </ClCompile>
@@ -456,7 +453,12 @@
     <ClCompile Include="..\..\..\src\jrd\Mapping.cpp">
       <Filter>JRD files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\jrd\DbCreators.cpp" />
+    <ClCompile Include="..\..\..\src\jrd\DbCreators.cpp">
+      <Filter>JRD files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\dsql\DsqlCursor.cpp">
+      <Filter>DSQL</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h">
@@ -978,7 +980,12 @@
     <ClInclude Include="..\..\..\src\jrd\Mapping.h">
       <Filter>Header files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\jrd\Monitoring.h" />
+    <ClInclude Include="..\..\..\src\dsql\DsqlCursor.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\jrd\Monitoring.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\dsql\DdlNodes.epp">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.