Merge branch 'main' of https://github.com/antopilo/Nuake

# Conflicts:
#	Editor/Editor.cpp

premake5.lua

@@ -4,7 +4,8 @@ workspace "Nuake"
     configurations
     {
         "Debug",
-        "Release"
+        "Release",
+        "Dist"
     }
 
 outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
@@ -14,6 +15,7 @@ include "Nuake/dependencies/assimp_p5.lua"
 include "Nuake/dependencies/freetype_p5.lua"
 include "Nuake/dependencies/jolt_p5.lua"
 include "Nuake/dependencies/soloud_p5.lua"
+include "Nuake/dependencies/optick_p5.lua"
 
 project "Nuake"
     location "Nuake"
@@ -26,6 +28,7 @@ project "Nuake"
         "_MBCS"
     }
 
+
     targetdir ("bin/" .. outputdir .. "/%{prj.name}")
     objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
 
@@ -72,15 +75,30 @@ project "Nuake"
     filter "system:windows"
         cppdialect "C++17"
         staticruntime "On"
+        defines {
+            "NK_WIN"
+        }
 
     filter "configurations:Debug"
         runtime "Debug"
         symbols "on"
+        defines 
+        {
+            "NK_DEBUG"
+        }
 
     filter "configurations:Release"
         runtime "Release"
         optimize "on"
 
+    filter "configurations:Dist"
+        runtime "Release"
+        optimize "on"
+        defines 
+        {
+            "NK_DIST"
+        }
+
 project "NuakeRuntime"
     location "Runtime"
     kind "ConsoleApp"
@@ -138,14 +156,28 @@ project "NuakeRuntime"
     filter "system:windows"
         cppdialect "C++17"
         staticruntime "On"
+        defines {
+            "NK_WIN"
+        }
 
     filter "configurations:Debug"
         runtime "Debug"
         symbols "on"
+        defines {
+            "NK_DEBUG"
+        }
 
     filter "configurations:Release"
+        kind "WindowedApp"
         runtime "Release"
         optimize "on"
+        defines {
+            "NK_DIST",
+            "WIN32_LEAN_AND_MEAN"
+        }
+        entrypoint "WinMainCRTStartup"
+        flags { "WinMain" }
+        buildoptions { "-mwindows"}
 
     -- copy a file from the objects directory to the target directory
     postbuildcommands {
@@ -161,11 +193,6 @@ project "Editor"
     objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
 	debugdir ("%{prj.name}")
 
-    defines 
-    {
-        
-    }
-
     files
     {
         "%{prj.name}/Editor.cpp",
@@ -227,6 +254,18 @@ project "Editor"
         runtime "Release"
         optimize "on"
 
+    filter "configurations:Dist"
+        kind "WindowedApp"
+        runtime "Release"
+        optimize "on"
+        defines {
+            "NK_DIST",
+            "WIN32_LEAN_AND_MEAN"
+        }
+        entrypoint "WinMainCRTStartup"
+        flags { "WinMain" }
+        buildoptions { "-mwindows"}
+
     -- 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"