From 8455e159f5f6c6b1a3553d82ea891232fd56d336 Mon Sep 17 00:00:00 2001
From: Laytan Laats <laytanlaats@hotmail.com>
Date: Wed, 5 Jun 2024 20:57:39 +0200
Subject: improve orca target

---
 src/main.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 3ca024ed9..a30cad059 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -155,6 +155,34 @@ gb_internal i32 system_exec_command_line_app(char const *name, char const *fmt,
 	return exit_code;
 }
 
+// TODO: windows.
+gb_internal bool system_exec_command_line_app_output(char const *command, gbString *output) {
+	GB_ASSERT(output);
+
+	u8 buffer[256];
+	FILE *stream;
+	stream = popen(command, "r");
+	if (!stream) {
+		return false;
+	}
+	defer (pclose(stream));
+
+	while (!feof(stream)) {
+		size_t n = fread(buffer, 1, 255, stream);
+		*output = gb_string_append_length(*output, buffer, n);
+
+		if (ferror(stream)) {
+			return false;
+		}
+	}
+
+	if (build_context.show_system_calls) {
+		gb_printf_err("[SYSTEM CALL OUTPUT] %s -> %s\n", command, *output);
+	}
+
+	return true;
+}
+
 gb_internal Array<String> setup_args(int argc, char const **argv) {
 	gbAllocator a = heap_allocator();
 
-- 
cgit v1.2.3


From 08382cb05dc23816f36c0a52b23c4d501431f88c Mon Sep 17 00:00:00 2001
From: laytan <laytanlaats@hotmail.com>
Date: Wed, 5 Jun 2024 19:26:23 +0200
Subject: orca windows

---
 src/build_settings.cpp |  2 +-
 src/linker.cpp         | 10 ++++------
 src/main.cpp           |  6 +++++-
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 8a08c2b34..05117a9b2 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -1080,7 +1080,7 @@ gb_global TargetMetrics target_orca_wasm32 = {
 	TargetOs_orca,
 	TargetArch_wasm32,
 	4, 4, 8, 16,
-	str_lit("wasm32-freestanding-js"),
+	str_lit("wasm32-wasi-js"),
 };
 
 
diff --git a/src/linker.cpp b/src/linker.cpp
index 91055a604..25c54a6ab 100644
--- a/src/linker.cpp
+++ b/src/linker.cpp
@@ -72,12 +72,10 @@ gb_internal i32 linker_stage(LinkerData *gen) {
 
 		gbString extra_orca_flags = gb_string_make(temporary_allocator(), "");
 
-		gbString inputs = gb_string_make(temporary_allocator(), "");		
+		gbString inputs = gb_string_make(temporary_allocator(), "");
 		inputs = gb_string_append_fmt(inputs, "\"%.*s.o\"", LIT(output_filename));
 
 		if (build_context.metrics.os == TargetOs_orca) {
-			// TODO: Orca windows.
-
 			gbString orca_sdk_path = gb_string_make(temporary_allocator(), "");
 			if (!system_exec_command_line_app_output("orca sdk-path", &orca_sdk_path)) {
 				gb_printf_err("executing `orca sdk-path` failed, make sure Orca is installed and added to your path\n");
@@ -95,10 +93,10 @@ gb_internal i32 linker_stage(LinkerData *gen) {
 
 	#if defined(GB_SYSTEM_WINDOWS)
 		result = system_exec_command_line_app("wasm-ld",
-			"\"%.*s\\bin\\wasm-ld\" \"%.*s.o\" -o \"%.*s\" %.*s %.*s %.*s",
+			"\"%.*s\\bin\\wasm-ld\" %s -o \"%.*s\" %.*s %.*s %s",
 			LIT(build_context.ODIN_ROOT),
-			LIT(output_filename), LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags),
-			LIT(extra_orca_flags));
+			inputs, LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags),
+			extra_orca_flags);
 	#else
 		result = system_exec_command_line_app("wasm-ld",
 			"wasm-ld %s -o \"%.*s\" %.*s %.*s %s",
diff --git a/src/main.cpp b/src/main.cpp
index a30cad059..70def5802 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -155,7 +155,11 @@ gb_internal i32 system_exec_command_line_app(char const *name, char const *fmt,
 	return exit_code;
 }
 
-// TODO: windows.
+#if defined(GB_SYSTEM_WINDOWS)
+#define popen _popen
+#define pclose _pclose
+#endif
+
 gb_internal bool system_exec_command_line_app_output(char const *command, gbString *output) {
 	GB_ASSERT(output);
 
-- 
cgit v1.2.3