From 195da29ceef84540f190c49a3a710c99d6531eea Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Wed, 6 Jan 2021 10:32:41 +0800 Subject: [PATCH 1/2] copy premake4 -> premake5 --- premake4.lua => premake5.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename premake4.lua => premake5.lua (100%) diff --git a/premake4.lua b/premake5.lua similarity index 100% rename from premake4.lua rename to premake5.lua From da180a79f553250b68f53a5e1978666ee8b62e39 Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Wed, 6 Jan 2021 10:34:05 +0800 Subject: [PATCH 2/2] link glfw instead of glfw3 in MacOSX env --- premake5.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/premake5.lua b/premake5.lua index 0f861686..4e73bb64 100644 --- a/premake5.lua +++ b/premake5.lua @@ -41,7 +41,7 @@ solution "nanovg" defines { "NANOVG_GLEW", "_CRT_SECURE_NO_WARNINGS" } configuration { "macosx" } - links { "glfw3" } + links { "glfw" } linkoptions { "-framework OpenGL", "-framework Cocoa", "-framework IOKit", "-framework CoreVideo", "-framework Carbon" } configuration "Debug" @@ -70,7 +70,7 @@ solution "nanovg" defines { "NANOVG_GLEW", "_CRT_SECURE_NO_WARNINGS" } configuration { "macosx" } - links { "glfw3" } + links { "glfw" } linkoptions { "-framework OpenGL", "-framework Cocoa", "-framework IOKit", "-framework CoreVideo", "-framework Carbon" } configuration "Debug" @@ -100,7 +100,7 @@ solution "nanovg" defines { "NANOVG_GLEW", "_CRT_SECURE_NO_WARNINGS" } configuration { "macosx" } - links { "glfw3" } + links { "glfw" } linkoptions { "-framework OpenGL", "-framework Cocoa", "-framework IOKit", "-framework CoreVideo", "-framework Carbon" } configuration "Debug" @@ -130,7 +130,7 @@ solution "nanovg" defines { "NANOVG_GLEW", "_CRT_SECURE_NO_WARNINGS" } configuration { "macosx" } - links { "glfw3" } + links { "glfw" } linkoptions { "-framework OpenGL", "-framework Cocoa", "-framework IOKit", "-framework CoreVideo", "-framework Carbon" } configuration "Debug" @@ -158,7 +158,7 @@ solution "nanovg" defines { "NANOVG_GLEW", "_CRT_SECURE_NO_WARNINGS" } configuration { "macosx" } - links { "glfw3" } + links { "glfw" } linkoptions { "-framework OpenGL", "-framework Cocoa", "-framework IOKit", "-framework CoreVideo", "-framework Carbon" } configuration "Debug" @@ -186,7 +186,7 @@ solution "nanovg" defines { "NANOVG_GLEW", "_CRT_SECURE_NO_WARNINGS" } configuration { "macosx" } - links { "glfw3" } + links { "glfw" } linkoptions { "-framework OpenGL", "-framework Cocoa", "-framework IOKit", "-framework CoreVideo", "-framework Carbon" } configuration "Debug" @@ -214,7 +214,7 @@ solution "nanovg" defines { "NANOVG_GLEW", "_CRT_SECURE_NO_WARNINGS" } configuration { "macosx" } - links { "glfw3" } + links { "glfw" } linkoptions { "-framework OpenGL", "-framework Cocoa", "-framework IOKit", "-framework CoreVideo", "-framework Carbon" } configuration "Debug"