Modifications in dlGenerateMakefile.sci and cppmex/builder.sce to make work demo... 16/14616/2
Charlotte HECQUET [Wed, 4 Jun 2014 15:41:33 +0000 (17:41 +0200)]
Change-Id: Ic8d54569f0ba449b9f2001b0b52f812606c897d9

scilab/modules/dynamic_link/macros/windows/dlwGenerateMakefile.sci
scilab/modules/mexlib/examples/cppmex/builder.sce

index 05263b0..cfa2c70 100644 (file)
@@ -162,7 +162,11 @@ function ilib_gen_Make_win32(name, ..
                 MEXCFLAGS = "-Dmexfunction_=mex" + table(i,2) + "_ -DmexFunction=mex_" + table(i,2);
                 MEXFFLAGS = "-Dmexfunction=mex" + table(i,2);
                 if table(i,3)=="cmex" then
-                    filenameMex = table(i,2) + ".c";
+                    if find(listfiles() == table(i,2)+".cpp") then
+                        filenameMex = table(i,2) + ".cpp";
+                    else
+                        filenameMex = table(i,2) + ".c";
+                    end
                 else
                     filenameMex = table(i,2) + ".f";
                 end
index 4725bba..458ea69 100644 (file)
@@ -15,7 +15,7 @@
 ilib_name  = "libmex"
 
 // objects files (but do not give mexfiles here)
-files = ["temptst2.o"];
+files = ["temptst2.cpp"];
 
 // other libs needed for linking (must be shared library names)
 libs  = [];