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/IceBox | |
| 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/IceBox')
| -rw-r--r-- | cpp/src/IceBox/Makefile.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index 1f18f449b60..220e196fcaf 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -63,13 +63,13 @@ $(DLLNAME): $(LIB_OBJS) IceBox.res $(SERVER): $(SOBJS) IceBoxExe.res $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icebox$(LIBSUFFIX).lib $(SRES_FILE) + $(SRES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(ADMIN): $(AOBJS) IceBoxAdmin.res $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icebox$(LIBSUFFIX).lib $(ARES_FILE) + $(ARES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest |