diff --git a/.gitignore b/.gitignore index 4ef6152..506b7da 100644 --- a/.gitignore +++ b/.gitignore @@ -393,4 +393,6 @@ Editor/bin Editor/intermediate-files Game/bin -imgui.ini \ No newline at end of file +lib/ + +imgui.ini diff --git a/.gitmodules b/.gitmodules index bb1bb72..01dd7f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "imgui-sfml-premake"] - path = imgui-sfml-premake - url = https://gitlab.com/JosephA1997/imgui-sfml-premake.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 deleted file mode 100644 index 2cd4d72..0000000 --- a/Create-Solution.bat +++ /dev/null @@ -1,2 +0,0 @@ -.\vendor\premake5\premake5.exe vs2022 -PAUSE \ No newline at end of file diff --git a/build-ninja.sh b/build-ninja.sh deleted file mode 100755 index c4a2877..0000000 --- a/build-ninja.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/bash - -./vendor/premake5/premake5 ninja -ninja $1 diff --git a/build.sh b/build.sh deleted file mode 100755 index 8b3a4e6..0000000 --- a/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/bash - -./vendor/premake5/premake5 gmake -make config=$1 diff --git a/clean-ninja.sh b/clean-ninja.sh deleted file mode 100755 index f01a203..0000000 --- a/clean-ninja.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash -if [ -z "$1" ] || [ $# -eq 0 ] - then - ninja -t clean - else - ninja -t clean $1 -fi \ No newline at end of file diff --git a/clean.sh b/clean.sh deleted file mode 100755 index d726eae..0000000 --- a/clean.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash -if [ -z "$1" ] || [ $# -eq 0 ] - then - make config=Debug clean && make config=Release clean - else - make config=$1 clean -fi \ No newline at end of file diff --git a/ecc.sh b/ecc.sh deleted file mode 100755 index 323e448..0000000 --- a/ecc.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/bash -if [ -z "$1" ] || [ $# -eq 0 ] - then - ./vendor/premake5/premake5 --config=Debug ecc - else - ./vendor/premake5/premake5 --config=$1 ecc -fi \ No newline at end of file diff --git a/imgui-sfml-premake b/imgui-sfml-premake deleted file mode 160000 index 5223f72..0000000 --- a/imgui-sfml-premake +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5223f725218bd8a62b2e5dac4e3d852b761731a6 diff --git a/lib/Release-linux-x86_64/libflac.a b/lib/Release-linux-x86_64/libflac.a deleted file mode 100644 index a6c4199..0000000 Binary files a/lib/Release-linux-x86_64/libflac.a and /dev/null differ diff --git a/lib/Release-linux-x86_64/libfreetype.a b/lib/Release-linux-x86_64/libfreetype.a deleted file mode 100644 index 6783cf0..0000000 Binary files a/lib/Release-linux-x86_64/libfreetype.a and /dev/null differ diff --git a/lib/Release-linux-x86_64/libimgui-sfml.a b/lib/Release-linux-x86_64/libimgui-sfml.a deleted file mode 100644 index 450e687..0000000 Binary files a/lib/Release-linux-x86_64/libimgui-sfml.a and /dev/null differ diff --git a/lib/Release-linux-x86_64/libimgui.a b/lib/Release-linux-x86_64/libimgui.a deleted file mode 100644 index 611165f..0000000 Binary files a/lib/Release-linux-x86_64/libimgui.a and /dev/null differ diff --git a/lib/Release-linux-x86_64/libogg.a b/lib/Release-linux-x86_64/libogg.a deleted file mode 100644 index 3a8c0ee..0000000 Binary files a/lib/Release-linux-x86_64/libogg.a and /dev/null differ diff --git a/lib/Release-linux-x86_64/libsfml.a b/lib/Release-linux-x86_64/libsfml.a deleted file mode 100644 index e24ecd7..0000000 Binary files a/lib/Release-linux-x86_64/libsfml.a and /dev/null differ diff --git a/lib/Release-linux-x86_64/libvorbis.a b/lib/Release-linux-x86_64/libvorbis.a deleted file mode 100644 index 0dd7944..0000000 Binary files a/lib/Release-linux-x86_64/libvorbis.a and /dev/null differ diff --git a/premake5.lua b/premake5.lua deleted file mode 100644 index 0e7c92b..0000000 --- a/premake5.lua +++ /dev/null @@ -1,154 +0,0 @@ -require "ecc/ecc" -require "ninja/ninja" - -workspace "breakout" - architecture "x64" - - output_dir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}" - vs_intdir = "!$(SolutionDir)intermediate-files/" .. output_dir - intdir = "%{wks.location}/intermediate-files/" .. output_dir - vs_bindir = "$(SolutionDir)bin/" .. output_dir - bindir = "%{wks.location}/bin/" .. output_dir - vs_coreinclude_dir = "$(SolutionDir)include" - vs_sfmldir = "$(SolutionDir)vendor/SFML" - sfmldir = "%{wks.location}/vendor/SFML" - vs_imguidir = "$(SolutionDir)vendor/imgui" - imguidir = "%{wks.location}/vendor/imgui" - vs_include_dir = "$(SolutionDir)include" - include_dir = "%{wks.location}/include" - - configurations - { - "Debug", - "Release" - } - - project "breakout" - language "C++" - cppdialect "C++20" - systemversion "latest" - kind "WindowedApp" - targetname "breakout" - - files - { - "src/**.cpp", - "include/**.h", - "include/**.hpp", - "vendor/imgui/imgui.cpp", - "vendor/imgui/imgui_draw.cpp", - "vendor/imgui/imgui_tables.cpp", - "vendor/imgui/imgui_widgets.cpp", - "vendor/imgui/imgui-SFML.cpp" - } - - --visual studio-- - filter {"action:vs*", "system:windows"} - targetdir (vs_bindir) - objdir (vs_intdir) - debugdir "$(SolutionDir)" - includedirs - { - "src", - vs_include_dir, - vs_sfmldir .. "/include", - vs_imguidir - } - - libdirs {vs_sfmldir .."/lib"} - - --not visual studio -- - filter {"not action:vs*", "system:windows"} - targetdir (bindir) - objdir (intdir) - debugdir "%{wks.location}" - includedirs - { - "src", - include_dir, - sfmldir .. "/include", - imguidir - } - - libdirs {sfmldir .."/lib"} - - --windows specific settings-- - filter{"system:windows"} - defines {"PLATFORM_WINDOWS", "SFML_STATIC"} - staticruntime "on" - - filter {"system:windows", "configurations:debug"} - defines{"_DEBUG", "_CONSOLE"} - links - { - "sfml-main-d", - "sfml-graphics-s-d", - "sfml-window-s-d", - "opengl32", - "gdi32", - "freetyped", - "sfml-audio-s-d", - "flacd", - "vorbisfiled", - "vorbisd", - "oggd", - "sfml-system-s-d", - "winmm" - } - - filter {"system:windows", "configurations:release"} - defines{"NDEBUG"} - links - { - "sfml-main", - "sfml-graphics-s", - "sfml-window-s", - "opengl32", - "gdi32", - "freetype", - "sfml-audio-s", - "flac", - "vorbisfile", - "vorbis", - "ogg", - "sfml-system-s", - "winmm" - } - - - --linux specific settings-- - filter {"system:linux"} - defines {"PLATFORM_LINUX"} - targetdir (bindir) - objdir (intdir) - debugdir "%{wks.location}" - includedirs - { - "src", - include_dir, - imguidir - } - - links - { - "sfml-graphics", - "sfml-window", - "sfml-audio", - "sfml-system", - "OpenGL", - } - - - --config settings-- - filter "configurations:debug" - defines {"LOG_ENABLE", "GAME_DEBUG"} - symbols "on" - runtime "Debug" - warnings "Extra" - - filter "configurations:release" - defines {"GAME_RELEASE"} - optimize "Speed" - inlining "Auto" - symbols "off" - runtime "Release" \ No newline at end of file diff --git a/run.sh b/run.sh deleted file mode 100755 index 3da1e02..0000000 --- a/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -./bin/$1-linux-x86_64/breakout \ No newline at end of file