Merge pull request #6 from LovelySanta/patch-1

Add support for Linux (expedite from #1)
This commit is contained in:
Yan Chernikov 2019-07-29 14:05:08 +10:00 committed by GitHub
commit b8e123e63d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 35 deletions

2
.gitignore vendored
View File

@ -14,6 +14,8 @@ Release
MinSizeRel MinSizeRel
RelWithDebInfo RelWithDebInfo
*.xcodeproj *.xcodeproj
bin
bin-int
# CMake files # CMake files
Makefile Makefile

View File

@ -17,10 +17,35 @@ project "GLFW"
"src/vulkan.c", "src/vulkan.c",
"src/window.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" } buildoptions { "-std=c11", "-lgdi32" }
systemversion "10.0.17134.0"
systemversion "latest"
staticruntime "On" staticruntime "On"
files files
@ -41,5 +66,11 @@ project "GLFW"
"_GLFW_WIN32", "_GLFW_WIN32",
"_CRT_SECURE_NO_WARNINGS" "_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"