diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370 index 1644cc826..2c4e460e8 100755 --- a/sys/unix/hints/linux.370 +++ b/sys/unix/hints/linux.370 @@ -440,13 +440,14 @@ endif endif ifdef WANT_LIBNH -$(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a - $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a +$(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua-$(LUA_VERSION).a + $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua-$(LUA_VERSION).a @echo "$@ built." $(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) $(CC) $(CFLAGS) -c -o$@ $< -$(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H) - $(CC) $(CFLAGS) -c -o$@ $< +#dependency tool added this to Makefile.src +#$(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H) +# $(CC) $(CFLAGS) -c -o$@ $< endif # WANT_LIBNH # diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370 index 48b9e90df..ad522bb2f 100755 --- a/sys/unix/hints/macOS.370 +++ b/sys/unix/hints/macOS.370 @@ -545,13 +545,14 @@ endif endif ifdef WANT_LIBNH -$(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a - $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a +$(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua-$(LUA_VERSION).a + $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua-$(LUA_VERSION).a @echo "$@ built." $(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) $(CC) $(CFLAGS) -c -o$@ $< -$(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H) - $(CC) $(CFLAGS) -c -o$@ $< +# dependency tool added this to Makefile.src +#$(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H) +# $(CC) $(CFLAGS) -c -o$@ $< endif # WANT_LIBNH ifdef MAKEFILE_DOC diff --git a/win/shim/winshim.c b/win/shim/winshim.c index 81bc7411d..ae4caed12 100644 --- a/win/shim/winshim.c +++ b/win/shim/winshim.c @@ -171,7 +171,6 @@ VDECLCB(shim_status_update, (int fldidx, genericptr_t ptr, int chg, int percent, int color, unsigned long *colormasks), "vipiiip", A2P fldidx, P2V ptr, A2P chg, A2P percent, A2P color, P2V colormasks) - #ifdef __EMSCRIPTEN__ /* XXX: calling display_inventory() from shim_update_inventory() causes reentrancy that breaks emscripten Asyncify */ /* this should be fine since according to windows.doc, the only purpose of shim_update_inventory() is to call display_inventory() */ @@ -192,15 +191,16 @@ win_request_info * shim_ctrl_nhwindow( winid window UNUSED, int request UNUSED, - win_request_info *wri UNUSED) { + win_request_info *wri) { return (win_request_info *) 0; } #else /* !__EMSCRIPTEN__ */ -VDECLCB(shim_update_inventory,(int a1 UNUSED) -DECLB(win_request_info *, shim_ctrl_nhwindow, +VDECLCB(shim_player_selection, (void), "v") +VDECLCB(shim_update_inventory,(int a1 UNUSED), "vi", A2P a1) +DECLCB(win_request_info *, shim_ctrl_nhwindow, (winid window, int request, win_request_info *wri), "viip", - A2P window UNUSED, A2P request UNUSED, P2V wri UNUSED) + A2P window, A2P request, P2V wri) #endif /* Interface definition used in windows.c */