fix windows compilation after ffcd8e2e #2 61/15961/2
Clément DAVID [Tue, 17 Feb 2015 10:22:16 +0000 (11:22 +0100)]
Rational:
 includes/ should only contain file used in others modules
 src/cpp/ contains files used by gateways and business logic

Change-Id: If22d34d40de86edcd8cf34cbe3eb7f5acd5dcbe5

scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos/src/cpp/var2vec.hxx [moved from scilab/modules/scicos/includes/var2vec.hxx with 100% similarity]
scilab/modules/scicos/src/cpp/vec2var.hxx [moved from scilab/modules/scicos/includes/vec2var.hxx with 100% similarity]

index 4c0c1fa..ac52e9a 100644 (file)
@@ -334,9 +334,9 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClInclude Include="..\..\includes\View.hxx" />
     <ClInclude Include="..\cpp\il_sim.hxx" />
     <ClInclude Include="..\cpp\il_state.hxx" />
+    <ClInclude Include="..\cpp\LoggerView.hxx" />
     <ClInclude Include="..\cpp\var2vec.hxx" />
     <ClInclude Include="..\cpp\vec2var.hxx" />
-    <ClInclude Include="..\cpp\LoggerView.hxx" />
     <ClInclude Include="..\cpp\model\Annotation.hxx" />
     <ClInclude Include="..\cpp\model\Block.hxx" />
     <ClInclude Include="..\cpp\model\Diagram.hxx" />
index 0867684..c4608f0 100644 (file)
     <ClCompile Include="..\..\sci_gateway\cpp\sci_scicosim.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="..\..\sci_gateway\cpp\sci_var2vec.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_vec2var.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
->>>>>>> 6605e76... xcos : allow scicossim to call function and macros
     <ClCompile Include="..\cpp\il_sim.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="sciblk4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\var2vec.hxx">
+    <ClInclude Include="..\cpp\LoggerView.hxx">
       <Filter>Header Files\MVC</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\vec2var.hxx">
+    <ClInclude Include="..\cpp\var2vec.hxx">
       <Filter>Header Files\MVC</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\LoggerView.hxx">
+    <ClInclude Include="..\cpp\vec2var.hxx">
       <Filter>Header Files\MVC</Filter>
     </ClInclude>
     <ClInclude Include="..\cpp\view_scilab\TextAdapter.hxx">