diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-02-21 14:49:18 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-02-21 14:49:18 -0330 |
| commit | 2b7b86691e80a8d5d251515feee55ec72364b6ad (patch) | |
| tree | 67697460ecd1dcb77da1778a25dd8be632a02d77 /cpp | |
| parent | Changed projects to work without *.exe.config (diff) | |
| download | ice-2b7b86691e80a8d5d251515feee55ec72364b6ad.tar.bz2 ice-2b7b86691e80a8d5d251515feee55ec72364b6ad.tar.xz ice-2b7b86691e80a8d5d251515feee55ec72364b6ad.zip | |
Allow windows demos to be built against 64bit installation
Install windows 64bit exe/dll/lib into bin\x64 lib\x64
Fixed slice installation on Windows
Use 64bit translators when building again 64 bit installation
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 |
3 files changed, 10 insertions, 11 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) |