diff options
| author | siddhu8990 | 2016-02-01 11:29:45 +0530 |
|---|---|---|
| committer | siddhu8990 | 2016-02-01 11:29:45 +0530 |
| commit | bbdc94252ee563f0b01d4949868a583e43a2e6a8 (patch) | |
| tree | 5f5197d22bba24e41928c98aed936dc5ad828fcf /macros/CCodeGeneration/C_GenerateMakefile.sci | |
| parent | 5df6d1cb2868abdc8df66755f76c997ee36c0b49 (diff) | |
| parent | 8ee41aca4183a0239b9cb220de3f159b1f0910fb (diff) | |
| download | scilab2c-bbdc94252ee563f0b01d4949868a583e43a2e6a8.tar.gz scilab2c-bbdc94252ee563f0b01d4949868a583e43a2e6a8.tar.bz2 scilab2c-bbdc94252ee563f0b01d4949868a583e43a2e6a8.zip | |
Merged RPi and bit operators
Diffstat (limited to 'macros/CCodeGeneration/C_GenerateMakefile.sci')
| -rw-r--r-- | macros/CCodeGeneration/C_GenerateMakefile.sci | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci index 424c8216..1ef5a411 100644 --- a/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -1,3 +1,5 @@ +//Removed 4 lines code from end that causes ot generate the Makefile.mak file that is not needed with cygwin +//Changed at line 52 function C_GenerateMakefile(FileInfo,SharedInfo) // function C_GenerateMakefile(FileInfo,SharedInfo) // ----------------------------------------------------------------- @@ -53,7 +55,9 @@ PrintStringInfo('ISRCDIR = '+makeisrcdir,FileInfo.MakefileFilename,'file','y PrintStringInfo('LIBDIR = '+makelibdir,FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('SCI2CDIR = .',FileInfo.MakefileFilename,'file','y','y'); -// Compiler definition +if getos() == 'Windows' then + + // Compiler definition if (target == 'RPi') PrintStringInfo('CC = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y'); else @@ -65,6 +69,12 @@ if (target == 'RPi') else PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); end +else + // Compiler definition + PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS = -lblas -llapack -lm',FileInfo.MakefileFilename,'file','y','y'); +end // Binary definition PrintStringInfo('EXEFILENAME = mytest.exe',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilename,'file','y','y'); @@ -118,8 +128,6 @@ PrintStringInfo('\t@echo ""==========================""',FileInfo.MakefileFilena PrintStringInfo('\trm -rf $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y'); -if getos() == 'Windows' then - C_GenerateMakefile_msvc(FileInfo,SharedInfo); -end + endfunction |