diff --git a/.gitmodules b/.gitmodules index 644d939f..3e32624d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [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/bootstrap.ps1 b/bootstrap.ps1 index 939b33f2..7fc2aaea 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -1,5 +1,7 @@ #!/usr/bin/env pwsh +git submodule update --init --recursive + if ($IsWindows) { } diff --git a/bootstrap.sh b/bootstrap.sh index c8dc57b8..730b5226 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,7 @@ #!/usr/bin/env sh +git submodule update --init --recursive + if [ "$(expr substr $(uname -s) 1 5)" = "Linux" ] then diff --git a/scripts/premake.bat b/scripts/premake.bat index ad2751f1..5488708a 100644 --- a/scripts/premake.bat +++ b/scripts/premake.bat @@ -1,3 +1,3 @@ @echo off -call .\vendor\premake\windows\premake5.exe vs2022 +call .\vendor\premake-core\windows\premake5.exe vs2022 diff --git a/scripts/premake.sh b/scripts/premake.sh index 0358ef01..3fb5e5e4 100644 --- a/scripts/premake.sh +++ b/scripts/premake.sh @@ -2,9 +2,9 @@ if [ "$(expr substr $(uname -s) 1 5)" = "Linux" ] then - ./vendor/premake/linux/premake5 gmake2 + ./vendor/premake-core/linux/premake5 gmake2 elif [ "$(uname)" = "Darwin" ] then - ./vendor/premake/mac/premake5 xcode4 + ./vendor/premake-core/mac/premake5 xcode4 fi diff --git a/vendor/premake-core b/vendor/premake-core new file mode 160000 index 00000000..4bd56019 --- /dev/null +++ b/vendor/premake-core @@ -0,0 +1 @@ +Subproject commit 4bd56019c4a0f93009b73614f778e3f9e5fad373 diff --git a/vendor/premake/LICENSE.txt b/vendor/premake/LICENSE.txt deleted file mode 100644 index f445f596..00000000 --- a/vendor/premake/LICENSE.txt +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2003-2019 Jason Perkins and individual contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. Neither the name of Premake nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/premake/linux/premake5 b/vendor/premake/linux/premake5 deleted file mode 100755 index 3d2f8f32..00000000 Binary files a/vendor/premake/linux/premake5 and /dev/null differ diff --git a/vendor/premake/mac/premake5 b/vendor/premake/mac/premake5 deleted file mode 100755 index 923ee9bf..00000000 Binary files a/vendor/premake/mac/premake5 and /dev/null differ diff --git a/vendor/premake/windows/premake5.exe b/vendor/premake/windows/premake5.exe deleted file mode 100644 index c73da1fb..00000000 Binary files a/vendor/premake/windows/premake5.exe and /dev/null differ