diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-02-15 16:19:43 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-02-15 16:19:43 -0330 |
| commit | 1236c24c0fd3fd6b70f0d2cb199e8663148864a9 (patch) | |
| tree | 381954a99b05dfe61e409fe9fb25d77c5ec322f4 /cpp | |
| parent | Documentation fixes, distribution fixies (diff) | |
| download | ice-1236c24c0fd3fd6b70f0d2cb199e8663148864a9.tar.bz2 ice-1236c24c0fd3fd6b70f0d2cb199e8663148864a9.tar.xz ice-1236c24c0fd3fd6b70f0d2cb199e8663148864a9.zip | |
Bug 2682
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/iceserviceinstall/Makefile.mak | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak index 7afa1d53d92..de86159d2c0 100644 --- a/cpp/src/iceserviceinstall/Makefile.mak +++ b/cpp/src/iceserviceinstall/Makefile.mak @@ -46,6 +46,11 @@ LINKWITH = $(LIBS) msi.lib LINKWITH = $(LIBS) !endif TLINKWITH = $(LIBS) iceserviceinstaller$(LIBSUFFIX).lib +!if "$(CPP_COMPILER)" == "VC90" +TLINKWITH = /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(TLINKWITH) +!else +EXTRA_MANIFEST = security.manifest +!endif !ifndef BUILD_UTILS @@ -70,7 +75,7 @@ $(DLLNAME): $(OBJS) $(TOOL): $(TOBJS) $(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(TLINKWITH) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest $(EXTRA_MANIFEST) -outputresource:$@;#1 && del /q $@.manifest !ifdef BUILD_UTILS |