Update Dependencies and Premake
This commit is contained in:
parent
aee5e3b4d6
commit
060937344b
|
@ -1,6 +1,21 @@
|
||||||
rmdir "Dependencies/VMA" /S /Q
|
rmdir "Dependencies/VMA" /S /Q
|
||||||
git clone https://github.com/SHADE-DP/VulkanMemoryAllocator.git "Dependencies/VMA"
|
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
|
rmdir "Dependencies/imgui" /S /Q
|
||||||
git clone https://github.com/SHADE-DP/imgui.git "Dependencies/imgui"
|
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
|
rmdir "Dependencies/tracy" /S /Q
|
||||||
git clone https://github.com/SHADE-DP/tracy.git "Dependencies/tracy"
|
git clone https://github.com/SHADE-DP/tracy.git "Dependencies/tracy"
|
||||||
|
|
||||||
rmdir "Dependencies/spdlog" /S /Q
|
rmdir "Dependencies/RTTR" /S /Q
|
||||||
git clone https://github.com/SHADE-DP/spdlog.git "Dependencies/spdlog"
|
git clone https://github.com/SHADE-DP/RTTR.git "Dependencies/RTTR"
|
||||||
|
|
||||||
rmdir "Dependencies/msdf" /S /Q
|
|
||||||
git clone --recurse-submodules https://github.com/SHADE-DP/msdf-atlas-gen.git "Dependencies/msdf"
|
|
||||||
|
|
||||||
rmdir "Dependencies/yamlcpp" /S /Q
|
rmdir "Dependencies/yamlcpp" /S /Q
|
||||||
git clone https://github.com/SHADE-DP/yaml-cpp.git "Dependencies/yamlcpp"
|
git clone https://github.com/SHADE-DP/yaml-cpp.git "Dependencies/yamlcpp"
|
||||||
|
|
||||||
rmdir "Dependencies/assimp" /S /Q
|
rmdir "Dependencies/spdlog" /S /Q
|
||||||
git clone https://github.com/SHADE-DP/assimp.git "Dependencies/assimp"
|
git clone https://github.com/SHADE-DP/spdlog.git "Dependencies/spdlog"
|
|
@ -1,13 +1,15 @@
|
||||||
IncludeDir = {}
|
IncludeDir = {}
|
||||||
IncludeDir["assimp"] = "%{wks.location}/Dependencies/assimp/include/assimp"
|
IncludeDir["assimp"] = "%{wks.location}/Dependencies/assimp"
|
||||||
IncludeDir["imgui"] = "%{wks.location}/Dependencies/imgui"
|
IncludeDir["imgui"] = "%{wks.location}/Dependencies/imgui"
|
||||||
IncludeDir["imguizmo"] = "%{wks.location}/Dependencies/imguizmo"
|
IncludeDir["imguizmo"] = "%{wks.location}/Dependencies/imguizmo"
|
||||||
IncludeDir["imnodes"] = "%{wks.location}/Dependencies/imnodes"
|
IncludeDir["imnodes"] = "%{wks.location}/Dependencies/imnodes"
|
||||||
IncludeDir["msdf_atlas_gen"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/msdf/msdf-atlas-gen"
|
IncludeDir["msdf_atlas_gen"] = "%{wks.location}/Dependencies/msdf"
|
||||||
IncludeDir["msdfgen"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/msdf/msdfgen"
|
IncludeDir["msdfgen"] = "%{wks.location}/Dependencies/msdf/msdfgen"
|
||||||
IncludeDir["spdlog"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/spdlog/include/spdlog"
|
IncludeDir["spdlog"] = "%{wks.location}/Dependencies/spdlog"
|
||||||
IncludeDir["stb"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/stb"
|
IncludeDir["tracy"] = "%{wks.location}/Dependencies/tracy"
|
||||||
IncludeDir["tracy"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/tracy"
|
IncludeDir["VMA"] = "%{wks.location}/Dependencies/VMA"
|
||||||
IncludeDir["VMA"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/VMA/include"
|
IncludeDir["yamlcpp"] = "%{wks.location}/Dependencies/yamlcpp/include"
|
||||||
IncludeDir["yamlcpp"] = "%{wks.location}/SHADE_Engine_y2/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)"
|
IncludeDir["VULKAN"] = "$(VULKAN_SDK)"
|
||||||
|
|
|
@ -21,29 +21,42 @@ project "SHADE_Engine"
|
||||||
includedirs
|
includedirs
|
||||||
{
|
{
|
||||||
"%{prj.location}/src",
|
"%{prj.location}/src",
|
||||||
"%{IncludeDir.assimp}",
|
"%{IncludeDir.assimp}/include",
|
||||||
"%{IncludeDir.imgui}",
|
"%{IncludeDir.imgui}",
|
||||||
"%{IncludeDir.imguizmo}",
|
"%{IncludeDir.imguizmo}",
|
||||||
"%{IncludeDir.imnodes}",
|
"%{IncludeDir.imnodes}",
|
||||||
"%{IncludeDir.msdf_atlas_gen}",
|
"%{IncludeDir.msdf_atlas_gen}",
|
||||||
"%{IncludeDir.msdfgen}",
|
"%{IncludeDir.msdfgen}",
|
||||||
"%{IncludeDir.spdlog}",
|
"%{IncludeDir.spdlog}/include",
|
||||||
"%{IncludeDir.stb}",
|
|
||||||
"%{IncludeDir.tracy}",
|
"%{IncludeDir.tracy}",
|
||||||
"%{IncludeDir.VMA}",
|
"%{IncludeDir.VMA}/include",
|
||||||
"%{IncludeDir.yamlcpp}",
|
"%{IncludeDir.yamlcpp}",
|
||||||
|
"%{IncludeDir.ktx}/include",
|
||||||
|
"%{IncludeDir.RTTR}/include",
|
||||||
|
"%{IncludeDir.reactphysics3d}/include",
|
||||||
|
"%{IncludeDir.VULKAN}/include"
|
||||||
}
|
}
|
||||||
|
|
||||||
libdirs
|
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
|
links
|
||||||
{
|
{
|
||||||
"yamlcpp",
|
"yaml-cpp",
|
||||||
"msdfgen",
|
"msdfgen",
|
||||||
"msdf-atlas-gen"
|
"msdf-atlas-gen",
|
||||||
|
"reactphysics3d",
|
||||||
|
"imgui",
|
||||||
|
"spdlog",
|
||||||
|
"vulkan-1.lib"
|
||||||
}
|
}
|
||||||
|
|
||||||
defines
|
defines
|
||||||
|
@ -60,7 +73,12 @@ project "SHADE_Engine"
|
||||||
|
|
||||||
dependson
|
dependson
|
||||||
{
|
{
|
||||||
"yaml-cpp"
|
"yaml-cpp",
|
||||||
|
"msdfgen",
|
||||||
|
"msdf-atlas-gen",
|
||||||
|
"reactphysics3d",
|
||||||
|
"imgui",
|
||||||
|
"spdlog",
|
||||||
}
|
}
|
||||||
|
|
||||||
warnings 'Extra'
|
warnings 'Extra'
|
||||||
|
@ -68,9 +86,11 @@ project "SHADE_Engine"
|
||||||
filter "configurations:Debug"
|
filter "configurations:Debug"
|
||||||
symbols "On"
|
symbols "On"
|
||||||
defines {"_DEBUG"}
|
defines {"_DEBUG"}
|
||||||
|
links{"assimp-vc142-mtd.lib", "ktxd.lib", "librttr_core_d.lib"}
|
||||||
--links{"fmodstudioL_vc.lib", "fmodL_vc.lib"}
|
--links{"fmodstudioL_vc.lib", "fmodL_vc.lib"}
|
||||||
|
|
||||||
filter "configurations:Release"
|
filter "configurations:Release"
|
||||||
optimize "On"
|
optimize "On"
|
||||||
defines{"_RELEASE"}
|
defines{"_RELEASE"}
|
||||||
|
links{"assimp-vc142-mt.lib", "ktx.lib", "librttr_core.lib"}
|
||||||
--links{"fmodstudio_vc.lib", "fmod_vc.lib"}
|
--links{"fmodstudio_vc.lib", "fmod_vc.lib"}
|
|
@ -7,7 +7,7 @@ workspace "SHADE"
|
||||||
configurations
|
configurations
|
||||||
{
|
{
|
||||||
"Debug",
|
"Debug",
|
||||||
"Release"
|
"Release",
|
||||||
}
|
}
|
||||||
|
|
||||||
flags
|
flags
|
||||||
|
@ -21,10 +21,10 @@ workspace "SHADE"
|
||||||
include "SHADE_Engine"
|
include "SHADE_Engine"
|
||||||
|
|
||||||
group "Dependencies"
|
group "Dependencies"
|
||||||
--include "Dependencies/imgui"
|
|
||||||
include "Dependencies/msdf"
|
include "Dependencies/msdf"
|
||||||
--include "Dependencies/spdlog"
|
include "Dependencies/imgui"
|
||||||
|
include "Dependencies/spdlog"
|
||||||
--include "Dependencies/tracy"
|
--include "Dependencies/tracy"
|
||||||
--include "Dependencies/VMA"
|
|
||||||
include "Dependencies/yamlcpp"
|
include "Dependencies/yamlcpp"
|
||||||
|
include "Dependencies/reactphysics3d"
|
||||||
group ""
|
group ""
|
||||||
|
|
Loading…
Reference in New Issue