Fix imports in loader to link Ninja

szapp · Jun 4, 2024 · c11e4da · c11e4da
1 parent a26d092
commit c11e4da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -244,13 +244,13 @@ $(SETUP) : $(LOADER) $(TARGET) LICENSE $(SETUPSCR) $(SETUPINI)
 
 $(LOADER) : $(LOADER_OBJ) $(TARGET)
 	@$(call mkdir,$(BUILDDIR))
-	$(LINKER) $(FLAGS_L) /fo $@ $^ $(LOADER_SYSDEP)
+	$(LINKER) $(FLAGS_L) /fo $(call FixPath,$@) $^ $(LOADER_SYSDEP)
 	$(REPRO) $@
 	$(PATCHREPRO) $(call FixPath,$@)
 
 $(TARGET) : $(OBJ) $(RSC)
 	@$(call mkdir,$(BUILDDIR))
-	$(LINKER) $(FLAGS_L) /fo $@ $^ $(SYSDEP)
+	$(LINKER) $(FLAGS_L) /fo $(call FixPath,$@) $^ $(SYSDEP)
 	$(REPRO) $@
 	$(PATCHREPRO) $(call FixPath,$@)
 

diff --git a/src/dll/BugslayerUtil.asm b/src/dll/BugslayerUtil.asm
@@ -83,6 +83,9 @@ DllMain:
         mov     eax, DWORD 0x1
         ret     0xC
     verifyStackoffset
+.reference:                                                                ; Never reached
+        call    Ninja                                                      ; Force import during linking
+        ret
 
 
 ; Load library on very first call, after that jump to function directly