diff --git a/scripts/build_sokol_demo.ps1 b/scripts/build_sokol_demo.ps1 index 2b3d504..6d8374e 100644 --- a/scripts/build_sokol_demo.ps1 +++ b/scripts/build_sokol_demo.ps1 @@ -32,19 +32,19 @@ elseif ( $IsWindows ) { write-host "Core Count - Physical: $CoreCount_Physical Logical: $CoreCount_Logical" #endregion CPU_Info -$url_freetype = 'https://github.com/Ed94/odin-freetype.git' +# $url_freetype = 'https://github.com/Ed94/odin-freetype.git' $url_harfbuzz = 'https://github.com/Ed94/harfbuzz-odin.git' $url_sokol = 'https://github.com/floooh/sokol-odin.git' $url_sokol_tools = 'https://github.com/floooh/sokol-tools-bin.git' -$path_freetype = join-path $path_thirdparty 'freetype' +# $path_freetype = join-path $path_thirdparty 'freetype' $path_harfbuzz = join-path $path_thirdparty 'harfbuzz' $path_sokol = join-path $path_thirdparty 'sokol' $path_sokol_tools = join-path $path_thirdparty 'sokol-tools' $sokol_build_clibs_command = join-path $path_scripts 'build_sokol_library.ps1' -clone-gitrepo $path_freetype $url_freetype +# clone-gitrepo $path_freetype $url_freetype clone-gitrepo $path_sokol_tools $url_sokol_tools Update-GitRepo -path $path_sokol -url $url_sokol -build_command $sokol_build_clibs_command diff --git a/scripts/build_sokol_demo.sh b/scripts/build_sokol_demo.sh index e76888d..3930423 100644 --- a/scripts/build_sokol_demo.sh +++ b/scripts/build_sokol_demo.sh @@ -42,20 +42,20 @@ else fi echo "Core Count - Physical: $CoreCount_Physical Logical: $CoreCount_Logical" -url_freetype='https://github.com/Ed94/odin-freetype.git' +# url_freetype='https://github.com/Ed94/odin-freetype.git' url_harfbuzz='https://github.com/Ed94/harfbuzz-odin.git' url_sokol='https://github.com/floooh/sokol-odin.git' url_sokol_tools='https://github.com/floooh/sokol-tools-bin.git' -path_freetype="$path_thirdparty/freetype" +# path_freetype="$path_thirdparty/freetype" path_harfbuzz="$path_thirdparty/harfbuzz" path_sokol="$path_thirdparty/sokol" path_sokol_tools="$path_thirdparty/sokol-tools" sokol_build_clibs_command="$path_scripts/build_sokol_library.sh" -clone_gitrepo "$path_freetype" "$url_freetype" -clone_gitrepo "$path_sokol_tools" "$url_sokol_tools" +# clone_git_repo "$path_freetype" "$url_freetype" +clone_git_repo "$path_sokol_tools" "$url_sokol_tools" update_git_repo "$path_sokol" "$url_sokol" "$sokol_build_clibs_command" update_git_repo "$path_harfbuzz" "$url_harfbuzz" "./scripts/build.sh" diff --git a/scripts/helpers/misc.sh b/scripts/helpers/misc.sh index 2dc0a6c..0af091c 100644 --- a/scripts/helpers/misc.sh +++ b/scripts/helpers/misc.sh @@ -1,6 +1,6 @@ #!/bin/bash -clone_gitrepo() { +clone_git_repo() { local path="$1" local url="$2" diff --git a/scripts/helpers/odin_compiler_defs.sh b/scripts/helpers/odin_compiler_defs.sh index 721aba0..e4f0df5 100644 --- a/scripts/helpers/odin_compiler_defs.sh +++ b/scripts/helpers/odin_compiler_defs.sh @@ -63,3 +63,4 @@ flag_vet_using_stmt='-vet-using-stmt' # Assuming to be in default path, change if otherwise odin_compiler='odin' +# odin_compiler='/mnt/c/projects/SectrPrototype/toolchain/Odin/odin'