set svn:eol-style to native
Pierre Marechal [Tue, 19 Jun 2007 12:10:18 +0000 (12:10 +0000)]
37 files changed:
scilab/modules/core/includes/getfastcode.h
scilab/modules/core/includes/isanan.h
scilab/modules/core/includes/syncexec.h
scilab/modules/core/src/c/getfastcode.c
scilab/modules/core/src/c/syncexec.c
scilab/modules/core/src/fortran/stackc2i.f
scilab/modules/core/src/fortran/stacki2d.f
scilab/modules/core/src/fortran/stackr2d.f
scilab/modules/elementaries_functions/includes/idmax.h
scilab/modules/elementaries_functions/includes/idmin.h
scilab/modules/elementaries_functions/includes/int2db.h
scilab/modules/elementaries_functions/includes/rea2b.h
scilab/modules/elementaries_functions/src/c/idmax.c
scilab/modules/elementaries_functions/src/c/idmin.c
scilab/modules/elementaries_functions/src/c/int2db.c
scilab/modules/elementaries_functions/src/c/rea2db.c
scilab/modules/renderer/LibScilab_Import.def
scilab/modules/renderer/build.xml
scilab/modules/renderer/etc/renderer.quit
scilab/modules/renderer/etc/renderer.start
scilab/modules/renderer/graphics_Import.def
scilab/modules/renderer/help/en_US/addchapter.sce
scilab/modules/renderer/help/en_US/removechapter.sce
scilab/modules/renderer/languages/en_US/errors.xml
scilab/modules/renderer/languages/en_US/menus.xml
scilab/modules/renderer/languages/en_US/messages.xml
scilab/modules/renderer/macros/buildmacros.sce
scilab/modules/renderer/renderer.iss
scilab/modules/renderer/renderer.vcproj
scilab/modules/renderer/renderer_header.def
scilab/modules/renderer/src/java/renderer-JAVA.vcproj
scilab/modules/renderer/src/norenderer/LibScilab_Import.def
scilab/modules/renderer/src/norenderer/norenderer.c
scilab/modules/renderer/src/norenderer/norenderer.vcproj
scilab/modules/renderer/src/norenderer/norenderer_header.def
scilab/modules/renderer/src/norenderer/resource.h
scilab/modules/renderer/version.xml

index 4bda4ab..42eaf50 100644 (file)
@@ -1,20 +1,20 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Sylvestre LEDRU */\r
-/*-----------------------------------------------------------------------------------*/\r
-#ifndef __GETFASTCODE_H__\r
-#define __GETFASTCODE_H__\r
-\r
-#include "machine.h"\r
-/**\r
-*   converts from ascii to Scilab internal coding \r
-* @param n integer, length of the string to be converted integer\r
-* @param line: integer array (where Scilab coded string are stored ) \r
-* @param string: string \r
-* @param job: integer flag \r
-* 1: code-->ascii \r
-* 0: ascii-->code \r
-*/\r
-integer C2F(getfastcode)(unsigned char *c, unsigned long c_len);\r
-\r
-#endif /* __GETFASTCODE_H__ */\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Sylvestre LEDRU */
+/*-----------------------------------------------------------------------------------*/
+#ifndef __GETFASTCODE_H__
+#define __GETFASTCODE_H__
+
+#include "machine.h"
+/**
+*   converts from ascii to Scilab internal coding 
+* @param n integer, length of the string to be converted integer
+* @param line: integer array (where Scilab coded string are stored ) 
+* @param string: string 
+* @param job: integer flag 
+* 1: code-->ascii 
+* 0: ascii-->code 
+*/
+integer C2F(getfastcode)(unsigned char *c, unsigned long c_len);
+
+#endif /* __GETFASTCODE_H__ */
index d4e31ed..1c49bf3 100644 (file)
@@ -1,18 +1,18 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef __ISANAN_H__\r
-#define __ISANAN_H__\r
-\r
-#include "machine.h" /* C2F */\r
-\r
-/**\r
-* testing Nan returns 1 if a Nan is found and 0 elsewhere \r
-* @param value to check\r
-* @return 1 if a Nan is found and 0 elsewhere\r
-*/\r
-integer C2F(isanan)(double *x);\r
-\r
-#endif /* __ISANAN_H__ */\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __ISANAN_H__
+#define __ISANAN_H__
+
+#include "machine.h" /* C2F */
+
+/**
+* testing Nan returns 1 if a Nan is found and 0 elsewhere 
+* @param value to check
+* @return 1 if a Nan is found and 0 elsewhere
+*/
+integer C2F(isanan)(double *x);
+
+#endif /* __ISANAN_H__ */
+/*-----------------------------------------------------------------------------------*/ 
index f42c107..5ac3b23 100644 (file)
@@ -1,21 +1,21 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef __SYNCEXEC_H__\r
-#define __SYNCEXEC_H__\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h"\r
-\r
-/**\r
-* execute a macro in scilab\r
-* @param macro to execute (a string , "a=1+3;")\r
-* @param length of macro (here 6)\r
-* @param code error returned \r
-* @param mode sequential or not\r
-* @param length of macro (again, fortran)\r
-*/\r
-int C2F(syncexec)(char *str, int *ns, int *ierr, int *seq, long int str_len);\r
-\r
-#endif /* __SYNCEXEC_H__ */\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __SYNCEXEC_H__
+#define __SYNCEXEC_H__
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h"
+
+/**
+* execute a macro in scilab
+* @param macro to execute (a string , "a=1+3;")
+* @param length of macro (here 6)
+* @param code error returned 
+* @param mode sequential or not
+* @param length of macro (again, fortran)
+*/
+int C2F(syncexec)(char *str, int *ns, int *ierr, int *seq, long int str_len);
+
+#endif /* __SYNCEXEC_H__ */
+/*-----------------------------------------------------------------------------------*/ 
index 4527876..7074b64 100644 (file)
@@ -1,38 +1,38 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/*-----------------------------------------------------------------------------------*/\r
-#include "getfastcode.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-static integer taba2s[128] = \r
-{ 100,101,102,103,104,105,106,107,108,-40,\r
-110,111,112,113,114,115,116,117,118,119,\r
-120,121,122,123,124,125,126,127,128,129,\r
-130,131, 40, 38,-53, 37, 39, 56, 58, 53,\r
-41, 42, 47, 45, 52, 46, 51, 48,  0,  1,\r
-2,  3,  4,  5,  6,  7,  8,  9, 44, 43,\r
-59, 50, 60,-38,-61,-10,-11,-12,-13,-14,\r
--15,-16,-17,-18,-19,-20,-21,-22,-23,-24,\r
--25,-26,-27,-28,-29,-30,-31,-32,-33,-34,\r
--35, 54, 49, 55, 62, 36,-59, 10, 11, 12,\r
-13, 14, 15, 16, 17, 18, 19, 20, 21, 22,\r
-23, 24, 25, 26, 27, 28, 29, 30, 31, 32,\r
-33, 34, 35,-54, 57,-55, 61,227 };\r
-/*-----------------------------------------------------------------------------------*/\r
-integer C2F(getfastcode)(unsigned char *c, unsigned long c_len) \r
-{\r
-       int k = *c ;\r
-       int val = 0;\r
-       if (k <= 127) val = taba2s[*c];\r
-       else val = k + 100;\r
-       return val;\r
-} \r
-/*-----------------------------------------------------------------------------------*/\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/*-----------------------------------------------------------------------------------*/
+#include "getfastcode.h"
+/*-----------------------------------------------------------------------------------*/
+static integer taba2s[128] = 
+{ 100,101,102,103,104,105,106,107,108,-40,
+110,111,112,113,114,115,116,117,118,119,
+120,121,122,123,124,125,126,127,128,129,
+130,131, 40, 38,-53, 37, 39, 56, 58, 53,
+41, 42, 47, 45, 52, 46, 51, 48,  0,  1,
+2,  3,  4,  5,  6,  7,  8,  9, 44, 43,
+59, 50, 60,-38,-61,-10,-11,-12,-13,-14,
+-15,-16,-17,-18,-19,-20,-21,-22,-23,-24,
+-25,-26,-27,-28,-29,-30,-31,-32,-33,-34,
+-35, 54, 49, 55, 62, 36,-59, 10, 11, 12,
+13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+33, 34, 35,-54, 57,-55, 61,227 };
+/*-----------------------------------------------------------------------------------*/
+integer C2F(getfastcode)(unsigned char *c, unsigned long c_len) 
+{
+       int k = *c ;
+       int val = 0;
+       if (k <= 127) val = taba2s[*c];
+       else val = k + 100;
+       return val;
+} 
+/*-----------------------------------------------------------------------------------*/
+
+
+
+
+
+
+
+
+
index 2244aa7..d5b2c10 100644 (file)
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* S. Steer */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "syncexec.h"\r
-#include "stack-c.h"\r
-#include "core_math.h"\r
-/*-----------------------------------------------------------------------------------*/ \r
-#define Pt (C2F(recu).pt)\r
-/*-----------------------------------------------------------------------------------*/ \r
-IMPORT struct {\r
-       int iflag, interruptible;\r
-} C2F(basbrk);\r
-/*-----------------------------------------------------------------------------------*/ \r
-int C2F(syncexec)(char *str, int *ns, int *ierr, int *seq, long int str_len)\r
-{\r
-       extern int C2F(iset)();\r
-       extern int C2F(ref2val)();\r
-       extern int C2F(bexec)();\r
-       extern int C2F(eptover)();\r
-       extern int Eptover(int n);\r
-\r
-       /* Local variables */\r
-       static int zero = 0;\r
-       static int one = 1;\r
-       int Pts, Tops;\r
-       static int k;\r
-       static int ir;\r
-\r
-       static int *Ids  = C2F(recu).ids-nsiz-1;\r
-       static int *Rstk = C2F(recu).rstk-1;\r
-       static int *Lstk = C2F(vstk).lstk-1;\r
-       static int *Infstk  = C2F(vstk).infstk-1;\r
-\r
-       Pt = Max(Pt,0);Pts=Pt;\r
-       Top = Max(Top,0);Tops=Top;\r
-       C2F(basbrk).interruptible = *seq == 0;\r
-       C2F(bexec)(str, ns, ierr, (*ns));\r
-       if (*ierr != 0) {\r
-               goto L9998;\r
-       }\r
-       /* + */\r
-       if (Eptover(1)) {\r
-               goto L9998;\r
-       }\r
-       Ids[1 + Pt * nsiz] = Lhs;\r
-       Ids[2 + Pt * nsiz] = Rhs;\r
-       Ids[3 + Pt * nsiz] = C2F(com).sym;\r
-       Rstk[Pt] = 1002;\r
-       ++C2F(recu).niv;\r
-       C2F(com).fun = 0;\r
-       C2F(recu).icall = 5;\r
-\r
-       /* code translated from callinterf.h */\r
-L60:\r
-\r
-       C2F(parse)();\r
-       if (C2F(iop).err > 0) {\r
-               goto L9999;\r
-       }\r
-\r
-       if (C2F(com).fun == 99) {\r
-               C2F(com).fun = 0;\r
-               goto L200;\r
-       }\r
-\r
-       if (Rstk[Pt] / 100 == 9) {\r
-               ir = Rstk[Pt] - 900;\r
-               if (ir == 1) {\r
-                       /* back to matsys */\r
-                       k = 13;\r
-               } else if (ir >= 2 && ir <= 9) {\r
-                       /* back to matio */\r
-                       k = 5;\r
-               } else if (ir == 10) {\r
-                       /* end of overloaded function */\r
-                       goto L96;\r
-               } else if (ir > 40) {\r
-                       /* back to gw_user2 */\r
-                       k = 24;\r
-               } else if (ir > 20) {\r
-                       /* back to gw_user */\r
-                       k = 14;\r
-               } else {\r
-                       goto L89;\r
-               }\r
-               goto L95;\r
-       }\r
-\r
-L89:\r
-       if (Top < Rhs) {\r
-               int ierr = 22;\r
-               C2F(error)(&ierr);\r
-               goto L9999;\r
-       }\r
-       if (Top - Rhs + Lhs + 1 >= C2F(vstk).bot) {\r
-               int ierr = 18;\r
-               C2F(error)(&ierr);\r
-               goto L9999;\r
-       }\r
-       goto L91;\r
-\r
-L90:\r
-       if (C2F(iop).err > 0) {\r
-               goto L9999;\r
-       }\r
-L91:\r
-       k = C2F(com).fun;\r
-       C2F(com).fun = 0;\r
-       if (k == C2F(recu).krec) {\r
-               int ierr = 22;\r
-               C2F(recu).krec = -1;\r
-               C2F(error)(&ierr);\r
-               goto L9999;\r
-       }\r
-       C2F(recu).krec = -1;\r
-       if (k == 0) {\r
-               goto L60;\r
-       }\r
-L95:\r
-       if (! C2F(allowptr)(&k)) {\r
-               C2F(ref2val)();\r
-       }\r
-       C2F(recu).krec = k;\r
-       C2F(callinterf)(&k);\r
-       /*      if (k.eq.krec) krec=99999 */\r
-       C2F(recu).krec = -1;\r
-       if (C2F(com).fun >= 0) {\r
-               if (Top - Lhs + 1 > 0) {\r
-                       C2F(iset)(&Rhs, &zero, &Infstk[Top - Lhs+1], &one);\r
-               }\r
-               goto L90;\r
-       }\r
-       /*     called interface ask for a scilab function to perform the function (fun=-1) */\r
-       /*     the function name is given in ids(1,pt+1) */\r
-       C2F(ref2val)();\r
-       C2F(com).fun = 0;\r
-       C2F(funs)(&Ids[1 + (Pt + 1) * nsiz]);\r
-       if (C2F(iop).err > 0) {\r
-               goto L9999;\r
-       }\r
-       if (C2F(com).fun > 0) {\r
-               goto L91;\r
-       }\r
-       if (C2F(com).fin == 0) {\r
-               int ierr = 246;\r
-               C2F(error)(&ierr);\r
-               if (C2F(iop).err > 0) {\r
-                       goto L9999;\r
-               }\r
-               goto L90;\r
-       }\r
-       ++Pt;\r
-       C2F(com).fin = Lstk[C2F(com).fin];\r
-       Rstk[Pt] = 910;\r
-       C2F(recu).icall = 5;\r
-       C2F(com).fun = 0;\r
-       /*     *call*  macro */\r
-       goto L60;\r
-L96:\r
-       --Pt;\r
-       goto L90;\r
-       /* End of callinterf.h code */\r
-\r
-L200:\r
-       Lhs = Ids[1 + Pt * nsiz];\r
-       Rhs = Ids[2 + Pt * nsiz];\r
-       C2F(com).sym = Ids[3 + Pt * nsiz];\r
-       --Pt;\r
-       --Top;\r
-       /* + */\r
-       --C2F(recu).niv;\r
-       *ierr = 0;\r
-       C2F(recu).icall = 0;\r
-       C2F(com).fin = 3;\r
-       return 0;\r
-L9998:\r
-       *ierr = 1;\r
-       Pt=Pts;Top=Tops;\r
-       return 0;\r
-L9999:\r
-       /* Err == 9999999 arises if abort has been used to terminate the callback execution */\r
-       if (Err != 9999999) *ierr = 1;\r
-       --Top;\r
-       --C2F(recu).niv;\r
-       Pt=Pts;Top=Tops;\r
-       return 0;\r
-} /* syncexec */\r
-/*-----------------------------------------------------------------------------------*/ \r
-\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* S. Steer */
+/*-----------------------------------------------------------------------------------*/ 
+#include "syncexec.h"
+#include "stack-c.h"
+#include "core_math.h"
+/*-----------------------------------------------------------------------------------*/ 
+#define Pt (C2F(recu).pt)
+/*-----------------------------------------------------------------------------------*/ 
+IMPORT struct {
+       int iflag, interruptible;
+} C2F(basbrk);
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(syncexec)(char *str, int *ns, int *ierr, int *seq, long int str_len)
+{
+       extern int C2F(iset)();
+       extern int C2F(ref2val)();
+       extern int C2F(bexec)();
+       extern int C2F(eptover)();
+       extern int Eptover(int n);
+
+       /* Local variables */
+       static int zero = 0;
+       static int one = 1;
+       int Pts, Tops;
+       static int k;
+       static int ir;
+
+       static int *Ids  = C2F(recu).ids-nsiz-1;
+       static int *Rstk = C2F(recu).rstk-1;
+       static int *Lstk = C2F(vstk).lstk-1;
+       static int *Infstk  = C2F(vstk).infstk-1;
+
+       Pt = Max(Pt,0);Pts=Pt;
+       Top = Max(Top,0);Tops=Top;
+       C2F(basbrk).interruptible = *seq == 0;
+       C2F(bexec)(str, ns, ierr, (*ns));
+       if (*ierr != 0) {
+               goto L9998;
+       }
+       /* + */
+       if (Eptover(1)) {
+               goto L9998;
+       }
+       Ids[1 + Pt * nsiz] = Lhs;
+       Ids[2 + Pt * nsiz] = Rhs;
+       Ids[3 + Pt * nsiz] = C2F(com).sym;
+       Rstk[Pt] = 1002;
+       ++C2F(recu).niv;
+       C2F(com).fun = 0;
+       C2F(recu).icall = 5;
+
+       /* code translated from callinterf.h */
+L60:
+
+       C2F(parse)();
+       if (C2F(iop).err > 0) {
+               goto L9999;
+       }
+
+       if (C2F(com).fun == 99) {
+               C2F(com).fun = 0;
+               goto L200;
+       }
+
+       if (Rstk[Pt] / 100 == 9) {
+               ir = Rstk[Pt] - 900;
+               if (ir == 1) {
+                       /* back to matsys */
+                       k = 13;
+               } else if (ir >= 2 && ir <= 9) {
+                       /* back to matio */
+                       k = 5;
+               } else if (ir == 10) {
+                       /* end of overloaded function */
+                       goto L96;
+               } else if (ir > 40) {
+                       /* back to gw_user2 */
+                       k = 24;
+               } else if (ir > 20) {
+                       /* back to gw_user */
+                       k = 14;
+               } else {
+                       goto L89;
+               }
+               goto L95;
+       }
+
+L89:
+       if (Top < Rhs) {
+               int ierr = 22;
+               C2F(error)(&ierr);
+               goto L9999;
+       }
+       if (Top - Rhs + Lhs + 1 >= C2F(vstk).bot) {
+               int ierr = 18;
+               C2F(error)(&ierr);
+               goto L9999;
+       }
+       goto L91;
+
+L90:
+       if (C2F(iop).err > 0) {
+               goto L9999;
+       }
+L91:
+       k = C2F(com).fun;
+       C2F(com).fun = 0;
+       if (k == C2F(recu).krec) {
+               int ierr = 22;
+               C2F(recu).krec = -1;
+               C2F(error)(&ierr);
+               goto L9999;
+       }
+       C2F(recu).krec = -1;
+       if (k == 0) {
+               goto L60;
+       }
+L95:
+       if (! C2F(allowptr)(&k)) {
+               C2F(ref2val)();
+       }
+       C2F(recu).krec = k;
+       C2F(callinterf)(&k);
+       /*      if (k.eq.krec) krec=99999 */
+       C2F(recu).krec = -1;
+       if (C2F(com).fun >= 0) {
+               if (Top - Lhs + 1 > 0) {
+                       C2F(iset)(&Rhs, &zero, &Infstk[Top - Lhs+1], &one);
+               }
+               goto L90;
+       }
+       /*     called interface ask for a scilab function to perform the function (fun=-1) */
+       /*     the function name is given in ids(1,pt+1) */
+       C2F(ref2val)();
+       C2F(com).fun = 0;
+       C2F(funs)(&Ids[1 + (Pt + 1) * nsiz]);
+       if (C2F(iop).err > 0) {
+               goto L9999;
+       }
+       if (C2F(com).fun > 0) {
+               goto L91;
+       }
+       if (C2F(com).fin == 0) {
+               int ierr = 246;
+               C2F(error)(&ierr);
+               if (C2F(iop).err > 0) {
+                       goto L9999;
+               }
+               goto L90;
+       }
+       ++Pt;
+       C2F(com).fin = Lstk[C2F(com).fin];
+       Rstk[Pt] = 910;
+       C2F(recu).icall = 5;
+       C2F(com).fun = 0;
+       /*     *call*  macro */
+       goto L60;
+L96:
+       --Pt;
+       goto L90;
+       /* End of callinterf.h code */
+
+L200:
+       Lhs = Ids[1 + Pt * nsiz];
+       Rhs = Ids[2 + Pt * nsiz];
+       C2F(com).sym = Ids[3 + Pt * nsiz];
+       --Pt;
+       --Top;
+       /* + */
+       --C2F(recu).niv;
+       *ierr = 0;
+       C2F(recu).icall = 0;
+       C2F(com).fin = 3;
+       return 0;
+L9998:
+       *ierr = 1;
+       Pt=Pts;Top=Tops;
+       return 0;
+L9999:
+       /* Err == 9999999 arises if abort has been used to terminate the callback execution */
+       if (Err != 9999999) *ierr = 1;
+       --Top;
+       --C2F(recu).niv;
+       Pt=Pts;Top=Tops;
+       return 0;
+} /* syncexec */
+/*-----------------------------------------------------------------------------------*/ 
+
index e059c6c..c3e83e2 100644 (file)
@@ -1,25 +1,25 @@
-      subroutine stackc2i(n,sl1,il1) \r
-c     =============================\r
-c     same as stacki2d but for characters\r
-c     to integer and overlapping region \r
-c     ===============================\r
-      include 'stack.h'\r
-      integer n,sl1,il1\r
-      integer iadr,cadr\r
-      iadr(l)=l+l-1\r
-      cadr(l)=l+l+l+l-3      \r
-      if((sl1+n-1).ge.cadr(il1+n-1)) then\r
-         call cvstr(n,istk(il1),cstk(sl1:sl1+n),0)\r
-      elseif( sl1.le.cadr(il1)) then\r
-         call cvstr1(n,istk(il1),cstk(sl1:sl1+n),0)\r
-      else\r
-         kh=(sl1-cadr(il1))/3\r
-         kb=n-kh\r
-         call cvstr(kh,istk(il1),cstk(sl1:sl1+kh),0)\r
-         lsuite=sl1+kh\r
-         call cvstr1(kb,istk(il1+kh),cstk(lsuite:lsuite+kb),0)\r
-      endif\r
-      return\r
-      end\r
-c     ===============================\r
-\r
+      subroutine stackc2i(n,sl1,il1) 
+c     =============================
+c     same as stacki2d but for characters
+c     to integer and overlapping region 
+c     ===============================
+      include 'stack.h'
+      integer n,sl1,il1
+      integer iadr,cadr
+      iadr(l)=l+l-1
+      cadr(l)=l+l+l+l-3      
+      if((sl1+n-1).ge.cadr(il1+n-1)) then
+         call cvstr(n,istk(il1),cstk(sl1:sl1+n),0)
+      elseif( sl1.le.cadr(il1)) then
+         call cvstr1(n,istk(il1),cstk(sl1:sl1+n),0)
+      else
+         kh=(sl1-cadr(il1))/3
+         kb=n-kh
+         call cvstr(kh,istk(il1),cstk(sl1:sl1+kh),0)
+         lsuite=sl1+kh
+         call cvstr1(kb,istk(il1+kh),cstk(lsuite:lsuite+kb),0)
+      endif
+      return
+      end
+c     ===============================
+
index a374b81..6432ca4 100644 (file)
@@ -1,38 +1,38 @@
-      subroutine stacki2d(n,il1,dl1) \r
-c     =============================\r
-c     performs stk(dl1+j) = istk(il1+j)\r
-c     but checks for overlapping areas\r
-c     there's an equivalence between stk and istk \r
-c     to perform stk(dl1+j)=istk(il1+j) j=0,N-1 \r
-c     we have three possible cases considering \r
-c     the 2 curves iadr(dl1+j) and il1+j \r
-c     -if ( iadr(dl1+j) < il1+j ) with \r
-c     possible equality for the last term \r
-c     the we copy from 0 to n-1\r
-c     -if ( iadr(dl1+j) > il1+j ) with \r
-c     possible equality for the first term \r
-c     then we copy from n-1 to 0 (step= -1)\r
-c     -if the two curves intersect \r
-c     ==> 2(dl1+p)-1 = il1+p \r
-c     p= il1- iadr(dl1) \r
-c     we copy from 0 to p-1 ( then istk(il1+k) k>=p\r
-c     are not scratched and then from n-1 to p \r
-c     ===============================\r
-      include 'stack.h'\r
-      integer n,il1,dl1 \r
-      integer iadr,sadr\r
-      iadr(l)=l+l-1\r
-      sadr(l)=(l/2)+1\r
-      if((il1+n-1).ge.iadr(dl1+n-1)) then\r
-         call int2db(n,istk(il1),1,stk(dl1),1)\r
-      elseif(il1.le.iadr(dl1)) then\r
-         call int2db(n,istk(il1),-1,stk(dl1),-1)\r
-      else\r
-         imont=il1-iadr(dl1)\r
-         ides=n-imont\r
-         call int2db(imont,istk(il1),1,stk(dl1),1)\r
-         call int2db(ides,istk(il1+imont),-1,stk(dl1+imont),-1)\r
-      endif\r
-      return\r
-      end\r
-c     ===============================\r
+      subroutine stacki2d(n,il1,dl1) 
+c     =============================
+c     performs stk(dl1+j) = istk(il1+j)
+c     but checks for overlapping areas
+c     there's an equivalence between stk and istk 
+c     to perform stk(dl1+j)=istk(il1+j) j=0,N-1 
+c     we have three possible cases considering 
+c     the 2 curves iadr(dl1+j) and il1+j 
+c     -if ( iadr(dl1+j) < il1+j ) with 
+c     possible equality for the last term 
+c     the we copy from 0 to n-1
+c     -if ( iadr(dl1+j) > il1+j ) with 
+c     possible equality for the first term 
+c     then we copy from n-1 to 0 (step= -1)
+c     -if the two curves intersect 
+c     ==> 2(dl1+p)-1 = il1+p 
+c     p= il1- iadr(dl1) 
+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     ===============================
+      include 'stack.h'
+      integer n,il1,dl1 
+      integer iadr,sadr
+      iadr(l)=l+l-1
+      sadr(l)=(l/2)+1
+      if((il1+n-1).ge.iadr(dl1+n-1)) then
+         call int2db(n,istk(il1),1,stk(dl1),1)
+      elseif(il1.le.iadr(dl1)) then
+         call int2db(n,istk(il1),-1,stk(dl1),-1)
+      else
+         imont=il1-iadr(dl1)
+         ides=n-imont
+         call int2db(imont,istk(il1),1,stk(dl1),1)
+         call int2db(ides,istk(il1+imont),-1,stk(dl1+imont),-1)
+      endif
+      return
+      end
+c     ===============================
index 6a8d8d4..7b838ab 100644 (file)
@@ -1,24 +1,24 @@
-      subroutine stackr2d(n,sl1,dl1) \r
-c     =============================\r
-c     same as stacki2d but for reals \r
-c     to double \r
-c     ===============================\r
-      include 'stack.h'\r
-      integer n,sl1,dl1 \r
-      integer iadr,sadr\r
-      iadr(l)=l+l-1\r
-      sadr(l)=(l/2)+1\r
-      if((sl1+n-1).ge.iadr(dl1+n-1)) then\r
-         call rea2db(n,istk(sl1),1,stk(dl1),1)\r
-      elseif(sl1.le.iadr(dl1)) then\r
-         call rea2db(n,istk(sl1),-1,stk(dl1),-1)\r
-      else\r
-         imont=sl1-iadr(dl1)\r
-         ides=n-imont\r
-         call rea2db(imont,istk(sl1),1,stk(dl1),1)\r
-         call rea2db(ides,istk(sl1+imont),-1,stk(dl1+imont),-1)\r
-      endif\r
-      return\r
-      end\r
-c     ===============================\r
-\r
+      subroutine stackr2d(n,sl1,dl1) 
+c     =============================
+c     same as stacki2d but for reals 
+c     to double 
+c     ===============================
+      include 'stack.h'
+      integer n,sl1,dl1 
+      integer iadr,sadr
+      iadr(l)=l+l-1
+      sadr(l)=(l/2)+1
+      if((sl1+n-1).ge.iadr(dl1+n-1)) then
+         call rea2db(n,istk(sl1),1,stk(dl1),1)
+      elseif(sl1.le.iadr(dl1)) then
+         call rea2db(n,istk(sl1),-1,stk(dl1),-1)
+      else
+         imont=sl1-iadr(dl1)
+         ides=n-imont
+         call rea2db(imont,istk(sl1),1,stk(dl1),1)
+         call rea2db(ides,istk(sl1+imont),-1,stk(dl1+imont),-1)
+      endif
+      return
+      end
+c     ===============================
+
index b891cf8..20ffe01 100644 (file)
@@ -1,20 +1,20 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef __IDMAX_H__\r
-#define __IDMAX_H__\r
-\r
-#include "machine.h" /* C2F */\r
-\r
-/**\r
-* finds the index of the first element having maximum value \r
-* @param n size of x\r
-* @param x vector\r
-* @param incr indice\r
-* @return 0\r
-*/\r
-int C2F(idmax)(int *n, double *x, int *incx);\r
-\r
-#endif /* __IDMAX_H__ */\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __IDMAX_H__
+#define __IDMAX_H__
+
+#include "machine.h" /* C2F */
+
+/**
+* finds the index of the first element having maximum value 
+* @param n size of x
+* @param x vector
+* @param incr indice
+* @return 0
+*/
+int C2F(idmax)(int *n, double *x, int *incx);
+
+#endif /* __IDMAX_H__ */
+/*-----------------------------------------------------------------------------------*/ 
index 2f3c7e0..2172ae7 100644 (file)
@@ -1,20 +1,20 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#ifndef __IDMIN_H__\r
-#define __IDMIN_H__\r
-\r
-#include "machine.h" /* C2F */\r
-\r
-/**\r
-* finds the index of the first element having minimum value \r
-* @param n size of x\r
-* @param x vector\r
-* @param incr indice\r
-* @return 0\r
-*/\r
-int C2F(idmin)(int *n, double *x, int *incx);\r
-\r
-#endif /* __IDMIN_H__ */\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#ifndef __IDMIN_H__
+#define __IDMIN_H__
+
+#include "machine.h" /* C2F */
+
+/**
+* finds the index of the first element having minimum value 
+* @param n size of x
+* @param x vector
+* @param incr indice
+* @return 0
+*/
+int C2F(idmin)(int *n, double *x, int *incx);
+
+#endif /* __IDMIN_H__ */
+/*-----------------------------------------------------------------------------------*/ 
index 695c6d0..1b78576 100644 (file)
@@ -1,21 +1,21 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/\r
-#ifndef __INT2DB_H__\r
-#define __INT2DB_H__\r
-\r
-#include "machine.h" /* C2F */\r
-\r
-/**\r
-* translate a int vector to double precision vector\r
-* @param n size of dx vector\r
-* @param dx int vector \r
-* @param incx increment order\r
-* @param dy double precision vector\r
-* @param incy increment order\r
-*/\r
-int C2F(int2db)(int *n, int *dx, int *incx, double *dy, int *incy);\r
-\r
-#endif /* __INT2DB_H__ */\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#ifndef __INT2DB_H__
+#define __INT2DB_H__
+
+#include "machine.h" /* C2F */
+
+/**
+* translate a int vector to double precision vector
+* @param n size of dx vector
+* @param dx int vector 
+* @param incx increment order
+* @param dy double precision vector
+* @param incy increment order
+*/
+int C2F(int2db)(int *n, int *dx, int *incx, double *dy, int *incy);
+
+#endif /* __INT2DB_H__ */
+/*-----------------------------------------------------------------------------------*/
index 78b76a4..b811dbd 100644 (file)
@@ -1,19 +1,19 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/\r
-#ifndef __REA2B_H__\r
-#define __REA2B_H__\r
-\r
-/**\r
-* translate a float vector to double precision vector\r
-* @param n size of dx vector\r
-* @param dx float vector \r
-* @param incx increment order\r
-* @param dy double precision vector\r
-* @param incy increment order\r
-*/\r
-int C2F(rea2db)(int *n, float *dx, int *incx, double *dy, int *incy);\r
-\r
-#endif /* __REA2B_H__ */\r
-/*-----------------------------------------------------------------------------------*/\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/
+#ifndef __REA2B_H__
+#define __REA2B_H__
+
+/**
+* translate a float vector to double precision vector
+* @param n size of dx vector
+* @param dx float vector 
+* @param incx increment order
+* @param dy double precision vector
+* @param incy increment order
+*/
+int C2F(rea2db)(int *n, float *dx, int *incx, double *dy, int *incy);
+
+#endif /* __REA2B_H__ */
+/*-----------------------------------------------------------------------------------*/
index 167e05f..1c52528 100644 (file)
@@ -1,44 +1,44 @@
-/*-----------------------------------------------------------------------------------*/ \r
-/* INRIA 2007 */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "idmax.h"\r
-#include "isanan.h"\r
-/*-----------------------------------------------------------------------------------*/ \r
-int C2F(idmax)(int *n, double *x, int *incx)\r
-{\r
-    int x_dim1 = 0, x_offset = 0, ret_val = 0, i1;\r
-\r
-    /* Local variables */\r
-    int i = 0, j = 0;\r
-    double xmax;\r
-\r
-       x_dim1 = *incx;\r
-    x_offset = 1 + x_dim1;\r
-    x -= x_offset;\r
-\r
-    ret_val = 1;\r
-       /* initialize the max with the first component being not a nan */\r
-    j = 1;\r
-    while(C2F(isanan)(&x[j * x_dim1 + 1]) == 1) \r
-       {\r
-               ++j;\r
-               if (j > *n) return ret_val;\r
-    }\r
-    xmax = x[j * x_dim1 + 1];\r
-    ret_val = j;\r
-\r
-       /* the usual loop */\r
-    i1 = *n;\r
-    for (i = j + 1; i <= i1; ++i) \r
-       {\r
-               if (x[i * x_dim1 + 1] > xmax) \r
-               {\r
-                       /* a test with a nan must always re */\r
-                       xmax = x[i * x_dim1 + 1];\r
-                       ret_val = i;\r
-               }\r
-    }\r
-    return ret_val;\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
-\r
+/*-----------------------------------------------------------------------------------*/ 
+/* INRIA 2007 */
+/*-----------------------------------------------------------------------------------*/ 
+#include "idmax.h"
+#include "isanan.h"
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(idmax)(int *n, double *x, int *incx)
+{
+    int x_dim1 = 0, x_offset = 0, ret_val = 0, i1;
+
+    /* Local variables */
+    int i = 0, j = 0;
+    double xmax;
+
+       x_dim1 = *incx;
+    x_offset = 1 + x_dim1;
+    x -= x_offset;
+
+    ret_val = 1;
+       /* initialize the max with the first component being not a nan */
+    j = 1;
+    while(C2F(isanan)(&x[j * x_dim1 + 1]) == 1) 
+       {
+               ++j;
+               if (j > *n) return ret_val;
+    }
+    xmax = x[j * x_dim1 + 1];
+    ret_val = j;
+
+       /* the usual loop */
+    i1 = *n;
+    for (i = j + 1; i <= i1; ++i) 
+       {
+               if (x[i * x_dim1 + 1] > xmax) 
+               {
+                       /* a test with a nan must always re */
+                       xmax = x[i * x_dim1 + 1];
+                       ret_val = i;
+               }
+    }
+    return ret_val;
+}
+/*-----------------------------------------------------------------------------------*/ 
+
index ebc489e..fc261c4 100644 (file)
@@ -1,42 +1,42 @@
-/*-----------------------------------------------------------------------------------*/ \r
-/* INRIA 2007 */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "idmin.h"\r
-#include "isanan.h"\r
-/*-----------------------------------------------------------------------------------*/ \r
-int C2F(idmin)(int *n, double *x, int *incx)\r
-{\r
-\r
-    int x_dim1 = 0, x_offset  = 0, ret_val = 0, i1 = 0;\r
-    int i = 0, j = 0;\r
-    double xmin  = 0;\r
-    \r
-    x_dim1 = *incx;\r
-    x_offset = 1 + x_dim1;\r
-    x -= x_offset;\r
-\r
-    ret_val = 1;\r
-       /* initialize the min with the first component being not a nan */\r
-    j = 1;\r
-    while(C2F(isanan)(&x[j * x_dim1 + 1]) == 1) \r
-       {\r
-               ++j;\r
-               if (j > *n) return ret_val;\r
-    }\r
-    xmin = x[j * x_dim1 + 1];\r
-    ret_val = j;\r
-\r
-       /* the usual loop */\r
-    i1 = *n;\r
-    for (i = j + 1; i <= i1; ++i) \r
-       {\r
-               if (x[i * x_dim1 + 1] < xmin) \r
-               {\r
-                       /* a test with a nan must always re */\r
-                       xmin = x[i * x_dim1 + 1];\r
-                       ret_val = i;\r
-               }\r
-    }\r
-    return ret_val;\r
-} \r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/ 
+/* INRIA 2007 */
+/*-----------------------------------------------------------------------------------*/ 
+#include "idmin.h"
+#include "isanan.h"
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(idmin)(int *n, double *x, int *incx)
+{
+
+    int x_dim1 = 0, x_offset  = 0, ret_val = 0, i1 = 0;
+    int i = 0, j = 0;
+    double xmin  = 0;
+    
+    x_dim1 = *incx;
+    x_offset = 1 + x_dim1;
+    x -= x_offset;
+
+    ret_val = 1;
+       /* initialize the min with the first component being not a nan */
+    j = 1;
+    while(C2F(isanan)(&x[j * x_dim1 + 1]) == 1) 
+       {
+               ++j;
+               if (j > *n) return ret_val;
+    }
+    xmin = x[j * x_dim1 + 1];
+    ret_val = j;
+
+       /* the usual loop */
+    i1 = *n;
+    for (i = j + 1; i <= i1; ++i) 
+       {
+               if (x[i * x_dim1 + 1] < xmin) 
+               {
+                       /* a test with a nan must always re */
+                       xmin = x[i * x_dim1 + 1];
+                       ret_val = i;
+               }
+    }
+    return ret_val;
+} 
+/*-----------------------------------------------------------------------------------*/ 
index c8755ac..cdcfb6d 100644 (file)
@@ -1,41 +1,41 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/*-----------------------------------------------------------------------------------*/\r
-#include "int2db.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(int2db)(int *n, int *dx, int *incx, double *dy, int *incy)\r
-{\r
-    int i1 = 0, i = 0;\r
-    int ix = 0, iy = 0;\r
-\r
-    --dy;\r
-    --dx;\r
-   \r
-    if (*n <= 0) return 0;\r
-\r
-    if (*incx == 1 && *incy == 1) \r
-       {\r
-               /* code for both increments equal to 1 */\r
-               i1 = *n;\r
-               for (i = 1; i <= i1; ++i) dy[i] = (double) dx[i];\r
-               return 0;\r
-    }\r
-\r
-       /* code for unequal increments or equal increments not equal to 1 */\r
-    ix = 1;\r
-    iy = 1;\r
-\r
-    if (*incx < 0) ix = (-(*n) + 1) * *incx + 1;\r
-    if (*incy < 0) iy = (-(*n) + 1) * *incy + 1;\r
-       iy = (-(*n) + 1) * *incy + 1;\r
-    i1 = *n;\r
-    for (i = 1; i <= i1; ++i) \r
-       {\r
-               dy[iy] = (double) dx[ix];\r
-               ix += *incx;\r
-               iy += *incy;\r
-    }\r
-    return 0;\r
-} \r
-/*-----------------------------------------------------------------------------------*/\r
-\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/*-----------------------------------------------------------------------------------*/
+#include "int2db.h"
+/*-----------------------------------------------------------------------------------*/
+int C2F(int2db)(int *n, int *dx, int *incx, double *dy, int *incy)
+{
+    int i1 = 0, i = 0;
+    int ix = 0, iy = 0;
+
+    --dy;
+    --dx;
+   
+    if (*n <= 0) return 0;
+
+    if (*incx == 1 && *incy == 1) 
+       {
+               /* code for both increments equal to 1 */
+               i1 = *n;
+               for (i = 1; i <= i1; ++i) dy[i] = (double) dx[i];
+               return 0;
+    }
+
+       /* code for unequal increments or equal increments not equal to 1 */
+    ix = 1;
+    iy = 1;
+
+    if (*incx < 0) ix = (-(*n) + 1) * *incx + 1;
+    if (*incy < 0) iy = (-(*n) + 1) * *incy + 1;
+       iy = (-(*n) + 1) * *incy + 1;
+    i1 = *n;
+    for (i = 1; i <= i1; ++i) 
+       {
+               dy[iy] = (double) dx[ix];
+               ix += *incx;
+               iy += *incy;
+    }
+    return 0;
+} 
+/*-----------------------------------------------------------------------------------*/
+
index 7b4c09c..44eb6db 100644 (file)
@@ -1,49 +1,49 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/*-----------------------------------------------------------------------------------*/\r
-#include "machine.h"\r
-/*-----------------------------------------------------------------------------------*/\r
-/* cette subroutine traduit un vecteur dx, de taille n, sur un \r
-   vecteur double precision dy. \r
-   dans le cas de deux increments egaux a 1, cette fonction\r
-   emploie des boucles "epanouies".\r
-   dans le cas ou les increments sont negatifs cette\r
-   fonction prend les composantes en ordre inverse. \r
-*/\r
-/*-----------------------------------------------------------------------------------*/\r
-int C2F(rea2db)(int *n, float *dx, int *incx, double *dy, int *incy)\r
-{\r
-       int i1 = 0, i = 0, ix = 0, iy = 0;\r
-\r
-     /* Parameter adjustments */\r
-    --dy;\r
-    --dx;\r
-\r
-    if (*n <= 0) return 0;\r
-\r
-    if (*incx == 1 && *incy == 1) \r
-       {\r
-               /* code for both increments equal to 1 */\r
-               i1 = *n;\r
-               for (i = 1; i <= i1; ++i) dy[i] = (double)dx[i];\r
-               return 0;\r
-    }\r
-\r
-       /* code for unequal increments or equal increments not equal to 1 */\r
-    ix = 1;\r
-    iy = 1;\r
-\r
-    if (*incx < 0) ix = (-(*n) + 1) * *incx + 1;\r
-    if (*incy < 0) iy = (-(*n) + 1) * *incy + 1;\r
-\r
-    i1 = *n;\r
-    for (i = 1; i <= i1; ++i) \r
-       {\r
-               dy[iy] = (double)dx[ix];\r
-               ix += *incx;\r
-               iy += *incy;\r
-    }\r
-    return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/\r
-\r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/*-----------------------------------------------------------------------------------*/
+#include "machine.h"
+/*-----------------------------------------------------------------------------------*/
+/* cette subroutine traduit un vecteur dx, de taille n, sur un 
+   vecteur double precision dy. 
+   dans le cas de deux increments egaux a 1, cette fonction
+   emploie des boucles "epanouies".
+   dans le cas ou les increments sont negatifs cette
+   fonction prend les composantes en ordre inverse. 
+*/
+/*-----------------------------------------------------------------------------------*/
+int C2F(rea2db)(int *n, float *dx, int *incx, double *dy, int *incy)
+{
+       int i1 = 0, i = 0, ix = 0, iy = 0;
+
+     /* Parameter adjustments */
+    --dy;
+    --dx;
+
+    if (*n <= 0) return 0;
+
+    if (*incx == 1 && *incy == 1) 
+       {
+               /* code for both increments equal to 1 */
+               i1 = *n;
+               for (i = 1; i <= i1; ++i) dy[i] = (double)dx[i];
+               return 0;
+    }
+
+       /* code for unequal increments or equal increments not equal to 1 */
+    ix = 1;
+    iy = 1;
+
+    if (*incx < 0) ix = (-(*n) + 1) * *incx + 1;
+    if (*incy < 0) iy = (-(*n) + 1) * *incy + 1;
+
+    i1 = *n;
+    for (i = 1; i <= i1; ++i) 
+       {
+               dy[iy] = (double)dx[ix];
+               ix += *incx;
+               iy += *incy;
+    }
+    return 0;
+}
+/*-----------------------------------------------------------------------------------*/
+
index ffc2b40..094c1a9 100644 (file)
@@ -1,10 +1,10 @@
-LIBRARY    LibScilab.dll\r
-\r
-\r
-EXPORTS\r
-\r
-Scierror\r
-List_free\r
-List_append\r
-List_free_item\r
-sciprint \r
+LIBRARY    LibScilab.dll
+
+
+EXPORTS
+
+Scierror
+List_free
+List_append
+List_free_item
+sciprint 
index 0083a0d..6cd9f32 100644 (file)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-@author Allan CORNET\r
-@author Sylvestre LEDRU\r
-INRIA 2007\r
--->\r
-<project name="renderer" default="compile">\r
-  <import file="../../build.incl.xml"/>\r
-\r
-  <property name="library.name" value="${library.renderer.name}" />\r
-\r
-  <description>\r
-       Build the renderer Scilab module\r
-  </description>\r
-\r
-<!-- \r
-  <target name="compile" description="build sources" depends="init,checkstyle-scilab">\r
--->\r
-  <target name="jar" description="Build the jar file" depends="compile">\r
-       <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">\r
-         <manifest>\r
-         </manifest>\r
-       </jar>\r
-  </target>\r
-</project>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+@author Allan CORNET
+@author Sylvestre LEDRU
+INRIA 2007
+-->
+<project name="renderer" default="compile">
+  <import file="../../build.incl.xml"/>
+
+  <property name="library.name" value="${library.renderer.name}" />
+
+  <description>
+       Build the renderer Scilab module
+  </description>
+
+<!-- 
+  <target name="compile" description="build sources" depends="init,checkstyle-scilab">
+-->
+  <target name="jar" description="Build the jar file" depends="compile">
+       <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">
+         <manifest>
+         </manifest>
+       </jar>
+  </target>
+</project>
index 9e70758..e502698 100644 (file)
@@ -1,8 +1,8 @@
-// ====================================================================\r
-// This file contains command to be executed at the end \r
-// of a scilab session for renderer module\r
-// Copyright INRIA 2007\r
-// ====================================================================\r
-// delete help chapter\r
-//del_module_help_chapter('renderer');\r
-// ====================================================================\r
+// ====================================================================
+// This file contains command to be executed at the end 
+// of a scilab session for renderer module
+// Copyright INRIA 2007
+// ====================================================================
+// delete help chapter
+//del_module_help_chapter('renderer');
+// ====================================================================
index c94fff3..661c0e1 100644 (file)
@@ -1,11 +1,11 @@
-// ====================================================================\r
-// renderer module initialisation file \r
-// Copyright INRIA 2007\r
-// ====================================================================\r
-//Load  functions librarie\r
-//load('SCI/modules/renderer/macros/lib');\r
-// ====================================================================\r
-//add help chapter\r
-//add_module_help_chapter('renderer');\r
-clear add_module_help_chapter;\r
-// ====================================================================\r
+// ====================================================================
+// renderer module initialisation file 
+// Copyright INRIA 2007
+// ====================================================================
+//Load  functions librarie
+//load('SCI/modules/renderer/macros/lib');
+// ====================================================================
+//add help chapter
+//add_module_help_chapter('renderer');
+clear add_module_help_chapter;
+// ====================================================================
index e61b138..abd97b0 100644 (file)
@@ -1,40 +1,40 @@
-LIBRARY    graphics.dll\r
-\r
-\r
-EXPORTS\r
-; from graphics\r
-sciIsExistingFigure\r
-sciGetLineStyle\r
-sciGetCurrentScilabXgc\r
-sciGetIsMark\r
-sciGetIsFilled\r
-sciGetIsLine\r
-sciGetParent\r
-sciGetInfoMessage\r
-sciGetForeground\r
-sciGetLineWidth\r
-sciGetGraphicContext\r
-sciGetNumColors\r
-sciGetLastSons\r
-sciGetVisibility\r
-sciGetEntityType\r
-sciGetParentFigure\r
-drawTextEntity\r
-drawSurfaceEntity\r
-drawSubWinEntity\r
-drawSegsEntity\r
-drawRectangleEntity\r
-drawPolylineEntity\r
-drawLegendEntity\r
-drawGrayplotEntity\r
-sciGetNum\r
-sciGetBackground\r
-drawFecEntity\r
-drawCompoundEntity\r
-drawAxesEntity\r
-drawArcEntity\r
-sciGetCurrentFigure\r
-getHandleDrawer\r
-sciGetMarkSizeUnit\r
-sciGetMarkSize\r
+LIBRARY    graphics.dll
+
+
+EXPORTS
+; from graphics
+sciIsExistingFigure
+sciGetLineStyle
+sciGetCurrentScilabXgc
+sciGetIsMark
+sciGetIsFilled
+sciGetIsLine
+sciGetParent
+sciGetInfoMessage
+sciGetForeground
+sciGetLineWidth
+sciGetGraphicContext
+sciGetNumColors
+sciGetLastSons
+sciGetVisibility
+sciGetEntityType
+sciGetParentFigure
+drawTextEntity
+drawSurfaceEntity
+drawSubWinEntity
+drawSegsEntity
+drawRectangleEntity
+drawPolylineEntity
+drawLegendEntity
+drawGrayplotEntity
+sciGetNum
+sciGetBackground
+drawFecEntity
+drawCompoundEntity
+drawAxesEntity
+drawArcEntity
+sciGetCurrentFigure
+getHandleDrawer
+sciGetMarkSizeUnit
+sciGetMarkSize
 sciGetMarkStyle
\ No newline at end of file
index fd5e469..4fd3150 100644 (file)
@@ -1,10 +1,10 @@
-// ====================================================================\r
-// help renderer module\r
-// Add chapter\r
-// Copyright INRIA 2007\r
-// Allan CORNET\r
-// ====================================================================\r
-path = SCI+'/modules/renderer/help/'+getlanguage('LANGUAGE_DEFAULT');\r
-add_help_chapter("renderer",path,%T);\r
-clear path add_help_chapter;\r
-// ====================================================================\r
+// ====================================================================
+// help renderer module
+// Add chapter
+// Copyright INRIA 2007
+// Allan CORNET
+// ====================================================================
+path = SCI+'/modules/renderer/help/'+getlanguage('LANGUAGE_DEFAULT');
+add_help_chapter("renderer",path,%T);
+clear path add_help_chapter;
+// ====================================================================
index 1d3cbe1..004a1ba 100644 (file)
@@ -1,9 +1,9 @@
-// ====================================================================\r
-// help renderer module\r
-// remove chapter\r
-// Copyright INRIA 2007\r
-// Allan CORNET\r
-// ====================================================================\r
-del_help_chapter("renderer",%T);\r
-clear del_help_chapter;\r
-// ====================================================================\r
+// ====================================================================
+// help renderer module
+// remove chapter
+// Copyright INRIA 2007
+// Allan CORNET
+// ====================================================================
+del_help_chapter("renderer",%T);
+clear del_help_chapter;
+// ====================================================================
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index 21c50a7..77da987 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">
+<LOCALIZATION>
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+               
+<entry>
+       <tag></tag>
+       <string></string>
+</entry>       
+
+</LOCALIZATION>
index fa1cbbf..f6a94cb 100644 (file)
@@ -1,5 +1,5 @@
-//------------------------------------\r
-// Allan CORNET INRIA 2007\r
-//------------------------------------\r
-//genlib('rendererlib','SCI/modules/renderer/macros');\r
-//------------------------------------\r
+//------------------------------------
+// Allan CORNET INRIA 2007
+//------------------------------------
+//genlib('rendererlib','SCI/modules/renderer/macros');
+//------------------------------------
index 5529c5b..9224fa9 100644 (file)
@@ -1,53 +1,53 @@
-;##############################################################################################################\r
-; Script d'installation Inno Setup (5.1.7) pour scilab\r
-; Allan CORNET\r
-; Version TRUNK\r
-; Copyright INRIA 2007\r
-;##############################################################################################################\r
-;--------------------------------------------------------------------------------------------------------------\r
-; renderer module\r
-;--------------------------------------------------------------------------------------------------------------\r
-;\r
-#define RENDERER "renderer"\r
-;\r
-Source: bin\jogl.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}\r
-Source: bin\jogl_awt.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}\r
-Source: bin\jogl_cg.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}\r
-\r
-Source: bin\scirenderer.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}\r
-;Source: bin\norenderer.dll; DestDir: {app}\bin; DestName: scirenderer.dll; Components: not ({#COMPN_GRAPHICS})\r
-;\r
-Source: thirdparty\gluegen-rt.jar; DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}\r
-Source: thirdparty\jogl.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}\r
-;\r
-Source: modules\{#RENDERER}\jar\org.scilab.modules.renderer.jar;DestDir: {app}\modules\{#RENDERER}\jar; Components: {#COMPN_GRAPHICS}\r
-;\r
-\r
-Source: modules\{#RENDERER}\changelog.txt; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS};\r
-Source: modules\{#RENDERER}\licence.txt; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS}\r
-Source: modules\{#RENDERER}\readme.txt; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS}\r
-Source: modules\{#RENDERER}\version.xml; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS}\r
-;\r
-;Source: modules\{#RENDERER}\sci_gateway\renderer_gateway.xml; DestDir: {app}\modules\{#RENDERER}\sci_gateway; Components: {#COMPN_GRAPHICS}\r
-;\r
-Source: modules\{#RENDERER}\includes\*.h; DestDir: {app}\modules\{#RENDERER}\includes; Components: {#COMPN_GRAPHICS}\r
-;\r
-Source: modules\{#RENDERER}\help\addchapter.sce; DestDir: {app}\modules\{#RENDERER}\help; Flags: recursesubdirs; Components:  {#COMPN_GRAPHICS}\r
-Source: modules\{#RENDERER}\help\removechapter.sce; DestDir: {app}\modules\{#RENDERER}\help; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}\r
-;\r
-Source: modules\{#RENDERER}\etc\{#RENDERER}.quit; DestDir: {app}\modules\{#RENDERER}\etc; Components: {#COMPN_GRAPHICS}\r
-Source: modules\{#RENDERER}\etc\{#RENDERER}.start; DestDir: {app}\modules\{#RENDERER}\etc; Components: {#COMPN_GRAPHICS}\r
-;\r
-;Source: modules\{#RENDERER}\help\*.htm; DestDir: {app}\modules\{#RENDERER}\help; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}\r
-;\r
-Source: modules\{#RENDERER}\languages\*.xml; DestDir: {app}\modules\{#RENDERER}\languages; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}\r
-;\r
-Source: modules\{#RENDERER}\macros\buildmacros.sce; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}\r
-;Source: modules\{#RENDERER}\macros\*.bin; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}\r
-;Source: modules\{#RENDERER}\macros\*.sci; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}\r
-;Source: modules\{#RENDERER}\macros\lib; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}\r
-;Source: modules\{#RENDERER}\macros\names; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}\r
-;\r
-;Source: modules\{#RENDERER}\demos\*.*; DestDir: {app}\modules\{#RENDERER}\demos; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}\r
-;\r
-;--------------------------------------------------------------------------------------------------------------\r
+;##############################################################################################################
+; Script d'installation Inno Setup (5.1.7) pour scilab
+; Allan CORNET
+; Version TRUNK
+; Copyright INRIA 2007
+;##############################################################################################################
+;--------------------------------------------------------------------------------------------------------------
+; renderer module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define RENDERER "renderer"
+;
+Source: bin\jogl.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
+Source: bin\jogl_awt.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
+Source: bin\jogl_cg.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
+
+Source: bin\scirenderer.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
+;Source: bin\norenderer.dll; DestDir: {app}\bin; DestName: scirenderer.dll; Components: not ({#COMPN_GRAPHICS})
+;
+Source: thirdparty\gluegen-rt.jar; DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
+Source: thirdparty\jogl.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
+;
+Source: modules\{#RENDERER}\jar\org.scilab.modules.renderer.jar;DestDir: {app}\modules\{#RENDERER}\jar; Components: {#COMPN_GRAPHICS}
+;
+
+Source: modules\{#RENDERER}\changelog.txt; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS};
+Source: modules\{#RENDERER}\licence.txt; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS}
+Source: modules\{#RENDERER}\readme.txt; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS}
+Source: modules\{#RENDERER}\version.xml; DestDir: {app}\modules\{#RENDERER}; Components: {#COMPN_GRAPHICS}
+;
+;Source: modules\{#RENDERER}\sci_gateway\renderer_gateway.xml; DestDir: {app}\modules\{#RENDERER}\sci_gateway; Components: {#COMPN_GRAPHICS}
+;
+Source: modules\{#RENDERER}\includes\*.h; DestDir: {app}\modules\{#RENDERER}\includes; Components: {#COMPN_GRAPHICS}
+;
+Source: modules\{#RENDERER}\help\addchapter.sce; DestDir: {app}\modules\{#RENDERER}\help; Flags: recursesubdirs; Components:  {#COMPN_GRAPHICS}
+Source: modules\{#RENDERER}\help\removechapter.sce; DestDir: {app}\modules\{#RENDERER}\help; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}
+;
+Source: modules\{#RENDERER}\etc\{#RENDERER}.quit; DestDir: {app}\modules\{#RENDERER}\etc; Components: {#COMPN_GRAPHICS}
+Source: modules\{#RENDERER}\etc\{#RENDERER}.start; DestDir: {app}\modules\{#RENDERER}\etc; Components: {#COMPN_GRAPHICS}
+;
+;Source: modules\{#RENDERER}\help\*.htm; DestDir: {app}\modules\{#RENDERER}\help; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}
+;
+Source: modules\{#RENDERER}\languages\*.xml; DestDir: {app}\modules\{#RENDERER}\languages; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}
+;
+Source: modules\{#RENDERER}\macros\buildmacros.sce; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}
+;Source: modules\{#RENDERER}\macros\*.bin; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}
+;Source: modules\{#RENDERER}\macros\*.sci; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}
+;Source: modules\{#RENDERER}\macros\lib; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}
+;Source: modules\{#RENDERER}\macros\names; DestDir: {app}\modules\{#RENDERER}\macros; Components: {#COMPN_GRAPHICS}
+;
+;Source: modules\{#RENDERER}\demos\*.*; DestDir: {app}\modules\{#RENDERER}\demos; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}
+;
+;--------------------------------------------------------------------------------------------------------------
index b86b61a..35fad12 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8,00"\r
-       Name="renderer"\r
-       ProjectGUID="{B23B01C1-A545-4BA0-9950-7BCADE201C5B}"\r
-       RootNamespace="renderer"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../../java/jdk/include;../../java/jdk/include/win32"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="0"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n scirenderer.dll %%f &gt;nul&#x0D;&#x0A;copy *.def renderertmp.def &gt;nul&#x0D;&#x0A;copy ..\renderer_header.def+renderertmp.def  ..\renderer.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions="/fixed:no"\r
-                               AdditionalDependencies="LibScilab.lib graphics.lib"\r
-                               OutputFile="../../bin/scirenderer.dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="renderer.def"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="1"\r
-                               WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../../java/jdk/include;../../java/jdk/include/win32"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableEnhancedInstructionSet="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n scirenderer.dll %%f &gt;nul&#x0D;&#x0A;copy *.def renderertmp.def &gt;nul&#x0D;&#x0A;copy ..\renderer_header.def+renderertmp.def  ..\renderer.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="LibScilab.lib graphics.lib"\r
-                               OutputFile="../../bin/scirenderer.dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="renderer.def"\r
-                               GenerateDebugInformation="false"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="0"\r
-                               ImportLibrary="../../bin/scirenderer.lib"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\cpp\BuildDrawingObserver.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\ConcreteDrawableFigure.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\arcDrawing\DrawableArc.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\arcDrawing\DrawableArcFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\axesDrawing\DrawableAxes.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\axesDrawing\DrawableAxesFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableClippedObject.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompound.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompoundFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\fecDrawing\DrawableFec.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\fecDrawing\DrawableFecFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigure.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImp.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImpFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureJoGL.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplot.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplotFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\labelDrawing\DrawableLabel.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\labelDrawing\DrawableLabelFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\legendDrawing\DrawableLegend.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\legendDrawing\DrawableLegendFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableObject.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableObjectFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableObjectJoGL.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolyline.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolylineFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangle.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImp.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImpFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleJoGL.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\segsDrawing\DrawableSegs.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\segsDrawing\DrawableSegsFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwin.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwinFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurface.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurfaceFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\textDrawing\DrawableText.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\textDrawing\DrawableTextFactory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawingBridge.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\FigureScilabCall.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\getHandleDrawer.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\GetJavaProperty.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\HandleDrawingObserver.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\HandleObserverManagement.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\RectangleFillDrawerJoGL.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\RectangleLineDrawerJoGL.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\RectangleMarkDrawerJoGL.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\SetJavaProperty.cpp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\cpp\BuildDrawingObserver.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\ConcreteDrawableFigure.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\arcDrawing\DrawableArc.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\arcDrawing\DrawableArcFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\axesDrawing\DrawableAxes.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\axesDrawing\DrawableAxesFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableClippedObject.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompound.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompoundFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\fecDrawing\DrawableFec.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\fecDrawing\DrawableFecFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigure.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImpFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureJoGL.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplot.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplotFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\labelDrawing\DrawableLabel.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\labelDrawing\DrawableLabelFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\legendDrawing\DrawableLegend.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\legendDrawing\DrawableLegendFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableObject.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableObjectFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableObjectImp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawableObjectJoGL.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolyline.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolylineFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangle.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImpFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleJoGL.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\segsDrawing\DrawableSegs.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\segsDrawing\DrawableSegsFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwinFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurface.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurfaceFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\textDrawing\DrawableText.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\textDrawing\DrawableTextFactory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\DrawingBridge.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\DrawRectangleStrategy.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\figureDrawing\FigureScilabCall.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\getHandleDrawer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\GetJavaProperty.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\HandleDrawingObserver.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\HandleObserver.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\HandleObserverManagement.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\Observer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\RectangleFillDrawerJoGL.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\RectangleLineDrawerJoGL.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\rectangleDrawing\RectangleMarkDrawerJoGL.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\cpp\SetJavaProperty.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="localization"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\languages\en_US\errors.xml"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\languages\en_US\menus.xml"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\languages\en_US\messages.xml"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <File\r
-                       RelativePath=".\Makefile.am"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath=".\renderer.iss"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath=".\sci_gateway\renderer_gateway.xml"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath=".\version.xml"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8,00"
+       Name="renderer"
+       ProjectGUID="{B23B01C1-A545-4BA0-9950-7BCADE201C5B}"
+       RootNamespace="renderer"
+       Keyword="Win32Proj"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../../java/jdk/include;../../java/jdk/include/win32"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n scirenderer.dll %%f &gt;nul&#x0D;&#x0A;copy *.def renderertmp.def &gt;nul&#x0D;&#x0A;copy ..\renderer_header.def+renderertmp.def  ..\renderer.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/fixed:no"
+                               AdditionalDependencies="LibScilab.lib graphics.lib"
+                               OutputFile="../../bin/scirenderer.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="renderer.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../../java/jdk/include;../../java/jdk/include/win32"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n scirenderer.dll %%f &gt;nul&#x0D;&#x0A;copy *.def renderertmp.def &gt;nul&#x0D;&#x0A;copy ..\renderer_header.def+renderertmp.def  ..\renderer.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib graphics.lib"
+                               OutputFile="../../bin/scirenderer.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="renderer.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               ImportLibrary="../../bin/scirenderer.lib"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\src\cpp\BuildDrawingObserver.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\ConcreteDrawableFigure.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\arcDrawing\DrawableArc.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\arcDrawing\DrawableArcFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\axesDrawing\DrawableAxes.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\axesDrawing\DrawableAxesFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableClippedObject.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompound.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompoundFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\fecDrawing\DrawableFec.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\fecDrawing\DrawableFecFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigure.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImp.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImpFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureJoGL.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplot.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplotFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\labelDrawing\DrawableLabel.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\labelDrawing\DrawableLabelFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\legendDrawing\DrawableLegend.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\legendDrawing\DrawableLegendFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableObject.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableObjectFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableObjectJoGL.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolyline.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolylineFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangle.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImp.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImpFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleJoGL.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\segsDrawing\DrawableSegs.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\segsDrawing\DrawableSegsFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwin.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwinFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurface.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurfaceFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\textDrawing\DrawableText.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\textDrawing\DrawableTextFactory.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawingBridge.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\FigureScilabCall.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\getHandleDrawer.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\GetJavaProperty.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\HandleDrawingObserver.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\HandleObserverManagement.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\RectangleFillDrawerJoGL.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\RectangleLineDrawerJoGL.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\RectangleMarkDrawerJoGL.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\SetJavaProperty.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File
+                               RelativePath=".\src\cpp\BuildDrawingObserver.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\ConcreteDrawableFigure.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\arcDrawing\DrawableArc.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\arcDrawing\DrawableArcFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\axesDrawing\DrawableAxes.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\axesDrawing\DrawableAxesFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableClippedObject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompound.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\compoundDrawing\DrawableCompoundFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\fecDrawing\DrawableFec.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\fecDrawing\DrawableFecFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigure.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImp.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureImpFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\DrawableFigureJoGL.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplot.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\grayplotDrawing\DrawableGrayplotFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\labelDrawing\DrawableLabel.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\labelDrawing\DrawableLabelFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\legendDrawing\DrawableLegend.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\legendDrawing\DrawableLegendFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableObject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableObjectFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableObjectImp.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawableObjectJoGL.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolyline.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\polylineDrawing\DrawablePolylineFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangle.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImp.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleImpFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawableRectangleJoGL.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\segsDrawing\DrawableSegs.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\segsDrawing\DrawableSegsFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwin.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\subwinDrawing\DrawableSubwinFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurface.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\surfaceDrawing\DrawableSurfaceFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\textDrawing\DrawableText.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\textDrawing\DrawableTextFactory.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\DrawingBridge.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\DrawRectangleStrategy.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\figureDrawing\FigureScilabCall.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\getHandleDrawer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\GetJavaProperty.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\HandleDrawingObserver.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\HandleObserver.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\HandleObserverManagement.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\Observer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\RectangleFillDrawerJoGL.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\RectangleLineDrawerJoGL.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\rectangleDrawing\RectangleMarkDrawerJoGL.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\cpp\SetJavaProperty.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+               </Filter>
+               <Filter
+                       Name="localization"
+                       >
+                       <File
+                               RelativePath=".\languages\en_US\errors.xml"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\languages\en_US\menus.xml"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\languages\en_US\messages.xml"
+                               >
+                       </File>
+               </Filter>
+               <File
+                       RelativePath=".\Makefile.am"
+                       >
+               </File>
+               <File
+                       RelativePath=".\renderer.iss"
+                       >
+               </File>
+               <File
+                       RelativePath=".\sci_gateway\renderer_gateway.xml"
+                       >
+               </File>
+               <File
+                       RelativePath=".\version.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index d2d65d6..1e6d12c 100644 (file)
@@ -1,21 +1,21 @@
-LIBRARY    scirenderer.dll\r
-\r
-\r
-EXPORTS\r
-\r
-; --------------------------------------- \r
-; scirenderer\r
-; --------------------------------------- \r
-; add here exports from cpp\r
-createDrawingObserver\r
-deleteObservers\r
-notifyObservers\r
-destroyHandleDrawer\r
-sciDrawObj\r
-displayChildren\r
-Java_org_scilab_modules_renderer_figureDrawing_FigureScilabCall_displayFigure\r
-Java_org_scilab_modules_renderer_figureDrawing_FigureScilabCall_redrawFigure\r
-sciSetJavaColormap\r
-sciGetJavaColormap\r
-; --------------------------------------- \r
-\r
+LIBRARY    scirenderer.dll
+
+
+EXPORTS
+
+; --------------------------------------- 
+; scirenderer
+; --------------------------------------- 
+; add here exports from cpp
+createDrawingObserver
+deleteObservers
+notifyObservers
+destroyHandleDrawer
+sciDrawObj
+displayChildren
+Java_org_scilab_modules_renderer_figureDrawing_FigureScilabCall_displayFigure
+Java_org_scilab_modules_renderer_figureDrawing_FigureScilabCall_redrawFigure
+sciSetJavaColormap
+sciGetJavaColormap
+; --------------------------------------- 
+
index c94e25f..39e9b9d 100644 (file)
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8,00"\r
-       Name="renderer-Ant"\r
-       ProjectGUID="{4235A847-ED0E-43A3-B62B-E59CB857EDE9}"\r
-       RootNamespace="renderer-Ant"\r
-       Keyword="MakeFileProj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCNMakeTool"\r
-                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"\r
-                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;_DEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCNMakeTool"\r
-                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"\r
-                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;NDEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{32CECC8B-3355-4312-87A2-5B25796C3F41}"\r
-                       >\r
-               </Filter>\r
-               <File\r
-                       RelativePath="..\..\..\build.xml"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8,00"
+       Name="renderer-Ant"
+       ProjectGUID="{4235A847-ED0E-43A3-B62B-E59CB857EDE9}"
+       RootNamespace="renderer-Ant"
+       Keyword="MakeFileProj"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ../..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{32CECC8B-3355-4312-87A2-5B25796C3F41}"
+                       >
+               </Filter>
+               <File
+                       RelativePath="..\..\..\build.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index cd87bef..29cdc34 100644 (file)
@@ -1,5 +1,5 @@
-LIBRARY    LibScilab.dll\r
-\r
-\r
-EXPORTS\r
- Scierror\r
+LIBRARY    LibScilab.dll
+
+
+EXPORTS
+ Scierror
index 6bfc911..87c8ed6 100644 (file)
@@ -1,15 +1,15 @@
-/*-----------------------------------------------------------------------------------*/\r
-/* INRIA 2007 */\r
-/* Allan CORNET */\r
-/*-----------------------------------------------------------------------------------*/ \r
-#include "machine.h" \r
-/*-----------------------------------------------------------------------------------*/ \r
-extern int  Scierror __PARAMS((int iv,char *fmt,...));\r
-/*-----------------------------------------------------------------------------------*/ \r
-int C2F(gw_module_skeleton)()\r
-{\r
-       Scierror(999,"module_skeleton interface not installed.\r\n");\r
-       return 0;\r
-}\r
-/*-----------------------------------------------------------------------------------*/ \r
+/*-----------------------------------------------------------------------------------*/
+/* INRIA 2007 */
+/* Allan CORNET */
+/*-----------------------------------------------------------------------------------*/ 
+#include "machine.h" 
+/*-----------------------------------------------------------------------------------*/ 
+extern int  Scierror __PARAMS((int iv,char *fmt,...));
+/*-----------------------------------------------------------------------------------*/ 
+int C2F(gw_module_skeleton)()
+{
+       Scierror(999,"module_skeleton interface not installed.\r\n");
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
        
\ No newline at end of file
index 22df56f..d56f09b 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8,00"\r
-       Name="nomodule_skeleton"\r
-       ProjectGUID="{6880943E-80BA-480B-A595-89B2C3BE14A8}"\r
-       RootNamespace="nomodule_skeleton"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../core/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="0"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nomodule_skeleton.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nomodule_skeletontmp.def &gt;nul&#x0D;&#x0A;copy ..\nomodule_skeleton_header.def+nomodule_skeletontmp.def  ..\nomodule_skeleton.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions="/fixed:no"\r
-                               AdditionalDependencies="LibScilab.lib"\r
-                               OutputFile="../../../../bin/$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="nomodule_skeleton.def"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="1"\r
-                               WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories="../../../core/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableEnhancedInstructionSet="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nomodule_skeleton.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nomodule_skeletontmp.def &gt;nul&#x0D;&#x0A;copy ..\nomodule_skeleton_header.def+nomodule_skeletontmp.def  ..\nomodule_skeleton.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="LibScilab.lib"\r
-                               OutputFile="../../../../bin/$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="nomodule_skeleton.def"\r
-                               GenerateDebugInformation="false"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="0"\r
-                               ImportLibrary="../../../../bin/$(ProjectName).lib"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\nomodule_skeleton.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\nomodule_skeleton.rc"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8,00"
+       Name="nomodule_skeleton"
+       ProjectGUID="{6880943E-80BA-480B-A595-89B2C3BE14A8}"
+       RootNamespace="nomodule_skeleton"
+       Keyword="Win32Proj"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../../core/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nomodule_skeleton.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nomodule_skeletontmp.def &gt;nul&#x0D;&#x0A;copy ..\nomodule_skeleton_header.def+nomodule_skeletontmp.def  ..\nomodule_skeleton.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/fixed:no"
+                               AdditionalDependencies="LibScilab.lib"
+                               OutputFile="../../../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="nomodule_skeleton.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="../../../core/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nomodule_skeleton.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nomodule_skeletontmp.def &gt;nul&#x0D;&#x0A;copy ..\nomodule_skeleton_header.def+nomodule_skeletontmp.def  ..\nomodule_skeleton.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib"
+                               OutputFile="../../../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="nomodule_skeleton.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               ImportLibrary="../../../../bin/$(ProjectName).lib"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\nomodule_skeleton.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+                       <File
+                               RelativePath=".\nomodule_skeleton.rc"
+                               >
+                       </File>
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index eae747f..59a59de 100644 (file)
@@ -1,14 +1,14 @@
-//{{NO_DEPENDENCIES}}\r
-// Microsoft Visual C++ generated include file.\r
-// Used by module_skeleton.rc\r
-\r
-// Next default values for new objects\r
-// \r
-#ifdef APSTUDIO_INVOKED\r
-#ifndef APSTUDIO_READONLY_SYMBOLS\r
-#define _APS_NEXT_RESOURCE_VALUE        101\r
-#define _APS_NEXT_COMMAND_VALUE         40001\r
-#define _APS_NEXT_CONTROL_VALUE         1001\r
-#define _APS_NEXT_SYMED_VALUE           101\r
-#endif\r
-#endif\r
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by module_skeleton.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
index 81ebd8d..edc237e 100644 (file)
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-\r
-<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">\r
-<MODULE_VERSION name="renderer">\r
-<!-- =================== -->\r
-<!--\r
- Scilab\r
- Defines the version of a module\r
-\r
- @author Allan CORNET\r
- @author Sylvestre LEDRU\r
- @date INRIA 2007\r
- ===================\r
-\r
--->\r
-<!-- =================== -->\r
-\r
-<VERSION major="5" minor="0" maintenance="0" revision="0" string="unstable-svn" />\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
+<MODULE_VERSION name="renderer">
+<!-- =================== -->
+<!--
+ Scilab
+ Defines the version of a module
+
+ @author Allan CORNET
+ @author Sylvestre LEDRU
+ @date INRIA 2007
+ ===================
+
+-->
+<!-- =================== -->
+
+<VERSION major="5" minor="0" maintenance="0" revision="0" string="unstable-svn" />
 </MODULE_VERSION>
\ No newline at end of file