diff options
| author | jofret | 2012-08-02 06:22:08 +0000 |
|---|---|---|
| committer | jofret | 2012-08-02 06:22:08 +0000 |
| commit | dcf66f5e1d605f7740b79bf8a20434bfa4853867 (patch) | |
| tree | 28082a919a264787e09e9685e9b4a7237e918886 | |
| parent | 96ebf66e990156763a31155f878633bf998c89c5 (diff) | |
| download | scilab2c-dcf66f5e1d605f7740b79bf8a20434bfa4853867.tar.gz scilab2c-dcf66f5e1d605f7740b79bf8a20434bfa4853867.tar.bz2 scilab2c-dcf66f5e1d605f7740b79bf8a20434bfa4853867.zip | |
Remove SCI2C tag on functions call for now.
| -rw-r--r-- | scilab2c/macros/CCodeGeneration/C_Funcall.sci | 10 | ||||
| -rw-r--r-- | scilab2c/macros/CCodeGeneration/C_GenerateMakefile.sci | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/scilab2c/macros/CCodeGeneration/C_Funcall.sci b/scilab2c/macros/CCodeGeneration/C_Funcall.sci index 8b629cb1..b130a622 100644 --- a/scilab2c/macros/CCodeGeneration/C_Funcall.sci +++ b/scilab2c/macros/CCodeGeneration/C_Funcall.sci @@ -195,11 +195,13 @@ else end -if CFunName == "main" +// FIXME : Wrap library function call with prefixed name + +//if CFunName == "main" CCall = CCall + CFunName + "("; -else - CCall = CCall+"SCI2C("+CFunName+")("; -end +//else +// CCall = CCall+"SCI2C("+CFunName+")("; +//end // #RNU_RES_B PrintStringInfo(' C call after output scalar args check: '+CCall,ReportFileName,'file','y'); diff --git a/scilab2c/macros/CCodeGeneration/C_GenerateMakefile.sci b/scilab2c/macros/CCodeGeneration/C_GenerateMakefile.sci index 3914d4dc..013f2e8f 100644 --- a/scilab2c/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/scilab2c/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -56,7 +56,8 @@ PrintStringInfo('SCI2CDIR = .',FileInfo.MakefileFilename,'file','y','y'); // Compiler definition PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); -PrintStringInfo('CFLAGS = -Wall -pedantic -I $(HSRCDIR) -I $(ISRCDIR) -lm',FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('CFLAGS = -Wall -pedantic -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('LDFLAGS = -lblas -llapack -lm',FileInfo.MakefileFilename,'file','y','y'); // Binary definition PrintStringInfo('EXEFILENAME = mytest.exe',FileInfo.MakefileFilename,'file','y','y'); @@ -85,7 +86,7 @@ PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""============================""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""Generation of the executable""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""============================""',FileInfo.MakefileFilename,'file','y','y'); -PrintStringInfo('\t$(CC) $(CFLAGS) $(OBJ) *.c -llapack -lblas -o $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('\t$(CC) $(CFLAGS) $(OBJ) *.c $(LDFLAGS) -o $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""==============""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""Executing code""',FileInfo.MakefileFilename,'file','y','y'); |