specified C version and ungrouped Engine-Core in premake scripts
This commit is contained in:
parent
3aa23a2109
commit
328bee1656
|
|
@ -1,6 +1,7 @@
|
||||||
project "Editor"
|
project "Editor"
|
||||||
language "C++"
|
language "C++"
|
||||||
cppdialect "C++17"
|
cppdialect "C++17"
|
||||||
|
cdialect "C17"
|
||||||
systemversion "latest"
|
systemversion "latest"
|
||||||
targetname "Editor"
|
targetname "Editor"
|
||||||
links {"Engine-Core"}
|
links {"Engine-Core"}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
project "Engine-Core"
|
project "Engine-Core"
|
||||||
language "C++"
|
language "C++"
|
||||||
cppdialect "C++17"
|
cppdialect "C++17"
|
||||||
|
cdialect "C17"
|
||||||
systemversion "latest"
|
systemversion "latest"
|
||||||
kind "StaticLib"
|
kind "StaticLib"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
project "Game"
|
project "Game"
|
||||||
language "C++"
|
language "C++"
|
||||||
cppdialect "C++17"
|
cppdialect "C++17"
|
||||||
|
cdialect "C17"
|
||||||
systemversion "latest"
|
systemversion "latest"
|
||||||
targetname "Game"
|
targetname "Game"
|
||||||
links {"Engine-Core"}
|
links {"Engine-Core"}
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ vs_intdir = "$(ProjectDir)intermediate-files/" .. output_dir
|
||||||
intdir = "%{prj.location}/intermediate-files/" .. output_dir
|
intdir = "%{prj.location}/intermediate-files/" .. output_dir
|
||||||
vs_bindir = "$(ProjectDir)bin/" .. output_dir
|
vs_bindir = "$(ProjectDir)bin/" .. output_dir
|
||||||
bindir = "%{prj.location}/bin/" .. output_dir
|
bindir = "%{prj.location}/bin/" .. output_dir
|
||||||
--local linuxlibdir =
|
|
||||||
corelibdir = "%{wks.location}/Engine-Core/lib"
|
corelibdir = "%{wks.location}/Engine-Core/lib"
|
||||||
vs_corelibdir = "$(SolutionDir)Engine-Core/lib"
|
vs_corelibdir = "$(SolutionDir)Engine-Core/lib"
|
||||||
coreinclude_dir = "%{wks.location}/Engine-Core/include"
|
coreinclude_dir = "%{wks.location}/Engine-Core/include"
|
||||||
|
|
@ -29,9 +28,6 @@ imguidir = "%{wks.location}/Engine-Core/vendor/imgui"
|
||||||
vs_include_dir = "$(ProjectDir)include"
|
vs_include_dir = "$(ProjectDir)include"
|
||||||
include_dir = "%{prj.location}/include"
|
include_dir = "%{prj.location}/include"
|
||||||
|
|
||||||
group "Core"
|
|
||||||
include "Engine-Core/Build-Core.lua"
|
include "Engine-Core/Build-Core.lua"
|
||||||
group ""
|
|
||||||
|
|
||||||
include "Game/Build-Game.lua"
|
include "Game/Build-Game.lua"
|
||||||
include "Editor/Build-Editor.lua"
|
include "Editor/Build-Editor.lua"
|
||||||
Loading…
Reference in New Issue