From c092692ed60e4a170a89167af980962ca10560f4 Mon Sep 17 00:00:00 2001 From: Guilherme Werner Date: Sat, 16 Dec 2023 09:35:29 -0300 Subject: [PATCH] Use premake from mintaka submodule --- .gitmodules | 4 ---- scripts/premake.bat | 2 +- scripts/premake.sh | 4 ++-- vendor/premake-core | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 160000 vendor/premake-core diff --git a/.gitmodules b/.gitmodules index 3e32624d..644d939f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ [submodule "vendor/Mintaka"] path = vendor/Mintaka url = https://github.com/Tribufu/Mintaka -[submodule "vendor/premake-core"] - path = vendor/premake-core - url = https://github.com/TribufuForks/premake-core - branch = vendor diff --git a/scripts/premake.bat b/scripts/premake.bat index 5488708a..0a16272f 100644 --- a/scripts/premake.bat +++ b/scripts/premake.bat @@ -1,3 +1,3 @@ @echo off -call .\vendor\premake-core\windows\premake5.exe vs2022 +call .\vendor\Mintaka\vendor\premake-core\windows\premake5.exe vs2022 diff --git a/scripts/premake.sh b/scripts/premake.sh index 3fb5e5e4..f1e09cba 100644 --- a/scripts/premake.sh +++ b/scripts/premake.sh @@ -2,9 +2,9 @@ if [ "$(expr substr $(uname -s) 1 5)" = "Linux" ] then - ./vendor/premake-core/linux/premake5 gmake2 + ./vendor/Mintaka/vendor/premake-core/linux/premake5 gmake2 elif [ "$(uname)" = "Darwin" ] then - ./vendor/premake-core/mac/premake5 xcode4 + ./vendor/Mintaka/vendor/premake-core/mac/premake5 xcode4 fi diff --git a/vendor/premake-core b/vendor/premake-core deleted file mode 160000 index 4bd56019..00000000 --- a/vendor/premake-core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4bd56019c4a0f93009b73614f778e3f9e5fad373