diff --git a/doc/samples/meshviewer/Makefile.am b/doc/samples/meshviewer/Makefile.am index 6e6bbfb1..e01551e0 100644 --- a/doc/samples/meshviewer/Makefile.am +++ b/doc/samples/meshviewer/Makefile.am @@ -12,7 +12,7 @@ meshviewer_SOURCES = meshviewer.cpp meshviewer.h \ shinymvtexture.lolfx shinyfur.lolfx meshviewer_CPPFLAGS = $(AM_CPPFLAGS) meshviewer_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ -meshviewer_LDFLAGS = $(AM_LDFLAGS) +meshviewer_LDFLAGS = $(AM_LDFLAGS) @LOL_LUA_DEPS@ if LOL_USE_EMSCRIPTEN meshviewer_LDFLAGS += -s EXPORTED_FUNCTIONS="['_main', '_C_Send']" endif diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am index faffa9bb..772486d2 100644 --- a/doc/tutorial/Makefile.am +++ b/doc/tutorial/Makefile.am @@ -31,6 +31,7 @@ tutorials += 16_movie 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@ 06_sprite_SOURCES = 06_sprite.cpp 06_sprite.png @@ -69,6 +70,7 @@ endif 14_lol_lua_SOURCES = 14_lol_lua.cpp 14_lol_lua_CPPFLAGS = $(AM_CPPFLAGS) +14_lol_lua_LDFLAGS = $(AM_LDFLAGS) @LOL_LUA_DEPS@ 14_lol_lua_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ 15_lolimgui_SOURCES = 15_lolimgui.cpp diff --git a/src/3rdparty/Makefile.am b/src/3rdparty/Makefile.am index b731af87..6b8f4c13 100644 --- a/src/3rdparty/Makefile.am +++ b/src/3rdparty/Makefile.am @@ -5,17 +5,19 @@ noinst_LIBRARIES = liblol-bullet.a liblol-lua.a # Only remove flags that were actually set, because we don't know # what the compiler actually accepts. -disable_cflags = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \ +disable_cflags_bullet = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \ -Wno-shadow -Wno-unused -Wno-unused-parameter \ -Wno-cast-align -Wno-cast-qual -Wno-strict-aliasing) +disable_cflags_lua = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \ + -Wno-cast-qual) liblol_bullet_a_SOURCES = $(bullet_sources) -liblol_bullet_a_CPPFLAGS = -DB3_USE_CLEW $(AM_CPPFLAGS) -I$(srcdir)/bullet3/src $(disable_cflags) +liblol_bullet_a_CPPFLAGS = -DB3_USE_CLEW $(AM_CPPFLAGS) -I$(srcdir)/bullet3/src $(disable_cflags_bullet) include lol-bullet.am liblol_lua_a_SOURCES = $(lua_sources) -liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI +liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI $(disable_cflags_lua) include lol-lua.am