diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-05 09:51:54 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-05 09:51:54 +0100 |
| commit | 12c0424d42a1f63eac78fb889e47b6d05d9498a5 (patch) | |
| tree | adefc49637cd6344679d88c68092d80c4a010afd /cpp | |
| parent | Don't cleanup on timeout some tests expect timeout (diff) | |
| download | ice-12c0424d42a1f63eac78fb889e47b6d05d9498a5.tar.bz2 ice-12c0424d42a1f63eac78fb889e47b6d05d9498a5.tar.xz ice-12c0424d42a1f63eac78fb889e47b6d05d9498a5.zip | |
Fixed testicedist.py and checks for VC100/VC110 when building IcePHP/IcePy
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/config/Make.rules.mak | 49 |
1 files changed, 15 insertions, 34 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 1d472376951..fd40db31fca 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -66,45 +66,11 @@ THIRDPARTY_HOME = $(PROGRAMFILES)\ZeroC\Ice-$(VERSION)-ThirdParty #UNIQUE_DLL_NAMES = yes - - # ---------------------------------------------------------------------- # Don't change anything below this line! # ---------------------------------------------------------------------- # -# Check CPP_COMPILER -# -!if "$(CPP_COMPILER)" == "" - -!if "$(VISUALSTUDIOVERSION)" == "11.0" -CPP_COMPILER = VC110 -!elseif ([cl 2>&1 | findstr "Version\ 16" > nul] == 0) -CPP_COMPILER = VC100 -!elseif ([cl 2>&1 | findstr "Version\ 17" > nul] == 0) -CPP_COMPILER = VC110 -!elseif ([cl 2>&1 | findstr "Version\ 18" > nul] == 0) -CPP_COMPILER = VC120 -!elseif ([cl 2>&1 | findstr "Version\ 15" > nul] == 0) -!error Detected VC90 -!else -!error Cannot detect C++ compiler -!endif - -#!message CPP_COMPILER set to $(CPP_COMPILER) -!elseif "$(CPP_COMPILER)" != "VC100" && "$(CPP_COMPILER)" != "VC110" && "$(CPP_COMPILER)" != "VC120" -!error Invalid CPP_COMPILER setting: $(CPP_COMPILER). Must be one of: VC100, VC110 or VC120. -!endif - -# -# With VC100, we want unique dll names by default -# -!if "$(CPP_COMPILER)" == "VC100" && "$(UNIQUE_DLL_NAMES)" == "" -UNIQUE_DLL_NAMES = yes -!endif - - -# # Common definitions # ice_language = cpp @@ -113,12 +79,27 @@ slice_translator = slice2cpp.exe ice_require_cpp = 1 !endif +# +# If CPP_COMPILER is not set, get Make.common.rules.mak to figure it +# out by setting CPP_COMPILER to "auto" +# +!if "$(CPP_COMPILER)" == "" +CPP_COMPILER=auto +!endif + !if exist ($(top_srcdir)\..\config\Make.common.rules.mak) !include $(top_srcdir)\..\config\Make.common.rules.mak !else !include $(top_srcdir)\config\Make.common.rules.mak !endif +# +# With VC100, we want unique dll names by default +# +!if "$(CPP_COMPILER)" == "VC100" && "$(UNIQUE_DLL_NAMES)" == "" +UNIQUE_DLL_NAMES = yes +!endif + bindir = $(top_srcdir)\bin libdir = $(top_srcdir)\lib headerdir = $(top_srcdir)\include |