diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-02-26 10:01:56 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-02-26 10:01:56 -0330 |
| commit | 9ecb63d311ade06b43d2700b637c1ffda010b07e (patch) | |
| tree | d1f0a7feee35fcd02c4f6b70bf4940ae467b391a /cpp | |
| parent | Merge branch 'master' of ssh://cvs/home/git/ice (diff) | |
| download | ice-9ecb63d311ade06b43d2700b637c1ffda010b07e.tar.bz2 ice-9ecb63d311ade06b43d2700b637c1ffda010b07e.tar.xz ice-9ecb63d311ade06b43d2700b637c1ffda010b07e.zip | |
Fixed erroneous checkin
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/config/Make.rules.mak | 4 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 05e0faed755..051addbde34 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -91,9 +91,9 @@ slice_translator = slice2cpp.exe ice_require_cpp = 1 !endif -#!if "$(AS)" == "ml64" || "$(XTARGET)" == "x64" +!if "$(AS)" == "ml64" || "$(XTARGET)" == "x64" x64suffix = \x64 -#!endif +!endif !if exist ($(top_srcdir)\..\config\Make.common.rules) !include $(top_srcdir)\..\config\Make.common.rules.mak diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 0981e6869ed..2b1007dc96b 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -26,7 +26,7 @@ PRELIBS = # If building a source distribution, use THIRDPARTY_HOME for the 3rd party libraries !if "$(THIRDPARTY_HOME)" != "" CPPFLAGS = -I"$(THIRDPARTY_HOME)\include" -LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib\$(x64suffix)" +LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib$(x64suffix)" !if "$(CPP_COMPILER)" == "VC60" CPPFLAGS = -I"$(THIRDPARTY_HOME)\include\stlport" $(CPPFLAGS) |