Fix lolfx compilation system so that it works with libtool.

bootstrap

@@ -29,7 +29,7 @@ fi
 # Check for needed features
 auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
 pkgconfig="`grep '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile >/dev/null 2>&1 && echo yes || echo no`"
-libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`"
+libtool="`grep '^[ \t]*\(A._PROG_LIBTOOL\|LT_INIT\)' $conffile >/dev/null 2>&1 && echo yes || echo no`"
 makefile="`[ -f Makefile.am ] && echo yes || echo no`"
 aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`"
 

build/autotools/common.am

@@ -56,6 +56,16 @@ SUFFIXES += .lolfx
 	> $@.lolfx.cpp && \
 	$(CXXCOMPILE) -xc++ -c $@.lolfx.cpp -o $@ && \
 	exit=0 || exit=1; rm -f $@.lolfx.cpp ; exit "$$exit"
+.lolfx.lo:
+	$(lolfx_gen)
+	$(AM_V_at)(echo "char const *"; \
+         echo "lolfx_resource_$(basename $(filter %.lolfx, $^))" | $(SED) 's/[^a-zA-Z0-9_]/_/g'; \
+	 echo "="; \
+	 $(SED) 's/"/\\"/g' $(filter %.lolfx, $^) | $(SED) 's/\([^\r]*\).*/"\1\\n"/'; \
+	 echo ";") \
+	> $@.lolfx.cpp && \
+	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $@.lolfx.cpp -o $@ && \
+	exit=0 || exit=1; rm -f $@.lolfx.cpp ; exit "$$exit"
 
 # Disable on the fly compilation because emscripten doesn't support it
 #	| $(CXXCOMPILE) -xc++ -c - -o $@

configure.ac

@@ -30,11 +30,10 @@ AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PROG_RANLIB
 
-LOL_AC_INIT()
+LT_INIT([win32-dll])
+LT_LANG([C++])
 
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
+LOL_AC_INIT()
 
 dnl Ensure an error is thrown if pkg-config M4 files are not found.
 m4_pattern_allow([^PKG_CONFIG_LIBDIR$])

doc/samples/Makefile.am

@@ -17,12 +17,12 @@ endif
 
 bluenoise_SOURCES = bluenoise.cpp
 bluenoise_CPPFLAGS = $(AM_CPPFLAGS)
-bluenoise_DEPENDENCIES = @LOL_DEPS@
+bluenoise_LDFLAGS = @LOL_DEPS@
 
 benchsuite_SOURCES = benchsuite.cpp \
     benchmark/vector.cpp benchmark/half.cpp benchmark/real.cpp
 benchsuite_CPPFLAGS = $(AM_CPPFLAGS)
-benchsuite_DEPENDENCIES = @LOL_DEPS@
+benchsuite_LDFLAGS = @LOL_DEPS@
 
 btphystest_SOURCES = \
     btphystest.cpp btphystest.h physicobject.h \
@@ -34,8 +34,7 @@ btphystest_SOURCES = \
     \
     front_camera_sprite.lolfx
 btphystest_CPPFLAGS = $(AM_CPPFLAGS)
-btphystest_DEPENDENCIES = @LOL_DEPS@
-btphystest_LDFLAGS = $(AM_LDFLAGS)
+btphystest_LDFLAGS = $(AM_LDFLAGS) @LOL_DEPS@
 if LOL_USE_EMSCRIPTEN
 btphystest_LDFLAGS += \
     --preload-file data/CatsSheet.png \
@@ -44,5 +43,5 @@ endif
 
 simplex_SOURCES = simplex.cpp
 simplex_CPPFLAGS = $(AM_CPPFLAGS)
-simplex_DEPENDENCIES = @LOL_DEPS@
+simplex_LDFLAGS = @LOL_DEPS@
 

doc/samples/math/Makefile.am

@@ -7,9 +7,7 @@ endif
 
 pi_SOURCES = pi.cpp
 pi_CPPFLAGS = $(AM_CPPFLAGS)
-pi_DEPENDENCIES = @LOL_DEPS@
 
 poly_SOURCES = poly.cpp
 poly_CPPFLAGS = $(AM_CPPFLAGS)
-poly_DEPENDENCIES = @LOL_DEPS@
 

doc/samples/sandbox/Makefile.am

@@ -7,5 +7,5 @@ endif
 
 sample_SOURCES = sample.cpp
 sample_CPPFLAGS = $(AM_CPPFLAGS)
-sample_DEPENDENCIES = @LOL_DEPS@
+sample_LDFLAGS = $(AM_LDFLAGS) @LOL_DEPS@
 

doc/tutorial/Makefile.am

@@ -15,73 +15,70 @@ tutorials += 16_movie 17_net
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
 01_triangle_CPPFLAGS = $(AM_CPPFLAGS)
-01_triangle_DEPENDENCIES = @LOL_DEPS@
+01_triangle_LDFLAGS = @LOL_DEPS@
 
 02_cube_SOURCES = 02_cube.cpp 02_cube.lolfx
 02_cube_CPPFLAGS = $(AM_CPPFLAGS)
-02_cube_DEPENDENCIES = @LOL_DEPS@
+02_cube_LDFLAGS = @LOL_DEPS@
 
 03_noise_SOURCES = 03_noise.cpp 03_noise.lolfx
 03_noise_CPPFLAGS = $(AM_CPPFLAGS)
-03_noise_DEPENDENCIES = @LOL_DEPS@
+03_noise_LDFLAGS = @LOL_DEPS@
 
 04_texture_SOURCES = 04_texture.cpp 04_texture.lolfx
 04_texture_CPPFLAGS = $(AM_CPPFLAGS)
-04_texture_DEPENDENCIES = @LOL_DEPS@
+04_texture_LDFLAGS = @LOL_DEPS@
 
 05_easymesh_SOURCES = 05_easymesh.cpp
 05_easymesh_CPPFLAGS = $(AM_CPPFLAGS)
-05_easymesh_LDFLAGS = $(AM_LDFLAGS) @LOL_LUA_DEPS@
-05_easymesh_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@
+05_easymesh_LDFLAGS = $(AM_LDFLAGS) @LOL_DEPS@ @LOL_LUA_DEPS@
 
 06_sprite_SOURCES = 06_sprite.cpp 06_sprite.png
 06_sprite_CPPFLAGS = $(AM_CPPFLAGS)
-06_sprite_DEPENDENCIES = @LOL_DEPS@
-06_sprite_LDFLAGS = $(AM_LDFLAGS)
+06_sprite_LDFLAGS = $(AM_LDFLAGS) @LOL_DEPS@
 if LOL_USE_EMSCRIPTEN
 06_sprite_LDFLAGS += --preload-file 06_sprite.png
 endif
 
 07_input_SOURCES = 07_input.cpp 07_input.lolfx
 07_input_CPPFLAGS = $(AM_CPPFLAGS)
-07_input_DEPENDENCIES = @LOL_DEPS@
+07_input_LDFLAGS = @LOL_DEPS@
 
 08_fbo_SOURCES = 08_fbo.cpp 08_fbo.lolfx
 08_fbo_CPPFLAGS = $(AM_CPPFLAGS)
-08_fbo_DEPENDENCIES = @LOL_DEPS@
+08_fbo_LDFLAGS = @LOL_DEPS@
 
 09_sound_SOURCES = 09_sound.cpp
 09_sound_CPPFLAGS = $(AM_CPPFLAGS)
-09_sound_DEPENDENCIES = @LOL_DEPS@
+09_sound_LDFLAGS = @LOL_DEPS@
 
 11_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
 11_fractal_CPPFLAGS = $(AM_CPPFLAGS)
-11_fractal_DEPENDENCIES = @LOL_DEPS@
+11_fractal_LDFLAGS = @LOL_DEPS@
 
 12_voronoi_SOURCES = 12_voronoi.cpp 12_voronoi.lolfx \
                      12_voronoi_distance.lolfx 12_voronoi_setup.lolfx \
                      12_texture_to_screen.lolfx 12_distance.lolfx
 12_voronoi_CPPFLAGS = $(AM_CPPFLAGS)
-12_voronoi_DEPENDENCIES = @LOL_DEPS@
+12_voronoi_LDFLAGS = @LOL_DEPS@
 
 13_shader_builder_SOURCES = 13_shader_builder.cpp
 13_shader_builder_CPPFLAGS = $(AM_CPPFLAGS)
-13_shader_builder_DEPENDENCIES = @LOL_DEPS@
+13_shader_builder_LDFLAGS = @LOL_DEPS@
 
 14_lua_SOURCES = 14_lua.cpp
 14_lua_CPPFLAGS = $(AM_CPPFLAGS)
-14_lua_LDFLAGS = $(AM_LDFLAGS) @LOL_LUA_DEPS@
-14_lua_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@
+14_lua_LDFLAGS = $(AM_LDFLAGS) @LOL_DEPS@ @LOL_LUA_DEPS@
 
 15_gui_SOURCES = 15_gui.cpp
 15_gui_CPPFLAGS = $(AM_CPPFLAGS)
-15_gui_DEPENDENCIES = @LOL_DEPS@
+15_gui_LDFLAGS = @LOL_DEPS@
 
 16_movie_SOURCES = 16_movie.cpp
 16_movie_CPPFLAGS = $(AM_CPPFLAGS)
-16_movie_DEPENDENCIES = @LOL_DEPS@
+16_movie_LDFLAGS = @LOL_DEPS@
 
 17_net_SOURCES = 17_net.cpp
 17_net_CPPFLAGS = $(AM_CPPFLAGS)
-17_net_DEPENDENCIES = @LOL_DEPS@
+17_net_LDFLAGS = @LOL_DEPS@
 

src/Makefile.am

@@ -26,6 +26,7 @@ liblol_core_la_SOURCES = \
     $(d3d9_sources) \
     $(android_sources)
 liblol_core_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/lua/src
+liblol_core_la_LDFLAGS = $(AM_LDFLAGS)
 
 liblol_core_headers = \
     lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \

src/t/Makefile.am

@@ -29,25 +29,25 @@ endif
 test_base_SOURCES = test-common.cpp \
     base/avl_tree.cpp base/array.cpp base/enum.cpp base/map.cpp base/array2d.cpp base/array3d.cpp \
     base/narray.cpp base/string.cpp base/types.cpp
-test_base_DEPENDENCIES = @LOL_DEPS@
+test_base_LDFLAGS = @LOL_DEPS@
 
 test_math_SOURCES = test-common.cpp \
     math/box.cpp math/cmplx.cpp math/half.cpp math/matrix.cpp math/quat.cpp math/rand.cpp \
     math/real.cpp math/rotation.cpp math/trig.cpp math/vector.cpp math/polynomial.cpp \
     math/noise/simplex.cpp math/bigint.cpp math/sqt.cpp math/numbers.cpp
-test_math_DEPENDENCIES = @LOL_DEPS@
+test_math_LDFLAGS = @LOL_DEPS@
 
 test_sys_SOURCES = test-common.cpp \
     sys/thread.cpp sys/timer.cpp
-test_sys_DEPENDENCIES = @LOL_DEPS@
+test_sys_LDFLAGS = @LOL_DEPS@
 
 test_image_SOURCES = test-common.cpp \
     image/color.cpp image/image.cpp
-test_image_DEPENDENCIES = @LOL_DEPS@
+test_image_LDFLAGS = @LOL_DEPS@
 
 test_entity_SOURCES = test-common.cpp \
     entity/camera.cpp
-test_entity_DEPENDENCIES = @LOL_DEPS@
+test_entity_LDFLAGS = @LOL_DEPS@
 
 EXTRA_DIST += data/gradient.png