diff options
Diffstat (limited to 'cppe')
26 files changed, 32 insertions, 31 deletions
diff --git a/cppe/Makefile.mak b/cppe/Makefile.mak index e9445fe4ee5..4843b6c1ce2 100755 --- a/cppe/Makefile.mak +++ b/cppe/Makefile.mak @@ -30,7 +30,7 @@ createdir:: $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ @echo "making $@ in %i" & \ - cmd /c "cd %i & $(MAKE) -nologo -f Makefile.mak $@ || exit 1" + cmd /c "cd %i & $(MAKE) -nologo -f Makefile.mak $@" || exit 1 install:: copy ICEE_LICENSE $(prefix) diff --git a/cppe/config/Make.rules.mak b/cppe/config/Make.rules.mak index 6d3e0cd55ab..c26bb02de54 100755 --- a/cppe/config/Make.rules.mak +++ b/cppe/config/Make.rules.mak @@ -42,8 +42,7 @@ CPP_COMPILER = VC80 # STLport is not used. # !if "$(CPP_COMPILER)" == "VC60" -#STLPORT_HOME = C:\STLport-5.0 -STLPORT_HOME = E:\src\packages_win32 +STLPORT_HOME = C:\STLport-5.0 !endif # diff --git a/cppe/config/Make.rules.msvc b/cppe/config/Make.rules.msvc index aaf3211083e..a1d0f374f87 100755 --- a/cppe/config/Make.rules.msvc +++ b/cppe/config/Make.rules.msvc @@ -16,7 +16,7 @@ CC = cl.exe LINK = link.exe AR = lib.exe -CPPFLAGS = -nologo -W3 -GR -EHsc -FD -D_CONSOLE -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -nologo -W3 -GR -EHsc -FD -D_CONSOLE !if "$(STLPORT_HOME)" != "" @@ -61,9 +61,11 @@ LDFLAGS = $(LDFLAGS) /LIBPATH:"$(libdir)" /nologo !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" LDFLAGS = $(LDFLAGS) /debug /fixed:no /incremental:yes !else -LDFLAGS = $(LDFLAGS) /pdb:none /OPT:REF /incremental:no +LDFLAGS = $(LDFLAGS) /OPT:REF /incremental:no !if "$(CPP_COMPILER)" != "VC60" LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 /LTCG +!else +LDFLAGS = $(LDFLAGS) /pdb:none !endif !endif diff --git a/cppe/demo/IceE/bidir/Makefile.mak b/cppe/demo/IceE/bidir/Makefile.mak index 65a391485cd..a30311fb442 100644 --- a/cppe/demo/IceE/bidir/Makefile.mak +++ b/cppe/demo/IceE/bidir/Makefile.mak @@ -27,7 +27,7 @@ SRCS = $(OBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -WX +CPPFLAGS = -I. $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/demo/IceE/callback/Makefile.mak b/cppe/demo/IceE/callback/Makefile.mak index 0c69b25203f..24de3d744bb 100644 --- a/cppe/demo/IceE/callback/Makefile.mak +++ b/cppe/demo/IceE/callback/Makefile.mak @@ -27,7 +27,7 @@ SRCS = $(OBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -WX +CPPFLAGS = -I. $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/demo/IceE/hello/Makefile.mak b/cppe/demo/IceE/hello/Makefile.mak index 225a5b4a6c1..3660c072a5f 100644 --- a/cppe/demo/IceE/hello/Makefile.mak +++ b/cppe/demo/IceE/hello/Makefile.mak @@ -27,7 +27,7 @@ SRCS = $(OBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -WX +CPPFLAGS = -I. $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/demo/IceE/latency/Makefile.mak b/cppe/demo/IceE/latency/Makefile.mak index bc8e31cbd2d..e4514ef58e9 100644 --- a/cppe/demo/IceE/latency/Makefile.mak +++ b/cppe/demo/IceE/latency/Makefile.mak @@ -26,7 +26,7 @@ SRCS = $(OBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -WX +CPPFLAGS = -I. $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/demo/IceE/minimal/Makefile.mak b/cppe/demo/IceE/minimal/Makefile.mak index 3a9f2e4c2e2..ed8cceb90f5 100644 --- a/cppe/demo/IceE/minimal/Makefile.mak +++ b/cppe/demo/IceE/minimal/Makefile.mak @@ -26,7 +26,7 @@ SRCS = $(OBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -WX +CPPFLAGS = -I. $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/demo/IceE/throughput/Makefile.mak b/cppe/demo/IceE/throughput/Makefile.mak index 94289baafa7..3989ce7ab3e 100644 --- a/cppe/demo/IceE/throughput/Makefile.mak +++ b/cppe/demo/IceE/throughput/Makefile.mak @@ -27,7 +27,7 @@ SRCS = $(OBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -WX +CPPFLAGS = -I. $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/demo/IceE/workqueue/Makefile.mak b/cppe/demo/IceE/workqueue/Makefile.mak index 9772008fce8..895e3d6b8a0 100644 --- a/cppe/demo/IceE/workqueue/Makefile.mak +++ b/cppe/demo/IceE/workqueue/Makefile.mak @@ -19,7 +19,7 @@ SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -DICEE_PURE_CLIENT -WX +CPPFLAGS = -I. $(CPPFLAGS) -DICEE_PURE_CLIENT -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/include/IceE/Config.h b/cppe/include/IceE/Config.h index b325d71ded3..9ef6339b569 100644 --- a/cppe/include/IceE/Config.h +++ b/cppe/include/IceE/Config.h @@ -13,18 +13,18 @@ // // Comment this out if you want to build without Router support. // -#define ICEE_HAS_ROUTER +//#define ICEE_HAS_ROUTER // // Comment this out if you want to build without Locator support. // -#define ICEE_HAS_LOCATOR +//#define ICEE_HAS_LOCATOR // // Comment this out if you want to build without batch mode on the // client side. // -#define ICEE_HAS_BATCH +//#define ICEE_HAS_BATCH // // Comment this out if want the pure client library built with both @@ -32,7 +32,7 @@ // If uncommented, only blocking support will be included in client // library. // -//#define ICEE_PURE_BLOCKING_CLIENT +#define ICEE_PURE_BLOCKING_CLIENT // *********************************************************************** // diff --git a/cppe/src/IceE/Makefile.mak b/cppe/src/IceE/Makefile.mak index 04026967b3b..9aa327766a2 100755 --- a/cppe/src/IceE/Makefile.mak +++ b/cppe/src/IceE/Makefile.mak @@ -92,7 +92,7 @@ SDIR = $(slicedir)\IceE !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -WX +CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -WX -DWIN32_LEAN_AND_MEAN SLICE2CPPEFLAGS = --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS) !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" diff --git a/cppe/src/IceEC/Makefile.mak b/cppe/src/IceEC/Makefile.mak index 8aa2725ac32..c6519a29609 100755 --- a/cppe/src/IceEC/Makefile.mak +++ b/cppe/src/IceEC/Makefile.mak @@ -73,7 +73,7 @@ ICEE_OBJS = BasicStream.obj \ !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DICEE_PURE_CLIENT +CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DICEE_PURE_CLIENT -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" !if "$(STATICLIBS)" == "yes" diff --git a/cppe/src/Makefile.mak b/cppe/src/Makefile.mak index 24a12c431b4..6dc9aafe85b 100755 --- a/cppe/src/Makefile.mak +++ b/cppe/src/Makefile.mak @@ -18,4 +18,4 @@ $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ @if exist %i \ @echo "making $@ in %i" & \ - cmd /c "cd %i & $(MAKE) -nologo -f Makefile.mak $@ || exit 1" + cmd /c "cd %i & $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/cppe/test/IceE/adapterDeactivation/Makefile.mak b/cppe/test/IceE/adapterDeactivation/Makefile.mak index 1fb52dfdf40..a1bff455427 100644 --- a/cppe/test/IceE/adapterDeactivation/Makefile.mak +++ b/cppe/test/IceE/adapterDeactivation/Makefile.mak @@ -34,7 +34,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/custom/Makefile.mak b/cppe/test/IceE/custom/Makefile.mak index 427f303d12e..e15c9bbdc1e 100644 --- a/cppe/test/IceE/custom/Makefile.mak +++ b/cppe/test/IceE/custom/Makefile.mak @@ -42,7 +42,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -Zm200 +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -Zm200 -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/exceptions/Makefile.mak b/cppe/test/IceE/exceptions/Makefile.mak index 1fb52dfdf40..a1bff455427 100644 --- a/cppe/test/IceE/exceptions/Makefile.mak +++ b/cppe/test/IceE/exceptions/Makefile.mak @@ -34,7 +34,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/facets/Makefile.mak b/cppe/test/IceE/facets/Makefile.mak index 1fb52dfdf40..a1bff455427 100644 --- a/cppe/test/IceE/facets/Makefile.mak +++ b/cppe/test/IceE/facets/Makefile.mak @@ -34,7 +34,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/faultTolerance/Makefile.mak b/cppe/test/IceE/faultTolerance/Makefile.mak index 1aa6cdb06fd..f2d5cfdc4b3 100644 --- a/cppe/test/IceE/faultTolerance/Makefile.mak +++ b/cppe/test/IceE/faultTolerance/Makefile.mak @@ -27,7 +27,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/inheritance/Makefile.mak b/cppe/test/IceE/inheritance/Makefile.mak index 1fb52dfdf40..a1bff455427 100644 --- a/cppe/test/IceE/inheritance/Makefile.mak +++ b/cppe/test/IceE/inheritance/Makefile.mak @@ -34,7 +34,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/location/Makefile.mak b/cppe/test/IceE/location/Makefile.mak index 8a48bba00d0..a2fe2e05ae5 100644 --- a/cppe/test/IceE/location/Makefile.mak +++ b/cppe/test/IceE/location/Makefile.mak @@ -28,7 +28,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/operations/Makefile.mak b/cppe/test/IceE/operations/Makefile.mak index 2d5164d7761..c26ae681cba 100644 --- a/cppe/test/IceE/operations/Makefile.mak +++ b/cppe/test/IceE/operations/Makefile.mak @@ -38,7 +38,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/retry/Makefile.mak b/cppe/test/IceE/retry/Makefile.mak index 1aa6cdb06fd..f2d5cfdc4b3 100644 --- a/cppe/test/IceE/retry/Makefile.mak +++ b/cppe/test/IceE/retry/Makefile.mak @@ -27,7 +27,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/slicing/Makefile.mak b/cppe/test/IceE/slicing/Makefile.mak index 5b0df28905c..626834af3c6 100755 --- a/cppe/test/IceE/slicing/Makefile.mak +++ b/cppe/test/IceE/slicing/Makefile.mak @@ -28,7 +28,7 @@ SRCS = $(COBJS:.obj=.cpp) \ !include $(top_srcdir)/config/Make.rules.mak -ICECPPFLAGS = -I. $(ICECPPFLAGS) +ICECPPFLAGS = -I. $(ICECPPFLAGS) -DWIN32_LEAN_AND_MEAN CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX diff --git a/cppe/test/IceE/thread/Makefile.mak b/cppe/test/IceE/thread/Makefile.mak index d55b1684679..a94afedd46b 100644 --- a/cppe/test/IceE/thread/Makefile.mak +++ b/cppe/test/IceE/thread/Makefile.mak @@ -30,7 +30,7 @@ SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cppe/test/IceE/uuid/Makefile.mak b/cppe/test/IceE/uuid/Makefile.mak index a596c2a8359..efbda255510 100644 --- a/cppe/test/IceE/uuid/Makefile.mak +++ b/cppe/test/IceE/uuid/Makefile.mak @@ -19,7 +19,7 @@ SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN !if "$(OPTIMIZE_SPEED)" != "yes" & "$(OPTIMIZE_SIZE)" != "yes" PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) |