1. TortoiseHg
  2. TortoiseHg
  3. thg

Commits

Daniel Atallah  committed 3ee430a

shellext: Don't include ThgVersion pseudotarget in list of link params

This prevents the following warning from appearing during linking:
ThgVersion.obj : warning LNK4042: object specified more than once; extras ignored

  • Participants
  • Parent commits ad2c317
  • Branches hgtk

Comments (0)

Files changed (1)

File win32/shellext/Makefile.nmake

View file
  • Ignore whitespace
 $(THGSHELL_TARGET): ThgVersion $(OBJECTS_THGSGELL)
     cl /EP ThgCLSIDs-template.wxi > ThgCLSIDs.wxi
     rc /dTHG_SHELL_FNAME="$@" $(THG_EXTRA_RCFLAGS) shellext.rc
-    link /OUT:$@ $(LDFLAGS_THGSHELL) $** shellext.res
+    link /OUT:$@ $(LDFLAGS_THGSHELL) $(OBJECTS_THGSGELL) shellext.res
     mt -nologo -manifest $@.manifest -outputresource:"$@;#2"
 
 dirstate.exe: dirstate.obj $(OBJECTS_DIRSTATE)