src/Builder4/Editor.bjs

[app.Builder.js] / src / Palete / ValaSourceCompiler.vala

diff --git a/src/Palete/ValaSourceCompiler.vala b/src/Palete/ValaSourceCompiler.vala
index cad265e..b245230 100644 (file)
--- a/src/Palete/ValaSourceCompiler.vala
+++ b/src/Palete/ValaSourceCompiler.vala
@@ -227,7 +227,9 @@ namespace Palete {
                
                        context.experimental = false;
                        context.experimental_non_null = false;
-#if VALA_0_30
+#if VALA_0_32
+                       var ver=32;
+#elif VALA_0_30
                        var ver=30;
 #elif VALA_0_28
                        var ver=28;
@@ -273,7 +275,7 @@ namespace Palete {
                        valac += " -b  " + GLib.Environment.get_home_dir() + " ";
                        context.basedir = GLib.Environment.get_home_dir(); //Posix.realpath (".");
                
-                       context.directory = context.basedir;
+                       context.directory = null; //??? causes target to end up in the right place at present..
                
 
                        // add default packages:
@@ -319,7 +321,7 @@ namespace Palete {
                                        }
                                        //print("Add source file %s\n", path);
                                        
-                                
+                                       valac += " " + path;
                                        
                                        if (Regex.match_simple("\\.c$", path)) {
                                                context.add_c_source_file(path);
@@ -338,7 +340,7 @@ namespace Palete {
                                }
                        }
                        
-                       print("%s\n", valac);
+                       // print("%s\n", valac); -
                        // default.. packages..
                        context.add_external_package ("glib-2.0"); 
                        context.add_external_package ("gobject-2.0");
@@ -419,10 +421,10 @@ namespace Palete {
                        var cc_command = Environment.get_variable ("CC");
                        
                        
-                       string [] cc_options = { "-lm" };
-                       valac += " -X -lm";
+                       string [] cc_options = { "-lm", "-pg" };
+                       valac += " -X -lm -X -pg";
                        
-#if VALA_0_28 || VALA_0_30
+#if VALA_0_28 || VALA_0_30 || VALA_0_32
                        var pkg_config_command = Environment.get_variable ("PKG_CONFIG");
                        ccompiler.compile (context, cc_command, cc_options, pkg_config_command);
 #else