From 060937344b6de312f5c6570de5ba6e1ffef16764 Mon Sep 17 00:00:00 2001 From: Sri Sham Haran Date: Tue, 6 Sep 2022 10:39:12 +0800 Subject: [PATCH] Update Dependencies and Premake --- Dependencies.bat | 26 +++++++++++++++++++------- Dependencies.lua | 18 ++++++++++-------- SHADE_Engine/premake5.lua | 36 ++++++++++++++++++++++++++++-------- premake5.lua | 8 ++++---- 4 files changed, 61 insertions(+), 27 deletions(-) diff --git a/Dependencies.bat b/Dependencies.bat index 0a3b3bea..7e9446ec 100644 --- a/Dependencies.bat +++ b/Dependencies.bat @@ -1,6 +1,21 @@ rmdir "Dependencies/VMA" /S /Q git clone https://github.com/SHADE-DP/VulkanMemoryAllocator.git "Dependencies/VMA" +rmdir "Dependencies/msdf" /S /Q +git clone --recurse-submodules https://github.com/SHADE-DP/msdf-atlas-gen.git "Dependencies/msdf" + +rmdir "Dependencies/assimp" /S /Q +git clone https://github.com/SHADE-DP/assimp.git "Dependencies/assimp" + +rmdir "Dependencies/ktx" /S /Q +git clone https://github.com/SHADE-DP/ktx.git "Dependencies/ktx" + +rmdir "Dependencies/spdlog" /S /Q +git clone https://github.com/SHADE-DP/spdlog.git "Dependencies/spdlog" + +rmdir "Dependencies/reactphysics3d" /S /Q +git clone https://github.com/SHADE-DP/reactphysics3d.git "Dependencies/reactphysics3d" + rmdir "Dependencies/imgui" /S /Q git clone https://github.com/SHADE-DP/imgui.git "Dependencies/imgui" @@ -13,14 +28,11 @@ git clone https://github.com/SHADE-DP/imnodes.git "Dependencies/imnodes" rmdir "Dependencies/tracy" /S /Q git clone https://github.com/SHADE-DP/tracy.git "Dependencies/tracy" -rmdir "Dependencies/spdlog" /S /Q -git clone https://github.com/SHADE-DP/spdlog.git "Dependencies/spdlog" - -rmdir "Dependencies/msdf" /S /Q -git clone --recurse-submodules https://github.com/SHADE-DP/msdf-atlas-gen.git "Dependencies/msdf" +rmdir "Dependencies/RTTR" /S /Q +git clone https://github.com/SHADE-DP/RTTR.git "Dependencies/RTTR" rmdir "Dependencies/yamlcpp" /S /Q git clone https://github.com/SHADE-DP/yaml-cpp.git "Dependencies/yamlcpp" -rmdir "Dependencies/assimp" /S /Q -git clone https://github.com/SHADE-DP/assimp.git "Dependencies/assimp" \ No newline at end of file +rmdir "Dependencies/spdlog" /S /Q +git clone https://github.com/SHADE-DP/spdlog.git "Dependencies/spdlog" \ No newline at end of file diff --git a/Dependencies.lua b/Dependencies.lua index 5619b666..32382cf9 100644 --- a/Dependencies.lua +++ b/Dependencies.lua @@ -1,13 +1,15 @@ IncludeDir = {} -IncludeDir["assimp"] = "%{wks.location}/Dependencies/assimp/include/assimp" +IncludeDir["assimp"] = "%{wks.location}/Dependencies/assimp" IncludeDir["imgui"] = "%{wks.location}/Dependencies/imgui" IncludeDir["imguizmo"] = "%{wks.location}/Dependencies/imguizmo" IncludeDir["imnodes"] = "%{wks.location}/Dependencies/imnodes" -IncludeDir["msdf_atlas_gen"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/msdf/msdf-atlas-gen" -IncludeDir["msdfgen"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/msdf/msdfgen" -IncludeDir["spdlog"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/spdlog/include/spdlog" -IncludeDir["stb"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/stb" -IncludeDir["tracy"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/tracy" -IncludeDir["VMA"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/VMA/include" -IncludeDir["yamlcpp"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/yamlcpp/include" +IncludeDir["msdf_atlas_gen"] = "%{wks.location}/Dependencies/msdf" +IncludeDir["msdfgen"] = "%{wks.location}/Dependencies/msdf/msdfgen" +IncludeDir["spdlog"] = "%{wks.location}/Dependencies/spdlog" +IncludeDir["tracy"] = "%{wks.location}/Dependencies/tracy" +IncludeDir["VMA"] = "%{wks.location}/Dependencies/VMA" +IncludeDir["yamlcpp"] = "%{wks.location}/Dependencies/yamlcpp/include" +IncludeDir["RTTR"] = "%{wks.location}/Dependencies/RTTR" +IncludeDir["ktx"] = "%{wks.location}/Dependencies/ktx" +IncludeDir["reactphysics3d"] = "%{wks.location}/Dependencies/reactphysics3d" IncludeDir["VULKAN"] = "$(VULKAN_SDK)" diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua index 1878a67e..39d5039f 100644 --- a/SHADE_Engine/premake5.lua +++ b/SHADE_Engine/premake5.lua @@ -21,29 +21,42 @@ project "SHADE_Engine" includedirs { "%{prj.location}/src", - "%{IncludeDir.assimp}", + "%{IncludeDir.assimp}/include", "%{IncludeDir.imgui}", "%{IncludeDir.imguizmo}", "%{IncludeDir.imnodes}", "%{IncludeDir.msdf_atlas_gen}", "%{IncludeDir.msdfgen}", - "%{IncludeDir.spdlog}", - "%{IncludeDir.stb}", + "%{IncludeDir.spdlog}/include", "%{IncludeDir.tracy}", - "%{IncludeDir.VMA}", + "%{IncludeDir.VMA}/include", "%{IncludeDir.yamlcpp}", + "%{IncludeDir.ktx}/include", + "%{IncludeDir.RTTR}/include", + "%{IncludeDir.reactphysics3d}/include", + "%{IncludeDir.VULKAN}/include" } libdirs { - "%{prj.location}/libs" + "%{prj.location}/libs", + "%{IncludeDir.VULKAN}/Lib", + "%{IncludeDir.assimp}/lib/Debug", + "%{IncludeDir.assimp}/lib/Release", + "%{IncludeDir.RTTR}/lib", + "%{IncludeDir.ktx}/lib/Debug", + "%{IncludeDir.ktx}/lib/Release", } links { - "yamlcpp", + "yaml-cpp", "msdfgen", - "msdf-atlas-gen" + "msdf-atlas-gen", + "reactphysics3d", + "imgui", + "spdlog", + "vulkan-1.lib" } defines @@ -60,7 +73,12 @@ project "SHADE_Engine" dependson { - "yaml-cpp" + "yaml-cpp", + "msdfgen", + "msdf-atlas-gen", + "reactphysics3d", + "imgui", + "spdlog", } warnings 'Extra' @@ -68,9 +86,11 @@ project "SHADE_Engine" filter "configurations:Debug" symbols "On" defines {"_DEBUG"} + links{"assimp-vc142-mtd.lib", "ktxd.lib", "librttr_core_d.lib"} --links{"fmodstudioL_vc.lib", "fmodL_vc.lib"} filter "configurations:Release" optimize "On" defines{"_RELEASE"} + links{"assimp-vc142-mt.lib", "ktx.lib", "librttr_core.lib"} --links{"fmodstudio_vc.lib", "fmod_vc.lib"} \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index 746a2854..d54f8e40 100644 --- a/premake5.lua +++ b/premake5.lua @@ -7,7 +7,7 @@ workspace "SHADE" configurations { "Debug", - "Release" + "Release", } flags @@ -21,10 +21,10 @@ workspace "SHADE" include "SHADE_Engine" group "Dependencies" - --include "Dependencies/imgui" include "Dependencies/msdf" - --include "Dependencies/spdlog" + include "Dependencies/imgui" + include "Dependencies/spdlog" --include "Dependencies/tracy" - --include "Dependencies/VMA" include "Dependencies/yamlcpp" + include "Dependencies/reactphysics3d" group ""