Permalink
Browse files

Merge pull request #1 from bl8/build-stuff

Various fixes to the build system
  • Loading branch information...
2 parents ccb70b9 + 4390e89 commit 7df4c19163037f0f9796040e3ba6a6c87643b8bd @alexkay alexkay committed Feb 9, 2012
Showing with 1,495 additions and 1,638 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 Mono.Upnp.sln
  3. +0 −2 configure.ac
  4. +3 −3 src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj
  5. +7 −7 src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.make
  6. +12 −14 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Makefile.am
  7. +1 −1 ...diaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.csproj
  8. +39 −34 ...np.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer/Makefile.am
  9. +2 −2 ....MediaServer1.FileSystem.ConsoleServer/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.csproj
  10. +26 −27 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Makefile.am
  11. +5 −3 ...p.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.csproj
  12. +33 −30 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.GtkClient/Makefile.am
  13. +12 −4 ...Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient.csproj
  14. +15 −19 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Makefile.am
  15. +2 −2 ....Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.csproj
  16. +14 −18 src/Mono.Upnp/Mono.Upnp.GtkClient/Makefile.am
  17. +11 −3 src/Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.csproj
  18. +86 −98 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ActionInvocationWindow.cs
  19. +104 −118 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.DeviceAnnouncementInfo.cs
  20. +328 −358 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.DeviceDescriptionInfo.cs
  21. +29 −38 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyDeviceInfo.cs
  22. +29 −38 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyIcon.cs
  23. +29 −38 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyServiceInfo.cs
  24. +73 −87 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.MainWindow.cs
  25. +43 −53 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.RawXmlInfo.cs
  26. +104 −118 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ServiceAnnouncementInfo.cs
  27. +161 −179 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ServiceDescriptionInfo.cs
  28. +52 −64 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ServiceScpdInfo.cs
  29. +114 −114 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/generated.cs
  30. +1 −1 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/gui.stetic
  31. +12 −16 src/Mono.Upnp/Mono.Upnp/Makefile.am
  32. +4 −4 src/Mono.Upnp/Mono.Upnp/Mono.Upnp.csproj
  33. +10 −12 tests/Mono.Ssdp.Tests/Makefile.am
  34. +8 −4 tests/Mono.Ssdp.Tests/Mono.Ssdp.Tests.csproj
  35. +39 −41 tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests/Makefile.am
  36. +15 −6 tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests.csproj
  37. +0 −6 tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests/mono.upnp.dcp.mediaserver1.filesystem.tests.pc.in
  38. +30 −37 tests/Mono.Upnp.Dcp.MediaServer1.Tests/Makefile.am
  39. +12 −5 tests/Mono.Upnp.Dcp.MediaServer1.Tests/Mono.Upnp.Dcp.MediaServer1.Tests.csproj
  40. +0 −6 tests/Mono.Upnp.Dcp.MediaServer1.Tests/mono.upnp.dcp.mediaserver1.tests.pc.in
  41. +15 −21 tests/Mono.Upnp.Tests/Makefile.am
  42. +13 −7 tests/Mono.Upnp.Tests/Mono.Upnp.Tests.csproj
View
@@ -11,6 +11,7 @@ Makefile.in
TestResult.xml
aclocal.m4
autom4te.cache/
+bin
config.log
config.status
configure
View
@@ -148,5 +148,6 @@ Global
$6.inheritsSet = VisualStudio
$6.inheritsScope = text/plain
$6.scope = text/plain
+ outputpath = bin
EndGlobalSection
EndGlobal
View
@@ -77,9 +77,7 @@ src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.GtkClien
src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Makefile
tests/Mono.Ssdp.Tests/Makefile
tests/Mono.Upnp.Tests/Makefile
-tests/Mono.Upnp.Dcp.MediaServer1.Tests/mono.upnp.dcp.mediaserver1.tests.pc
tests/Mono.Upnp.Dcp.MediaServer1.Tests/Makefile
-tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests/mono.upnp.dcp.mediaserver1.filesystem.tests.pc
tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests/Makefile
tests/Makefile
Makefile
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
@@ -64,7 +64,7 @@
<ProjectExtensions>
<MonoDevelop>
<Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" RelativeConfigureInPath="../../..">
<BuildFilesVar />
<DeployFilesVar />
<ResourcesVar />
@@ -4,26 +4,26 @@
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:mono-ssdp.snk"
-ASSEMBLY = Mono.Ssdp.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:$(srcdir)/mono-ssdp.snk"
+ASSEMBLY = ../../../bin/Mono.Ssdp.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES =
-BUILD_DIR = .
+BUILD_DIR = ../../../bin
-MONO_SSDP_DLL_MDB_SOURCE=Mono.Ssdp.dll.mdb
+MONO_SSDP_DLL_MDB_SOURCE=../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:mono-ssdp.snk"
-ASSEMBLY = Mono.Ssdp.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:$(srcdir)/mono-ssdp.snk"
+ASSEMBLY = ../../../bin/Mono.Ssdp.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES =
-BUILD_DIR = .
+BUILD_DIR = ../../../bin
MONO_SSDP_DLL_MDB=
@@ -6,20 +6,20 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
-MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
endif
@@ -31,12 +31,12 @@ ASSEMBLY = MSMediaServerRegistrar1.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
+ ../../../../bin/Mono.Upnp.dll
BUILD_DIR = .
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
@@ -73,7 +73,7 @@ EXTRAS = \
mono.upnp.dcp.msmediareceiverregistrar1.pc.in
REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
+ ../../../../bin/Mono.Upnp.dll \
System
DLL_REFERENCES =
@@ -88,8 +88,6 @@ MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_PC = $(BUILD_DIR)/mono.upnp.dcp.msmediar
$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_PC,mono.upnp.dcp.msmediareceiverregistrar1.pc))
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -6,53 +6,62 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = exe
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
- ../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+BUILD_DIR = ../../../../bin
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB_SOURCE=Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
-MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_SOURCE=../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
MSMEDIASERVERREGISTRAR1_DLL=
endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
ASSEMBLY_MDB =
COMPILE_TARGET = exe
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll \
../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/MSMediaServerRegistrar1.dll
-BUILD_DIR = .
+BUILD_DIR = ../../../../bin
MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB=
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL=
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=
MSMEDIASERVERREGISTRAR1_DLL_SOURCE=../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/MSMediaServerRegistrar1.dll
MSMEDIASERVERREGISTRAR1_DLL=$(BUILD_DIR)/MSMediaServerRegistrar1.dll
@@ -69,7 +78,10 @@ PROGRAMFILES = \
$(MONO_SSDP_DLL) \
$(MONO_SSDP_DLL_MDB) \
$(MONO_UPNP_DLL_MDB) \
+ $(MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB) \
+ $(MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB) \
$(MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL) \
+ $(MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB) \
$(MSMEDIASERVERREGISTRAR1_DLL)
BINARIES = \
@@ -96,10 +108,10 @@ EXTRAS = \
mono-upnp-simple-media-server.in
REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
- ../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll \
+ ../../../../bin/Mono.Upnp.dll \
System
DLL_REFERENCES =
@@ -114,13 +126,6 @@ MONO_UPNP_DLL = $(BUILD_DIR)/Mono.Upnp.dll
MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
MONO_UPNP_SIMPLE_MEDIA_SERVER = $(BUILD_DIR)/mono-upnp-simple-media-server
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_SIMPLE_MEDIA_SERVER,mono-upnp-simple-media-server,x))
$(eval $(call emit-deploy-target,MSMEDIASERVERREGISTRAR1_DLL))
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Oops, something went wrong. Retry.

0 comments on commit 7df4c19

Please sign in to comment.