Windows porting from JCD

diff --git a/adm_local/win32/All.vcproj b/adm_local/win32/All.vcproj
index 9a8a1774683eecf840cb4f948294ac7ae9fd58b9..4751e38737262320906d74efb15e4fe555ad13d0 100755 (executable)
--- a/adm_local/win32/All.vcproj
+++ b/adm_local/win32/All.vcproj
@@ -98,14 +98,13 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\resources\CatalogRessources.xml">\r
+                               RelativePath="..\..\resources\CatalogResources.xml">\r
                                <FileConfiguration\r
                                        Name="Release|Win32">\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               CommandLine="type $(InputPath) &gt; ..\..\$(ConfigurationName)\share\salome\resources\$(InputFileName)\r
-"\r
-                                               Outputs="..\..\$(ConfigurationName)\share\salome\resources\$(InputFileName)"/>\r
+                                               CommandLine="type $(InputPath) &gt; ..\..\$(ConfigurationName)\share\salome\resources\$(InputFileName)"\r
+                                               AdditionalDependencies="..\..\$(ConfigurationName)\share\salome\resources\$(InputFileName)"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
@@ -214,6 +213,12 @@
                                </FileConfiguration>\r
                        </File>\r
                </Filter>\r
+               <File\r
+                       RelativePath=".\All.rc">\r
+               </File>\r
+               <File\r
+                       RelativePath=".\resource.h">\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/adm_local/win32/KERNEL_SRC.ncb b/adm_local/win32/KERNEL_SRC.ncb
index f330419709cb55fcb40c1aff5a87eadf8501fb13..8d2c903f1dc05bb9db2785b8180d26ea2778740e 100755 (executable)
Binary files a/adm_local/win32/KERNEL_SRC.ncb and b/adm_local/win32/KERNEL_SRC.ncb differ

diff --git a/adm_local/win32/KERNEL_SRC.suo b/adm_local/win32/KERNEL_SRC.suo
index 430d26bff8c88c496c25b16a01c3ad1eabcce966..3d9b33bfb6b6de0bbd40b3b054c99d57f8d0d549 100755 (executable)
Binary files a/adm_local/win32/KERNEL_SRC.suo and b/adm_local/win32/KERNEL_SRC.suo differ

diff --git a/adm_local/win32/Salome_WNT.vcproj b/adm_local/win32/Salome_WNT.vcproj
index 1ad4ab57a4855aaa39dbbfaf8c726e055e6bfafc..c63ca59f9aa1a1671de43852382355a9aeb468ec 100755 (executable)
--- a/adm_local/win32/Salome_WNT.vcproj
+++ b/adm_local/win32/Salome_WNT.vcproj
@@ -172,25 +172,6 @@
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl">\r
-                       <File\r
-                               RelativePath=".\NCollection_DataMap1.hxx">\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               CommandLine="type $(InputPath) &gt; $(KERNEL_SRC_DIR)\$(ConfigurationName)\include\$(InputName).hxx\r
-"\r
-                                               Outputs="$(KERNEL_SRC_DIR)\$(ConfigurationName)\include\$(InputName).hxx"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               CommandLine="type $(InputPath) &gt; ..\..\include\$(InputName).hxx\r
-"\r
-                                               Outputs="..\..\include\$(InputName).hxx"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
                        <File\r
                                RelativePath="SALOME_WNT.hxx">\r
                                <FileConfiguration\r