Changeset f16f05426992…
Parent 8f26a4aa2ff5…
by
Changes to 3 files · Browse files at f16f05426992 Showing diff from parent 8f26a4aa2ff5 Diff from another changeset...
@@ -17,9 +17,10 @@
call "%_SDKBIN_%\SetEnv.cmd" /xp /%4 /release
set DEBUG=1
+set THG_PLATFORM=%4
set THG_EXTRA_CPPFLAGS=/DTHG_MSI_INSTALL /DTHG_PRODUCT_ID=%5
set THG_EXTRA_RCFLAGS=/dTHG_VERSION_FIRST=%1 /dTHG_VERSION_SECOND=%2 /dTHG_VERSION_THIRD=%3 /dTHG_PRODUCT_ID="%5"
nmake /f Makefile.nmake clean
nmake /f Makefile.nmake
-move ThgShell.dll ..\ThgShell%4.dll
-move terminate.exe ..\terminate-%4.exe
+move ThgShell%4.dll ..
+move terminate-%4.exe ..
|
@@ -40,14 +40,17 @@ LDFLAGS_TERMINATE = $(BASE_LDFLAGS) /SUBSYSTEM:CONSOLE
-all: THgShell.dll terminate.exe
+THGSHELL_TARGET = THgShell$(THG_PLATFORM).dll
+TERMINATE_TARGET = terminate-$(THG_PLATFORM).exe
+
+all: $(THGSHELL_TARGET) $(TERMINATE_TARGET)
clean:
del *.obj *.dll *.exe *.lib *.exp *.manifest *.res parentid.h
-THgShell.dll: $(OBJECTS_THGSGELL)
+$(THGSHELL_TARGET): $(OBJECTS_THGSGELL)
create-parentid-h.cmd
- rc $(THG_EXTRA_RCFLAGS) shellext.rc
+ rc /dTHG_SHELL_FNAME="$@" $(THG_EXTRA_RCFLAGS) shellext.rc
link /OUT:$@ $(LDFLAGS_THGSHELL) $** shellext.res
mt -nologo -manifest $@.manifest -outputresource:"$@;#2"
@@ -55,6 +58,6 @@ link /OUT:$@ $(LDFLAGS_DIRSTATE) $**
mt -nologo -manifest $@.manifest -outputresource:"$@;#1"
-terminate.exe: terminate.obj $(OBJECTS_TERMINATE)
+$(TERMINATE_TARGET): terminate.obj $(OBJECTS_TERMINATE)
link /OUT:$@ $(LDFLAGS_TERMINATE) $**
mt -nologo -manifest $@.manifest -outputresource:"$@;#1"
|
@@ -56,7 +56,7 @@ VALUE "FileVersion", THG_VERSION_STRING
VALUE "InternalName", "shellext"
VALUE "LegalCopyright", "Copyright (C) 2010 Steve Borho and others"
- VALUE "OriginalFilename", "ThgShell.dll"
+ VALUE "OriginalFilename", TOSTR2(THG_SHELL_FNAME)
VALUE "ProductName", "TortoiseHg " TOSTR2(THG_PRODUCT_ID)
VALUE "ProductVersion", THG_VERSION_STRING
END
|
Loading...