From b5011e7db1fcc2160b46471ee50296e71ec9c67c Mon Sep 17 00:00:00 2001 From: Joseph Aquino Date: Tue, 30 Dec 2025 20:22:02 -0500 Subject: [PATCH] use my repo as a submodule --- .gitmodules | 24 +++--------------------- Create-Solution.bat | 2 +- build-ninja.sh | 2 +- premake5.lua | 20 +++++++++----------- project.lua | 6 +++--- third-party | 1 + 6 files changed, 18 insertions(+), 37 deletions(-) create mode 160000 third-party diff --git a/.gitmodules b/.gitmodules index b8980b1..01dd7f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +1,3 @@ -[submodule "vendor/vorbis"] - path = vendor/vorbis - url = https://github.com/xiph/vorbis.git -[submodule "vendor/ogg"] - path = vendor/ogg - url = https://github.com/xiph/ogg.git -[submodule "vendor/flac"] - path = vendor/flac - url = https://github.com/xiph/flac.git -[submodule "vendor/freetype"] - path = vendor/freetype - url = https://github.com/freetype/freetype.git -[submodule "vendor/SFML"] - path = vendor/SFML - url = https://github.com/SFML/SFML.git -[submodule "vendor/imgui"] - path = vendor/imgui - url = https://github.com/ocornut/imgui.git -[submodule "vendor/imgui-sfml"] - path = vendor/imgui-sfml - url = https://github.com/SFML/imgui-sfml.git +[submodule "third-party"] + path = third-party + url = https://gitlab.com/JosephA1997/imgui-sfml-premake.git diff --git a/Create-Solution.bat b/Create-Solution.bat index eaf44ef..4b14c6d 100644 --- a/Create-Solution.bat +++ b/Create-Solution.bat @@ -1,4 +1,4 @@ @ECHO OFF ECHO Project files will be written to ./build -.\vendor\premake5\premake5.exe vs2022 +.\third-party\premake5\premake5.exe vs2022 PAUSE \ No newline at end of file diff --git a/build-ninja.sh b/build-ninja.sh index 52e6662..34e1265 100755 --- a/build-ninja.sh +++ b/build-ninja.sh @@ -2,5 +2,5 @@ set -e echo build files will be placed in ./build -./vendor/premake5/premake5 premake-ninja +./third-party/premake5/premake5 premake-ninja ninja $1 -C build diff --git a/premake5.lua b/premake5.lua index ba9cbbd..abfff3c 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,19 +1,21 @@ require "ecc/ecc" require "ninja/ninja" -local ogg = require("vendor/build-ogg") -local sfml = require("vendor/build-sfml") -local flac = require("vendor/build-flac") -local imgui = require("vendor/build-imgui") -local vorbis = require("vendor/build-vorbis") -local freetype = require("vendor/build-freetype") -local imguisfml = require("vendor/build-imgui-sfml") +local ogg = require("third-party/build-ogg") +local sfml = require("third-party/build-sfml") +local flac = require("third-party/build-flac") +local imgui = require("third-party/build-imgui") +local vorbis = require("third-party/build-vorbis") +local freetype = require("third-party/build-freetype") +local imguisfml = require("third-party/build-imgui-sfml") local snake = require("project") workspace "snake" architecture "x64" startproject"snake" + configurations{"Debug", "Release"} + location "build" filter"system:linux" staticruntime"Off" @@ -22,10 +24,6 @@ workspace "snake" staticruntime"On" filter"" - location "build" - - configurations{"Debug", "Release"} - filter"system:linux" pic"On" -- fix warning when statically linking filter"" diff --git a/project.lua b/project.lua index 256d2c9..82da0ab 100644 --- a/project.lua +++ b/project.lua @@ -1,9 +1,9 @@ local m = {} local scriptdir = path.getabsolute(path.getdirectory(_SCRIPT)) -local sfml = require("vendor/build-sfml") -local imguisfml = require("vendor/build-imgui-sfml") -local imgui = require("vendor/build-imgui") +local sfml = require("third-party/build-sfml") +local imguisfml = require("third-party/build-imgui-sfml") +local imgui = require("third-party/build-imgui") function m.generateproject(bindir, intdir) project "snake" diff --git a/third-party b/third-party new file mode 160000 index 0000000..4b41677 --- /dev/null +++ b/third-party @@ -0,0 +1 @@ +Subproject commit 4b416772fd1bf397b81fa003110e1e39460cc5ba