clean compilation flags (windows)
Allan CORNET [Tue, 20 Jan 2009 11:11:41 +0000 (12:11 +0100)]
scilab/modules/core/examples/call_scilab/c/common/makefile.mak
scilab/modules/dynamic_link/macros/ilib_gen_Make.sci
scilab/modules/dynamic_link/src/scripts/Makedll.incl
scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak
scilab/modules/intersci/examples/Makefile.mak
scilab/modules/linear_algebra/examples/Makefile.mak
scilab/modules/scicos/macros/scicos_scicos/buildnewblock.sci

index e3a3f6b..35f0966 100644 (file)
@@ -30,5 +30,5 @@ RESOURCES= $(SCIDIR)/routines/wsci/Rscilab.res
 $(SCIDIR)/bin/prog.exe : $(OBJSC)
        @echo "Linking" 
        $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe" \
-       $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(XLIBSBIN) 
+       $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(SCILAB_LIBS) 
        @echo "done " $(SCIDIR)/bin/prog.exe 
index e1b9605..ff90f54 100644 (file)
@@ -82,7 +82,6 @@ function ilib_gen_Make_win32(name,table,files,libs,Makename,with_gateway,ldflags
   fd=mopen(Makename,"w");
   mfprintf(fd,"# generated by builder.sce: Please do not edit this file\n");
   mfprintf(fd,"# ------------------------------------------------------\n");
-  mfprintf(fd,"SHELL = /bin/sh\n");
   mfprintf(fd,"SCIDIR =%s\n",SCI);
   mfprintf(fd,"SCIDIR1 =%s\n",pathconvert(SCI,%f,%f,'w'));
   mfprintf(fd,"# name of the dll to be built\n"); 
@@ -105,7 +104,7 @@ function ilib_gen_Make_win32(name,table,files,libs,Makename,with_gateway,ldflags
   end
   
   for it=1:L 
-    table = tables(it)
+    table = tables(it);
     [mt,nt]=size(table);
  
     for i=1:mt ; 
@@ -119,7 +118,7 @@ function ilib_gen_Make_win32(name,table,files,libs,Makename,with_gateway,ldflags
   mfprintf(fd,"OTHERLIBS = ");
   for x=libs(:)' ; mfprintf(fd," %s.lib",x);end
   mfprintf(fd,"\n");
-  mfprintf(fd,"!include $(SCIDIR1)\\modules\\dynamic_link\\src\\scripts\\Makefile.incl.mak\n");
+  mfprintf(fd,"!include $(SCIDIR1)/modules/dynamic_link/src/scripts/Makefile.incl.mak\n");
   
   mexcflags = ' ';
   mexfflags = ' ';
@@ -135,7 +134,7 @@ function ilib_gen_Make_win32(name,table,files,libs,Makename,with_gateway,ldflags
   mfprintf(fd,"FFLAGS = $(FC_OPTIONS) -DFORDLL -I\""$(SCIDIR)/modules/core/includes\"""+...
           mexfflags + fflags +"\n"); 
   mfprintf(fd,"EXTRA_LDFLAGS = "+ ldflags+"\n");
-  mfprintf(fd,"!include $(SCIDIR1)\\modules\\dynamic_link\\src\\scripts\\Makedll.incl \n");
+  mfprintf(fd,"!include $(SCIDIR1)/modules/dynamic_link/src/scripts/Makedll.incl \n");
   mclose(fd);
 endfunction
 //---------------------------------------------------------------------------------------
@@ -220,7 +219,7 @@ function ilib_gen_Make_lcc(name,table,files,libs,Makename,with_gateway,ldflags,c
   mfprintf(fd,"\nall :: $(LIBRARY).dll\n");
   mfprintf(fd,"\n$(LIBRARY).dll: $(OBJS)\n");
   mfprintf(fd,"\t"+"$(DUMPEXTS) -o ""$(LIBRARY).def"" ""$*"" $(OBJS)\n");
-  mfprintf(fd,"\t"+"$(LINKER) $(LINKER_FLAGS) $(OBJS) $(OTHERLIBS) $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) $(EXTRA_LDFLAGS) $*.def -o $(LIBRARY).dll\n\n");
+  mfprintf(fd,"\t"+"$(LINKER) $(LINKER_FLAGS) $(OBJS) $(OTHERLIBS) $(SCIIMPLIB) $(SCILAB_LIBS) $(EXTRA_LDFLAGS) $*.def -o $(LIBRARY).dll\n\n");
 
   for x=files(:)' ;
     managed_ext_obj = ['.obj','.o'];
index 8d525b5..e2f3d4d 100644 (file)
@@ -9,7 +9,7 @@ $(LIBRARY).dll: $(OBJS)
        @echo Creation of dll $(LIBRARY).dll and import lib from ...
        @echo $(OBJS)
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $(OBJS) $(OTHERLIBS) $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) $(EXTRA_LDFLAGS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $(OBJS) $(OTHERLIBS) $(SCIIMPLIB) $(SCILAB_LIBS) $(EXTRA_LDFLAGS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 clean  ::
        -del *.obj
index 7abf6dc..ef9915d 100644 (file)
@@ -28,17 +28,17 @@ LINKER_OPTIMISATION_MODE=/RELEASE
 CC__OPTIMISATION_MODE=-Z7 -O2
 !ENDIF
 
-CC_COMMON=-D__MSC__ $(DWIN) -c -DSTRICT -D_CRT_SECURE_NO_DEPRECATE -D__MAKEFILEVC__ -nologo $(INCLUDES) $(DTK) $(USE_MT)
+CC_COMMON=-D__MSC__ $(DWIN) -c -DSTRICT -D_CRT_SECURE_NO_DEPRECATE -D__MAKEFILEVC__ -nologo $(INCLUDES)
 LINKER_FLAGS=/NOLOGO $(MACHINE) $(LINKER_OPTIMISATION_MODE)
 CC_OPTIONS = $(CC_COMMON) -W3 -Gd $(CC__OPTIMISATION_MODE)
 
 # include options 
-INCLUDES=-I"$(SCIDIR)\libs\MALLOC\includes" \
--I"$(SCIDIR)\modules\core\includes" \
--I"$(SCIDIR)\modules\output_stream\includes" \
--I"$(SCIDIR)\modules\jvm\includes" \
--I"$(SCIDIR)\modules\localization\includes" \
--I"$(SCIDIR)\libs\intl" \
+INCLUDES=-I"$(SCIDIR)/libs/MALLOC/includes" \
+-I"$(SCIDIR)/modules/core/includes" \
+-I"$(SCIDIR)/modules/output_stream/includes" \
+-I"$(SCIDIR)/modules/jvm/includes" \
+-I"$(SCIDIR)/modules/localization/includes" \
+-I"$(SCIDIR)/libs/intl" \
 -I"$(SCIDIR)/libs/f2c" \
 -I"$(SCIDIR)/modules/mexlib/includes" \
 -I"$(SCIDIR)/modules/localization/includes" \
@@ -72,18 +72,14 @@ RCVARS=-r -DWIN32
 #==================================================
 # Libraries 
 #==================================================
-GUIFLAGS=-SUBSYSTEM:console
-GUI=comctl32.lib wsock32.lib shell32.lib winspool.lib user32.lib gdi32.lib comdlg32.lib kernel32.lib advapi32.lib 
-GUILIBS=-NODEFAULTLIB:libc.lib -NODEFAULTLIB:msvcrt.lib $(GUI) libcmt.lib oldnames.lib
-
-# XLIBSBIN is used by the binary version of Scilab for linking examples
-XLIBSBIN="$(SCIDIR1)\bin\MALLOC.lib" "$(SCIDIR1)\bin\blasplus.lib" \
-"$(SCIDIR1)\bin\libf2c.lib" "$(SCIDIR1)\bin\lapack.lib" \
-"$(SCIDIR1)\bin\scicos.lib" "$(SCIDIR1)\bin\intersci.lib" \
-"$(SCIDIR1)\bin\scioutput_stream.lib" "$(SCIDIR1)\bin\dynamic_link.lib" \
-"$(SCIDIR1)\bin\integer.lib" "$(SCIDIR1)\bin\optimization_f.lib" \
-"$(SCIDIR1)\bin\libjvm.lib" "$(SCIDIR1)\bin\scilocalization.lib" \
-"$(SCIDIR1)\bin\libintl.lib" "$(SCIDIR1)\bin\linpack_f.lib"
+# SCILAB_LIBS is used by the binary version of Scilab for linking external codes
+SCILAB_LIBS="$(SCIDIR1)/bin/MALLOC.lib" "$(SCIDIR1)/bin/blasplus.lib" \
+"$(SCIDIR1)/bin/libf2c.lib" "$(SCIDIR1)/bin/lapack.lib" \
+"$(SCIDIR1)/bin/scicos.lib" "$(SCIDIR1)/bin/intersci.lib" \
+"$(SCIDIR1)/bin/scioutput_stream.lib" "$(SCIDIR1)/bin/dynamic_link.lib" \
+"$(SCIDIR1)/bin/integer.lib" "$(SCIDIR1)/bin/optimization_f.lib" \
+"$(SCIDIR1)/bin/libjvm.lib" "$(SCIDIR1)/bin/scilocalization.lib" \
+"$(SCIDIR1)/bin/libintl.lib" "$(SCIDIR1)/bin/linpack_f.lib"
 #==================================================
 .c.obj :
        @echo ------------- Compile file $< --------------
@@ -103,7 +99,7 @@ XLIBSBIN="$(SCIDIR1)\bin\MALLOC.lib" "$(SCIDIR1)\bin\blasplus.lib" \
 
 .f.obj :
        @echo ----------- Compile file $*.f (using f2c) -------------
-       @"$(SCIDIR1)\bin\f2c.exe" -I"$(SCIDIR1)\modules\core\includes" $(FFLAGS) $*.f 2>NUL
+       @"$(SCIDIR1)/bin/f2c.exe" -I"$(SCIDIR1)/modules/core/includes" $(FFLAGS) $*.f 2>NUL
        @$(CC) $(CFLAGS) $*.c 
 !IF "$(DEBUG_SCILAB_DYNAMIC_LINK)" == "YES"
 
index b2b34b5..b26165e 100644 (file)
@@ -28,7 +28,7 @@ dlls : $(DLLS)
 ex1.dll : ex1fi.obj ex1c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**   $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**   $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex1fi.obj : ex1fi.desc
        @$(INTERSCI) $* 
@@ -39,7 +39,7 @@ ex1fi.obj : ex1fi.desc
 ex2.dll : ex2fi.obj ex2f.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex2fi.obj : ex2fi.desc
        @$(INTERSCI) $* 
@@ -50,7 +50,7 @@ ex2fi.obj : ex2fi.desc
 ex3.dll : ex3fi.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex3fi.obj : ex3fi.desc
        @$(INTERSCI) $* 
@@ -61,7 +61,7 @@ ex3fi.obj : ex3fi.desc
 ex4.dll : ex4fi.obj ex4f.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex4fi.obj : ex4fi.desc
        @$(INTERSCI) $* 
@@ -72,7 +72,7 @@ ex4fi.obj : ex4fi.desc
 ex5.dll : ex5fi.obj ex5f.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex5fi.obj : ex5fi.desc
        @$(INTERSCI) $* 
@@ -84,7 +84,7 @@ ex5fi.obj : ex5fi.desc
 ex6.dll : ex6fi.obj ex6c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex6fi.obj : ex6fi.desc
        @$(INTERSCI) $* 
@@ -95,7 +95,7 @@ ex6fi.obj : ex6fi.desc
 ex7.dll : ex7fi.obj ex7f.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex7fi.obj : ex7fi.desc
        @$(INTERSCI) $* 
@@ -106,7 +106,7 @@ ex7fi.obj : ex7fi.desc
 ex8.dll : ex8fi.obj ex8c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex8fi.obj : ex8fi.desc
        @$(INTERSCI) $* 
@@ -117,7 +117,7 @@ ex8fi.obj : ex8fi.desc
 ex9.dll : ex9fi.obj ex9f.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex9fi.obj : ex9fi.desc
        @$(INTERSCI) $* 
@@ -129,7 +129,7 @@ ex9fi.obj : ex9fi.desc
 ex10.dll : ex10fi.obj ex10f.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex10fi.obj : ex10fi.desc
        @$(INTERSCI) $* 
@@ -141,7 +141,7 @@ ex10fi.obj : ex10fi.desc
 ex11.dll : ex11fi.obj ex11c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex11fi.obj : ex11fi.desc
        @$(INTERSCI) $* 
@@ -152,7 +152,7 @@ ex11fi.obj : ex11fi.desc
 ex12.dll : ex12fi.obj ex12c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex12fi.obj : ex12fi.desc
        @$(INTERSCI) $* 
@@ -163,7 +163,7 @@ ex12fi.obj : ex12fi.desc
 ex13.dll : ex13fi.obj ex13c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex13fi.obj : ex13fi.desc
        @$(INTERSCI) $* 
@@ -174,7 +174,7 @@ ex13fi.obj : ex13fi.desc
 ex14.dll : ex14fi.obj ex14c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex14fi.obj : ex14fi.desc
        @$(INTERSCI) $* 
@@ -185,7 +185,7 @@ ex14fi.obj : ex14fi.desc
 ex15.dll : ex15fi.obj ex15c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex15fi.obj : ex15fi.desc
        @$(INTERSCI) $* 
@@ -197,7 +197,7 @@ ex15fi.obj : ex15fi.desc
 ex16.dll : ex16fi.obj ex16c.obj 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 ex16fi.obj : ex16fi.desc
        @$(INTERSCI) $* 
@@ -227,7 +227,7 @@ OBJS=ex1c.obj ex2f.obj ex4f.obj ex5f.obj ex6c.obj ex7f.obj ex8c.obj \
 zallfi.dll : zallfi.obj $(OBJS) 
        @echo Creation of dll $(DLL) and import lib 
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $**  $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
 
 zallfi.obj : zallfi.desc
        @$(INTERSCI) $* 
index 939621c..bbbdf6e 100644 (file)
@@ -122,13 +122,13 @@ clean     ::
 distclean::    clean
 
 tests:: 
-  @"$(SCIDIR1)\bin\scilex.exe" -nwni -nb -e scitest('lapackscilab.tst',%t);quit; 
+  @"$(SCIDIR1)/bin/scilex.exe" -nwni -nb -e scitest('lapackscilab.tst',%t);quit; 
 
 $(LIBRARY).dll: $(OBJS)
        @echo Creation of dll $(LIBRARY).dll and import lib from ...
        @echo $(OBJS)
        @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
-       @echo $(LINKER) $(LINKER_FLAGS) $(OBJS) $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
-       @$(LINKER) $(LINKER_FLAGS) $(OBJS) $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @echo $(LINKER) $(LINKER_FLAGS) $(OBJS) $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
+       @$(LINKER) $(LINKER_FLAGS) $(OBJS) $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 
        
 
index ca61178..65aca5a 100644 (file)
@@ -530,7 +530,7 @@ function T=gen_make_lccwin32(blknam,files,filestan,libs,ldflags,cflags)
      ascii(9)+"@$(DUMPEXTS) -o ""$(LIBRARY).def"" ""$*"" $(OBJS)"
      ascii(9)+"@$(LINKER) $(LINKER_FLAGS) $(OBJS) $(SCIIMPLIB) $(OTHERLIBS) "+ ..
               " $(SCICOSCLIB) $(SCICOSFLIB) $(SCICOS_BLOCKSCLIB) $(SCICOS_BLOCKSFLIB) " + ..
-              " $(XLIBSBIN) $(TERMCAPLIB) $*.def -o "+ ..
+              " $(SCILAB_LIBS) $*.def -o "+ ..
               " $(LIBRARY).dll"
      ".c.obj:"
      ascii(9)+"@echo ------------- Compile file $< --------------"
@@ -714,31 +714,31 @@ function T=gen_make_msvc(blknam,files,filestan,libs,ldflags,cflags)
      "# ------------------------------------------------------"
      "SCIDIR       = "+SCI
      "SCIDIR1      = "+WSCI
-     "DUMPEXTS     = """+WSCI+"\bin\dumpexts"""
-     "SCIIMPLIB    = """+WSCI+"\bin\LibScilab.lib"""
-     "SCILIBS      = """+WSCI+"\bin\LibScilab.lib"""
-     "SCICOSCLIB      = """+WSCI+"\bin\scicos.lib"""
-     "SCICOSFLIB      = """+WSCI+"\bin\scicos_f.lib"""
-     "SCICOS_BLOCKSCLIB      = """+WSCI+"\bin\scicos_blocks.lib"""
-     "SCICOS_BLOCKSFLIB      = """+WSCI+"\bin\scicos_blocks_f.lib"""
+     "DUMPEXTS     = """+WSCI+"/bin/dumpexts"""
+     "SCIIMPLIB    = """+WSCI+"/bin/LibScilab.lib"""
+     "SCILIBS      = """+WSCI+"/bin/LibScilab.lib"""
+     "SCICOSCLIB      = """+WSCI+"/bin/scicos.lib"""
+     "SCICOSFLIB      = """+WSCI+"/bin/scicos_f.lib"""
+     "SCICOS_BLOCKSCLIB      = """+WSCI+"/bin/scicos_blocks.lib"""
+     "SCICOS_BLOCKSFLIB      = """+WSCI+"/bin/scicos_blocks_f.lib"""
      "LIBRARY      = lib"+blknam
      "CC           = cl"
      "LINKER       = link"
      "OTHERLIBS    = "+libs
      "LINKER_FLAGS = "+LINKER_FLAGS_MACHINE
-     "INCLUDES     = -I"""+WSCI+"\libs\f2c"""
+     "INCLUDES     = -I"""+WSCI+"/libs/f2c"""
      "CC_COMMON    = "+CC_COMMON
      "CC_OPTIONS   = "+CC_OPTIONS
-     "CFLAGS       = $(CC_OPTIONS) -I"""+WSCI+"\modules\core\includes"" " + .. 
-                     "-I"""+WSCI+"\modules\scicos\includes"" " + ..
-                     "-I"""+WSCI+"\modules\scicos_blocks\includes"" " + ..
-                     "-I"""+WSCI+"\modules\dynamic_link\includes"" " + cflags
+     "CFLAGS       = $(CC_OPTIONS) -I"""+WSCI+"/modules/core/includes"" " + .. 
+                     "-I"""+WSCI+"/modules/scicos/includes"" " + ..
+                     "-I"""+WSCI+"/modules/scicos_blocks/includes"" " + ..
+                     "-I"""+WSCI+"/modules/dynamic_link/includes"" " + cflags
                      
                      
-     "FFLAGS       = $(FC_OPTIONS) -I"""+WSCI+"\modules\core\includes"" " + ..
-                     "-I"""+WSCI+"\modules\scicos\includes"" " + ..
-                     "-I"""+WSCI+"\modules\dynamic_link\includes"" " + ..
-                     "-I"""+WSCI+"\modules\scicos_blocks\includes"" "
+     "FFLAGS       = $(FC_OPTIONS) -I"""+WSCI+"/modules/core/includes"" " + ..
+                     "-I"""+WSCI+"/modules/scicos/includes"" " + ..
+                     "-I"""+WSCI+"/modules/dynamic_link/includes"" " + ..
+                     "-I"""+WSCI+"/modules/scicos_blocks/includes"" "
      ""
      "OBJS         = "+strcat(files+'.obj',' ')]
 
@@ -757,14 +757,14 @@ function T=gen_make_msvc(blknam,files,filestan,libs,ldflags,cflags)
      ascii(9)+"@$(DUMPEXTS) -o ""$*.def"" ""$*.dll"" $**"
      ascii(9)+"@$(LINKER) $(LINKER_FLAGS) $(OBJS) $(SCIIMPLIB) " + .. 
               "$(SCICOSCLIB) $(SCICOSFLIB) $(SCICOS_BLOCKSCLIB) $(SCICOS_BLOCKSFLIB) $(OTHERLIBS) "+ ..
-              "$(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:""$*.dll"""+...
+              "$(SCILAB_LIBS) /nologo /dll /out:""$*.dll"""+...
               " /implib:""$*.lib"" /def:""$*.def"""
      ".c.obj:"
      ascii(9)+"@echo ------------- Compile file $< --------------"
      ascii(9)+"$(CC) $(CFLAGS) $< "
      ".f.obj:"
      ascii(9)+"@echo ----------- Compile file $*.f (using f2c) -------------"
-     ascii(9)+"@"""+WSCI+"\bin\f2c.exe"" $(FFLAGS) $*.f "
+     ascii(9)+"@"""+WSCI+"/bin/f2c.exe"" $(FFLAGS) $*.f "
      ascii(9)+"@$(CC) $(CFLAGS) $*.c "
      ascii(9)+"@del $*.c "
      "clean::"