Skip to content

Commit 1ab11ae

Browse files
committed
Fix lua51.dll dependency in Windows tests
1 parent f9f1d1e commit 1ab11ae

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ build/compile_commands.json: Makefile
218218

219219
build/%/test_cmodule.so: src/test/test_cmodule.c
220220
$(_CC) -o $@ $^ -shared $(CFLAGS) $(LDFLAGS)
221-
build/%/test_cmodule.dll: src/test/test_cmodule.c
221+
build/%/test_cmodule.dll: src/test/test_cmodule.c build/%/lua51.dll
222222
$(_CC) -o $@ $^ -shared $(CFLAGS) $(LDFLAGS)
223223
build/%/test_cmodule.dylib: LDFLAGS += -Wl,-undefined,dynamic_lookup
224224
build/%/test_cmodule.dylib: src/test/test_cmodule.c
@@ -277,18 +277,20 @@ linux64: build/linux_x86_64/liblua_pluginscript.so
277277
$(eval $(call GEN_TEST,linux64,build/linux_x86_64,liblua_pluginscript.so test_cmodule.so))
278278

279279
windows32: build/windows_x86/lua_pluginscript.dll
280-
$(eval $(call GEN_TEST,windows32,build/windows_x86,lua_pluginscript.dll test_cmodule.dll))
280+
$(eval $(call GEN_TEST,windows32,build/windows_x86,lua_pluginscript.dll lua51.dll test_cmodule.dll))
281281
mingw-windows32: CROSS = i686-w64-mingw32-
282282
mingw-windows32: MAKE_LUAJIT_ARGS += HOST_CC="$(CC) -m32" CROSS="$(CROSS)" LDFLAGS=-static-libgcc
283283
mingw-windows32: windows32
284-
$(eval $(call GEN_TEST,mingw-windows32,build/windows_x86,lua_pluginscript.dll test_cmodule.dll))
284+
test-mingw-windows32: CROSS = i686-w64-mingw32-
285+
$(eval $(call GEN_TEST,mingw-windows32,build/windows_x86,lua_pluginscript.dll lua51.dll test_cmodule.dll))
285286

286287
windows64: build/windows_x86_64/lua_pluginscript.dll
287-
$(eval $(call GEN_TEST,windows64,build/windows_x86_64,lua_pluginscript.dll test_cmodule.dll))
288+
$(eval $(call GEN_TEST,windows64,build/windows_x86_64,lua_pluginscript.dll lua51.dll test_cmodule.dll))
288289
mingw-windows64: CROSS = x86_64-w64-mingw32-
289290
mingw-windows64: MAKE_LUAJIT_ARGS += HOST_CC="$(CC)" CROSS="$(CROSS)" LDFLAGS=-static-libgcc
290291
mingw-windows64: windows64
291-
$(eval $(call GEN_TEST,mingw-windows64,build/windows_x86_64,lua_pluginscript.dll test_cmodule.dll))
292+
test-mingw-windows64: CROSS = x86_64-w64-mingw32-
293+
$(eval $(call GEN_TEST,mingw-windows64,build/windows_x86_64,lua_pluginscript.dll lua51.dll test_cmodule.dll))
292294

293295
osx-x86_64: MACOSX_DEPLOYMENT_TARGET ?= 10.7
294296
osx-x86_64: _ADD_CFLAGS = -isysroot '$(shell xcrun --sdk macosx --show-sdk-path)' -arch x86_64

0 commit comments

Comments
 (0)