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/src/FreezeScript | |
| 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/src/FreezeScript')
| -rw-r--r-- | cpp/src/FreezeScript/Makefile.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index f08533c5315..47893ecf5d8 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -40,7 +40,7 @@ HDIR = $(headerdir)\FreezeScript !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS) +LINKWITH = $(LIBS) $(DB_LIBS) !if "$(GENERATE_PDB)" == "yes" TPDBFLAGS = /pdb:$(TRANSFORMDB:.exe=.pdb) |