Moved to glad

This commit is contained in:
Antoine Pilote
2023-09-27 17:14:43 -04:00
parent 7fdb3e11b7
commit 63f6904d59
35 changed files with 8105 additions and 104 deletions

View File

@@ -8,9 +8,22 @@ workspace "Nuake"
"Dist"
}
filter "configurations:Dist"
defines
{
"NK_DIST"
}
filter "configurations:Debug"
defines
{
"NK_DEBUG"
}
outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
include "Nuake/dependencies/glfw_p5.lua"
include "Nuake/dependencies/glad_p5.lua"
include "Nuake/dependencies/assimp_p5.lua"
include "Nuake/dependencies/freetype_p5.lua"
include "Nuake/dependencies/jolt_p5.lua"
@@ -20,15 +33,16 @@ include "Nuake/dependencies/optick_p5.lua"
project "Nuake"
location "Nuake"
kind "StaticLib"
staticruntime "On"
language "C++"
cppdialect "C++20"
defines
{
"GLEW_STATIC",
"_MBCS"
}
targetdir ("bin/" .. outputdir .. "/%{prj.name}")
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
@@ -48,25 +62,25 @@ project "Nuake"
"%{prj.name}/src/Vendors/wren/src/vm/*.c",
"%{prj.name}/src/Vendors/katana-parser/*.h",
"%{prj.name}/src/Vendors/katana-parser/*.c",
"%{prj.name}/../Nuake/src/Vendors/incbin/*.c",
"%{prj.name}/../Nuake/src/Vendors/incbin/*.h"
"%{prj.name}/src/Vendors/incbin/*.c",
"%{prj.name}/src/Vendors/incbin/*.h"
}
includedirs
{
"%{prj.name}/../Nuake",
"%{prj.name}/../Nuake/src/Vendors",
"%{prj.name}/../Nuake/dependencies/GLEW/include",
"%{prj.name}/../Nuake/dependencies/glfw/include",
"%{prj.name}/../Nuake/dependencies/assimp/include",
"%{prj.name}/../Nuake/dependencies/JoltPhysics",
"%{prj.name}/../Nuake/src/Vendors/msdfgen/include",
"%{prj.name}/../Nuake/src/Vendors/msdfgen/freetype/include",
"%{prj.name}/../Nuake/src/Vendors/msdfgen",
"%{prj.name}/../Nuake/src/Vendors/wren/src/include",
"%{prj.name}/../Nuake/src/Vendors/incbin",
"%{prj.name}/../Nuake/dependencies/build",
"%{prj.name}/../Nuake/dependencies/soloud/include"
"%{prj.name}",
"%{prj.name}/src/Vendors",
"%{prj.name}/dependencies/glad/include",
"%{prj.name}/dependencies/glfw/include",
"%{prj.name}/dependencies/assimp/include",
"%{prj.name}/dependencies/JoltPhysics",
"%{prj.name}/src/Vendors/msdfgen/include",
"%{prj.name}/src/Vendors/msdfgen/freetype/include",
"%{prj.name}/src/Vendors/msdfgen",
"%{prj.name}/src/Vendors/wren/src/include",
"%{prj.name}/src/Vendors/incbin",
"%{prj.name}/dependencies/build",
"%{prj.name}/dependencies/soloud/include"
}
links
@@ -76,17 +90,15 @@ project "Nuake"
}
filter "system:linux"
cppdialect "C++20"
staticruntime "On"
defines {
"NK_LINUX",
"GLFW_STATIC",
"GLEW_NO_GLU"
"NK_LINUX"
}
filter "system:windows"
cppdialect "C++20"
staticruntime "On"
defines {
defines
{
"NK_WIN"
}
@@ -95,10 +107,6 @@ project "Nuake"
filter "configurations:Debug"
runtime "Debug"
symbols "on"
defines
{
"NK_DEBUG"
}
filter "configurations:Release"
runtime "Release"
@@ -107,10 +115,7 @@ project "Nuake"
filter "configurations:Dist"
runtime "Release"
optimize "on"
defines
{
"NK_DIST"
}
project "NuakeRuntime"
location "Runtime"
@@ -130,7 +135,7 @@ project "NuakeRuntime"
{
"%{prj.name}/../Nuake",
"%{prj.name}/../Nuake/src/Vendors",
"%{prj.name}/../Nuake/Dependencies/GLEW/include",
"%{prj.name}/../Nuake/Dependencies/glad/include",
"%{prj.name}/../Nuake/Dependencies/GLFW/include",
"%{prj.name}/../Nuake/Dependencies/assimp/include",
"%{prj.name}/../Nuake/Dependencies/build",
@@ -142,8 +147,6 @@ project "NuakeRuntime"
libdirs
{
"%{prj.name}/../Nuake/dependencies/GLEW/lib/Release/x64",
"%{prj.name}/../Nuake/dependencies/GLEW/lib/Release/Linux",
"%{prj.name}/../Nuake/dependencies/assimp/lib/",
"%{prj.name}/../Nuake/dependencies/freetype-windows-binaries/release static/win64",
"%{prj.name}/../bin/%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}/Nuake/",
@@ -159,6 +162,7 @@ project "NuakeRuntime"
{
"Nuake",
"GLFW",
"glad",
"assimp",
"Freetype",
"JoltPhysics",
@@ -179,14 +183,14 @@ project "NuakeRuntime"
filter "system:linux"
links
{
"GL",
"GLEW"
"GL"
}
filter "configurations:Debug"
runtime "Debug"
symbols "on"
defines {
defines
{
"NK_DEBUG"
}
@@ -194,15 +198,18 @@ project "NuakeRuntime"
kind "WindowedApp"
runtime "Release"
optimize "on"
defines {
defines
{
"NK_DIST",
"WIN32_LEAN_AND_MEAN"
}
entrypoint "WinMainCRTStartup"
buildoptions { "-mwindows"}
filter "configurations:Dist"
kind "WindowedApp"
kind "WindowedApp"
runtime "Release"
optimize "on"
flags { "WinMain" }
@@ -211,16 +218,14 @@ project "NuakeRuntime"
"NK_DIST"
}
-- copy a file from the objects directory to the target directory
postbuildcommands {
--"{COPY} "Nuake/dependencies/GLFW/lib-vc2019/glfw3.dll" " .. "./bin/" .. outputdir .. "/%{prj.name}/glfw3.dll"
}
project "Editor"
location "Editor"
kind "ConsoleApp"
language "C++"
cppdialect "C++20"
staticruntime "On"
targetdir ("bin/" .. outputdir .. "/%{prj.name}")
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
debugdir ("%{prj.name}")
@@ -236,7 +241,7 @@ project "Editor"
{
"%{prj.name}/../Nuake",
"%{prj.name}/../Nuake/src/Vendors",
"%{prj.name}/../Nuake/dependencies/GLEW/include",
"%{prj.name}/../Nuake/dependencies/glad/include",
"%{prj.name}/../Nuake/dependencies/glfw/include",
"%{prj.name}/../Nuake/dependencies/assimp/include",
"%{prj.name}/../Nuake/dependencies/build",
@@ -263,7 +268,7 @@ project "Editor"
links
{
"Nuake",
"GLEW",
"glad",
"GLFW",
"assimp",
"Freetype",
@@ -271,38 +276,42 @@ project "Editor"
"soloud"
}
filter "system:windows"
cppdialect "C++20"
staticruntime "On"
filter "system:Windows"
links
{
"OpenGL32"
}
files
{
"%{prj.name}/resources/*.rc",
"%{prj.name}/resources/**.ico"
"%{prj.name}/resources/*.rc",
"%{prj.name}/resources/**.ico"
}
defines
{
"NK_WIN"
}
filter "system:linux"
links
{
"GL",
"GLEW",
"glfw3",
"glad",
"X11"
}
cppdialect "C++20"
staticruntime "On"
defines {
"NK_LINUX",
"GLFW_STATIC"
defines
{
"GLFW_STATIC",
"NK_LINUX"
}
filter "configurations:Debug"
runtime "Debug"
symbols "on"
defines {
"NK_DEBUG",
defines
{
"WIN32_LEAN_AND_MEAN"
}
@@ -311,14 +320,17 @@ project "Editor"
optimize "on"
filter "configurations:Dist"
kind "WindowedApp"
runtime "Release"
optimize "on"
defines {
"NK_DIST",
defines
{
"WIN32_LEAN_AND_MEAN"
}
-- Removes the console for windows
filter {"configurations:Dist", "platforms:windows"}
kind "WindowedApp"
-- copy a file from the objects directory to the target directory
postbuildcommands {
--"{COPY} "Nuake/dependencies/GLFW/lib-vc2019/glfw3.dll" " .. "./bin/" .. outputdir .. "/%{prj.name}/glfw3.dll"