fix scicos-cli compilation on Windows 14/17314/2
Antoine ELIAS [Tue, 13 Oct 2015 08:50:46 +0000 (10:50 +0200)]
Change-Id: Iba7e4f4209c5108cfc90c2cdc1932b081d7e9c66

scilab/modules/scicos/src/c/Output_stream_Import.def
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
scilab/modules/scicos/src/c/core_Import.def

index 2efdc12..148a21b 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -273,21 +273,43 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_pointer_xproperty.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_debug.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_debug_count.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_log.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_new.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_setfield.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_time.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_blockerror.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_model2blk.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_xproperty.cpp" />
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_sig2data.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_var2vec.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_vec2var.cpp" />
     <ClCompile Include="..\..\..\sci_gateway\c\sci_loadScicos.c" />
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_validvar.cpp" />
+    <ClCompile Include="..\..\cpp\Controller.cpp" />
+    <ClCompile Include="..\..\cpp\controller_helpers.cpp" />
     <ClCompile Include="..\..\cpp\il_sim.cpp" />
     <ClCompile Include="..\..\cpp\il_state.cpp" />
     <ClCompile Include="..\..\cpp\createblklist.cpp" />
     <ClCompile Include="..\..\cpp\extractblklist.cpp" />
+    <ClCompile Include="..\..\cpp\LoggerView.cpp" />
+    <ClCompile Include="..\..\cpp\Model.cpp" />
+    <ClCompile Include="..\..\cpp\Model_getObjectProperties.cpp" />
+    <ClCompile Include="..\..\cpp\Model_setObjectProperties.cpp" />
     <ClCompile Include="..\..\cpp\sciblk2.cpp" />
     <ClCompile Include="..\..\cpp\sciblk4.cpp" />
     <ClCompile Include="..\..\cpp\var2vec.cpp" />
     <ClCompile Include="..\..\cpp\vec2var.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\Adapters.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\BlockAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\CprAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\DiagramAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\GraphicsAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\LinkAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\ModelAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\ParamsAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\ScsAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\StateAdapter.cpp" />
+    <ClCompile Include="..\..\cpp\view_scilab\TextAdapter.cpp" />
     <ClCompile Include="..\ddaskr.c" />
     <ClCompile Include="..\DllmainScicos.c" />
     <ClCompile Include="..\ezxml.c" />
@@ -306,12 +328,36 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\var2sci.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\includes\Controller.hxx" />
+    <ClInclude Include="..\..\..\includes\Model.hxx" />
+    <ClInclude Include="..\..\..\includes\model\BaseObject.hxx" />
+    <ClInclude Include="..\..\..\includes\View.hxx" />
+    <ClInclude Include="..\..\..\includes\view_scilab\Adapters.hxx" />
+    <ClInclude Include="..\..\cpp\controller_helpers.hxx" />
     <ClInclude Include="..\..\cpp\createblklist.hxx" />
     <ClInclude Include="..\..\cpp\extractblklist.hxx" />
     <ClInclude Include="..\..\cpp\copyvarfromtlist.hxx" />
+    <ClInclude Include="..\..\cpp\LoggerView.hxx" />
+    <ClInclude Include="..\..\cpp\model\Annotation.hxx" />
+    <ClInclude Include="..\..\cpp\model\Block.hxx" />
+    <ClInclude Include="..\..\cpp\model\Diagram.hxx" />
+    <ClInclude Include="..\..\cpp\model\Link.hxx" />
+    <ClInclude Include="..\..\cpp\model\Port.hxx" />
     <ClInclude Include="..\..\cpp\var2vec.hxx" />
     <ClInclude Include="..\..\cpp\vec2var.hxx" />
     <ClInclude Include="..\..\..\includes\dynlib_scicos.h" />
+    <ClInclude Include="..\..\cpp\view_scilab\BaseAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\BlockAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\CprAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\DiagramAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\GraphicsAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\LinkAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\ModelAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\ParamsAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\ports_management.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\ScsAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\StateAdapter.hxx" />
+    <ClInclude Include="..\..\cpp\view_scilab\TextAdapter.hxx" />
     <ClInclude Include="..\ddaskr.h" />
     <ClInclude Include="..\ezxml.h" />
     <ClInclude Include="..\..\..\includes\gw_scicos.h" />
@@ -387,4 +433,4 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 02688be..38017bb 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <Filter Include="Resource Files">
       <UniqueIdentifier>{1111ba6f-2a3d-4841-9870-995a4fc81bad}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\MVC">
+      <UniqueIdentifier>{8631d601-4f1f-4f1f-b459-3bf316f51420}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\MVC\view_scilab">
+      <UniqueIdentifier>{277421e7-70c6-4eac-8c74-27ca81d9067a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\MVC">
+      <UniqueIdentifier>{22c7b0e3-08cb-4962-b6c4-d73f9d409eac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\MVC\model">
+      <UniqueIdentifier>{2fa2159f-7d33-41ea-b8d9-5e4f8733e8a4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\MVC\view_scilab">
+      <UniqueIdentifier>{dc18c789-8234-487d-be5e-2c9bc71d0cbb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\DllmainScicos.c">
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_vec2var.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\cpp\var2vec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\cpp\vec2var.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_coserror.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\sci_gateway\cpp\sci_model2blk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\Adapters.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\BlockAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\CprAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\DiagramAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\GraphicsAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\LinkAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\ModelAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\ParamsAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\ScsAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\StateAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\view_scilab\TextAdapter.cpp">
+      <Filter>Source Files\MVC\view_scilab</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\Controller.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\controller_helpers.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\LoggerView.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\Model.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\Model_getObjectProperties.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\Model_setObjectProperties.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\vec2var.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpp\var2vec.cpp">
+      <Filter>Source Files\MVC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_new.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_scicos_setfield.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_xproperty.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\sci_gateway\cpp\sci_sig2data.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\includes\dynlib_scicos.h">
     <ClInclude Include="..\ddaskr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\cpp\copyvarfromtlist.hxx">
+    <ClInclude Include="..\..\cpp\createblklist.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\cpp\var2vec.hxx">
+    <ClInclude Include="..\..\cpp\extractblklist.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\cpp\controller_helpers.hxx">
+      <Filter>Header Files\MVC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\LoggerView.hxx">
+      <Filter>Header Files\MVC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\copyvarfromtlist.hxx">
+      <Filter>Header Files\MVC</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\cpp\vec2var.hxx">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\MVC</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\cpp\createblklist.hxx">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\cpp\var2vec.hxx">
+      <Filter>Header Files\MVC</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\cpp\extractblklist.hxx">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\includes\Controller.hxx">
+      <Filter>Header Files\MVC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\includes\Model.hxx">
+      <Filter>Header Files\MVC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\includes\View.hxx">
+      <Filter>Header Files\MVC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\model\Annotation.hxx">
+      <Filter>Header Files\MVC\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\model\Block.hxx">
+      <Filter>Header Files\MVC\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\model\Diagram.hxx">
+      <Filter>Header Files\MVC\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\model\Link.hxx">
+      <Filter>Header Files\MVC\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\model\Port.hxx">
+      <Filter>Header Files\MVC\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\BaseAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\BlockAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\CprAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\DiagramAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\GraphicsAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\LinkAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\ModelAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\ParamsAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\ports_management.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\ScsAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\StateAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cpp\view_scilab\TextAdapter.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\includes\model\BaseObject.hxx">
+      <Filter>Header Files\MVC\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\includes\view_scilab\Adapters.hxx">
+      <Filter>Header Files\MVC\view_scilab</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index b9b3023..900c103 100644 (file)
@@ -4,12 +4,9 @@ LIBRARY    core.dll
 EXPORTS
 ;
 ; core
-com_
 MyHeapAlloc
 MyHeapFree
 MyHeapRealloc
 xscion_
-iop_
-ierode_
 ismenu
 GetCommand