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 | |
| 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')
115 files changed, 524 insertions, 224 deletions
diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak index cf42e6f746a..f0d61c4a2ee 100644 --- a/cpp/Makefile.mak +++ b/cpp/Makefile.mak @@ -12,6 +12,7 @@ top_srcdir = . !include $(top_srcdir)/config/Make.rules.mak !if "$(WINRT)" != "yes" + SUBDIRS = config src include test demo INSTALL_SUBDIRS = "$(install_bindir)" "$(install_libdir)" "$(install_includedir)" "$(install_configdir)" @@ -65,6 +66,6 @@ $(EVERYTHING):: install:: xcopy /s /y "$(top_srcdir)\SDKs" "$(prefix)\SDKs" @echo Register SDK "$(SDK_NAME)" in Windows registry "$(SDK_KEY)" - @reg ADD "$(SDK_KEY)" /ve /d "$(prefix)\SDKs\$(SDK_NAME)\$(SDK_VERSION)" /f || \ + @reg ADD "$(SDK_KEY)" /ve /d "$(prefix)\SDKs$(SDK_PREFIX)\$(SDK_NAME)\$(SDK_VERSION)" /f || \ echo "Could not add registry keyword $(SDK_KEY)" && exit 1 !endif 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"] diff --git a/cpp/allTests.py b/cpp/allTests.py index a7dce5ee529..cc8e86146ee 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -77,42 +77,42 @@ tests = [ ("Ice/logger", ["once"]), ("Ice/networkProxy", ["core", "noipv6", "nosocks"]), ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl - ("IceBox/configuration", ["core", "noipv6", "novc90", "nomingw", "nomx"]), - ("IceBox/admin", ["core", "noipv6", "novc90", "nomingw", "nomx"]), - ("Freeze/dbmap", ["once", "novc90", "nomingw"]), - ("Freeze/complex", ["once", "novc90", "nomingw"]), - ("Freeze/evictor", ["core", "novc90", "nomingw"]), - ("Freeze/fileLock", ["core", "novc90", "nomingw"]), - ("IceStorm/single", ["service", "novc90", "noappverifier", "nomingw"]), # This test doesn't work with appverifier - ("IceStorm/federation", ["service", "novc90", "nomingw"]), - ("IceStorm/federation2", ["service", "novc90", "nomingw"]), - ("IceStorm/stress", ["service", "stress", "novc90", "noappverifier", "nomingw"]), # Too slow with appverifier. - ("IceStorm/rep1", ["service", "novc90", "nomingw"]), - ("IceStorm/repgrid", ["service", "novc90", "nomingw"]), - ("IceStorm/repstress", ["service", "noipv6", "stress", "novc90", "nomingw"]), - ("FreezeScript/dbmap", ["once", "novc90", "nomingw"]), - ("FreezeScript/evictor", ["once", "novc90", "nomingw"]), - ("IceDiscovery/simple", ["service", "novc90", "nomingw"]), - ("IceGrid/simple", ["service", "novc90", "nomingw"]), - ("IceGrid/fileLock", ["service", "novc90", "nomingw"]), - ("IceGrid/deployer", ["service", "novc90", "nomingw"]), - ("IceGrid/session", ["service", "novc90", "nomingw"]), - ("IceGrid/update", ["service", "novc90", "nomingw"]), - ("IceGrid/noRestartUpdate", ["service", "novc90", "nomingw"]), - ("IceGrid/activation", ["service", "novc90", "nomingw"]), - ("IceGrid/replicaGroup", ["service", "novc90", "nomingw"]), - ("IceGrid/replication", ["service", "novc90", "nomingw", "nomx"]), - ("IceGrid/allocation", ["service", "novc90", "nomingw"]), - ("IceGrid/distribution", ["service", "novc90", "nomingw"]), - ("IceGrid/admin", ["service", "novc90", "nomingw","nows"]), - ("Glacier2/router", ["service", "novc90", "nomingw"]), - ("Glacier2/attack", ["service", "novc90", "nomingw", "nomx"]), - ("Glacier2/override", ["service", "novc90", "nomingw"]), - ("Glacier2/sessionControl", ["service", "novc90", "nomingw"]), - ("Glacier2/ssl", ["service", "novalgrind", "novc90", "nomingw"]), # valgrind doesn't work well with openssl - ("Glacier2/dynamicFiltering", ["service", "novc90", "nomingw"]), - ("Glacier2/staticFiltering", ["service", "noipv6", "novc90", "nomingw", "nomx"]), - ("Glacier2/sessionHelper", ["service", "novc90", "nomingw", "nossl", "noipv6"]), + ("IceBox/configuration", ["core", "noipv6", "novc100", "nomingw", "nomx"]), + ("IceBox/admin", ["core", "noipv6", "novc100", "nomingw", "nomx"]), + ("Freeze/dbmap", ["once", "novc100", "nomingw"]), + ("Freeze/complex", ["once", "novc100", "nomingw"]), + ("Freeze/evictor", ["core", "novc100", "nomingw"]), + ("Freeze/fileLock", ["core", "novc100", "nomingw"]), + ("IceStorm/single", ["service", "novc100", "noappverifier", "nomingw"]), # This test doesn't work with appverifier + ("IceStorm/federation", ["service", "novc100", "nomingw"]), + ("IceStorm/federation2", ["service", "novc100", "nomingw"]), + ("IceStorm/stress", ["service", "stress", "novc100", "noappverifier", "nomingw"]), # Too slow with appverifier. + ("IceStorm/rep1", ["service", "novc100", "nomingw"]), + ("IceStorm/repgrid", ["service", "novc100", "nomingw"]), + ("IceStorm/repstress", ["service", "noipv6", "stress", "novc100", "nomingw"]), + ("FreezeScript/dbmap", ["once", "novc100", "nomingw"]), + ("FreezeScript/evictor", ["once", "novc100", "nomingw"]), + ("IceDiscovery/simple", ["service"]), + ("IceGrid/simple", ["service", "novc100", "nomingw"]), + ("IceGrid/fileLock", ["service", "novc100", "nomingw"]), + ("IceGrid/deployer", ["service", "novc100", "nomingw"]), + ("IceGrid/session", ["service", "novc100", "nomingw"]), + ("IceGrid/update", ["service", "novc100", "nomingw"]), + ("IceGrid/noRestartUpdate", ["service", "novc100", "nomingw"]), + ("IceGrid/activation", ["service", "novc100", "nomingw"]), + ("IceGrid/replicaGroup", ["service", "novc100", "nomingw"]), + ("IceGrid/replication", ["service", "novc100", "nomingw", "nomx"]), + ("IceGrid/allocation", ["service", "novc100", "nomingw"]), + ("IceGrid/distribution", ["service", "novc100", "nomingw"]), + ("IceGrid/admin", ["service", "novc100", "nomingw","nows"]), + ("Glacier2/router", ["service", "novc100", "nomingw"]), + ("Glacier2/attack", ["service", "novc100", "nomingw", "nomx"]), + ("Glacier2/override", ["service", "novc100", "nomingw"]), + ("Glacier2/sessionControl", ["service", "novc100", "nomingw"]), + ("Glacier2/ssl", ["service", "novalgrind", "novc100", "nomingw"]), # valgrind doesn't work well with openssl + ("Glacier2/dynamicFiltering", ["service", "novc100", "nomingw"]), + ("Glacier2/staticFiltering", ["service", "noipv6", "novc100", "nomingw", "nomx"]), + ("Glacier2/sessionHelper", ["service", "novc100", "nomingw", "nossl", "noipv6"]), ] # diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index fa44aab14de..03a75690cc1 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -60,9 +60,12 @@ THIRDPARTY_HOME = $(PROGRAMFILES)\ZeroC\Ice-$(VERSION)-ThirdParty # # Define if you want the Ice DLLs to have compiler specific names. -# Will be unset by default. +# Will be set to yes by default when CPP_COMPILER=VC100, and unset +# otherwise # -#UNIQUE_DLL_NAMES = yes +#UNIQUE_DLL_NAMES = yes + + # ---------------------------------------------------------------------- @@ -94,6 +97,14 @@ CPP_COMPILER = 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 @@ -168,15 +179,18 @@ RCFLAGS = -nologo -D_DEBUG RCFLAGS = -nologo !endif -SSL_OS_LIBS = secur32.lib crypt32.lib -EXPAT_LIBS = libexpat.lib +!if "$(WINRT)" != "yes" +ICEUTIL_OS_LIBS = rpcrt4.lib advapi32.lib DbgHelp.lib +ICE_OS_LIBS = advapi32.lib ws2_32.lib Iphlpapi.lib +SSL_OS_LIBS = advapi32.lib secur32.lib crypt32.lib ws2_32.lib -!if "$(STATICLIBS)" =="yes" -SLICE_LIBS = $(PRELIBS)slice$(LIBSUFFIX).lib $(MCPP_LIBS) -!else -SLICE_LIBS = $(PRELIBS)slice$(LIBSUFFIX).lib +BZIP2_LIBS = libbz2$(LIBSUFFIX).lib +DB_LIBS = libdb53$(LIBSUFFIX).lib +MCPP_LIBS = mcpp$(LIBSUFFIX).lib +EXPAT_LIBS = libexpat.lib !endif + CPPFLAGS = $(CPPFLAGS) -I"$(includedir)" ICECPPFLAGS = -I"$(slicedir)" SLICE2CPPFLAGS = $(ICECPPFLAGS) $(SLICE2CPPFLAGS) @@ -292,6 +306,14 @@ depend:: !if "$(SLICE_SRCS)" != "" depend:: $(SLICE_SRCS:.ice=.d) +!else + +!if "$(SLICE_OBJS)" != "" +SLICE_SRCS = $(SLICE_OBJS:.obj=.cpp) +SLICE_SRCS = $(SLICE_SRCS:.\=) +all:: $(SLICE_SRCS) +!endif + !endif !if "$(SRCS)" != "" @@ -329,6 +351,10 @@ depend:: $(SRCS) $(OBJS_DEPEND) move $(*F).h $(HDIR) move $(*F).cpp .. +.ice.cpp: + del /q $(*F).h $(*F).cpp + "$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(*F).ice + !if "$(INCLUDE_DIR)" != "" .h{$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\}.h: copy $(*F).h $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR) diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 61300a06043..29380658d23 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -101,35 +101,21 @@ LDFLAGS = $(LDFLAGS) /debug /incremental:no LD_DLLFLAGS = $(LDFLAGS) /dll LD_EXEFLAGS = $(LDFLAGS) -!if "$(WINRT)" == "yes" -ICE_OS_LIBS = kernel32.lib user32.lib -ICEUTIL_OS_LIBS = $(ICE_OS_LIBS) -!else -ICE_OS_LIBS = rpcrt4.lib advapi32.lib -ICEUTIL_OS_LIBS = $(ICE_OS_LIBS) DbgHelp.lib -BZIP2_LIBS = libbz2$(LIBSUFFIX).lib -DB_LIBS = libdb53$(LIBSUFFIX).lib -MCPP_LIBS = mcpp$(LIBSUFFIX).lib -!endif - -!if "$(WINRT)" != "yes" -BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS) -LIBS = ice$(LIBSUFFIX).lib $(BASELIBS) -!else -BASELIBS = iceutil.lib $(ICE_OS_LIBS) -LIBS = ice.lib $(BASELIBS) -!endif +# +# With MSVC, we link automatically all Ice libraries using pragma comment +# +BASELIBS = +LIBS = !if "$(WINRT)" == "yes" -SDK_VERSION = $(SHORT_VERSION) -SDK_NAME = Ice SDK_REG_FILE = $(SDK_NAME).reg SDK_MANIFEST = SDKManifest.xml !if "$(CPP_COMPILER)" == "VC110" TARGET_PLATFORM_VERSION = 8.0 MIN_VS_VERSION = 11.0 +SDK_PREFIX = \8.0 !elseif "$(CPP_COMPILER)" == "VC120" TARGET_PLATFORM_VERSION = 8.1 MIN_VS_VERSION = 12.0 @@ -219,11 +205,6 @@ $(SDK_PROPS_PATH)\$(SDK_PROPS_FILE): $(SDK_PROPS_PATH) <IncludePath>$$(IceWinRTHome)\Designtime\CommonConfiguration\Neutral\include;$$(IncludePath)</IncludePath> <LibraryPath>$$(IceWinRTHome)\Designtime\$$(ConfigurationPrefix)\$$(PlatformTarget);$$(LibraryPath)</LibraryPath> </PropertyGroup> - <ItemDefinitionGroup> - <Link> - <AdditionalDependencies>icegrid.lib;icestorm.lib;glacier2.lib;ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> </Project> <<KEEP move $(SDK_PROPS_FILE) $(SDK_PROPS_PATH) diff --git a/cpp/demo/Freeze/backup/Makefile.mak b/cpp/demo/Freeze/backup/Makefile.mak index 0c92f119e70..546154576ff 100644 --- a/cpp/demo/Freeze/backup/Makefile.mak +++ b/cpp/demo/Freeze/backup/Makefile.mak @@ -26,7 +26,7 @@ PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Freeze/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak index 9c1ae066301..0b134bd1b37 100644 --- a/cpp/demo/Freeze/bench/Makefile.mak +++ b/cpp/demo/Freeze/bench/Makefile.mak @@ -30,7 +30,7 @@ PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Freeze/casino/Makefile.mak b/cpp/demo/Freeze/casino/Makefile.mak index 7327c9bca3f..d741b8e5278 100644 --- a/cpp/demo/Freeze/casino/Makefile.mak +++ b/cpp/demo/Freeze/casino/Makefile.mak @@ -46,7 +46,7 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Freeze/customEvictor/Makefile.mak b/cpp/demo/Freeze/customEvictor/Makefile.mak index 4fc303faee1..a2ac9a652e4 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile.mak +++ b/cpp/demo/Freeze/customEvictor/Makefile.mak @@ -50,7 +50,7 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak index 5072afeded8..19fa03e5016 100644 --- a/cpp/demo/Freeze/library/Makefile.mak +++ b/cpp/demo/Freeze/library/Makefile.mak @@ -63,12 +63,12 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak index 7f7b51007a3..6be9420c16a 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mak +++ b/cpp/demo/Freeze/phonebook/Makefile.mak @@ -62,12 +62,12 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(COLLOCATED): $(COLOBJS) - $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Freeze/transform/Makefile.mak b/cpp/demo/Freeze/transform/Makefile.mak index 961fd0c410e..dd166bd7db6 100644 --- a/cpp/demo/Freeze/transform/Makefile.mak +++ b/cpp/demo/Freeze/transform/Makefile.mak @@ -43,22 +43,22 @@ RECREATE_PDBFLAGS = /pdb:$(RECREATE:.exe=.pdb) $(CREATE): $(CREATE_OBJS) - $(LINK) $(LD_EXEFLAGS) $(CREATE_PDBFLAGS) $(SETARGV) $(CREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CREATE_PDBFLAGS) $(SETARGV) $(CREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(READ): $(READ_OBJS) - $(LINK) $(LD_EXEFLAGS) $(READ_PDBFLAGS) $(SETARGV) $(READ_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(READ_PDBFLAGS) $(SETARGV) $(READ_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(READNEW): $(READNEW_OBJS) - $(LINK) $(LD_EXEFLAGS) $(READNEW_PDBFLAGS) $(SETARGV) $(READNEW_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(READNEW_PDBFLAGS) $(SETARGV) $(READNEW_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(RECREATE): $(RECREATE_OBJS) - $(LINK) $(LD_EXEFLAGS) $(RECREATE_PDBFLAGS) $(SETARGV) $(RECREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(RECREATE_PDBFLAGS) $(SETARGV) $(RECREATE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Glacier2/callback/Makefile.mak b/cpp/demo/Glacier2/callback/Makefile.mak index d053f05083f..a4ec928bbac 100644 --- a/cpp/demo/Glacier2/callback/Makefile.mak +++ b/cpp/demo/Glacier2/callback/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Glacier2/chat/Makefile.mak b/cpp/demo/Glacier2/chat/Makefile.mak index 6272efb2614..d981657c664 100644 --- a/cpp/demo/Glacier2/chat/Makefile.mak +++ b/cpp/demo/Glacier2/chat/Makefile.mak @@ -36,12 +36,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceBox/hello/Makefile.mak b/cpp/demo/IceBox/hello/Makefile.mak index 0cd7e1f363d..078cd76a909 100644 --- a/cpp/demo/IceBox/hello/Makefile.mak +++ b/cpp/demo/IceBox/hello/Makefile.mak @@ -31,7 +31,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)\config\Make.rules.mak CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/demo/IceDiscovery/replication/Makefile.mak b/cpp/demo/IceDiscovery/replication/Makefile.mak index 0345b25eeb3..2eb16b956f3 100644 --- a/cpp/demo/IceDiscovery/replication/Makefile.mak +++ b/cpp/demo/IceDiscovery/replication/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak index 876f86fe0d6..3775ac79a39 100644 --- a/cpp/demo/IceGrid/allocate/Makefile.mak +++ b/cpp/demo/IceGrid/allocate/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceGrid/customLoadBalancing/Makefile.mak b/cpp/demo/IceGrid/customLoadBalancing/Makefile.mak index f5cb87c1f55..2168491edf0 100644 --- a/cpp/demo/IceGrid/customLoadBalancing/Makefile.mak +++ b/cpp/demo/IceGrid/customLoadBalancing/Makefile.mak @@ -35,7 +35,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) @@ -44,7 +44,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceGrid/icebox/Makefile.mak b/cpp/demo/IceGrid/icebox/Makefile.mak index d2192e85d4a..fc8b190b129 100644 --- a/cpp/demo/IceGrid/icebox/Makefile.mak +++ b/cpp/demo/IceGrid/icebox/Makefile.mak @@ -31,7 +31,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)\config\Make.rules.mak CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/demo/IceGrid/replication/Makefile.mak b/cpp/demo/IceGrid/replication/Makefile.mak index 802bb1dace5..29650899acd 100644 --- a/cpp/demo/IceGrid/replication/Makefile.mak +++ b/cpp/demo/IceGrid/replication/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceGrid/secure/Makefile.mak b/cpp/demo/IceGrid/secure/Makefile.mak index 378d70c6fa5..e3c5297226c 100644 --- a/cpp/demo/IceGrid/secure/Makefile.mak +++ b/cpp/demo/IceGrid/secure/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak index 79799167ca3..d1a3dd55107 100644 --- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak +++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak index 876f86fe0d6..3775ac79a39 100644 --- a/cpp/demo/IceGrid/simple/Makefile.mak +++ b/cpp/demo/IceGrid/simple/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IcePatch2/MFC/Makefile.mak b/cpp/demo/IcePatch2/MFC/Makefile.mak index b61ae499f1a..1203615eac4 100644 --- a/cpp/demo/IcePatch2/MFC/Makefile.mak +++ b/cpp/demo/IcePatch2/MFC/Makefile.mak @@ -20,7 +20,7 @@ OBJS = .\PatchClient.obj \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN -D_UNICODE -LINKWITH = icepatch2$(LIBSUFFIX).lib $(LIBS) +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak index 8be6c65b324..a3c99cbbefc 100644 --- a/cpp/demo/IceStorm/clock/Makefile.mak +++ b/cpp/demo/IceStorm/clock/Makefile.mak @@ -36,13 +36,13 @@ SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) $(PUBLISHER): $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icestorm$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SUBSCRIBER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icestorm$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak index 452e01cf746..e437982d99d 100644 --- a/cpp/demo/IceStorm/counter/Makefile.mak +++ b/cpp/demo/IceStorm/counter/Makefile.mak @@ -43,7 +43,7 @@ $(CLIENT): $(COBJS) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icestorm$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceStorm/replicated/Makefile.mak b/cpp/demo/IceStorm/replicated/Makefile.mak index e2b4cc2175d..a97cd6ecb7b 100644 --- a/cpp/demo/IceStorm/replicated/Makefile.mak +++ b/cpp/demo/IceStorm/replicated/Makefile.mak @@ -37,13 +37,13 @@ SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) $(PUBLISHER): $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icestorm$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SUBSCRIBER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/IceStorm/replicated2/Makefile.mak b/cpp/demo/IceStorm/replicated2/Makefile.mak index 7ae91349fcf..99429fe4468 100644 --- a/cpp/demo/IceStorm/replicated2/Makefile.mak +++ b/cpp/demo/IceStorm/replicated2/Makefile.mak @@ -37,13 +37,13 @@ SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) $(PUBLISHER): $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icestorm$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SUBSCRIBER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \ - icestorm$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak index d0365c18388..cf5755b1e44 100644 --- a/cpp/demo/Makefile.mak +++ b/cpp/demo/Makefile.mak @@ -11,6 +11,11 @@ top_srcdir = .. !include $(top_srcdir)/config/Make.rules.mak +!if "$(CPP_COMPILER)" == "VC100" +SUBDIRS = IceUtil \ + Ice \ + IceDiscovery +!else SUBDIRS = IceUtil \ Ice \ IceDiscovery \ @@ -25,6 +30,7 @@ SUBDIRS = IceUtil \ SUBDIRS = $(SUBDIRS) \ IcePatch2 !endif +!endif $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ diff --git a/cpp/demo/book/evictor_filesystem/Makefile.mak b/cpp/demo/book/evictor_filesystem/Makefile.mak index f18ae63c0ad..43bac65048d 100644 --- a/cpp/demo/book/evictor_filesystem/Makefile.mak +++ b/cpp/demo/book/evictor_filesystem/Makefile.mak @@ -46,7 +46,7 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/book/map_filesystem/Makefile.mak b/cpp/demo/book/map_filesystem/Makefile.mak index bb358d252e7..e7de10deb3f 100644 --- a/cpp/demo/book/map_filesystem/Makefile.mak +++ b/cpp/demo/book/map_filesystem/Makefile.mak @@ -50,7 +50,7 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h index e0d6d853f0f..8eb72e05dcc 100644 --- a/cpp/include/Freeze/Initialize.h +++ b/cpp/include/Freeze/Initialize.h @@ -17,6 +17,22 @@ #include <Freeze/Transaction.h> // +// Automatically link Freeze[D].lib with Visual C++ +// +#ifdef _MSC_VER +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "Freeze.lib") +# elif !defined(FREEZE_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "FreezeD.lib") +# else +# pragma comment(lib, "Freeze.lib") +# endif +# endif +#endif + + +// // Berkeley DB's DbEnv and DbTxn // class DbEnv; diff --git a/cpp/include/Glacier2/.headers b/cpp/include/Glacier2/.headers index 553626bb597..05f3ad31278 100644 --- a/cpp/include/Glacier2/.headers +++ b/cpp/include/Glacier2/.headers @@ -1,5 +1,6 @@ SDK_HEADERS = \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Application.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Config.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Glacier2.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Metrics.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\NullPermissionsVerifier.h \ diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h new file mode 100644 index 00000000000..1d78cac66a0 --- /dev/null +++ b/cpp/include/Glacier2/Config.h @@ -0,0 +1,28 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef GLACIER2_CONFIG_H +#define GLACIER2_CONFIG_H + +#ifdef _MSC_VER +// +// Automatically link with Glacier2[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "Glacier2.lib") +# elif !defined(GLACIER2_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "Glacier2D.lib") +# else +# pragma comment(lib, "Glacier2.lib") +# endif +# endif +#endif + +#endif diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index e0c63f79bd0..91e75030aa8 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -33,6 +33,21 @@ #endif // +// Automatically link Ice[D].lib with Visual C++ +// +#ifdef _MSC_VER +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "Ice.lib") +# elif !defined(ICE_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceD.lib") +# else +# pragma comment(lib, "Ice.lib") +# endif +# endif +#endif + +// // Define the Ice and IceInternal namespace, so that we can use the following // everywhere in our code: // diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h new file mode 100644 index 00000000000..61a451bd5e5 --- /dev/null +++ b/cpp/include/IceBox/Config.h @@ -0,0 +1,28 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_BOX_CONFIG_H +#define ICE_BOX_CONFIG_H + +#ifdef _MSC_VER +// +// Automatically link with IceBox[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceBox.lib") +# elif !defined(ICE_BOX_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceBoxD.lib") +# else +# pragma comment(lib, "IceBox.lib") +# endif +# endif +#endif + +#endif diff --git a/cpp/include/IceGrid/.headers b/cpp/include/IceGrid/.headers index ee7a0fc5f48..a10f5bdac20 100644 --- a/cpp/include/IceGrid/.headers +++ b/cpp/include/IceGrid/.headers @@ -1,5 +1,6 @@ SDK_HEADERS = \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Admin.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Config.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Descriptor.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Discovery.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Exception.h \ diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h new file mode 100644 index 00000000000..883c8a39820 --- /dev/null +++ b/cpp/include/IceGrid/Config.h @@ -0,0 +1,28 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_GRID_CONFIG_H +#define ICE_GRID_CONFIG_H + +#ifdef _MSC_VER +// +// Automatically link with IceGrid[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceGrid.lib") +# elif !defined(ICE_GRID_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceGridD.lib") +# else +# pragma comment(lib, "IceGrid.lib") +# endif +# endif +#endif + +#endif diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h new file mode 100644 index 00000000000..6626a5f8dc4 --- /dev/null +++ b/cpp/include/IcePatch2/Config.h @@ -0,0 +1,29 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_PATCH2_CONFIG_H +#define ICE_PATCH2_CONFIG_H + +#ifdef _MSC_VER +// +// Automatically link with IcePatch2[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IcePatch2.lib") +# elif !defined(ICE_PATCH2_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IcePatch2D.lib") +# else +# pragma comment(lib, "IcePatch2.lib") +# endif +# endif +#endif + +#endif + diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h index c1a71e40ea8..fa339bcba95 100644 --- a/cpp/include/IceSSL/Config.h +++ b/cpp/include/IceSSL/Config.h @@ -7,6 +7,9 @@ // // ********************************************************************** +#ifndef ICE_SSL_CONFIG_H +#define ICE_SSL_CONFIG_H + #include <Ice/Config.h> #if defined(__APPLE__) @@ -16,3 +19,5 @@ #else # define ICE_USE_OPENSSL 1 #endif + +#endif diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index 743918ea755..ed4b0b91ec7 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -18,6 +18,21 @@ #include <vector> #include <list> +// +// Automatically link IceSSL[D].lib with Visual C++ +// +#ifdef _MSC_VER +# if defined(ICE_STATIC_LIBS) +# error("IceSSL Plugin does not support static libraries") +# elif !defined(ICE_SSL_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceSSLD.lib") +# else +# pragma comment(lib, "IceSSL.lib") +# endif +# endif +#endif + // For struct sockaddr_storage #ifdef _WIN32 # include <winsock2.h> diff --git a/cpp/include/IceStorm/.headers b/cpp/include/IceStorm/.headers index 699039cdb0d..71130c8ed79 100644 --- a/cpp/include/IceStorm/.headers +++ b/cpp/include/IceStorm/.headers @@ -1,3 +1,4 @@ SDK_HEADERS = \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Config.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceStorm.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Metrics.h \ diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h new file mode 100644 index 00000000000..e27f8ff8da8 --- /dev/null +++ b/cpp/include/IceStorm/Config.h @@ -0,0 +1,28 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_STORM_CONFIG_H +#define ICE_STORM_CONFIG_H + +#ifdef _MSC_VER +// +// Automatically link with IceStorm[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceStorm.lib") +# elif !defined(ICE_STORM_LIB_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceStormD.lib") +# else +# pragma comment(lib, "IceStorm.lib") +# endif +# endif +#endif + +#endif diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index d830f49f81c..a6be6d33946 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -145,10 +145,6 @@ #endif #ifdef _WIN32 -# if !defined(ICE_STATIC_LIBS) && defined(_MSC_VER) && (!defined(_DLL) || !defined(_MT)) -# error "Only multi-threaded DLL libraries can be used with Ice!" -# endif - # include <windows.h> # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x600) @@ -174,6 +170,21 @@ #endif #ifdef _MSC_VER +# if !defined(ICE_STATIC_LIBS) && (!defined(_DLL) || !defined(_MT)) +# error "Only multi-threaded DLL libraries can be used with Ice!" +# endif +// +// Automatically link with IceUtil[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceUtil.lib") +# elif !defined(ICE_UTIL_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceUtilD.lib") +# else +# pragma comment(lib, "IceUtil.lib") +# endif +# endif // // Move some warnings to level 4 // diff --git a/cpp/include/Makefile.mak b/cpp/include/Makefile.mak index ded44f28178..ddeaf38328b 100644 --- a/cpp/include/Makefile.mak +++ b/cpp/include/Makefile.mak @@ -10,15 +10,26 @@ top_srcdir = .. !include $(top_srcdir)/config/Make.rules.mak + +!if "$(WINRT)" == "yes" +SUBDIRS = IceUtil \ + Ice \ + IceSSL \ + Glacier2 \ + IceStorm \ + IceGrid \ +!elseif "$(CPP_COMPILER)" == "VC100" +SUBDIRS = IceUtil \ + Slice \ + Ice \ + IceSSL +!else SUBDIRS = Glacier2 \ Ice \ IceSSL \ IceGrid \ IceStorm \ - IceUtil - -!if "$(WINRT)" != "yes" -SUBDIRS = $(SUBDIRS) \ + IceUtil \ Freeze \ IceBox \ IcePatch2 \ diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 0b70f236476..d4893173b99 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -20,6 +20,21 @@ #include <set> #include <stdio.h> +// +// Automatically link Slice[D].lib with Visual C++ +// +#ifdef _MSC_VER +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "Slice.lib") +# elif !defined(SLICE_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "SliceD.lib") +# else +# pragma comment(lib, "Slice.lib") +# endif +# endif +#endif + #ifndef SLICE_API # ifdef SLICE_API_EXPORTS # define SLICE_API ICE_DECLSPEC_EXPORT 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) diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index 3f63f26ae52..3581c25b9f0 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -34,7 +34,7 @@ OBJS = .\Blobject.obj \ CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN SLICE2CPPFLAGS = --include-dir Glacier2 $(SLICE2CPPFLAGS) -LINKWITH = $(LIBS) $(OPENSSL_LIBS) glacier2$(LIBSUFFIX).lib icessl$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(ROUTER:.exe=.pdb) diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak index 408aa444314..48af6d9a0e9 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak @@ -20,7 +20,7 @@ OBJS = .\CryptPermissionsVerifierI.obj CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib libeay32.lib +LINKWITH = $(LIBS) libeay32.lib !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 3db9346782a..dba766416a9 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -158,7 +158,7 @@ CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN -bigobj CPPFLAGS = $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\" !endif SLICE2CPPFLAGS = --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) -LINKWITH = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib Iphlpapi.lib +LINKWITH = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) LD_DLLFLAGS = $(LD_DLLFLAGS) /entry:"ice_DLL_Main" diff --git a/cpp/src/Ice/winrt/StreamAcceptor.cpp b/cpp/src/Ice/winrt/StreamAcceptor.cpp index 7506e45916e..cd6d1d12305 100644 --- a/cpp/src/Ice/winrt/StreamAcceptor.cpp +++ b/cpp/src/Ice/winrt/StreamAcceptor.cpp @@ -28,6 +28,8 @@ using namespace Windows::Storage::Streams; using namespace Windows::Networking; using namespace Windows::Networking::Sockets; +IceUtil::Shared* IceInternal::upCast(StreamAcceptor* p) { return p; } + NativeInfoPtr IceInternal::StreamAcceptor::getNativeInfo() { diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp index 32b0bd39038..0dfd7f1bba5 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.cpp +++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp @@ -62,6 +62,8 @@ private: } +IceUtil::Shared* IceInternal::upCast(StreamEndpointI* p) { return p; } + IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance, const string& ho, Int po, Int ti, const string& conId, bool co) : IPEndpointI(instance, ho, po, Address(), conId), 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 diff --git a/cpp/src/IceDiscovery/Makefile b/cpp/src/IceDiscovery/Makefile index a918e6a867a..14f2500a1e8 100644 --- a/cpp/src/IceDiscovery/Makefile +++ b/cpp/src/IceDiscovery/Makefile @@ -27,10 +27,10 @@ SDIR = $(slicedir)/IceDiscovery include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_DISCOVERY_API_EXPORTS -SLICE2CPPFLAGS := --ice --include-dir IceDiscovery --dll-export ICE_DISCOVERY_API $(SLICE2CPPFLAGS) +CPPFLAGS := -I.. $(CPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir IceDiscovery $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CXXLIBS) +LINKWITH := -lIce -lIceUtil $(CXXLIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) diff --git a/cpp/src/IceDiscovery/Makefile.mak b/cpp/src/IceDiscovery/Makefile.mak index 4176187f5da..67b484d0cbf 100644 --- a/cpp/src/IceDiscovery/Makefile.mak +++ b/cpp/src/IceDiscovery/Makefile.mak @@ -24,10 +24,10 @@ OBJS = .\LocatorI.obj \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_DISCOVERY_API_EXPORTS -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --ice --include-dir IceDiscovery --dll-export ICE_DISCOVERY_API $(SLICE2CPPFLAGS) +CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +SLICE2CPPFLAGS = --ice --include-dir IceDiscovery $(SLICE2CPPFLAGS) -LINKWITH = $(LIBS) ws2_32.lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 9718ce79ca4..2a023cd4508 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -104,11 +104,9 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) -I.. --ice --include-dir IceGrid $(ICECPPFLAGS !include $(top_srcdir)\config\Make.rules.mak -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib -ALINKWITH = $(LINKWITH) icegrid$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib icepatch2$(LIBSUFFIX).lib \ - icebox$(LIBSUFFIX).lib -NLINKWITH = $(ALINKWITH) freeze$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib \ - icessl$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib libeay32.lib pdh.lib ws2_32.lib +LINKWITH = $(LIBS) +ALINKWITH = $(LIBS) +NLINKWITH = $(LIBS) advapi32.lib pdh.lib ws2_32.lib SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS) CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak index fecdae8fde5..677bf48559a 100644 --- a/cpp/src/IceGridLib/Makefile.mak +++ b/cpp/src/IceGridLib/Makefile.mak @@ -36,7 +36,7 @@ SDIR = $(slicedir)\IceGrid !include $(top_srcdir)\config\Make.rules.mak -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS) CPPFLAGS = -I.. $(CPPFLAGS) diff --git a/cpp/src/IcePatch2Lib/Makefile.mak b/cpp/src/IcePatch2Lib/Makefile.mak index d2172ab1f84..bc44918bab2 100755 --- a/cpp/src/IcePatch2Lib/Makefile.mak +++ b/cpp/src/IcePatch2Lib/Makefile.mak @@ -40,7 +40,7 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) IcePatch2.res $(LINK) $(BASE):0x29000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) \ - $(OPENSSL_LIBS) $(RES_FILE) + $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 701106b0cde..26c15a6e409 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -39,7 +39,7 @@ SDIR = $(slicedir)\IceSSL CPPFLAGS = -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DWIN32_LEAN_AND_MEAN SLICE2CPPFLAGS = --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) -LINKWITH = $(LIBS) $(SSL_OS_LIBS) ws2_32.lib +LINKWITH = $(LIBS) $(SSL_OS_LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 94a85daa0f0..016511744f3 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -11,7 +11,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION)) SONAME = $(call mksoname,IceStormService,$(SOVERSION)) -LIBNAME = $(call mklibname,IceStormService) +LIBNAME = $(call mklibname,IceStormService) ADMIN = $(bindir)/icestormadmin MIGRATE = $(bindir)/icestormmigrate @@ -75,9 +75,9 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) -I../.. --ice --include-dir IceStorm $(ICECPPF include $(top_srcdir)/config/Make.rules -CPPFLAGS := $(CPPFLAGS) -I.. -DICESTORM_SERVICE_API_EXPORTS $(READLINE_FLAGS) +CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) ICECPPFLAGS := $(ICECPPFLAGS) -I.. -SLICE2CPPFLAGS := --ice --include-dir IceStorm --dll-export ICE_STORM_SERVICE_API $(SLICE2CPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir IceStorm $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIceStorm -lIceGrid -lGlacier2 -lFreeze -lIceBox -lIce -lIceUtil $(libdir)/$(LIBFILENAME): $(LIB_OBJS) diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index a9307a0e2e9..066c0afbd70 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -68,12 +68,12 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) -I.. --ice --include-dir IceStorm $(ICECPPFLAG !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I.. -DICE_STORM_SERVICE_API_EXPORTS $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN ICECPPFLAGS = $(ICECPPFLAGS) -I.. -SLICE2CPPFLAGS = --ice --include-dir IceStorm --dll-export ICE_STORM_SERVICE_API $(SLICE2CPPFLAGS) -LINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib -ALINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib -MLINKWITH = freeze$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib $(LIBS) +SLICE2CPPFLAGS = --ice --include-dir IceStorm $(SLICE2CPPFLAGS) +LINKWITH = $(LIBS) +ALINKWITH = $(LIBS) +MLINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index 673fdae3860..376277e9f93 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -7,6 +7,8 @@ // // ********************************************************************** +#define ICE_STORM_SERVICE_API_EXPORTS + #include <IceUtil/DisableWarnings.h> #include <Ice/PluginManagerI.h> // For loadPlugin @@ -16,7 +18,6 @@ #include <IceStorm/TransientTopicManagerI.h> #include <IceStorm/Instance.h> -#define ICE_STORM_API ICE_DECLSPEC_EXPORT #include <IceStorm/Service.h> #include <IceStorm/Observers.h> diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h index b9866e56beb..a48329f9c6f 100644 --- a/cpp/src/IceStorm/Service.h +++ b/cpp/src/IceStorm/Service.h @@ -13,10 +13,30 @@ #include <IceBox/IceBox.h> #include <IceStorm/IceStorm.h> -#ifndef ICE_STORM_API -# define ICE_STORM_API ICE_DECLSPEC_IMPORT +#ifdef _MSC_VER +// +// Automatically link with IceStormService[D].lib +// +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceStormService.lib") +# elif !defined(ICE_STORM_SERVICE_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceStormServiceD.lib") +# else +# pragma comment(lib, "IceStormService.lib") +# endif +# endif #endif +#ifndef ICE_STORM_SERVICE_API +# ifdef ICE_STORM_SERVICE_API_EXPORTS +# define ICE_STORM_SERVICE_API ICE_DECLSPEC_EXPORT +# else +# define ICE_STORM_SERVICE_API ICE_DECLSPEC_IMPORT +# endif +#endif + + // This API is internal to Ice, and should not be used by external // applications. namespace IceStormInternal @@ -29,16 +49,16 @@ class Service : public ::IceBox::Service { public: - ICE_STORM_API static ServicePtr create(const Ice::CommunicatorPtr&, - const Ice::ObjectAdapterPtr&, - const Ice::ObjectAdapterPtr&, - const std::string&, - const Ice::Identity&, - const std::string&); + ICE_STORM_SERVICE_API static ServicePtr create(const Ice::CommunicatorPtr&, + const Ice::ObjectAdapterPtr&, + const Ice::ObjectAdapterPtr&, + const std::string&, + const Ice::Identity&, + const std::string&); virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&) = 0; - ICE_STORM_API virtual IceStorm::TopicManagerPrx getTopicManager() const = 0; + ICE_STORM_SERVICE_API virtual IceStorm::TopicManagerPrx getTopicManager() const = 0; virtual void stop() = 0; }; diff --git a/cpp/src/IceStormLib/Makefile.mak b/cpp/src/IceStormLib/Makefile.mak index 3b7dceb0884..0a62b9de932 100644 --- a/cpp/src/IceStormLib/Makefile.mak +++ b/cpp/src/IceStormLib/Makefile.mak @@ -27,7 +27,7 @@ SDIR = $(slicedir)\IceStorm CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN ICECPPFLAGS = $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS = --ice --include-dir IceStorm --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) -LINKWITH = $(LIBS) $(DBLINKWITH) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h index 09629e67a9c..e33d4ff526b 100644 --- a/cpp/src/IceXML/Parser.h +++ b/cpp/src/IceXML/Parser.h @@ -25,6 +25,21 @@ # endif #endif +// +// Automatically link IceXML[D].lib with Visual C++ +// +#ifdef _MSC_VER +# if defined(ICE_STATIC_LIBS) +# pragma comment(lib, "IceXML.lib") +# elif !defined(ICE_XML_API_EXPORTS) +# if defined(_DEBUG) +# pragma comment(lib, "IceXMLD.lib") +# else +# pragma comment(lib, "IceXML.lib") +# endif +# endif +#endif + namespace IceXML { diff --git a/cpp/src/Makefile b/cpp/src/Makefile index eb9edce0cda..b29f1632416 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -17,7 +17,8 @@ ifneq ($(findstring MINGW,$(UNAME)),) slice2cpp \ slice2rb \ Ice \ - IceSSL + IceSSL \ + IceDiscovery else SUBDIRS = IceUtil \ Slice \ diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak index c9e7fcd0d32..71994999ac2 100644 --- a/cpp/src/Makefile.mak +++ b/cpp/src/Makefile.mak @@ -17,6 +17,14 @@ SUBDIRS = IceUtil\winrt \ Glacier2Lib\winrt \ IceStormLib\winrt \ IceGridLib\winrt +!elseif "$(CPP_COMPILER)" == "VC100" +SUBDIRS = IceUtil \ + Slice \ + slice2cpp \ + slice2py \ + Ice \ + IceSSL \ + IceDiscovery \ !else SUBDIRS = IceUtil \ Slice \ diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak index 5c3f859279e..0c584173fc6 100755 --- a/cpp/src/iceserviceinstall/Makefile.mak +++ b/cpp/src/iceserviceinstall/Makefile.mak @@ -20,7 +20,8 @@ OBJS = .\ServiceInstaller.obj \ CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" authz.lib $(LIBS) +LINKWITH = /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" \ + authz.lib advapi32.lib $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(TOOL:.exe=.pdb) diff --git a/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak index ddd034046d8..fce94fa8c6a 100644 --- a/cpp/src/slice2confluence/Makefile.mak +++ b/cpp/src/slice2confluence/Makefile.mak @@ -28,7 +28,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Confluence.res $(NAME): $(OBJS) Slice2Confluence.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index 7d8405d1a16..552203f8e90 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -27,7 +27,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Cpp.res $(NAME): $(OBJS) Slice2Cpp.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak index 0268d4d734e..3c979d2a88e 100644 --- a/cpp/src/slice2cs/Makefile.mak +++ b/cpp/src/slice2cs/Makefile.mak @@ -27,7 +27,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Cs.res $(NAME): $(OBJS) Slice2Cs.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak index 22f953ceaea..fdc3fcecd85 100644 --- a/cpp/src/slice2freeze/Makefile.mak +++ b/cpp/src/slice2freeze/Makefile.mak @@ -26,7 +26,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Freeze.res $(NAME): $(OBJS) Slice2Freeze.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak index ca7b5f23dc6..6b1bd319e18 100644 --- a/cpp/src/slice2freezej/Makefile.mak +++ b/cpp/src/slice2freezej/Makefile.mak @@ -26,7 +26,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2FreezeJ.res $(NAME): $(OBJS) Slice2FreezeJ.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak index 43c775f6c76..14247237119 100644 --- a/cpp/src/slice2html/Makefile.mak +++ b/cpp/src/slice2html/Makefile.mak @@ -27,7 +27,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Html.res $(NAME): $(OBJS) Slice2Html.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak index 2edaa9e9a92..9499e2dc37f 100644 --- a/cpp/src/slice2java/Makefile.mak +++ b/cpp/src/slice2java/Makefile.mak @@ -27,7 +27,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Java.res $(NAME): $(OBJS) Slice2Java.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2php/Makefile.mak b/cpp/src/slice2php/Makefile.mak index b6893d013f4..ba0f21073c2 100644 --- a/cpp/src/slice2php/Makefile.mak +++ b/cpp/src/slice2php/Makefile.mak @@ -26,7 +26,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2PHP.res $(NAME): $(OBJS) Slice2PHP.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak index 43d0bd47f2a..1b39222820a 100644 --- a/cpp/src/slice2py/Makefile.mak +++ b/cpp/src/slice2py/Makefile.mak @@ -26,7 +26,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Py.res $(NAME): $(OBJS) Slice2Py.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak index d2e8913c55a..9e4b877e387 100644 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -26,7 +26,7 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) RES_FILE = Slice2Rb.res $(NAME): $(OBJS) Slice2Rb.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \ $(BASELIBS) $(RES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak index 25e5c5b1144..4ca12e26684 100644 --- a/cpp/test/Freeze/complex/Makefile.mak +++ b/cpp/test/Freeze/complex/Makefile.mak @@ -33,7 +33,7 @@ PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Freeze/dbmap/Makefile.mak b/cpp/test/Freeze/dbmap/Makefile.mak index 850aebe06cb..410e1d2d2fe 100644 --- a/cpp/test/Freeze/dbmap/Makefile.mak +++ b/cpp/test/Freeze/dbmap/Makefile.mak @@ -35,7 +35,7 @@ CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Freeze/evictor/Makefile.mak b/cpp/test/Freeze/evictor/Makefile.mak index 09de99e4e58..c08fafa168f 100644 --- a/cpp/test/Freeze/evictor/Makefile.mak +++ b/cpp/test/Freeze/evictor/Makefile.mak @@ -41,7 +41,7 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Freeze/fileLock/Makefile.mak b/cpp/test/Freeze/fileLock/Makefile.mak index 4f3ddd68981..eaa4d89e14e 100644 --- a/cpp/test/Freeze/fileLock/Makefile.mak +++ b/cpp/test/Freeze/fileLock/Makefile.mak @@ -29,12 +29,12 @@ CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(CLIENTF): $(CFOBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(CFOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(CFOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak index 4151f33eb5f..3e4ea6e46c0 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile.mak +++ b/cpp/test/FreezeScript/dbmap/Makefile.mak @@ -30,7 +30,7 @@ PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/FreezeScript/evictor/Makefile.mak b/cpp/test/FreezeScript/evictor/Makefile.mak index 8bcd4f7b6c9..50426de97ff 100644 --- a/cpp/test/FreezeScript/evictor/Makefile.mak +++ b/cpp/test/FreezeScript/evictor/Makefile.mak @@ -27,7 +27,7 @@ PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/attack/Makefile.mak b/cpp/test/Glacier2/attack/Makefile.mak index bb3fb88fc0a..24a0b152d92 100644 --- a/cpp/test/Glacier2/attack/Makefile.mak +++ b/cpp/test/Glacier2/attack/Makefile.mak @@ -38,7 +38,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mak b/cpp/test/Glacier2/dynamicFiltering/Makefile.mak index c4950aedd7b..bc3720168ed 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Makefile.mak +++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mak @@ -38,12 +38,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/override/Makefile.mak b/cpp/test/Glacier2/override/Makefile.mak index ceeb12e2874..ccffb4f85be 100644 --- a/cpp/test/Glacier2/override/Makefile.mak +++ b/cpp/test/Glacier2/override/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/router/Makefile.mak b/cpp/test/Glacier2/router/Makefile.mak index ceeb12e2874..ccffb4f85be 100644 --- a/cpp/test/Glacier2/router/Makefile.mak +++ b/cpp/test/Glacier2/router/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mak b/cpp/test/Glacier2/sessionControl/Makefile.mak index d80f9e7892a..30ff5999d10 100644 --- a/cpp/test/Glacier2/sessionControl/Makefile.mak +++ b/cpp/test/Glacier2/sessionControl/Makefile.mak @@ -36,12 +36,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/sessionHelper/Makefile.mak b/cpp/test/Glacier2/sessionHelper/Makefile.mak index c9c03aa07b5..7f058448a0f 100644 --- a/cpp/test/Glacier2/sessionHelper/Makefile.mak +++ b/cpp/test/Glacier2/sessionHelper/Makefile.mak @@ -35,7 +35,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/ssl/Makefile.mak b/cpp/test/Glacier2/ssl/Makefile.mak index 4750bd03431..c13099fc854 100644 --- a/cpp/test/Glacier2/ssl/Makefile.mak +++ b/cpp/test/Glacier2/ssl/Makefile.mak @@ -24,7 +24,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) @@ -37,6 +37,6 @@ $(CLIENT): $(COBJS) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Glacier2/staticFiltering/Makefile.mak b/cpp/test/Glacier2/staticFiltering/Makefile.mak index fb7aaae6900..f6cc49f1640 100644 --- a/cpp/test/Glacier2/staticFiltering/Makefile.mak +++ b/cpp/test/Glacier2/staticFiltering/Makefile.mak @@ -37,7 +37,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Ice/info/Makefile.mak b/cpp/test/Ice/info/Makefile.mak index 08b6fb7527e..06bc7f4d84c 100644 --- a/cpp/test/Ice/info/Makefile.mak +++ b/cpp/test/Ice/info/Makefile.mak @@ -42,7 +42,7 @@ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN !if "$(WINRT)" != "yes" LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -LIBS = $(LIBS) icessl$(LIBSUFFIX).lib +LIBS = $(LIBS) !else LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain !endif diff --git a/cpp/test/IceBox/admin/Makefile.mak b/cpp/test/IceBox/admin/Makefile.mak index b759ec9b6c4..6d46aaa0c36 100644 --- a/cpp/test/IceBox/admin/Makefile.mak +++ b/cpp/test/IceBox/admin/Makefile.mak @@ -32,7 +32,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) @@ -44,14 +44,14 @@ $(LIBNAME) : $(DLLNAME) $(DLLNAME): $(SERVICE_OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \ - freeze$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceBox/configuration/Makefile.mak b/cpp/test/IceBox/configuration/Makefile.mak index 313ffc1bead..631521e5fb9 100644 --- a/cpp/test/IceBox/configuration/Makefile.mak +++ b/cpp/test/IceBox/configuration/Makefile.mak @@ -32,7 +32,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/test/IceGrid/activation/Makefile.mak b/cpp/test/IceGrid/activation/Makefile.mak index 953a29b82cb..fa8cec71546 100644 --- a/cpp/test/IceGrid/activation/Makefile.mak +++ b/cpp/test/IceGrid/activation/Makefile.mak @@ -30,7 +30,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/IceGrid/allocation/Makefile.mak b/cpp/test/IceGrid/allocation/Makefile.mak index c42ce50a9f0..b253d3b17cb 100644 --- a/cpp/test/IceGrid/allocation/Makefile.mak +++ b/cpp/test/IceGrid/allocation/Makefile.mak @@ -35,7 +35,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/IceGrid/deployer/Makefile.mak b/cpp/test/IceGrid/deployer/Makefile.mak index 3ae86b034f4..337c11e560c 100644 --- a/cpp/test/IceGrid/deployer/Makefile.mak +++ b/cpp/test/IceGrid/deployer/Makefile.mak @@ -38,7 +38,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) @@ -50,14 +50,14 @@ $(LIBNAME) : $(DLLNAME) $(DLLNAME): $(SERVICE_OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \ - freeze$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceGrid/distribution/Makefile.mak b/cpp/test/IceGrid/distribution/Makefile.mak index 252395f9c5e..bab4fa0c65b 100644 --- a/cpp/test/IceGrid/distribution/Makefile.mak +++ b/cpp/test/IceGrid/distribution/Makefile.mak @@ -30,7 +30,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mak b/cpp/test/IceGrid/noRestartUpdate/Makefile.mak index 63b37ed4097..14e0b84b846 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Makefile.mak +++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mak @@ -38,7 +38,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) @@ -49,7 +49,7 @@ $(LIBNAME) : $(DLLNAME) $(DLLNAME): $(SERVICE_OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) $(SERVICE_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) \ - freeze$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mak b/cpp/test/IceGrid/replicaGroup/Makefile.mak index ec31e9d7d33..7627b438847 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mak +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mak @@ -41,7 +41,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) @@ -61,14 +61,14 @@ $(PLUGINLIBNAME) : $(PLUGINDLLNAME) $(PLUGINDLLNAME): RegistryPlugin.obj $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(SETARGV) RegistryPlugin.obj $(PREOUT)$(PLUGINDLLNAME) $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(PLUGINDLLNAME:.dll=.exp) del /q $(PLUGINDLLNAME:.dll=.exp) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceGrid/replication/Makefile.mak b/cpp/test/IceGrid/replication/Makefile.mak index e9d0a450efb..4b191e0cc82 100644 --- a/cpp/test/IceGrid/replication/Makefile.mak +++ b/cpp/test/IceGrid/replication/Makefile.mak @@ -30,7 +30,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) @@ -39,7 +39,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ - icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceGrid/session/Makefile.mak b/cpp/test/IceGrid/session/Makefile.mak index f41473fc106..0756a4e5b81 100644 --- a/cpp/test/IceGrid/session/Makefile.mak +++ b/cpp/test/IceGrid/session/Makefile.mak @@ -35,7 +35,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) @@ -44,17 +44,17 @@ VPDBFLAGS = /pdb:$(VERIFIER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icegrid$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(VERIFIER): $(VOBJS) - $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(SETARGV) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(SETARGV) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceGrid/simple/Makefile.mak b/cpp/test/IceGrid/simple/Makefile.mak index e4cd9122107..b9682c1a92a 100644 --- a/cpp/test/IceGrid/simple/Makefile.mak +++ b/cpp/test/IceGrid/simple/Makefile.mak @@ -30,7 +30,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/IceGrid/update/Makefile.mak b/cpp/test/IceGrid/update/Makefile.mak index 92159e0fb24..cdefafc026c 100644 --- a/cpp/test/IceGrid/update/Makefile.mak +++ b/cpp/test/IceGrid/update/Makefile.mak @@ -30,7 +30,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/IceSSL/configuration/Makefile.mak b/cpp/test/IceSSL/configuration/Makefile.mak index b8e2999a10e..8bb061d8b60 100644 --- a/cpp/test/IceSSL/configuration/Makefile.mak +++ b/cpp/test/IceSSL/configuration/Makefile.mak @@ -37,12 +37,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib $(SSL_OS_LIBS) + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(SSL_OS_LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak index 3ec223e190f..401e5a8e499 100644 --- a/cpp/test/IceStorm/federation/Makefile.mak +++ b/cpp/test/IceStorm/federation/Makefile.mak @@ -28,7 +28,7 @@ OBJS = $(POBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) +LIBS = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) diff --git a/cpp/test/IceStorm/federation2/Makefile.mak b/cpp/test/IceStorm/federation2/Makefile.mak index e379435e0c1..e063b46b105 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mak +++ b/cpp/test/IceStorm/federation2/Makefile.mak @@ -29,7 +29,7 @@ OBJS = $(POBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) +LIBS = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) diff --git a/cpp/test/IceStorm/rep1/Makefile.mak b/cpp/test/IceStorm/rep1/Makefile.mak index 844982f991b..9fd0a472413 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mak +++ b/cpp/test/IceStorm/rep1/Makefile.mak @@ -33,7 +33,7 @@ OBJS = $(POBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) +LIBS = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) diff --git a/cpp/test/IceStorm/repgrid/Makefile.mak b/cpp/test/IceStorm/repgrid/Makefile.mak index 57e5a62b487..f818059f56e 100644 --- a/cpp/test/IceStorm/repgrid/Makefile.mak +++ b/cpp/test/IceStorm/repgrid/Makefile.mak @@ -21,7 +21,7 @@ OBJS = $(SLICE_OBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) +LIBS = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/IceStorm/repstress/Makefile.mak b/cpp/test/IceStorm/repstress/Makefile.mak index 49da70bb431..3993ed67cd7 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mak +++ b/cpp/test/IceStorm/repstress/Makefile.mak @@ -35,7 +35,7 @@ OBJS = $(POBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) +LIBS = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) diff --git a/cpp/test/IceStorm/single/Makefile.mak b/cpp/test/IceStorm/single/Makefile.mak index 42df6481f1e..8d6fcba927d 100644 --- a/cpp/test/IceStorm/single/Makefile.mak +++ b/cpp/test/IceStorm/single/Makefile.mak @@ -29,7 +29,7 @@ OBJS = $(POBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) +LIBS = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) diff --git a/cpp/test/IceStorm/stress/Makefile.mak b/cpp/test/IceStorm/stress/Makefile.mak index 5908a6dcf8b..05f00bb7492 100644 --- a/cpp/test/IceStorm/stress/Makefile.mak +++ b/cpp/test/IceStorm/stress/Makefile.mak @@ -29,7 +29,7 @@ OBJS = $(POBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = icestorm$(LIBSUFFIX).lib $(LIBS) +LIBS = $(LIBS) !if "$(GENERATE_PDB)" == "yes" PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) diff --git a/cpp/test/Makefile b/cpp/test/Makefile index 7dc829d0dbf..e01ed65e09e 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -14,7 +14,8 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = IceUtil \ Slice \ Ice \ - IceSSL + IceSSL \ + IceDiscovery ifeq ($(findstring MINGW,$(UNAME)),) SUBDIRS := $(SUBDIRS) \ @@ -23,11 +24,9 @@ SUBDIRS := $(SUBDIRS) \ Freeze \ FreezeScript \ Glacier2 \ - IceGrid \ - IceDiscovery + IceGrid endif - .PHONY: $(EVERYTHING) $(SUBDIRS) all:: $(SUBDIRS) diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak index e6a0f1f11ee..9fa0c1c57bc 100644 --- a/cpp/test/Makefile.mak +++ b/cpp/test/Makefile.mak @@ -15,12 +15,17 @@ top_srcdir = .. SUBDIRS = Ice +!elseif "$(CPP_COMPILER)" == "VC100" +SUBDIRS = IceUtil \ + Slice \ + Ice \ + IceSSL \ + IceDiscovery !else - SUBDIRS = IceUtil \ Slice \ Ice \ - IceSSL \ + IceSSL \ Glacier2 \ Freeze \ IceStorm \ |