diff options
Diffstat (limited to 'cpp/src')
32 files changed, 99 insertions, 51 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) 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 |