From fd3fa760d336312acafeb6812b5b0068f5851f27 Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@anderso.nz>
Date: Fri, 24 Aug 2018 19:35:02 +1200
Subject: Revert "Revert "Merge pull request #1194 from
 ascent12/meson_feature""

This reverts commit 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0.
---
 render/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'render')

diff --git a/render/meson.build b/render/meson.build
index 4b90c229..c5401d22 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -1,6 +1,7 @@
 glgen = find_program('../glgen.sh')
 
-glapi = custom_target('glapi',
+glapi = custom_target(
+	'glapi',
 	input: 'glapi.txt',
 	output: ['@BASENAME@.c', '@BASENAME@.h'],
 	command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'],
@@ -19,8 +20,7 @@ lib_wlr_render = static_library(
 		'wlr_renderer.c',
 		'wlr_texture.c',
 	),
-	glapi[0],
-	glapi[1],
+	glapi,
 	include_directories: wlr_inc,
 	dependencies: [egl, glesv2, pixman, wayland_server],
 )
-- 
cgit v1.2.3


From dc371942911aac5c098205dad7d021837d2d4acd Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@anderso.nz>
Date: Fri, 24 Aug 2018 19:33:35 +1200
Subject: Change how glgen.sh outputs files

This fixes building wlroots as a subproject.
---
 glgen.sh           | 15 +++++++--------
 render/meson.build |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'render')

diff --git a/glgen.sh b/glgen.sh
index b27750e4..fb3bb3c6 100755
--- a/glgen.sh
+++ b/glgen.sh
@@ -7,16 +7,15 @@
 # to fail if it can't load the function. You'll need to check if that function
 # is NULL before using it.
 
-if [ $# -ne 3 ]; then
+if [ $# -ne 2 ]; then
 	exit 1
 fi
 
 SPEC=$1
-OUT_C=$2
-OUT_H=$3
+OUTDIR=$2
 
 BASE=$(basename "$SPEC" .txt)
-INCLUDE_GUARD=$(printf %s "$OUT_H" | tr -c [:alnum:] _ | tr [:lower:] [:upper:])
+INCLUDE_GUARD=$(printf %s_%s_H "$OUTDIR" "$BASE" | tr -c [:alnum:] _ | tr [:lower:] [:upper:])
 
 DECL=""
 DEFN=""
@@ -56,9 +55,9 @@ while read -r COMMAND; do
 	if [ $OPTIONAL -eq 0 ]; then
 		LOADER="$LOADER$(printf "\n$CHECK_FMT" "$COMMAND" "$COMMAND")"
 	fi
-done < $SPEC
+done < "$SPEC"
 
-cat > $OUT_H << EOF
+cat > "$OUTDIR/$BASE.h" << EOF
 #ifndef $INCLUDE_GUARD
 #define $INCLUDE_GUARD
 
@@ -75,9 +74,9 @@ $DECL
 #endif
 EOF
 
-cat > $OUT_C << EOF
+cat > "$OUTDIR/$BASE.c" << EOF
 #include <wlr/util/log.h>
-#include "$OUT_H"
+#include "$BASE.h"
 $DEFN
 
 bool load_$BASE(void) {
diff --git a/render/meson.build b/render/meson.build
index c5401d22..ab66eab0 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -4,7 +4,7 @@ glapi = custom_target(
 	'glapi',
 	input: 'glapi.txt',
 	output: ['@BASENAME@.c', '@BASENAME@.h'],
-	command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'],
+	command: [glgen, '@INPUT@', '@OUTDIR@'],
 )
 
 lib_wlr_render = static_library(
-- 
cgit v1.2.3