Skip to content

Commit c11e4da

Browse files
committed
Fix imports in loader to link Ninja
1 parent a26d092 commit c11e4da

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,13 @@ $(SETUP) : $(LOADER) $(TARGET) LICENSE $(SETUPSCR) $(SETUPINI)
244244

245245
$(LOADER) : $(LOADER_OBJ) $(TARGET)
246246
@$(call mkdir,$(BUILDDIR))
247-
$(LINKER) $(FLAGS_L) /fo $@ $^ $(LOADER_SYSDEP)
247+
$(LINKER) $(FLAGS_L) /fo $(call FixPath,$@) $^ $(LOADER_SYSDEP)
248248
$(REPRO) $@
249249
$(PATCHREPRO) $(call FixPath,$@)
250250

251251
$(TARGET) : $(OBJ) $(RSC)
252252
@$(call mkdir,$(BUILDDIR))
253-
$(LINKER) $(FLAGS_L) /fo $@ $^ $(SYSDEP)
253+
$(LINKER) $(FLAGS_L) /fo $(call FixPath,$@) $^ $(SYSDEP)
254254
$(REPRO) $@
255255
$(PATCHREPRO) $(call FixPath,$@)
256256

src/dll/BugslayerUtil.asm

+3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ DllMain:
8383
mov eax, DWORD 0x1
8484
ret 0xC
8585
verifyStackoffset
86+
.reference: ; Never reached
87+
call Ninja ; Force import during linking
88+
ret
8689

8790

8891
; Load library on very first call, after that jump to function directly

0 commit comments

Comments
 (0)