diff --git a/BuildScripts/build.lua b/BuildScripts/build.lua index b78d7fe..2499380 100644 --- a/BuildScripts/build.lua +++ b/BuildScripts/build.lua @@ -25,3 +25,4 @@ group "Dependencies" include "../Dependencies/GLFW/build.lua" include "../Dependencies/GLAD/build.lua" include "../Dependencies/imgui/build.lua" +include "../Dependencies/stb_image/build.lua" diff --git a/Dependencies/stb_image/build.lua b/Dependencies/stb_image/build.lua new file mode 100644 index 0000000..2c91b6b --- /dev/null +++ b/Dependencies/stb_image/build.lua @@ -0,0 +1,44 @@ +project "stb_image" + + location "%{wks.location}/Dependencies/stb_image" + + -- Output Directories -- + targetdir ("%{wks.location}/bin/" .. outputdir) + objdir ("%{wks.location}/bin-int/" .. outputdir) + + -- Compiler -- + kind "StaticLib" + language "C" + + runtime "Release" + optimize "on" + + defines "STB_IMAGE_IMPLEMENTATION" + + -- Project Files --- + files + { + "**.c", + "**.h", + + "build.lua" + } + + -- Dependencies -- + includedirs + { + "%{prj.location}/include/" + } + + --- Filters --- + -- windows + filter "system:windows" + systemversion "latest" + staticruntime "On" + + defines + { + "_CRT_SECURE_NO_WARNINGS", + } + + flags { "MultiProcessorCompile" } \ No newline at end of file diff --git a/Dependencies/stb_image/stb_image.cpp b/Dependencies/stb_image/stb_image.cpp new file mode 100644 index 0000000..e23d4a0 --- /dev/null +++ b/Dependencies/stb_image/stb_image.cpp @@ -0,0 +1 @@ +#include "stb_image.h" \ No newline at end of file diff --git a/Engine/build.lua b/Engine/build.lua index 89bb217..909f385 100644 --- a/Engine/build.lua +++ b/Engine/build.lua @@ -56,6 +56,7 @@ project "Engine" "GLFW" , "GLAD" , "ImGui" , + "stb_image" , } --- Filters --- diff --git a/Engine/src/Engine/Utility/ResourceManager.cpp b/Engine/src/Engine/Utility/ResourceManager.cpp index d5ac346..c6e5098 100644 --- a/Engine/src/Engine/Utility/ResourceManager.cpp +++ b/Engine/src/Engine/Utility/ResourceManager.cpp @@ -5,7 +5,6 @@ #include "Graphics/Shader.h" #include "Graphics/Texture.h" -#define STB_IMAGE_IMPLEMENTATION #include namespace Light { diff --git a/Mirror/build.lua b/Mirror/build.lua index 54dc367..54dc0f7 100644 --- a/Mirror/build.lua +++ b/Mirror/build.lua @@ -42,6 +42,7 @@ project "Mirror" "GLFW", "GLAD", "ImGui", + "stb_image" , } --- Filters --- diff --git a/Sandbox/build.lua b/Sandbox/build.lua index d7ccf0e..c3f326b 100644 --- a/Sandbox/build.lua +++ b/Sandbox/build.lua @@ -42,6 +42,7 @@ project "Sandbox" "GLFW", "GLAD", "ImGui", + "stb_image" , } --- Filters ---