Reorganization
Allan Cornet [Tue, 29 Aug 2006 14:47:34 +0000 (14:47 +0000)]
move files in core ,io , cacsd modules (dependencies)

20 files changed:
scilab/modules/cacsd/sci_gateway/fortran/sci_linmeq.f [moved from scilab/routines/interf/intlinmeq.f with 99% similarity]
scilab/modules/cacsd/src/fortran/cacsd_f.vfproj
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/cs2st.c [moved from scilab/routines/interf/cs2st.c with 93% similarity]
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/hmcreate.f [moved from scilab/routines/interf/hmcreate.f with 99% similarity]
scilab/modules/core/src/fortran/hndlops.f [moved from scilab/routines/interf/hndlops.f with 99% similarity]
scilab/modules/core/src/fortran/indxg.f [moved from scilab/routines/interf/indxg.f with 99% similarity]
scilab/modules/core/src/fortran/isany.f [moved from scilab/routines/interf/isany.f with 97% similarity]
scilab/modules/core/src/fortran/misops.f [moved from scilab/routines/interf/misops.f with 98% similarity]
scilab/modules/core/src/fortran/stack0.f [moved from scilab/routines/interf/stack0.f with 97% similarity]
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/io/src/fortran/newsave.f [moved from scilab/routines/interf/newsave.f with 97% similarity]
scilab/modules/io/src/fortran/v2cunit.f [moved from scilab/routines/interf/v2cunit.f with 98% similarity]
scilab/modules/io/src/fortran/v2unit.f [moved from scilab/routines/interf/v2unit.f with 98% similarity]
scilab/routines/interf/Interf.c [deleted file]
scilab/routines/interf/ciargc.c [deleted file]
scilab/routines/interf/ctest.c [deleted file]
scilab/routines/interf/interf.vcproj
scilab/routines/interf/interf_f/interf_f.vfproj

similarity index 99%
rename from scilab/routines/interf/intlinmeq.f
rename to scilab/modules/cacsd/sci_gateway/fortran/sci_linmeq.f
index 7995b57..b90521e 100644 (file)
@@ -123,7 +123,7 @@ C
 C
       SUBROUTINE intlinmeq  (fname)
 
-      include '../stack.h'
+      include 'stack.h'
       character*(*) fname
 
 
@@ -747,7 +747,7 @@ C *** Last line of LINMEQ ***
       end 
 
       logical function iscomplex(pos)
-      include '../stack.h'
+      include 'stack.h'
       integer pos
 c
       integer iadr,sadr
index e02058e..1fffa8f 100644 (file)
@@ -6,32 +6,32 @@
                <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def cacsd_f.def &gt;nul
 copy cacsd_f.def ..\..\..\..\..\libs\cacsd_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib" SuppressStartupBanner="true"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
+                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="static /threads" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def cacsd_f.def &gt;nul
 copy cacsd_f.def ..\..\..\..\..\libs\cacsd_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="static /threads" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib" SuppressStartupBanner="true"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
+                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../../libs/cacsd_f.lib" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="arl2.f"/>
@@ -79,6 +79,7 @@ cd .."/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_gspec.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_hinf.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_ldiv.f"/>
+               <File RelativePath="..\..\sci_gateway\fortran\sci_linmeq.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_ltitr.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_mucomp.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_ppol.f"/>
index 9e285cd..23b61b6 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\cs2st.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\csignal.c"
                                >
                        </File>
similarity index 93%
rename from scilab/routines/interf/cs2st.c
rename to scilab/modules/core/src/c/cs2st.c
index 82a573f..87be2ee 100644 (file)
@@ -3,7 +3,7 @@
  *    jpc@cereve.enpc.fr 
  --------------------------------------------------------------------------*/
 
-#include "../machine.h" 
+#include "machine.h" 
 
 int C2F(cs2st)(i,ires)
      integer *i,*ires;
index ca508ab..e0f499a 100644 (file)
@@ -6,32 +6,32 @@
                <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def core_f.def &gt;nul
 copy core_f.def ..\..\..\..\..\libs\core_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
+                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def core_f.def &gt;nul
 copy core_f.def ..\..\..\..\..\libs\core_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
+                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="algebre.f"/>
@@ -131,9 +131,13 @@ cd .."/>
                <File RelativePath="getpro.f"/>
                <File RelativePath="getstr.f"/>
                <File RelativePath="getsym.f"/>
+               <File RelativePath="hmcreate.f"/>
+               <File RelativePath="hndlops.f"/>
+               <File RelativePath="indxg.f"/>
                <File RelativePath="inibrk.f"/>
                <File RelativePath="inisci.f"/>
                <File RelativePath="intstr.f"/>
+               <File RelativePath="isany.f"/>
                <File RelativePath="isbrk.f"/>
                <File RelativePath="iseye.f"/>
                <File RelativePath="isnum.f"/>
@@ -148,6 +152,7 @@ cd .."/>
                <File RelativePath="matc.f"/>
                <File RelativePath="matz.f"/>
                <File RelativePath="matzs.f"/>
+               <File RelativePath="misops.f"/>
                <File RelativePath="mkindx.f"/>
                <File RelativePath="mklist.f"/>
                <File RelativePath="mname.f"/>
@@ -217,6 +222,7 @@ cd .."/>
                <File RelativePath="sigbas.f"/>
                <File RelativePath="skpins.f"/>
                <File RelativePath="stack.f"/>
+               <File RelativePath="stack0.f"/>
                <File RelativePath="stackg.f"/>
                <File RelativePath="stackgl.f"/>
                <File RelativePath="stackp.f"/>
similarity index 99%
rename from scilab/routines/interf/hmcreate.f
rename to scilab/modules/core/src/fortran/hmcreate.f
index 784b682..7aaba54 100644 (file)
@@ -5,7 +5,7 @@ c     sz : dimensions
 c     typv : Matlab class
 c     iflag = 0 or 1 (real or complex)
 
-      include '../stack.h'
+      include 'stack.h'
       integer nz,sz(nz),szv,retval
       integer typv
       integer hmsz
@@ -187,7 +187,7 @@ c        entry (3,1) = "entries"
       integer function hmsz(nz,sz,typv,iflag)
 c     sz = dimensions
 
-      include '../stack.h'
+      include 'stack.h'
       integer nz,sz(nz)
       integer nv
       integer typv
similarity index 99%
rename from scilab/routines/interf/hndlops.f
rename to scilab/modules/core/src/fortran/hndlops.f
index 9513dbe..b0367f2 100644 (file)
@@ -3,7 +3,7 @@ c
 c     operations sur les matrices de handle
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
       integer op
 c     
       integer dot,colon,quote
@@ -91,7 +91,7 @@ c
 c     .'
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer vol
       integer iadr,sadr
@@ -131,7 +131,7 @@ c
 c     [a b]
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer iadr,sadr
 c     
@@ -185,7 +185,7 @@ c
 c     [a;b]
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer iadr,sadr
 c     
@@ -256,7 +256,7 @@ c
 c     B=A(i)
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer iadr,sadr
 c     
@@ -377,7 +377,7 @@ c
 c     B=A(i,j)
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer iadr,sadr
 c     
@@ -492,7 +492,7 @@ c
 c     A(i)=B
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       logical isany
       integer top0
@@ -796,7 +796,7 @@ c
 c     A(i,j)=B
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer top0
       integer iadr,sadr
@@ -1119,7 +1119,7 @@ c
 c     ==  <>
 c     
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer top0,op
       double precision  e1,e2,e1r,e2r,e1i,e2i
similarity index 99%
rename from scilab/routines/interf/indxg.f
rename to scilab/modules/core/src/fortran/indxg.f
index 5ba1d5d..a798f1b 100644 (file)
@@ -20,7 +20,7 @@ c               implicit indice ":" gives mi=-1,mx=siz
 c!
 
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
       integer siz,iopt1,iopt
       double precision e1,v(3)
       integer iadr,sadr
@@ -251,7 +251,7 @@ c!
 *     modification by Bruno so as to use a faster algorithm (7 May 2002)
 
       implicit none
-      include '../stack.h'
+      include 'stack.h'
       integer il, siz, ilr, mi, mx, lw
 
       integer i, k, ilc
similarity index 97%
rename from scilab/routines/interf/isany.f
rename to scilab/modules/core/src/fortran/isany.f
index 02f7697..ff517ef 100644 (file)
@@ -2,7 +2,7 @@
 c     given il the adress of the begining of a scilab variable 
 c     in istk isany returns true if one of the variable entry is non
 c     zero or true
-      include '../stack.h'
+      include 'stack.h'
       integer genisany
       integer iadr,sadr
 c
similarity index 98%
rename from scilab/routines/interf/misops.f
rename to scilab/modules/core/src/fortran/misops.f
index be90395..5729418 100644 (file)
@@ -3,7 +3,7 @@ c     ================================== ( Inria    ) =============
 c     operations sur les types secondaires (macros librairies...)
 c     =============================================================
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer iadr,sadr,op,rhs1,r
       integer equal,less,great,insert,extrac
@@ -61,7 +61,7 @@ c
 
       subroutine libops
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer iadr,sadr,op,r
       integer id(nsiz)
@@ -249,7 +249,7 @@ c     *call* macro
 
       subroutine macroops
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     
       integer iadr,sadr,op,rhs1
       integer equal,less,great,insert,extrac
similarity index 97%
rename from scilab/routines/interf/stack0.f
rename to scilab/modules/core/src/fortran/stack0.f
index 2c649ea..95dfd7f 100644 (file)
@@ -19,7 +19,7 @@ c     we copy from 0 to p-1 ( then istk(il1+k) k>=p
 c     are not scratched and then from n-1 to p 
 c     ===============================
 c     Copyright ENPC/INRIA
-      include '../stack.h'
+      include 'stack.h'
       integer n,il1,dl1 
       integer iadr,sadr
       iadr(l)=l+l-1
@@ -42,7 +42,7 @@ c     =============================
 c     same as stacki2d but for reals 
 c     to double 
 c     ===============================
-      include '../stack.h'
+      include 'stack.h'
       integer n,sl1,dl1 
       integer iadr,sadr
       iadr(l)=l+l-1
@@ -65,7 +65,7 @@ c     =============================
 c     same as stacki2d but for characters
 c     to integer and overlapping region 
 c     ===============================
-      include '../stack.h'
+      include 'stack.h'
       integer n,sl1,il1
       integer iadr,cadr
       iadr(l)=l+l-1
index ea0a461..322e3a8 100644 (file)
@@ -6,32 +6,32 @@
                <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../../core/includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def io_f.def &gt;nul
 copy io_f.def ..\..\..\..\..\libs\io_f.def &gt;nul
 del *.def &gt;nul
 cd .." Description="Create io_f.def"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../../core/includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
+                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/io_f.lib" SuppressStartupBanner="true"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/io_f.lib" SuppressStartupBanner="true"/></Configuration>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def io_f.def &gt;nul
 copy io_f.def ..\..\..\..\..\libs\io_f.def &gt;nul
 del *.def &gt;nul
 cd .." Description="Create io_f.def"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
+                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../../libs/io_f.lib" SuppressStartupBanner="true"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/io_f.lib" SuppressStartupBanner="true"/></Configuration></Configurations>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="..\..\sci_gateway\fortran\intdeff.f"/>
@@ -55,7 +55,10 @@ cd .." Description="Create io_f.def"/>
                <File RelativePath="..\..\sci_gateway\fortran\intwritb.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intwrite.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intwrite4b.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\oldloadsave.f"/></Filter>
+               <File RelativePath="newsave.f"/>
+               <File RelativePath="..\..\sci_gateway\fortran\oldloadsave.f"/>
+               <File RelativePath="v2cunit.f"/>
+               <File RelativePath="v2unit.f"/></Filter>
                <Filter Name="Header Files" Filter="fi;fd"/>
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
                <File RelativePath="..\..\sci_gateway\io.fundef"/></Files>
similarity index 97%
rename from scilab/routines/interf/newsave.f
rename to scilab/modules/io/src/fortran/newsave.f
index 7eaf908..8793e3d 100644 (file)
@@ -1,7 +1,7 @@
       
       subroutine intsave
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
       logical opened,ptover,cremat
       integer fd,vol,top0,srhs,bl(nsiz)
       double precision res
@@ -130,7 +130,7 @@ c     Loads variables stored in a file. if id1 is a valid variable name
 c     (id1(1).ne.blank) and if this variable if loaded k1 ist set to its
 c     index in the stack
 c
-      include '../stack.h'
+      include 'stack.h'
       integer id1(nsiz),k1,vol
       logical opened,cremat,ptover,eqid
       integer fd,id(nsiz),semi,blank,top0,endian,getendian,it,ssym
@@ -336,7 +336,7 @@ c     return a nul variable
 
       subroutine savevar(fd,id,il,vol,ierr)
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd,id(nsiz),vol
       integer iadr
@@ -403,7 +403,7 @@ c     .  call an external function
 
       subroutine loadvar(fd,id,il,nn,ierr)
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd,id(nsiz),vol
       integer iadr
@@ -467,7 +467,7 @@ c     read id and type
       subroutine savelist(fd,il,ierr)
 c     Copyright INRIA
 c     Save a matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       logical ptover,cremat
@@ -577,7 +577,7 @@ c     finish
       subroutine loadlist(fd,il,nn,ierr)
 c     Copyright INRIA
 c     Save a matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       logical ptover,cremat
@@ -717,7 +717,7 @@ c     finish
       subroutine savemat(fd,il,ierr)
 c     Copyright INRIA
 c     Save a matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -742,7 +742,7 @@ c     write matrix elements
       subroutine loadmat(fd,il,n,ierr)
 c     Copyright INRIA
 c     Save a matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*3 fmti,fmtd
       integer sadr
@@ -779,7 +779,7 @@ c      n=4+2*mn
       subroutine savepol(fd,il,ierr)
 c     Copyright INRIA
 c     Save a matrix of polynomials
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -805,7 +805,7 @@ c     write polynomials coefficients
       subroutine loadpol(fd,il,n,ierr)
 c     Copyright INRIA
 c     Load a matrix of polynomials
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*3 fmti,fmtd
       integer sadr
@@ -853,7 +853,7 @@ c      n=9+mn+2*mn1
       subroutine savestr(fd,il,ierr)
 c     Copyright INRIA
 c     Save a matrix of strings
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
 
@@ -878,7 +878,7 @@ c     write characters
       subroutine loadstr(fd,il,n,ierr)
 c     Copyright INRIA
 c     Load a matrix of strings
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*2 fmti,fmtd
       integer sadr
@@ -921,7 +921,7 @@ c     read characters
       subroutine savebool(fd,il,ierr)
 c     Copyright INRIA
 c     Save a matrix of boolean
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*2 fmti,fmtd
@@ -943,7 +943,7 @@ c     write matrix elements
       subroutine loadbool(fd,il,n,ierr)
 c     Copyright INRIA
 c     Load a matrix of boolean
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*2 fmti,fmtd
       integer sadr
@@ -978,7 +978,7 @@ c     read matrix elements
       subroutine savefun(fd,il,ierr)
 c     Copyright INRIA
 c     Save  a function
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*2 fmti,fmtd
@@ -1003,7 +1003,7 @@ c     write function header without type
       subroutine loadfun(fd,il,n,ierr)
 c     Copyright INRIA
 c     Load a function
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*2 fmti,fmtd
@@ -1060,7 +1060,7 @@ c     read function  without type
       subroutine savecfun(fd,il,ierr)
 c     Copyright INRIA
 c     Save a compiled function
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*2 fmti,fmtd
@@ -1085,7 +1085,7 @@ c     write function header without type
       subroutine loadcfun(fd,il,n,ierr)
 c     Copyright INRIA
 c     Load a compiled function
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       integer sadr
@@ -1143,7 +1143,7 @@ c     read function  without type
       subroutine savesparse(fd,il,ierr)
 c     Copyright INRIA
 c     Save a sparse matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -1172,7 +1172,7 @@ c     write matrix elements
       subroutine loadsparse(fd,il,n,ierr)
 c     Copyright INRIA
 c     load a sparse matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*3 fmti,fmtd
       integer sadr
@@ -1221,7 +1221,7 @@ c      n=5+m+nel+2*mn
       subroutine savespb(fd,il,ierr)
 c     Copyright INRIA
 c     Save a sparse matrix of boolean
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -1242,7 +1242,7 @@ c     write matrix elements
       subroutine loadspb(fd,il,n,ierr)
 c     Copyright INRIA
 c     Load a sparse matrix of boolean
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*3 fmti,fmtd
       integer sadr 
@@ -1280,7 +1280,7 @@ c     read matrix elements
 c     [14,n,codagedupath(n),nombre-de-nom,nclas+1 cases,suite des noms]
 c     Copyright INRIA
 c     Save a sparse matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -1299,7 +1299,7 @@ c
 c     [14,n,codagedupath(n),nombre-de-nom,nclas+1 cases,suite des noms]
 c     Copyright INRIA
 c     Save a sparse matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -1346,7 +1346,7 @@ c
       subroutine savemsp(fd,il,ierr)
 c     Copyright INRIA
 c     Save a sparse matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -1375,7 +1375,7 @@ c     write matrix elements
       subroutine loadmsp(fd,il,n,ierr)
 c     Copyright INRIA
 c     load a sparse matrix of numbers
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*3 fmti,fmtd
       integer sadr
@@ -1425,7 +1425,7 @@ c      n=5+n+nel+2*mn
       subroutine saveptr(fd,il,ierr)
 c     Copyright INRIA
 c     Save a pointer on sparse lu factorization
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -1452,7 +1452,7 @@ c      return
       subroutine loadptr(fd,il,n,ierr)
 c     Copyright INRIA
 c     Save a pointer on sparse lu factorization
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       character*3 fmti,fmtd
       integer sadr
@@ -1482,7 +1482,7 @@ c      n=4+2*1
       subroutine saveint(fd,il,ierr)
 c     Copyright INRIA
 c     Save a pointer on sparse lu factorization
-      include '../stack.h'
+      include 'stack.h'
 c
       integer fd
       character*3 fmti,fmtd
@@ -1519,7 +1519,7 @@ c     write  header type excluded
       subroutine loadint(fd,il,n,ierr)
 c     Copyright INRIA
 c     Save a pointer on sparse lu factorization
-      include '../stack.h'
+      include 'stack.h'
       integer fd
       external memused
       integer memused
similarity index 98%
rename from scilab/routines/interf/v2cunit.f
rename to scilab/modules/io/src/fortran/v2cunit.f
index 8511029..b85ebd6 100644 (file)
@@ -2,7 +2,7 @@
 c     given variable #k (scalar or string) and mode 
 c     v2unit return a  logical unit attached to corresponding file
 
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c
       logical opened
       integer fd
similarity index 98%
rename from scilab/routines/interf/v2unit.f
rename to scilab/modules/io/src/fortran/v2unit.f
index 10b9290..577c0be 100644 (file)
@@ -2,7 +2,7 @@
 c     given variable #k (scalar or string) and mode 
 c     v2unit return a  logical unit attached to corresponding file
 
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c
       logical opened
       integer mode(2)
diff --git a/scilab/routines/interf/Interf.c b/scilab/routines/interf/Interf.c
deleted file mode 100644 (file)
index 4522aec..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-/*------------------------------------------------------------------------
- *    Copyright (C) 1998-2000 Enpc/Jean-Philippe Chancelier
- *    jpc@cereve.enpc.fr 
- --------------------------------------------------------------------------*/
-
-#include "../stack-c.h"
-
-#define MAX_ENV 256 
-
-#ifdef NORANDLIB 
-
-C2F(randlib)()
-{
-  int ilib=0;
-  static char name[MAX_ENV];
-  static char *names[]={ "randlib",(char *) 0};
-  static char *files[] = {
-    name,
-    (char *) 0
-  };
-  int nums[1];
-  static int Buildname=0;
-  static int randpos = -1;
-  if ( Buildname == 0) { BuildName(name,"rand.so"); Buildname++;}
-  CallDynInterf(&randpos,1,0,names,nums,files);
-}  
-
-#endif 
-
-#ifdef NODCD 
-
-C2F(dcd)()
-{
-  int ilib=0;
-  static char name[MAX_ENV];
-  static char *files[] = {
-    name,
-    (char *) 0
-  };
-  int nums[1];
-  static char *names[] = {"dcd",(char *)0};
-  static int Buildname=0;
-  static int randpos = -1;
-  if ( Buildname == 0) { BuildName(name,"dcd.so"); Buildname++;}
-  CallDynInterf(&randpos,1,0,names,nums,files);
-}  
-
-#endif 
-
-#ifdef NOSCICOS 
-
-static char scicos_name[MAX_ENV];
-static char *scicos_names[]={"intcos",(char *) 0};
-static char *scicos_files[] = {
-  scicos_name,
-  (char *) 0
-};
-int scicos_nums[1];
-static int intcospos=-1;
-
-void C2F(intcos) ()
-{
-  static int Buildname=0;
-  if ( Buildname == 0) { BuildName(scicos_name,"scicos.so"); Buildname++;}
-  CallDynInterf(&intcospos,2,1,scicos_names,scicos_nums,scicos_files);
-}
-
-#endif 
-
-#ifdef NOSIGNAL
-
-void C2F(sigelm) ()
-{
-  int Error=9999;
-  sciprint("Scicos interface not loaded \n");
-  Error(9999);
-  return;
-}
-
-void C2F(datatf) ()
-{
-  int Error=9999;
-  sciprint("Scicos interface not loaded \n");
-  Error(9999);
-  return;
-}
-
-#endif 
-
-
-#ifdef NOSOUND 
-
-C2F(matfileio)()
-{
-  int Error=9999;
-  sciprint("Sound and <<binary read>> interface not loaded \n");
-  Error(9999);
-  return;
-}  
-
-#endif 
-
-
-#ifdef NOSPARSE 
-
-void C2F(spelm) ()
-{
-  int Error=9999;
-  sciprint("Sparse interface not loaded \n");
-  Error(9999);
-  return;
-}
-
-void C2F(lspops) ()
-{
-  int Error=9999;
-  sciprint("Sparse interface not loaded \n");
-  Error(9999);
-  return;
-}
-
-void C2F(spops) ()
-{
-  int Error=9999;
-  sciprint("Sparse interface not loaded \n");
-  Error(9999);
-  return;
-}
-
-#endif 
diff --git a/scilab/routines/interf/ciargc.c b/scilab/routines/interf/ciargc.c
deleted file mode 100644 (file)
index 3a99ef1..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-int ciargc()
-{
-  return IARGC();
-
-}
diff --git a/scilab/routines/interf/ctest.c b/scilab/routines/interf/ctest.c
deleted file mode 100644 (file)
index 8c58e61..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*------------------------------------------------------------------------
- *    Copyright (C) 1998-2000 Enpc/Jean-Philippe Chancelier
- *    jpc@cereve.enpc.fr 
- --------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <string.h>
-#include "../machine.h"
-
-C2F(ctest)(str,lstr,ilstr)
-     char str[];
-     int *lstr;
-     long int ilstr;
-{
-  int i;
-  fprintf(stderr,"The string transmitted [");
-  for (i=0;i<*lstr;i++)
-      fprintf(stderr,"%c",str[i]);
-  fprintf(stderr,"]\n");
-  strncpy(str,"A returned\n string\n",*lstr);
-  fprintf(stderr,"and now [%s],%d\n",str,strlen(str));
-  *lstr=strlen(str);
-}
-
-
-C2F(cvs2c)(n,line,str,csiz,alfa,alfb,lstr,lalfa,lalfb)
-     int *n,line[],*csiz;
-     char str[],alfa[],alfb[];
-     long int lstr,lalfa,lalfb;
-{
-  int eol=99,j;
-  for (j=0; j < *n; j++)
-    {
-      int m=line[j];
-      if ( m > *csiz || m < - *csiz) m=eol;
-      if ( m == eol )
-       str[j]= '\n';
-      else
-       str[j]= ( m < 0) ? alfb[-m] : alfa[m];
-    }
-}
-
-C2F(cvc2s)(n,line,str,csiz,alfa,alfb,lstr,lalfa,lalfb)
-     int *n,line[],*csiz;
-     char str[],alfa[],alfb[];
-     long int lstr,lalfa,lalfb;
-{
-  int eol=99,j ;
-  for (j = *n-1; j >= 0 ; j--)
-    {
-      int k,flag=0;
-      char mc=str[j];
-      for ( k =0 ; k < *csiz; k++)
-       {
-         if (mc == alfa[k] ) {
-           line[j]=k; flag=1;break;}
-         else  
-           if ( mc == alfb[k] ) 
-             {
-               line[j] = -(k); flag=1;break;}
-       }
-      if (flag==0) line[j]= eol;
-    }
-}
-
-
-
-
-
-
-
index cb676d4..a5b7a0e 100644 (file)
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
                        >
                        <File
-                               RelativePath=".\cs2st.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\ctest.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\hmops.c"
                                >
                        </File>
index 4b11c2d..9bff5bc 100644 (file)
@@ -6,44 +6,39 @@
                <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../modules/core/includes" OpenMPConditionalCompilation="false" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" Diagnostics="diagnosticsDisableAll" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def interf_f.def &gt;nul
 copy interf_f.def ..\..\..\..\libs\interf_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../modules/core/includes" OpenMPConditionalCompilation="false" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" Diagnostics="diagnosticsDisableAll" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../libs/interf_f.lib" SuppressStartupBanner="true" IgnoreAllDefaultLibraries="true"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
+                               <Tool Name="VFLibrarianTool" OutputFile="../../../libs/interf_f.lib" SuppressStartupBanner="true" IgnoreAllDefaultLibraries="true"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../modules/core/includes" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def interf_f.def &gt;nul
 copy interf_f.def ..\..\..\..\libs\interf_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../modules/core/includes" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../libs/interf_f.lib" SuppressStartupBanner="true"/>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
+                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../libs/interf_f.lib" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="..\followpath.f"/>
-               <File RelativePath="..\hmcreate.f"/>
-               <File RelativePath="..\hndlops.f"/>
-               <File RelativePath="..\indxg.f"/>
                <File RelativePath="..\insertfield.f"/>
                <File RelativePath="..\intl_e.f"/>
                <File RelativePath="..\intl_i.f"/>
-               <File RelativePath="..\intlinmeq.f"/>
                <File RelativePath="..\intlsqrsolve.f"/>
-               <File RelativePath="..\isany.f"/>
                <File RelativePath="..\logelm.f"/>
                <File RelativePath="..\logic.f"/>
                <File RelativePath="..\lstelm.f"/>
@@ -51,12 +46,7 @@ cd .."/>
                <File RelativePath="..\lstops.f"/>
                <File RelativePath="..\matold.f"/>
                <File RelativePath="..\matops.f"/>
-               <File RelativePath="..\matric.f"/>
-               <File RelativePath="..\misops.f"/>
-               <File RelativePath="..\newsave.f"/>
-               <File RelativePath="..\stack0.f"/>
-               <File RelativePath="..\v2cunit.f"/>
-               <File RelativePath="..\v2unit.f"/></Filter>
+               <File RelativePath="..\matric.f"/></Filter>
                <Filter Name="Header Files" Filter="fi;fd"/>
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>
        <Globals/></VisualStudioProject>