From 99d40b082bb0576f11c288bfa3457fef453aef41 Mon Sep 17 00:00:00 2001 From: Nikhil Bharadwaj <44049892+pixelbrahma@users.noreply.github.com> Date: Sat, 23 Jul 2022 19:20:40 +0100 Subject: [PATCH] Premake changed for Linux and git ignore updated --- .gitignore | 56 ++++++++++++++-------------------------------------- premake5.lua | 28 +++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 4eb2d98e..bffebade 100644 --- a/.gitignore +++ b/.gitignore @@ -1,53 +1,27 @@ -# The canonical out-of-tree build subdirectory -build - -# Directories -.vs/ -bin/ -bin-int/ - -# Files -*.user - -# Visual Studio clutter +# External junk +.DS_Store _ReSharper* +*.opensdf *.sdf *.suo *.dir *.vcxproj* *.sln -.vs -CMakeSettings.json Win32 x64 Debug Release MinSizeRel RelWithDebInfo -*.opensdf +*.xcodeproj +bin +bin-int -# Xcode clutter -GLFW.build -GLFW.xcodeproj - -# macOS clutter -.DS_Store - -# Makefile generator clutter +# CMake files Makefile - -# Ninja generator clutter -build.ninja -rules.ninja -.ninja_deps -.ninja_log - -# CMake clutter CMakeCache.txt CMakeFiles CMakeScripts -CMakeDoxyfile.in -CMakeDoxygenDefaults.cmake cmake_install.cmake cmake_uninstall.cmake @@ -60,15 +34,19 @@ src/glfw_config.h src/glfw3.pc src/glfw3Config.cmake src/glfw3ConfigVersion.cmake +src/wayland-pointer-constraints-unstable-v1-client-protocol.h +src/wayland-pointer-constraints-unstable-v1-protocol.c +src/wayland-relative-pointer-unstable-v1-client-protocol.h +src/wayland-relative-pointer-unstable-v1-protocol.c # Compiled binaries src/libglfw.so src/libglfw.so.3 -src/libglfw.so.3.4 +src/libglfw.so.3.3 src/libglfw.dylib src/libglfw.dylib src/libglfw.3.dylib -src/libglfw.3.4.dylib +src/libglfw.3.3.dylib src/libglfw3.a src/glfw3.lib src/glfw3.dll @@ -83,9 +61,8 @@ examples/offscreen examples/particles examples/splitview examples/sharing -examples/triangle-opengl +examples/simple examples/wave -examples/windows tests/*.app tests/*.exe tests/clipboard @@ -96,7 +73,6 @@ tests/gamma tests/glfwinfo tests/icon tests/iconify -tests/inputlag tests/joysticks tests/monitors tests/msaa @@ -105,7 +81,5 @@ tests/tearing tests/threads tests/timeout tests/title -tests/triangle-vulkan -tests/window +tests/vulkan tests/windows - diff --git a/premake5.lua b/premake5.lua index 36660bf5..fa5e97ca 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,7 +1,6 @@ project "GLFW" kind "StaticLib" language "C" - staticruntime "on" targetdir ("bin/" .. outputdir .. "/%{prj.name}") objdir ("bin-int/" .. outputdir .. "/%{prj.name}") @@ -29,8 +28,35 @@ project "GLFW" "src/null_joystick.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" systemversion "latest" + staticruntime "On" files {