diff --git a/Editor/Build-Editor.lua b/Editor/Build-Editor.lua index 1d1702b..eb73619 100644 --- a/Editor/Build-Editor.lua +++ b/Editor/Build-Editor.lua @@ -41,8 +41,7 @@ project "Editor" --windows specific settings-- filter{"system:windows"} - defines {"SFML_STATIC"} - defines {"PLATFORM_WINDOWS"} + defines {"PLATFORM_WINDOWS", "SFML_STATIC"} staticruntime "on" filter {"system:windows", "configurations:debug"} diff --git a/Engine-Core/Build-Core.lua b/Engine-Core/Build-Core.lua index d5abd6b..a9da846 100644 --- a/Engine-Core/Build-Core.lua +++ b/Engine-Core/Build-Core.lua @@ -46,8 +46,7 @@ project "Engine-Core" --windows specific settings-- filter{"system:windows"} - defines {"SFML_STATIC"} - defines {"PLATFORM_WINDOWS"} + defines {"PLATFORM_WINDOWS", "SFML_STATIC"} staticruntime "on" filter {"system:windows", "configurations:debug"} @@ -93,7 +92,7 @@ project "Engine-Core" filter {"system:linux"} defines {"PLATFORM_LINUX"} targetdir (corelibdir) - objdir (intdir) + objdir (intdir) libdirs{sfmldir .. "/lib/linux"} includedirs { diff --git a/Game/Build-Game.lua b/Game/Build-Game.lua index 9d2f018..f850036 100644 --- a/Game/Build-Game.lua +++ b/Game/Build-Game.lua @@ -41,7 +41,7 @@ project "Game" --windows specific settings-- filter{"system:windows"} - defines {"PLATFORM_WINDOWS"} + defines {"PLATFORM_WINDOWS", "SFML_STATIC"} staticruntime "on" filter {"system:windows", "configurations:debug"} diff --git a/premake5.lua b/premake5.lua index 1c8f0bd..7c1f77b 100644 --- a/premake5.lua +++ b/premake5.lua @@ -13,7 +13,7 @@ workspace "2d-platformer" startproject "Game" output_dir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}" -vs_intdir = "$(ProjectDir)intermediate-files/" .. output_dir +vs_intdir = "!$(ProjectDir)intermediate-files/" .. output_dir intdir = "%{prj.location}/intermediate-files/" .. output_dir vs_bindir = "$(ProjectDir)bin/" .. output_dir bindir = "%{prj.location}/bin/" .. output_dir