diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-14 13:49:22 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-14 13:49:22 -0400 |
| commit | 02b438a11060630b4262756db91a48293088b35b (patch) | |
| tree | 645378bc3c217811e1d87f8730a7ce7aa5f9c794 /cpp/src | |
| parent | Better generated __read and __write for classes and exceptions (C++, Java and... (diff) | |
| download | ice-02b438a11060630b4262756db91a48293088b35b.tar.bz2 ice-02b438a11060630b4262756db91a48293088b35b.tar.xz ice-02b438a11060630b4262756db91a48293088b35b.zip | |
Fixed Windows build
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Glacier2/Makefile.mak | 5 | ||||
| -rw-r--r-- | cpp/src/Glacier2Lib/Makefile.mak | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index f77ce0e2941..446a5cf624e 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -17,6 +17,8 @@ OBJS = Blobject.obj \ CryptPermissionsVerifierI.obj \
Glacier2Router.obj \
Instance.obj \
+ Instrumentation.obj \
+ InstrumentationI.obj \
ProxyVerifier.obj \
RequestQueue.obj \
RouterI.obj \
@@ -31,6 +33,8 @@ SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)\config\Make.rules.mak
CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS = --include-dir Glacier2 $(SLICE2CPPFLAGS)
+
LINKWITH = $(LIBS) $(OPENSSL_LIBS) glacier2$(LIBSUFFIX).lib icessl$(LIBSUFFIX).lib
!if "$(GENERATE_PDB)" == "yes"
@@ -45,6 +49,7 @@ $(ROUTER): $(OBJS) Glacier2Router.res $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
clean::
+ -del /q Instrumentation.cpp Instrumentation.h
-del /q Glacier2Router.res
-del /q $(ROUTER:.exe=.*)
diff --git a/cpp/src/Glacier2Lib/Makefile.mak b/cpp/src/Glacier2Lib/Makefile.mak index f5469f29f5d..c352135b18c 100644 --- a/cpp/src/Glacier2Lib/Makefile.mak +++ b/cpp/src/Glacier2Lib/Makefile.mak @@ -19,6 +19,7 @@ OBJS = PermissionsVerifier.obj \ SSLInfo.obj \
Session.obj \
Application.obj \
+ Metrics.obj \
SessionHelper.obj
SRCS = $(OBJS:.obj=.cpp)
@@ -36,7 +37,7 @@ PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) RES_FILE = Glacier2.res
-SLICE2CPPFLAGS = --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS = --ice --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
$(LIBNAME): $(DLLNAME)
@@ -54,6 +55,7 @@ clean:: -del /q Router.cpp $(HDIR)\Router.h
-del /q Session.cpp $(HDIR)\Session.h
-del /q SSLInfo.cpp $(HDIR)\SSLInfo.h
+ -del /q Metrics.obj $(HDIR)\Metrics.h
-del /q Glacier2.res
install:: all
|