diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-22 11:26:52 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-22 11:26:52 -0230 |
| commit | e59e318754302123e3e15f12d78b2600ed4c8ca7 (patch) | |
| tree | 7443657d6d2b713b06135618084bcf7781070938 /cpp/src | |
| parent | ICE-5585 Connection::setCallback should always invoke the callback (diff) | |
| download | ice-e59e318754302123e3e15f12d78b2600ed4c8ca7.tar.bz2 ice-e59e318754302123e3e15f12d78b2600ed4c8ca7.tar.xz ice-e59e318754302123e3e15f12d78b2600ed4c8ca7.zip | |
ICE-5653 DLL base address conflicts
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceDiscovery/Makefile.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak index d297171b325..e2711e69723 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak @@ -33,7 +33,7 @@ RES_FILE = CryptPermissionsVerifier.res $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) CryptPermissionsVerifier.res - $(LINK) $(BASE):0x24000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) + $(LINK) $(BASE):0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest diff --git a/cpp/src/IceDiscovery/Makefile.mak b/cpp/src/IceDiscovery/Makefile.mak index 68ea19a9700..41c87f69a78 100644 --- a/cpp/src/IceDiscovery/Makefile.mak +++ b/cpp/src/IceDiscovery/Makefile.mak @@ -39,7 +39,7 @@ RES_FILE = IceDiscovery.res $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) IceDiscovery.res - $(LINK) $(BASE):0x24000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) + $(LINK) $(BASE):0x28000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest |