From c951daa4d7f4e8be84c60527fd9e62a82c9ed220 Mon Sep 17 00:00:00 2001 From: Marian Bielcik Date: Wed, 2 Jan 2019 08:14:27 +0100 Subject: [PATCH 1/4] Add support for Linux --- premake5.lua | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/premake5.lua b/premake5.lua index 13e7dba7..f1335326 100644 --- a/premake5.lua +++ b/premake5.lua @@ -2,11 +2,11 @@ project "GLFW" kind "StaticLib" language "C" - targetdir ("bin/" .. outputdir .. "/%{prj.name}") + targetdir ("bin/" .. outputdir .. "/%{prj.name}") objdir ("bin-int/" .. outputdir .. "/%{prj.name}") - files - { + files + { "include/GLFW/glfw3.h", "include/GLFW/glfw3native.h", "src/glfw_config.h", @@ -17,10 +17,36 @@ project "GLFW" "src/vulkan.c", "src/window.c" } + + filter "system:linux" + + pic "On" + + systemversion "latest" + staticruntime "On" + + files + { + "src/x11_init.c", + "src/x11_monitor.c", + "src/x11_window.c", + "src/xkb_unicode.c", + "src/posix_time.c", + "src/posix_thread.c", + "src/glx_context.c", + "src/egl_context.c", + "src/osmesa_context.c", + "src/linux_joystick.c" + } + + defines + { + "_GLFW_X11" + } - filter "system:windows" + filter "system:windows" buildoptions { "-std=c11", "-lgdi32" } - systemversion "10.0.17134.0" + systemversion "latest" staticruntime "On" files @@ -36,10 +62,10 @@ project "GLFW" "src/osmesa_context.c" } - defines - { + defines + { "_GLFW_WIN32", "_CRT_SECURE_NO_WARNINGS" - } + } filter { "system:windows", "configurations:Release" } buildoptions "/MT" From f822529f26be5700dd2773adf2f90f98a710db3b Mon Sep 17 00:00:00 2001 From: Marian Bielcik Date: Wed, 10 Apr 2019 20:52:18 +0200 Subject: [PATCH 2/4] Added bin and bin-int to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f6103c22..2a1c12ee 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ Release MinSizeRel RelWithDebInfo *.xcodeproj +bin +bin-int # CMake files Makefile From 8f16ea039262ae4d4e4f0760e1a89eb5bd3ea1c7 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Wed, 3 Jul 2019 11:32:20 +0200 Subject: [PATCH 3/4] Converted spaces to tabs as requested in #1 --- premake5.lua | 128 +++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/premake5.lua b/premake5.lua index f1335326..e296af31 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,71 +1,71 @@ project "GLFW" - kind "StaticLib" - language "C" - - targetdir ("bin/" .. outputdir .. "/%{prj.name}") - objdir ("bin-int/" .. outputdir .. "/%{prj.name}") + kind "StaticLib" + language "C" - files - { - "include/GLFW/glfw3.h", - "include/GLFW/glfw3native.h", - "src/glfw_config.h", - "src/context.c", - "src/init.c", - "src/input.c", - "src/monitor.c", - "src/vulkan.c", - "src/window.c" - } + targetdir ("bin/" .. outputdir .. "/%{prj.name}") + objdir ("bin-int/" .. outputdir .. "/%{prj.name}") - filter "system:linux" + files + { + "include/GLFW/glfw3.h", + "include/GLFW/glfw3native.h", + "src/glfw_config.h", + "src/context.c", + "src/init.c", + "src/input.c", + "src/monitor.c", + "src/vulkan.c", + "src/window.c" + } + filter "system:linux" + pic "On" - pic "On" + systemversion "latest" + staticruntime "On" - systemversion "latest" - staticruntime "On" - - files - { - "src/x11_init.c", - "src/x11_monitor.c", - "src/x11_window.c", - "src/xkb_unicode.c", - "src/posix_time.c", - "src/posix_thread.c", - "src/glx_context.c", - "src/egl_context.c", - "src/osmesa_context.c", - "src/linux_joystick.c" - } + files + { + "src/x11_init.c", + "src/x11_monitor.c", + "src/x11_window.c", + "src/xkb_unicode.c", + "src/posix_time.c", + "src/posix_thread.c", + "src/glx_context.c", + "src/egl_context.c", + "src/osmesa_context.c", + "src/linux_joystick.c" + } - defines - { - "_GLFW_X11" - } - - filter "system:windows" - buildoptions { "-std=c11", "-lgdi32" } - systemversion "latest" - staticruntime "On" - - files - { - "src/win32_init.c", - "src/win32_joystick.c", - "src/win32_monitor.c", - "src/win32_time.c", - "src/win32_thread.c", - "src/win32_window.c", - "src/wgl_context.c", - "src/egl_context.c", - "src/osmesa_context.c" - } + defines + { + "_GLFW_X11" + } - defines - { - "_GLFW_WIN32", - "_CRT_SECURE_NO_WARNINGS" - } - filter { "system:windows", "configurations:Release" } - buildoptions "/MT" + filter "system:windows" + buildoptions { "-std=c11", "-lgdi32" } + + systemversion "latest" + staticruntime "On" + + files + { + "src/win32_init.c", + "src/win32_joystick.c", + "src/win32_monitor.c", + "src/win32_time.c", + "src/win32_thread.c", + "src/win32_window.c", + "src/wgl_context.c", + "src/egl_context.c", + "src/osmesa_context.c" + } + + defines + { + "_GLFW_WIN32", + "_CRT_SECURE_NO_WARNINGS" + } + + filter { "system:windows", "configurations:Release" } + buildoptions "/MT" From 05f2147de2a2053c27ab8d71740c91cd8e7ed36b Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Wed, 3 Jul 2019 11:34:28 +0200 Subject: [PATCH 4/4] Added symbols and optimization --- premake5.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/premake5.lua b/premake5.lua index e296af31..cb72ce4a 100644 --- a/premake5.lua +++ b/premake5.lua @@ -67,5 +67,10 @@ project "GLFW" "_CRT_SECURE_NO_WARNINGS" } - filter { "system:windows", "configurations:Release" } - buildoptions "/MT" + filter "configurations:Debug" + runtime "Debug" + symbols "on" + + filter "configurations:Release" + runtime "Release" + optimize "on"