build: various autotools improvements and fixes

build/autotools/m4/lol-conf.m4

@@ -1,3 +1,16 @@
+dnl
+dnl  Lol Engine
+dnl
+dnl  Copyright © 2010—2016 Sam Hocevar <sam@hocevar.net>
+dnl
+dnl  Lol Engine is free software. It comes without any warranty, to
+dnl  the extent permitted by applicable law. You can redistribute it
+dnl  and/or modify it under the terms of the Do What the Fuck You Want
+dnl  to Public License, Version 2, as published by the WTFPL Task Force.
+dnl  See http://www.wtfpl.net/ for more details.
+dnl
+
+
 # LOL_AC_INIT()
 # ---------------------
 AC_DEFUN([LOL_AC_INIT], [

build/autotools/m4/lol-misc.m4

@@ -1,3 +1,15 @@
+dnl
+dnl  Lol Engine
+dnl
+dnl  Copyright © 2010—2016 Sam Hocevar <sam@hocevar.net>
+dnl
+dnl  Lol Engine is free software. It comes without any warranty, to
+dnl  the extent permitted by applicable law. You can redistribute it
+dnl  and/or modify it under the terms of the Do What the Fuck You Want
+dnl  to Public License, Version 2, as published by the WTFPL Task Force.
+dnl  See http://www.wtfpl.net/ for more details.
+dnl
+
 
 dnl LOL_TRY_CFLAGS (CFLAGS, [ACTION-IF-WORKS], [ACTION-IF-FAILS])
 dnl check if $CC supports a given set of cflags

build/autotools/m4/lol-subproject.m4

@@ -0,0 +1,37 @@
+dnl
+dnl  Lol Engine
+dnl
+dnl  Copyright © 2010—2016 Sam Hocevar <sam@hocevar.net>
+dnl
+dnl  Lol Engine is free software. It comes without any warranty, to
+dnl  the extent permitted by applicable law. You can redistribute it
+dnl  and/or modify it under the terms of the Do What the Fuck You Want
+dnl  to Public License, Version 2, as published by the WTFPL Task Force.
+dnl  See http://www.wtfpl.net/ for more details.
+dnl
+
+
+# LOL_AC_SUBPROJECT()
+# ---------------------
+AC_DEFUN([LOL_AC_SUBPROJECT], [
+
+dnl
+dnl  Build and configure Lol Engine before our repository
+dnl  Ensure $lol_srcdir and $lol_builddir are properly set up
+dnl
+
+ac_configure_args="${ac_configure_args} --disable-test --disable-doc --disable-tutorial --disable-samples"
+AC_CONFIG_SUBDIRS([lol])
+AC_SUBST(lol_srcdir, '${top_srcdir}/lol')
+AC_SUBST(lol_builddir, '${top_builddir}/lol')
+
+dnl
+dnl  Subprojects use the same macros as us
+dnl
+
+LOL_AC_INIT()
+LOL_AC_CHECK()
+LOL_AC_SUBST()
+
+]) # LOL_AC_SUBPROJECT
+

src/Makefile.am

@@ -27,8 +27,6 @@ liblol_core_a_SOURCES = \
 #liblol_core_a_CPPFLAGS = -include-pch $(srcdir)/lol/engine-internal.h.pch $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
 liblol_core_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
 
-EXTRA_DIST += easymesh/easymesh-scanner.l easymesh/easymesh-parser.y
-
 liblol_core_headers = \
     lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \
     \
@@ -39,8 +37,8 @@ liblol_core_headers = \
     \
     lol/math/all.h \
     lol/math/functions.h lol/math/vector.h lol/math/half.h lol/math/real.h \
-    lol/math/geometry.h lol/math/interp.h lol/math/rand.h lol/math/array2d.h \
-    lol/math/array3d.h lol/math/constants.h lol/math/matrix.h lol/math/ops.h \
+    lol/math/geometry.h lol/math/interp.h lol/math/rand.h lol/math/arraynd.h \
+    lol/math/constants.h lol/math/matrix.h lol/math/ops.h \
     lol/math/transform.h lol/math/polynomial.h lol/math/bigint.h \
     lol/math/noise/gradient.h lol/math/noise/perlin.h \
     lol/math/noise/simplex.h \
@@ -49,7 +47,8 @@ liblol_core_headers = \
     lol/algorithm/sort.h lol/algorithm/portal.h lol/algorithm/aabb_tree.h \
     \
     lol/sys/all.h \
-    lol/sys/init.h lol/sys/file.h lol/sys/thread.h lol/sys/timer.h \
+    lol/sys/init.h lol/sys/file.h lol/sys/thread.h lol/sys/threadtypes.h \
+    lol/sys/timer.h \
     \
     lol/image/all.h \
     lol/image/pixel.h lol/image/color.h lol/image/image.h lol/image/movie.h \

src/bullet/Makefile.am

@@ -11,12 +11,10 @@ disable_cflags = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \
 liblol_bullet_a_SOURCES = $(bullet_sources)
 liblol_bullet_a_CPPFLAGS = -DB3_USE_CLEW $(AM_CPPFLAGS) -I$(srcdir) $(disable_cflags)
 
-bullet_sources =
-
-if FALSE #CONDITIONAL_BUILD_MULTITHREADED
-libBulletMultiThreaded_la_CXXFLAGS = -I./BulletMultiThreaded/vectormath/scalar/cpp
-bullet_sources +=
-endif
+bullet_sources = \
+	btBulletCollisionCommon.h \
+	btBulletDynamicsCommon.h \
+	$(NULL)
 
 bullet_sources += \
 	Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h \

src/lua/Makefile.am

@@ -14,7 +14,9 @@ lua_sources = \
     lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h \
     lopcodes.c lopcodes.h loslib.c lparser.c lparser.h \
     lstate.c lstate.h lstring.c lstring.h lstrlib.c lprefix.h \
-    ltable.c ltable.h ltablib.c ltm.c ltm.h lutf8lib.c lutf8lib.h \
+    ltable.c ltable.h ltablib.c ltm.c ltm.h lutf8lib.c \
     luaconf.h lua.h lualib.h lundump.c lundump.h lvm.c lvm.h \
     lzio.c lzio.h
 
+lua_sources += lua.hpp
+

tools/lolremez/Makefile.am

@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-EXTRA_DIST += NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters
+EXTRA_DIST += NEWS.txt lolremez.sln lolremez.vcxproj lolremez.vcxproj.filters
 
 noinst_PROGRAMS = lolremez