@@ -12,7 +12,7 @@ meshviewer_SOURCES = meshviewer.cpp meshviewer.h \ | |||||
shinymvtexture.lolfx shinyfur.lolfx | shinymvtexture.lolfx shinyfur.lolfx | ||||
meshviewer_CPPFLAGS = $(AM_CPPFLAGS) | meshviewer_CPPFLAGS = $(AM_CPPFLAGS) | ||||
meshviewer_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ | meshviewer_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ | ||||
meshviewer_LDFLAGS = $(AM_LDFLAGS) | meshviewer_LDFLAGS = $(AM_LDFLAGS) @LOL_LUA_DEPS@ | ||||
if LOL_USE_EMSCRIPTEN | if LOL_USE_EMSCRIPTEN | ||||
meshviewer_LDFLAGS += -s EXPORTED_FUNCTIONS="['_main', '_C_Send']" | meshviewer_LDFLAGS += -s EXPORTED_FUNCTIONS="['_main', '_C_Send']" | ||||
endif | endif | ||||
@@ -31,6 +31,7 @@ tutorials += 16_movie | |||||
05_easymesh_SOURCES = 05_easymesh.cpp | 05_easymesh_SOURCES = 05_easymesh.cpp | ||||
05_easymesh_CPPFLAGS = $(AM_CPPFLAGS) | 05_easymesh_CPPFLAGS = $(AM_CPPFLAGS) | ||||
05_easymesh_LDFLAGS = $(AM_LDFLAGS) @LOL_LUA_DEPS@ | |||||
05_easymesh_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ | 05_easymesh_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ | ||||
06_sprite_SOURCES = 06_sprite.cpp 06_sprite.png | 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_SOURCES = 14_lol_lua.cpp | ||||
14_lol_lua_CPPFLAGS = $(AM_CPPFLAGS) | 14_lol_lua_CPPFLAGS = $(AM_CPPFLAGS) | ||||
14_lol_lua_LDFLAGS = $(AM_LDFLAGS) @LOL_LUA_DEPS@ | |||||
14_lol_lua_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ | 14_lol_lua_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@ | ||||
15_lolimgui_SOURCES = 15_lolimgui.cpp | 15_lolimgui_SOURCES = 15_lolimgui.cpp | ||||
@@ -5,17 +5,19 @@ noinst_LIBRARIES = liblol-bullet.a liblol-lua.a | |||||
# Only remove flags that were actually set, because we don't know | # Only remove flags that were actually set, because we don't know | ||||
# what the compiler actually accepts. | # 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-shadow -Wno-unused -Wno-unused-parameter \ | ||||
-Wno-cast-align -Wno-cast-qual -Wno-strict-aliasing) | -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_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 | include lol-bullet.am | ||||
liblol_lua_a_SOURCES = $(lua_sources) | 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 | include lol-lua.am | ||||