From d1e2457104ef3271daaf02dcf2f86f34e0251295 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 12 Jun 2021 17:07:50 -0400 Subject: [PATCH] Updated premake build script --- premake5.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/premake5.lua b/premake5.lua index f6cd18e5..9c54592d 100644 --- a/premake5.lua +++ b/premake5.lua @@ -9,6 +9,8 @@ workspace "Nuake" outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}" +include "Nuake/dependencies/glfw_p5.lua" + project "Nuake" location "Nuake" kind "StaticLib" @@ -48,7 +50,7 @@ project "Nuake" "%{prj.name}/../Nuake", "%{prj.name}/../Nuake/src/Vendors", "%{prj.name}/../Nuake/Dependencies/GLEW/include", - "%{prj.name}/../Nuake/Dependencies/GLFW/x64/include", + "%{prj.name}/../Nuake/Dependencies/GLFW/include", "%{prj.name}/../Nuake/Dependencies/bullet/src", "%{prj.name}/../Nuake/Dependencies/assimp/include", "%{prj.name}/../Nuake/src/Vendors/msdfgen/include", @@ -79,7 +81,7 @@ project "Editor" "%{prj.name}/../Nuake", "%{prj.name}/../Nuake/src/Vendors", "%{prj.name}/../Nuake/Dependencies/GLEW/include", - "%{prj.name}/../Nuake/Dependencies/GLFW/x64/include", + "%{prj.name}/../Nuake/Dependencies/GLFW/include", "%{prj.name}/../Nuake/Dependencies/bullet/src", "%{prj.name}/../Nuake/Dependencies/assimp/include", "%{prj.name}/../Nuake/src/Vendors/msdfgen" @@ -103,7 +105,7 @@ project "Editor" links { "Nuake.lib", - "glfw3dll.lib", + "GLFW", "glew32s.lib", "opengl32.lib", "BulletCollision_vs2010_x64_release.lib", @@ -119,5 +121,5 @@ project "Editor" -- 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" + --"{COPY} "Nuake/dependencies/GLFW/lib-vc2019/glfw3.dll" " .. "./bin/" .. outputdir .. "/%{prj.name}/glfw3.dll" } \ No newline at end of file