mirror of
https://github.com/nicbarker/clay.git
synced 2025-04-19 04:38:01 +00:00
Fixed paths
This commit is contained in:
parent
f8b13b5978
commit
31bf0ad2dd
@ -41,7 +41,7 @@ generate_bindings :: (args: [] string, minimum_os_version: type_of(Compiler.Buil
|
|||||||
compile := array_find(args, "-compile");
|
compile := array_find(args, "-compile");
|
||||||
compile_debug := array_find(args, "-debug");
|
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;
|
if !could_copy then return false;
|
||||||
defer if !compile_debug then File.file_delete("source/clay.h");
|
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;
|
success := true;
|
||||||
#if OS == .WINDOWS {
|
#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 {
|
command := ifx compile_debug {
|
||||||
write_string("Compiling debug...\n");
|
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");
|
defer File.file_delete("clay.o");
|
||||||
|
|
||||||
write_string("Linking...\n");
|
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);
|
result = Process.run_command(..command, capture_and_return_output=true, print_captured_output=true);
|
||||||
if result.exit_code != 0 then return false;
|
if result.exit_code != 0 then return false;
|
||||||
} else {
|
} else {
|
||||||
@ -83,7 +83,7 @@ generate_bindings :: (args: [] string, minimum_os_version: type_of(Compiler.Buil
|
|||||||
using options;
|
using options;
|
||||||
|
|
||||||
#if OS == .WINDOWS {
|
#if OS == .WINDOWS {
|
||||||
array_add(*libpaths, "clay-jai/windows");
|
array_add(*libpaths, "windows");
|
||||||
output_filename = "windows.jai";
|
output_filename = "windows.jai";
|
||||||
} else {
|
} else {
|
||||||
assert(false);
|
assert(false);
|
||||||
|
@ -564,7 +564,7 @@ _debugViewWidth: u32 #elsewhere clay "Clay__debugViewWidth";
|
|||||||
|
|
||||||
#import "Basic"; // For assert
|
#import "Basic"; // For assert
|
||||||
|
|
||||||
clay :: #library,no_dll "clay-jai/windows/clay";
|
clay :: #library,no_dll "windows/clay";
|
||||||
|
|
||||||
#run {
|
#run {
|
||||||
{
|
{
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user