diff options
| author | Jose <jose@zeroc.com> | 2014-12-04 16:23:28 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-04 16:23:28 +0100 |
| commit | 39126e8f5f7a54be60fedc6ac73cc1105c669e6f (patch) | |
| tree | fdd97e0eb6fdc8c9f8bf8732218a335770c3de1a /cpp/src | |
| parent | Fixed issue from previous commit, removed all references to getIceVersion (diff) | |
| download | ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.tar.bz2 ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.tar.xz ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.zip | |
Fixed (ICE-6057) - VS2012: IceGrid\customLoadBalancing fails
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 2a023cd4508..c287d28eb46 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -10,8 +10,17 @@ top_srcdir = ..\.. ADMIN = $(top_srcdir)\bin\icegridadmin.exe -NODE_SERVER = $(top_srcdir)\bin\icegridnode.exe -REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry.exe + +NODE_SERVER_D = $(top_srcdir)\bin\icegridnoded.exe +NODE_SERVER_R = $(top_srcdir)\bin\icegridnode.exe + +NODE_SERVER = $(top_srcdir)\bin\icegridnode$(LIBSUFFIX).exe + + +REGISTRY_SERVER_D = $(top_srcdir)\bin\icegridregistryd.exe +REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe + +REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry$(LIBSUFFIX).exe TARGETS = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER) @@ -178,8 +187,8 @@ clean:: -del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp -del /q SerialsDict.h SerialsDict.cpp -del /q $(ADMIN:.exe=.*) - -del /q $(NODE_SERVER:.exe=.*) - -del /q $(REGISTRY_SERVER:.exe=.*) + -del /q $(NODE_SERVER_D:.exe=.*) $(NODE_SERVER_R:.exe=.*) + -del /q $(REGISTRY_SERVER_D:.exe=.*) $(REGISTRY_SERVER_R:.exe=.*) -del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res install:: all |