From f991a075e18df5e58bd6f6f90c1b02b5b353cbe3 Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <ahmad@a3f.at>
Date: Sat, 25 Nov 2017 20:27:53 +0100
Subject: Build examples and games on Travis CI

They were disabled because they failed to build,
but this patch set fixes the build on Linux and macOS.

This doesn't apply to the AppVeyor build on Windows yet;
it currently fails at linking with OpenAL.
---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 331d062d..65b3020c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,3 +132,8 @@ build
 
 # Ignore Android generated files and folders
 templates/android_project/output
+
+# Ignore GNU global tags
+GPATH
+GRTAGS
+GTAGS
-- 
cgit v1.2.3


From 4a7840b75297e2a2ea3ddf5ef6b2e0c9b9d5d057 Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <ahmad@a3f.at>
Date: Mon, 11 Dec 2017 11:13:34 +0100
Subject: Remove Meson build system

Less maintenance overhead that way,
given that make/CMake now also do library versioning.
---
 .gitignore      |  3 ---
 meson.build     | 15 ---------------
 src/meson.build | 22 ----------------------
 3 files changed, 40 deletions(-)
 delete mode 100644 meson.build
 delete mode 100644 src/meson.build

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 65b3020c..44f882d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,9 +110,6 @@ docs/examples/web/*/*.html
 !docs/examples/web/shaders/loader.html
 !docs/examples/web/models/loader.html
 
-# Meson build system
-builddir/
-
 # CMake stuff
 CMakeCache.txt
 CMakeFiles
diff --git a/meson.build b/meson.build
deleted file mode 100644
index c85905cc..00000000
--- a/meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-project('raylib', 'c', version:	'1.8.0',
-		license: 'zlib',
-		meson_version: '>= 0.39.1',
-		default_options : 'c_std=gnu99')
-
-cc = meson.get_compiler('c')
-
-glfw_dep = dependency('glfw3', version : '>=3.2')
-gl_dep = dependency('gl')
-openal_dep = dependency('openal')
-x11_dep = dependency('x11')
-m_dep = cc.find_library('m', required : false)
-
-subdir('src')
-
diff --git a/src/meson.build b/src/meson.build
deleted file mode 100644
index 12385fc9..00000000
--- a/src/meson.build
+++ /dev/null
@@ -1,22 +0,0 @@
-install_headers('raylib.h')
-
-source_c = [
-  'audio.c',
-  'core.c',
-  'models.c',
-  'rlgl.c',
-  'shapes.c',
-  'text.c',
-  'textures.c',
-  'utils.c',
-  'external/stb_vorbis.c',
-]
-
-# use 'meson --default-library=static builddir' to build as static, if no builddir yet exists
-# use 'mesonconf -Ddefault_library=static builddir' to change the type
-raylib = library('raylib',
-                  source_c,
-                  dependencies : [ glfw_dep, gl_dep, openal_dep, m_dep, x11_dep],
-                  install : true,
-                  version : '1.8.0')
-
-- 
cgit v1.2.3