diff options
| author | Jose <jose@zeroc.com> | 2014-10-08 01:07:13 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-08 01:07:13 +0200 |
| commit | 3a98e0453a7d8367e478eff8c742b14835da7603 (patch) | |
| tree | bfeb6335ccc9d0b0ef99118e49812e5f7459e305 /cpp/allDemos.py | |
| parent | Windows thirdparty distribution updates (diff) | |
| download | ice-3a98e0453a7d8367e478eff8c742b14835da7603.tar.bz2 ice-3a98e0453a7d8367e478eff8c742b14835da7603.tar.xz ice-3a98e0453a7d8367e478eff8c742b14835da7603.zip | |
Several Windows build fixes:
ICE-3420 - Force link failure for debug/release mismatch?
Update VS add-in to not add C++ libraries
Fixed WinRT builds
Fixed Python Windows builds
Diffstat (limited to 'cpp/allDemos.py')
| -rwxr-xr-x | cpp/allDemos.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/allDemos.py b/cpp/allDemos.py index 63364c02627..39ff08ba4cf 100755 --- a/cpp/allDemos.py +++ b/cpp/allDemos.py @@ -44,7 +44,10 @@ demos = [ "Ice/properties", "Ice/optional", "Ice/context", - "IceStorm/clock", +] + +if not Util.isWin32() or not Util.isVC100() + demos += ["IceStorm/clock", "IceStorm/counter", "IceStorm/replicated", "IceStorm/replicated2", @@ -66,8 +69,7 @@ demos = [ "book/evictor_filesystem", "book/simple_filesystem", "book/printer", - "book/lifecycle", -] + "book/lifecycle"] if not Util.isNoServices(): demos += ["IceBox/hello", "IceGrid/icebox"] |