From 31bf0ad2dd8872113d1db6124b92a15cb314ca97 Mon Sep 17 00:00:00 2001 From: Stowy Date: Fri, 3 Jan 2025 12:24:17 +0100 Subject: [PATCH] Fixed paths --- bindings/jai/clay-jai/generate.jai | 8 ++++---- bindings/jai/clay-jai/windows.jai | 2 +- bindings/jai/clay-jai/windows/clay.lib | Bin 279534 -> 279534 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bindings/jai/clay-jai/generate.jai b/bindings/jai/clay-jai/generate.jai index def33c2..5373558 100644 --- a/bindings/jai/clay-jai/generate.jai +++ b/bindings/jai/clay-jai/generate.jai @@ -41,7 +41,7 @@ generate_bindings :: (args: [] string, minimum_os_version: type_of(Compiler.Buil compile := array_find(args, "-compile"); compile_debug := array_find(args, "-debug"); - could_copy := FileUtils.copy_file("../../clay.h", "source/clay.h"); + could_copy := FileUtils.copy_file("../../../clay.h", "source/clay.h"); if !could_copy then return false; defer if !compile_debug then File.file_delete("source/clay.h"); @@ -50,7 +50,7 @@ generate_bindings :: (args: [] string, minimum_os_version: type_of(Compiler.Buil success := true; #if OS == .WINDOWS { - File.make_directory_if_it_does_not_exist("clay-jai/windows", true); + File.make_directory_if_it_does_not_exist("windows", true); command := ifx compile_debug { write_string("Compiling debug...\n"); @@ -64,7 +64,7 @@ generate_bindings :: (args: [] string, minimum_os_version: type_of(Compiler.Buil defer File.file_delete("clay.o"); write_string("Linking...\n"); - command = Process.break_command_into_strings("llvm-ar -rcs clay-jai/windows/clay.lib clay.o"); + command = Process.break_command_into_strings("llvm-ar -rcs windows/clay.lib clay.o"); result = Process.run_command(..command, capture_and_return_output=true, print_captured_output=true); if result.exit_code != 0 then return false; } else { @@ -83,7 +83,7 @@ generate_bindings :: (args: [] string, minimum_os_version: type_of(Compiler.Buil using options; #if OS == .WINDOWS { - array_add(*libpaths, "clay-jai/windows"); + array_add(*libpaths, "windows"); output_filename = "windows.jai"; } else { assert(false); diff --git a/bindings/jai/clay-jai/windows.jai b/bindings/jai/clay-jai/windows.jai index 8971003..4cdb67d 100644 --- a/bindings/jai/clay-jai/windows.jai +++ b/bindings/jai/clay-jai/windows.jai @@ -564,7 +564,7 @@ _debugViewWidth: u32 #elsewhere clay "Clay__debugViewWidth"; #import "Basic"; // For assert -clay :: #library,no_dll "clay-jai/windows/clay"; +clay :: #library,no_dll "windows/clay"; #run { { diff --git a/bindings/jai/clay-jai/windows/clay.lib b/bindings/jai/clay-jai/windows/clay.lib index e2d10802ac3060a984c7b92994b9481036720cc1..ad47ba33fcb8ef055b5ca8b4c702ec5724041c7b 100644 GIT binary patch delta 29 kcmaFYF8HopaKns3rj;j}XBD>3Dr5v=rtPx|nL{oC0NK+G*#H0l delta 29 jcmaFYF8HopaKns3ru1XYvkKd16*2-b)Am_~%psQm)X5E%