diff --git a/Editor/Build-Editor.lua b/Editor/Build-Editor.lua index 3983394..1d1702b 100644 --- a/Editor/Build-Editor.lua +++ b/Editor/Build-Editor.lua @@ -41,8 +41,8 @@ project "Editor" --windows specific settings-- filter{"system:windows"} - defines "SFML_STATIC" - defines "PLATFORM_WINDOWS" + defines {"SFML_STATIC"} + defines {"PLATFORM_WINDOWS"} staticruntime "on" filter {"system:windows", "configurations:debug"} @@ -55,7 +55,7 @@ project "Editor" filter {"system:linux"} targetdir (bindir) objdir (intdir) - defines "PLATFORM_LINUX" + defines {"PLATFORM_LINUX"} includedirs { coreinclude_dir, diff --git a/Engine-Core/Build-Core.lua b/Engine-Core/Build-Core.lua index 6166147..d5abd6b 100644 --- a/Engine-Core/Build-Core.lua +++ b/Engine-Core/Build-Core.lua @@ -39,7 +39,6 @@ project "Engine-Core" { "src", include_dir, - sfmldir .. "/include", imguidir } @@ -47,8 +46,8 @@ project "Engine-Core" --windows specific settings-- filter{"system:windows"} - defines "SFML_STATIC" - defines "PLATFORM_WINDOWS" + defines {"SFML_STATIC"} + defines {"PLATFORM_WINDOWS"} staticruntime "on" filter {"system:windows", "configurations:debug"} @@ -92,7 +91,7 @@ project "Engine-Core" --linux specific settings-- filter {"system:linux"} - defines {"PLATFORM_LINUX", "SFML_STATIC"} + defines {"PLATFORM_LINUX"} targetdir (corelibdir) objdir (intdir) libdirs{sfmldir .. "/lib/linux"} diff --git a/Engine-Core/vendor/SFML/lib/linux/libsfml-audio-s.a b/Engine-Core/vendor/SFML/lib/linux/libsfml-audio-s.a deleted file mode 100644 index 0702458..0000000 Binary files a/Engine-Core/vendor/SFML/lib/linux/libsfml-audio-s.a and /dev/null differ diff --git a/Engine-Core/vendor/SFML/lib/linux/libsfml-graphics-s.a b/Engine-Core/vendor/SFML/lib/linux/libsfml-graphics-s.a deleted file mode 100644 index fb38da6..0000000 Binary files a/Engine-Core/vendor/SFML/lib/linux/libsfml-graphics-s.a and /dev/null differ diff --git a/Engine-Core/vendor/SFML/lib/linux/libsfml-network-s.a b/Engine-Core/vendor/SFML/lib/linux/libsfml-network-s.a deleted file mode 100644 index 7a14501..0000000 Binary files a/Engine-Core/vendor/SFML/lib/linux/libsfml-network-s.a and /dev/null differ diff --git a/Engine-Core/vendor/SFML/lib/linux/libsfml-system-s.a b/Engine-Core/vendor/SFML/lib/linux/libsfml-system-s.a deleted file mode 100644 index 42962ad..0000000 Binary files a/Engine-Core/vendor/SFML/lib/linux/libsfml-system-s.a and /dev/null differ diff --git a/Engine-Core/vendor/SFML/lib/linux/libsfml-window-s.a b/Engine-Core/vendor/SFML/lib/linux/libsfml-window-s.a deleted file mode 100644 index eab1681..0000000 Binary files a/Engine-Core/vendor/SFML/lib/linux/libsfml-window-s.a and /dev/null differ diff --git a/Game/Build-Game.lua b/Game/Build-Game.lua index 1a8f945..9d2f018 100644 --- a/Game/Build-Game.lua +++ b/Game/Build-Game.lua @@ -41,8 +41,7 @@ project "Game" --windows specific settings-- filter{"system:windows"} - defines "SFML_STATIC" - defines "PLATFORM_WINDOWS" + defines {"PLATFORM_WINDOWS"} staticruntime "on" filter {"system:windows", "configurations:debug"} @@ -55,7 +54,7 @@ project "Game" filter {"system:linux"} targetdir (bindir) objdir (intdir) - defines "PLATFORM_LINUX" + defines {"PLATFORM_LINUX"} includedirs { coreinclude_dir,