diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-04-13 10:22:47 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-04-13 10:22:47 -0230 |
| commit | 7ee9541a1f3b2b7f7e7f632dd336bd523ba238db (patch) | |
| tree | 577082cf3730f510e315457263190c4f175517aa /csharp/src | |
| parent | IceSSL fixes (diff) | |
| download | ice-7ee9541a1f3b2b7f7e7f632dd336bd523ba238db.tar.bz2 ice-7ee9541a1f3b2b7f7e7f632dd336bd523ba238db.tar.xz ice-7ee9541a1f3b2b7f7e7f632dd336bd523ba238db.zip | |
ICE-6445 Remove .NET CF support
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/IceBox/Makefile.mak | 12 | ||||
| -rw-r--r-- | csharp/src/Makefile.mak | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak index 6633c7bdbf0..fffd6ae0233 100644 --- a/csharp/src/IceBox/Makefile.mak +++ b/csharp/src/IceBox/Makefile.mak @@ -62,12 +62,6 @@ $(ICEBOXNET).config: publicKeyToken = $(PUBLIC_KEY_TOKEN: =) -!if "$(COMPACT)" == "yes" -assembliesRelativeDir = ..\..\Assemblies\cf -!else -assembliesRelativeDir = ..\Assemblies -!endif - iceboxnetconfig: echo <<$(ICEBOXNET).config <?xml version="1.0"?> @@ -76,11 +70,11 @@ iceboxnetconfig: <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Ice" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.6.0.0" href="$(assembliesRelativeDir)\Ice.dll"/> + <codeBase version="3.6.0.0" href="..\Assemblies\Ice.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.6.0.0" href="$(assembliesRelativeDir)\IceBox.dll"/> + <codeBase version="3.6.0.0" href="..\Assemblies\IceBox.dll"/> </dependentAssembly> <!-- This allows iceboxnet to load the IceSSL plug-in using a strong name. We omit the @@ -89,7 +83,7 @@ iceboxnetconfig: --> <dependentAssembly> <assemblyIdentity name="IceSSL"/> - <codeBase version="3.6.0.0" href="$(assembliesRelativeDir)\IceSSL.dll"/> + <codeBase version="3.6.0.0" href="..\Assemblies\IceSSL.dll"/> </dependentAssembly> </assemblyBinding> </runtime> diff --git a/csharp/src/Makefile.mak b/csharp/src/Makefile.mak index 79b98bcd365..527a24434ab 100644 --- a/csharp/src/Makefile.mak +++ b/csharp/src/Makefile.mak @@ -11,10 +11,15 @@ top_srcdir = .. !include $(top_srcdir)\config\Make.rules.mak.cs -SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox -!if "$(COMPACT)" != "yes" -SUBDIRS = $(SUBDIRS) IceSSL IceDiscovery IceLocatorDiscovery -!endif +SUBDIRS = Ice \ + IceStorm \ + Glacier2 \ + IcePatch2 \ + IceGrid \ + IceBox \ + IceSSL \ + IceDiscovery \ + IceLocatorDiscovery $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ |