diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-19 15:01:56 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-19 15:01:56 -0230 |
| commit | 7bdadcf187a1a7e960147ae44b5314b5a447ce08 (patch) | |
| tree | ba9f9984e78042e9ba5471c33ef4833fe89750b3 | |
| parent | Bug 4297 - allow full path in plugin/service config (diff) | |
| download | ice-7bdadcf187a1a7e960147ae44b5314b5a447ce08.tar.bz2 ice-7bdadcf187a1a7e960147ae44b5314b5a447ce08.tar.xz ice-7bdadcf187a1a7e960147ae44b5314b5a447ce08.zip | |
Bug 4294 - dependcies not able to detect proper slice library on windows
| -rw-r--r-- | cs/config/Make.rules.mak.cs | 15 | ||||
| -rw-r--r-- | php/config/Make.rules.mak | 21 | ||||
| -rw-r--r-- | py/config/Make.rules.mak | 21 | ||||
| -rw-r--r-- | rb/config/Make.rules.mak | 21 |
4 files changed, 57 insertions, 21 deletions
diff --git a/cs/config/Make.rules.mak.cs b/cs/config/Make.rules.mak.cs index a9e2628bea1..607ec817785 100644 --- a/cs/config/Make.rules.mak.cs +++ b/cs/config/Make.rules.mak.cs @@ -88,14 +88,23 @@ MCSFLAGS = $(MCSFLAGS) -optimize+ !if "$(ice_src_dist)" != ""
!if "$(ice_cpp_dir)" == "$(ice_dir)\cpp"
SLICE2CS = "$(ice_cpp_dir)\bin\slice2cs.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice$(LIBSUFFIX).lib"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\sliced.lib"
+!endif
!else
SLICE2CS = "$(ice_cpp_dir)\bin$(x64suffix)\slice2cs.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
!else
SLICE2CS = "$(ice_dir)\bin$(x64suffix)\slice2cs.exe"
-SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
EVERYTHING = all clean install config
diff --git a/php/config/Make.rules.mak b/php/config/Make.rules.mak index d5fa9e8e40d..e1e0c52eabb 100644 --- a/php/config/Make.rules.mak +++ b/php/config/Make.rules.mak @@ -156,15 +156,24 @@ SLICE2PHPFLAGS = $(SLICE2PHPFLAGS) -n !if "$(ice_src_dist)" != ""
!if "$(ice_cpp_dir)" == "$(ice_dir)\cpp"
-SLICE2PHP = "$(ice_cpp_dir)\bin\slice2php.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice$(LIBSUFFIX).lib"
+SLICE2PHP = "$(ice_cpp_dir)\bin\slice2php.exe"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\sliced.lib"
+!endif
!else
-SLICE2PHP = "$(ice_cpp_dir)\bin$(x64suffix)\slice2php.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICE2PHP = "$(ice_cpp_dir)\bin$(x64suffix)\slice2php.exe"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
!else
-SLICE2PHP = "$(ice_dir)\bin$(x64suffix)\slice2php.exe"
-SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICE2PHP = "$(ice_dir)\bin$(x64suffix)\slice2php.exe"
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
EVERYTHING = all clean install
diff --git a/py/config/Make.rules.mak b/py/config/Make.rules.mak index 37c790e9967..50b55218bdb 100644 --- a/py/config/Make.rules.mak +++ b/py/config/Make.rules.mak @@ -119,15 +119,24 @@ SLICE2PYFLAGS = $(ICECPPFLAGS) !if "$(ice_src_dist)" != ""
!if "$(ice_cpp_dir)" == "$(ice_dir)\cpp"
-SLICE2PY = "$(ice_cpp_dir)\bin\slice2py.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice$(LIBSUFFIX).lib"
+SLICE2PY = "$(ice_cpp_dir)\bin\slice2py.exe"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\sliced.lib"
+!endif
!else
-SLICE2PY = "$(ice_cpp_dir)\bin$(x64suffix)\slice2py.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICE2PY = "$(ice_cpp_dir)\bin$(x64suffix)\slice2py.exe"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
!else
-SLICE2PY = "$(ice_dir)\bin$(x64suffix)\slice2py.exe"
-SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICE2PY = "$(ice_dir)\bin$(x64suffix)\slice2py.exe"
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
MT = mt.exe
diff --git a/rb/config/Make.rules.mak b/rb/config/Make.rules.mak index 36a562a70eb..c99a887d908 100644 --- a/rb/config/Make.rules.mak +++ b/rb/config/Make.rules.mak @@ -116,15 +116,24 @@ SLICE2RBFLAGS = $(ICECPPFLAGS) !if "$(ice_src_dist)" != ""
!if "$(ice_cpp_dir)" == "$(ice_dir)\cpp"
-SLICE2RB = "$(ice_cpp_dir)\bin\slice2rb.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice$(LIBSUFFIX).lib"
+SLICE2RB = "$(ice_cpp_dir)\bin\slice2rb.exe"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib\sliced.lib"
+!endif
!else
-SLICE2RB = "$(ice_cpp_dir)\bin$(x64suffix)\slice2rb.exe"
-SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICE2RB = "$(ice_cpp_dir)\bin$(x64suffix)\slice2rb.exe"
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_cpp_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
!else
-SLICE2RB = "$(ice_dir)\bin$(x64suffix)\slice2rb.exe"
-SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice$(LIBSUFFIX).lib"
+SLICE2RB = "$(ice_dir)\bin$(x64suffix)\slice2rb.exe"
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\slice.lib"
+!if !exist ($(SLICEPARSERLIB))
+SLICEPARSERLIB = "$(ice_dir)\lib$(x64suffix)\sliced.lib"
+!endif
!endif
EVERYTHING = all clean install
|