mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-02-23 20:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] egl: handle \r character when processing #includes

Browse source
This commit is contained in:
Quantum 2021-08-09 19:40:05 -04:00 • committed by Geoffrey McRae
parent 9f4afcd944
commit c1a362f8d3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/renderers/EGL/CMakeLists.txt
View file

@ -14,7 +14,7 @@ pkg_check_modules(RENDERER_EGL_OPT IMPORTED_TARGET
find_program(AWK gawk mawk original-awk awk) find_program(AWK gawk mawk original-awk awk)
if(AWK MATCHES ".+-NOTFOUND") if(AWK MATCHES ".+-NOTFOUND")
message(FATAL_ERROR "FATAL: some known version of awk couldn't be found (${AWK}).") message(FATAL_ERROR "FATAL: some known version of awk couldn't be found (${AWK}).")
else() else()
message(STATUS "Using awk: ${AWK}") message(STATUS "Using awk: ${AWK}")
endif() endif()

2
client/renderers/EGL/glsl.include.awk
View file

@ -1,7 +1,7 @@
BEGIN { FS="\"" } BEGIN { FS="\"" }
function process(line, second) { function process(line, second) {
if (line ~ /^#include[ \t]*".+"[ \t]*$/) { if (line ~ /^#include[ \t]*".+"[ \t\r]*$/) {
while (getline < second) { while (getline < second) {
process($0, $2) process($0, $2)
} }