rewrote the build file

farzher · Nov 27, 2022 · ebb9d75 · ebb9d75
1 parent f3e2e55
commit ebb9d75
Showing 1 changed file with 51 additions and 36 deletions.
diff --git a/first.jai b/first.jai
@@ -4,54 +4,69 @@ main_filepath :: "src/main.jai";
 exe_icon_path :: "assets/bunny.ico";
 
 #run build();
+build :: () {
 
+  // seperate build options for debug vs release
+  build_options((options: *Build_Options) {
+    options.output_executable_name = "bunnymark";
+    #if !RELEASE then options.backend = .X64;
+    #if  RELEASE then #run Windows_Resources.disable_runtime_console();
+  });
 
-build :: () {
-  w := compiler_create_workspace();
-  options := get_build_options(); set_build_options_dc(.{do_output=false});
+  // wait for the exe to finish compiling, so we can set its icon
+  build_compile(main_filepath);
 
-  { // build for debug or release
+  // set exe icon
+  exe_path := tprint("%1%2.exe", options.output_path, options.output_executable_name);
+  Windows_Resources.set_icon_by_filename(exe_path, exe_icon_path);
 
-    options.output_executable_name = "bunnymark";
+  // delete .pdb if release
+  #if RELEASE  File.file_delete("bunnymark.pdb");
 
-    #if !RELEASE {
-      options.backend = .X64;
-    }
-    #if  RELEASE {
-      set_optimization_level(*options, 2, 0);
-      options.stack_trace = false;
-      #run WR.disable_runtime_console();
-    }
-  }
+}
 
-  // done setting options
-  set_build_options(options, w);
 
 
-  { // compile
-    compiler_begin_intercept(w);
 
-    add_build_file(main_filepath, w);
 
-    // waiting for our exe to finish so we can set its icon
-    while true {
-      message := compiler_wait_for_message();
-      if !message continue;
-      if message.workspace != w continue;
-      if message.kind == .COMPLETE break;
-    }
-    compiler_end_intercept(w);
-  }
 
-  // set exe icon
-  exe_path := tprint("%1%2.exe", options.output_path, options.output_executable_name);
-  WR.set_icon_by_filename(exe_path, exe_icon_path);
 
-  // delete .pdb if release
-  #if RELEASE  File.file_delete("bunnymark.pdb");
-}
 
 #import "Basic";
 #import "Compiler";
-WR   :: #import "Windows_Resources";
-File :: #import "File";
+Windows_Resources :: #import "Windows_Resources";
+File              :: #import "File";
+
+w: Workspace;
+options: Build_Options;
+build_inited := false;
+build_ensure_init :: () {
+  if build_inited return; build_inited = true;
+  w       = compiler_create_workspace();
+  options = get_build_options();
+  set_build_options_dc(.{do_output=false});
+}
+build_options :: (fn: (*Build_Options)) {
+  build_ensure_init();
+  fn(*options);
+  set_build_options(options, w);
+}
+build_compile :: (src_files: ..string) {
+  build_ensure_init();
+
+  compiler_begin_intercept(w);
+
+  for src_files  add_build_file(it, w);
+
+  // actually compile the code, and wait for it to finish compiling
+  while true {
+    message := compiler_wait_for_message();
+    if !message continue;
+    if message.workspace != w continue;
+    if message.kind == .COMPLETE break;
+  }
+
+  compiler_end_intercept(w);
+}
+
+