diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-02-21 16:24:59 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-02-21 16:24:59 -0500 |
| commit | 18b6296b9b080cdb1eb17345948f3e26dd63f124 (patch) | |
| tree | 5ecaa8b903f93ae236463f38b3d2cad0826f38e6 /cpp | |
| parent | VC90 MSI fixes (diff) | |
| parent | Allow windows demos to be built against 64bit installation (diff) | |
| download | ice-18b6296b9b080cdb1eb17345948f3e26dd63f124.tar.bz2 ice-18b6296b9b080cdb1eb17345948f3e26dd63f124.tar.xz ice-18b6296b9b080cdb1eb17345948f3e26dd63f124.zip | |
Merge branch 'master' of ssh://git/home/git/ice
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 2 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.mak | 12 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 7 | ||||
| -rw-r--r-- | cpp/config/icegridnode.cfg | 8 | ||||
| -rw-r--r-- | cpp/config/icegridregistry.cfg | 4 | ||||
| -rw-r--r-- | cpp/test/IceBox/configuration/.gitignore | 1 | ||||
| -rw-r--r-- | cpp/test/IceBox/configuration/Makefile.mak | 1 |
7 files changed, 18 insertions, 17 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index f8abdc0937b..c59c58d0310 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -133,7 +133,7 @@ ifdef ice_src_dist libdir = $(top_srcdir)/lib includedir = $(top_srcdir)/include else - bindir = $(ice_dir)/bin + bindir = $(ice_dir)/bin$(lp64binsuffix) libdir = $(ice_dir)/$(libsubdir) includedir = $(ice_dir)/include endif diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 7f0251747dd..05e0faed755 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -91,6 +91,10 @@ slice_translator = slice2cpp.exe ice_require_cpp = 1 !endif +#!if "$(AS)" == "ml64" || "$(XTARGET)" == "x64" +x64suffix = \x64 +#!endif + !if exist ($(top_srcdir)\..\config\Make.common.rules) !include $(top_srcdir)\..\config\Make.common.rules.mak !else @@ -102,15 +106,15 @@ bindir = $(top_srcdir)\bin libdir = $(top_srcdir)\lib includedir = $(top_srcdir)\include !else -bindir = $(ice_dir)\bin -libdir = $(ice_dir)\lib +bindir = $(ice_dir)\bin$(x64suffix) +libdir = $(ice_dir)\lib$(x64suffix) includedir = $(ice_dir)\include !endif -install_bindir = $(prefix)\bin +install_bindir = $(prefix)\bin$(x64suffix) +install_libdir = $(prefix)\lib$(x64suffix) install_includedir = $(prefix)\include install_docdir = $(prefix)\doc -install_libdir = $(prefix)\lib libsubdir = lib SETARGV = setargv.obj diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index d1d13a46797..0981e6869ed 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -26,12 +26,7 @@ PRELIBS = # If building a source distribution, use THIRDPARTY_HOME for the 3rd party libraries !if "$(THIRDPARTY_HOME)" != "" CPPFLAGS = -I"$(THIRDPARTY_HOME)\include" - -!if "$(AS)" == "ml64" || "$(XTARGET)" == "x64" -LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib\x64" -!else -LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib" -!endif +LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib\$(x64suffix)" !if "$(CPP_COMPILER)" == "VC60" CPPFLAGS = -I"$(THIRDPARTY_HOME)\include\stlport" $(CPPFLAGS) diff --git a/cpp/config/icegridnode.cfg b/cpp/config/icegridnode.cfg index 64bfbf3b36e..2a25264b264 100644 --- a/cpp/config/icegridnode.cfg +++ b/cpp/config/icegridnode.cfg @@ -26,18 +26,18 @@ IceGrid.Node.Endpoints=tcp #
# Under Vista we recommend using:
#
-# C:\Users\Local Service\AppData\Local\ZeroC\icegrid\node1
+# C:\Windows\ServiceProfiles\LocalService\AppData\Local\ZeroC\icegrid\node1
#
-IceGrid.Node.Data=C:\Documents and Settings\Local Service\Local Settings\Application Data\ZeroC\icegrid\node1
+IceGrid.Node.Data=C:\Documents and Settings\LocalService\Local Settings\Application Data\ZeroC\icegrid\node1
#
# Redirect server stdout and stderr to files in this directory:
#
# Under Vista we recommend using:
#
-# C:\Users\Local Service\AppData\Local\ZeroC\icegrid\node1
+# C:\Windows\ServiceProfiles\LocalService\AppData\Local\ZeroC\icegrid\node1
#
-IceGrid.Node.Output=C:\Documents and Settings\Local Service\Local Settings\Application Data\ZeroC\icegrid\node1
+IceGrid.Node.Output=C:\Documents and Settings\LocalService\Local Settings\Application Data\ZeroC\icegrid\node1
#IceGrid.Node.RedirectErrToOut=1
#
diff --git a/cpp/config/icegridregistry.cfg b/cpp/config/icegridregistry.cfg index da87f7d0867..6558ddd088e 100644 --- a/cpp/config/icegridregistry.cfg +++ b/cpp/config/icegridregistry.cfg @@ -31,9 +31,9 @@ IceGrid.Registry.Internal.Endpoints=tcp #
# Under Vista we recommend using:
#
-# C:\Users\Local Service\AppData\Local\ZeroC\icegrid\registry
+# C:\Windows\ServiceProfiles\LocalService\AppData\Local\ZeroC\icegrid\registry
#
-IceGrid.Registry.Data=C:\Documents and Settings\Local Service\Local Settings\Application Data\ZeroC\icegrid\registry
+IceGrid.Registry.Data=C:\Documents and Settings\LocalService\Local Settings\Application Data\ZeroC\icegrid\registry
#
# Authentication/authorization
diff --git a/cpp/test/IceBox/configuration/.gitignore b/cpp/test/IceBox/configuration/.gitignore index bc5fb97a328..60460cfc40a 100644 --- a/cpp/test/IceBox/configuration/.gitignore +++ b/cpp/test/IceBox/configuration/.gitignore @@ -5,3 +5,4 @@ client libTestService.so Test.cpp Test.h +build.txt diff --git a/cpp/test/IceBox/configuration/Makefile.mak b/cpp/test/IceBox/configuration/Makefile.mak index 6758664fd20..3372ce4a15b 100644 --- a/cpp/test/IceBox/configuration/Makefile.mak +++ b/cpp/test/IceBox/configuration/Makefile.mak @@ -56,6 +56,7 @@ $(CLIENT): $(OBJS) $(COBJS) clean:: del /q Test.cpp Test.h + del /q build.txt !if "$(OPTIMIZE)" == "yes" |