undo static llinking on linux
too complicated to do without using cmake
This commit is contained in:
parent
e95b247459
commit
8b610054cc
|
|
@ -41,8 +41,8 @@ project "Editor"
|
||||||
|
|
||||||
--windows specific settings--
|
--windows specific settings--
|
||||||
filter{"system:windows"}
|
filter{"system:windows"}
|
||||||
defines "SFML_STATIC"
|
defines {"SFML_STATIC"}
|
||||||
defines "PLATFORM_WINDOWS"
|
defines {"PLATFORM_WINDOWS"}
|
||||||
staticruntime "on"
|
staticruntime "on"
|
||||||
|
|
||||||
filter {"system:windows", "configurations:debug"}
|
filter {"system:windows", "configurations:debug"}
|
||||||
|
|
@ -55,7 +55,7 @@ project "Editor"
|
||||||
filter {"system:linux"}
|
filter {"system:linux"}
|
||||||
targetdir (bindir)
|
targetdir (bindir)
|
||||||
objdir (intdir)
|
objdir (intdir)
|
||||||
defines "PLATFORM_LINUX"
|
defines {"PLATFORM_LINUX"}
|
||||||
includedirs
|
includedirs
|
||||||
{
|
{
|
||||||
coreinclude_dir,
|
coreinclude_dir,
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,6 @@ project "Engine-Core"
|
||||||
{
|
{
|
||||||
"src",
|
"src",
|
||||||
include_dir,
|
include_dir,
|
||||||
sfmldir .. "/include",
|
|
||||||
imguidir
|
imguidir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -47,8 +46,8 @@ project "Engine-Core"
|
||||||
|
|
||||||
--windows specific settings--
|
--windows specific settings--
|
||||||
filter{"system:windows"}
|
filter{"system:windows"}
|
||||||
defines "SFML_STATIC"
|
defines {"SFML_STATIC"}
|
||||||
defines "PLATFORM_WINDOWS"
|
defines {"PLATFORM_WINDOWS"}
|
||||||
staticruntime "on"
|
staticruntime "on"
|
||||||
|
|
||||||
filter {"system:windows", "configurations:debug"}
|
filter {"system:windows", "configurations:debug"}
|
||||||
|
|
@ -92,7 +91,7 @@ project "Engine-Core"
|
||||||
|
|
||||||
--linux specific settings--
|
--linux specific settings--
|
||||||
filter {"system:linux"}
|
filter {"system:linux"}
|
||||||
defines {"PLATFORM_LINUX", "SFML_STATIC"}
|
defines {"PLATFORM_LINUX"}
|
||||||
targetdir (corelibdir)
|
targetdir (corelibdir)
|
||||||
objdir (intdir)
|
objdir (intdir)
|
||||||
libdirs{sfmldir .. "/lib/linux"}
|
libdirs{sfmldir .. "/lib/linux"}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -41,8 +41,7 @@ project "Game"
|
||||||
|
|
||||||
--windows specific settings--
|
--windows specific settings--
|
||||||
filter{"system:windows"}
|
filter{"system:windows"}
|
||||||
defines "SFML_STATIC"
|
defines {"PLATFORM_WINDOWS"}
|
||||||
defines "PLATFORM_WINDOWS"
|
|
||||||
staticruntime "on"
|
staticruntime "on"
|
||||||
|
|
||||||
filter {"system:windows", "configurations:debug"}
|
filter {"system:windows", "configurations:debug"}
|
||||||
|
|
@ -55,7 +54,7 @@ project "Game"
|
||||||
filter {"system:linux"}
|
filter {"system:linux"}
|
||||||
targetdir (bindir)
|
targetdir (bindir)
|
||||||
objdir (intdir)
|
objdir (intdir)
|
||||||
defines "PLATFORM_LINUX"
|
defines {"PLATFORM_LINUX"}
|
||||||
includedirs
|
includedirs
|
||||||
{
|
{
|
||||||
coreinclude_dir,
|
coreinclude_dir,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue