static linking update
-included libs are now static for windows -c++ runtime is linked statically -premake script updated
This commit is contained in:
parent
dd1ef04d7f
commit
573aa69d3b
|
|
@ -17,7 +17,7 @@
|
||||||
mono_crash.*
|
mono_crash.*
|
||||||
|
|
||||||
# Build results
|
# Build results
|
||||||
[Dd]ebug/
|
#[Dd]ebug/
|
||||||
[Dd]ebugPublic/
|
[Dd]ebugPublic/
|
||||||
[Rr]elease/
|
[Rr]elease/
|
||||||
[Rr]eleases/
|
[Rr]eleases/
|
||||||
|
|
|
||||||
108
premake5.lua
108
premake5.lua
|
|
@ -9,13 +9,27 @@ workspace "fake-mario"
|
||||||
"release"
|
"release"
|
||||||
}
|
}
|
||||||
|
|
||||||
outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
|
local outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
|
||||||
sfmldir = "%{wks.location}/vendor/SFML-3.0.0"
|
local vs_intdir = "$(SolutionDir)intermediate-files/" .. outputdir
|
||||||
imguidir = "%{wks.location}/vendor/imgui"
|
local intdir = "%{wks.location}/intermediate-files/" .. outputdir
|
||||||
|
local vs_bindir = "$(SolutionDir)bin/" .. outputdir
|
||||||
|
local bindir = "%{wks.location}/bin/" .. outputdir
|
||||||
|
local linuxlibdir = "%{wks.location}/vendor/SFML/lib/linux"
|
||||||
|
local vs_libreldir = "$(SolutionDir)vendor/SFML/lib/MinSizeRel"
|
||||||
|
local libreldir = "%{wks.location}/vendor/SFML/lib/MinSizeRel"
|
||||||
|
local vs_libdebugdir = "$(SolutionDir)vendor/SFML/lib/Debug"
|
||||||
|
local libdebugdir = "%{wks.location}/vendor/SFML/lib/Debug"
|
||||||
|
local vs_sfmldir = "$(SolutionDir)vendor/SFML"
|
||||||
|
local sfmldir = "%{wks.location}/vendor/SFML"
|
||||||
|
local vs_imguidir = "$(SolutionDir)vendor/imgui"
|
||||||
|
local imguidir = "%{wks.location}/vendor/imgui"
|
||||||
|
local vs_includedir = "$(SolutionDir)include"
|
||||||
|
local includedir = "%{wks.location}/include"
|
||||||
|
|
||||||
project "fake-mario"
|
project "fake-mario"
|
||||||
cppdialect "C++17"
|
cppdialect "C++17"
|
||||||
language "C++"
|
language "C++"
|
||||||
|
defines "SFML_STATIC"
|
||||||
|
|
||||||
files
|
files
|
||||||
{
|
{
|
||||||
|
|
@ -29,56 +43,64 @@ project "fake-mario"
|
||||||
"vendor/imgui/imgui-SFML.cpp"
|
"vendor/imgui/imgui-SFML.cpp"
|
||||||
}
|
}
|
||||||
|
|
||||||
filter "action:vs*"
|
--visual studio--
|
||||||
targetdir ("$(SolutionDir)bin/" .. outputdir)
|
filter {"action:vs*", "system:windows"}
|
||||||
objdir ("$(SolutionDir)intermediate-files/" .. outputdir)
|
targetdir (vs_bindir )
|
||||||
libdirs "$(SolutionDir)vendor/SFML-3.0.0/lib"
|
objdir (vs_intdir)
|
||||||
|
staticruntime "on"
|
||||||
includedirs
|
includedirs
|
||||||
{
|
{
|
||||||
"$(SolutionDir)include",
|
vs_includedir,
|
||||||
"$(SolutionDir)vendor/SFML-3.0.0/include",
|
vs_sfmldir .. "/include",
|
||||||
"$(SolutionDir)vendor/imgui"
|
vs_imguidir
|
||||||
}
|
}
|
||||||
|
|
||||||
filter {"not action:vs*", "system:windows"}
|
filter {"action:vs*", "system:windows", "configurations:debug"}
|
||||||
targetdir ("%{wks.location}/bin/" .. outputdir)
|
libdirs {vs_libdebugdir}
|
||||||
objdir ("%{wks.location}/intermediate-files/" .. outputdir)
|
|
||||||
libdirs "%{wks.location}/vendor/SFML-3.0.0/lib"
|
|
||||||
includedirs
|
|
||||||
{
|
|
||||||
"%{wks.location}/include",
|
|
||||||
"%{wks.location}/vendor/imgui"
|
|
||||||
}
|
|
||||||
|
|
||||||
filter {"not action:vs*", "system:linux"}
|
filter {"action:vs*", "system:windows", "configurations:release"}
|
||||||
targetdir ("%{wks.location}/bin/" .. outputdir)
|
libdirs {vs_libreldir}
|
||||||
objdir ("%{wks.location}/intermediate-files/" .. outputdir)
|
|
||||||
|
--not visual studio on windows--
|
||||||
|
filter {"not action:vs*", "system:windows"}
|
||||||
|
targetdir (bindir)
|
||||||
|
objdir (intdir)
|
||||||
includedirs
|
includedirs
|
||||||
{
|
{
|
||||||
"%{wks.location}/include",
|
includedir,
|
||||||
"%{wks.location}/vendor/imgui"
|
imguidir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filter {"not action:vs*", "system:windows", "configurations:debug"}
|
||||||
|
libdirs {libdebugdir}
|
||||||
|
|
||||||
|
filter {"not action:vs*", "system:windows", "configurations:release"}
|
||||||
|
libdirs {libreldir}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
--platform specific settings--
|
--platform specific settings--
|
||||||
filter{"system:windows"}
|
filter{"system:windows"}
|
||||||
defines "SFML_STATIC"
|
|
||||||
systemversion "latest"
|
systemversion "latest"
|
||||||
defines "PLATFORM_WINDOWS"
|
defines "PLATFORM_WINDOWS"
|
||||||
|
|
||||||
filter {"system:windows", "configurations:debug"}
|
filter {"system:windows", "configurations:debug"}
|
||||||
kind "ConsoleApp"
|
kind "ConsoleApp"
|
||||||
|
defines{"_DEBUG", "_CONSOLE"}
|
||||||
|
runtime "Debug"
|
||||||
links
|
links
|
||||||
{
|
{
|
||||||
"sfml-graphics-s-d",
|
"sfml-graphics-s-d",
|
||||||
"sfml-window-s-d",
|
"sfml-window-s-d",
|
||||||
"opengl32",
|
"opengl32",
|
||||||
"gdi32",
|
"gdi32",
|
||||||
"freetype",
|
"freetyped",
|
||||||
"sfml-audio-s-d",
|
"sfml-audio-s-d",
|
||||||
"flac",
|
"flacd",
|
||||||
"vorbisenc",
|
"vorbisencd",
|
||||||
"vorbisfile",
|
"vorbisfiled",
|
||||||
"vorbis",
|
"vorbisd",
|
||||||
"ogg",
|
"oggd",
|
||||||
"sfml-network-s-d",
|
"sfml-network-s-d",
|
||||||
"ws2_32",
|
"ws2_32",
|
||||||
"sfml-system-s-d",
|
"sfml-system-s-d",
|
||||||
|
|
@ -87,8 +109,11 @@ project "fake-mario"
|
||||||
|
|
||||||
filter {"system:windows", "configurations:release"}
|
filter {"system:windows", "configurations:release"}
|
||||||
kind "WindowedApp"
|
kind "WindowedApp"
|
||||||
optimize "on"
|
optimize "Speed"
|
||||||
|
inlining "Auto"
|
||||||
entrypoint "mainCRTStartup"
|
entrypoint "mainCRTStartup"
|
||||||
|
defines{"NDEBUG"}
|
||||||
|
runtime "Release"
|
||||||
links
|
links
|
||||||
{
|
{
|
||||||
"sfml-graphics-s",
|
"sfml-graphics-s",
|
||||||
|
|
@ -109,6 +134,15 @@ project "fake-mario"
|
||||||
}
|
}
|
||||||
|
|
||||||
filter {"system:linux"}
|
filter {"system:linux"}
|
||||||
|
targetdir (bindir)
|
||||||
|
objdir (intdir)
|
||||||
|
libdirs{linuxlibdir}
|
||||||
|
includedirs
|
||||||
|
{
|
||||||
|
includedir,
|
||||||
|
sfmldir .. "/include",
|
||||||
|
imguidir
|
||||||
|
}
|
||||||
systemversion "latest"
|
systemversion "latest"
|
||||||
defines "PLATFORM_LINUX"
|
defines "PLATFORM_LINUX"
|
||||||
links
|
links
|
||||||
|
|
@ -119,12 +153,18 @@ project "fake-mario"
|
||||||
"sfml-network",
|
"sfml-network",
|
||||||
"sfml-system",
|
"sfml-system",
|
||||||
"OpenGL"
|
"OpenGL"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
filter {"system:linux" , "configurations:debug"}
|
filter {"system:linux" , "configurations:debug"}
|
||||||
kind "ConsoleApp"
|
kind "ConsoleApp"
|
||||||
|
symbols "on"
|
||||||
|
runtime "Debug"
|
||||||
|
|
||||||
filter {"system:linux" , "configurations:release"}
|
filter {"system:linux" , "configurations:release"}
|
||||||
kind "WindowedApp"
|
kind "WindowedApp"
|
||||||
optimize "on"
|
optimize "Speed"
|
||||||
|
inlining "Auto"
|
||||||
entrypoint "mainCRTStartup"
|
entrypoint "mainCRTStartup"
|
||||||
|
symbols "off"
|
||||||
|
runtime "Release"
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-audio-d.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-audio-d.so.3.0.0
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-audio.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-audio.so.3.0.0
|
|
||||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-graphics-d.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-graphics-d.so.3.0.0
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-graphics.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-graphics.so.3.0.0
|
|
||||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-network-d.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-network-d.so.3.0.0
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-network.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-network.so.3.0.0
|
|
||||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-system-d.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-system-d.so.3.0.0
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-system.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-system.so.3.0.0
|
|
||||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-window-d.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-window-d.so.3.0.0
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
libsfml-window.so.3.0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
libsfml-window.so.3.0.0
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue