From 5b671e3c4a51d6fd3a43c68c19fc5734eeb235fe Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Wed, 1 Oct 2008 20:48:50 +0000
Subject: [PATCH] update build to take account of new libx264 and speex
 delivery.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@62 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/gtk-glade/linphone.iss                           | 2 ++
 .../mediastreamer2/build/win32native/mediastreamer2.dev   | 2 +-
 linphone/mediastreamer2/plugins/msx264/msx264.iss         | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss
index c623f73ab..9d68bba3a 100755
--- a/linphone/gtk-glade/linphone.iss
+++ b/linphone/gtk-glade/linphone.iss
@@ -37,6 +37,8 @@ Source: "..\..\linphone-deps\bin\libogg.dll"; DestDir: "{app}"; Flags: ignorever
 Source: "..\..\linphone-deps\bin\speex.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\linphone-deps\bin\avcodec.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\linphone-deps\bin\avutil.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\linphone-deps\bin\libspeex-1.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\linphone-deps\bin\libspeexdsp-1.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\mediastreamer2\build\win32native\mediastreamer2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\oRTP\build\win32native\ortp.dll"; DestDir: "{app}"; Flags: ignoreversion
 ;;Sound files:
diff --git a/linphone/mediastreamer2/build/win32native/mediastreamer2.dev b/linphone/mediastreamer2/build/win32native/mediastreamer2.dev
index ce8a0df85..3ddde2f96 100755
--- a/linphone/mediastreamer2/build/win32native/mediastreamer2.dev
+++ b/linphone/mediastreamer2/build/win32native/mediastreamer2.dev
@@ -514,7 +514,7 @@ ResourceIncludes=
 MakeIncludes=
 Compiler=-ggdb_@@_-DINET6 _@@_-DORTP_INET6 _@@_-D_WORKAROUND_MINGW32_BUGS_@@_-D_WIN32_WINNT=0x0501 _@@_-DNOSDL_@@_-DVIDEO_ENABLED_@@_-DNORESAMPLE_@@_-Wall _@@_-DHAVE_LIBAVCODEC_AVCODEC_H_@@_
 CppCompiler=
-Linker=-lortp_@@_-lavcodec_@@_-lavutil_@@_-ltheora_@@_-lspeex_@@_-lgsm_@@_-lws2_32_@@_-lwinmm_@@_-lvfw32_@@_-logg_@@__@@_
+Linker=-lortp_@@_-lavcodec_@@_-lavutil_@@_-ltheora_@@_-lspeex_@@_-lspeexdsp_@@_-lgsm_@@_-lws2_32_@@_-lwinmm_@@_-lvfw32_@@_-logg_@@__@@_
 PreprocDefines=
 CompilerSettings=0000000000010000000000
 Icon=
diff --git a/linphone/mediastreamer2/plugins/msx264/msx264.iss b/linphone/mediastreamer2/plugins/msx264/msx264.iss
index faeea2fe0..4c874e15a 100755
--- a/linphone/mediastreamer2/plugins/msx264/msx264.iss
+++ b/linphone/mediastreamer2/plugins/msx264/msx264.iss
@@ -3,15 +3,15 @@
 
 [Setup]
 AppName=msx264
-AppVerName=msx264 H.264 plugin for linphone. Plugin version is 1.1.2.
+AppVerName=msx264 H.264 plugin for linphone. Plugin version is 1.1.3.
 AppPublisher=linphone.org
 AppPublisherURL=http://www.linphone.org
 AppSupportURL=http://www.linphone.org
 AppUpdatesURL=http://www.linphone.org
 DefaultDirName={pf}\Linphone
 DefaultGroupName=Linphone
-LicenseFile=C:\Documents and Settings\simorl.EMEA\cvs\linphone\mediastreamer2\plugins\msx264\COPYING
-InfoBeforeFile=C:\Documents and Settings\simorl.EMEA\cvs\linphone\mediastreamer2\plugins\msx264\README
+LicenseFile=COPYING
+InfoBeforeFile=README
 OutputBaseFilename=setup
 Compression=lzma
 SolidCompression=yes
@@ -23,7 +23,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 ;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\mediastreamer2\plugins\msx264\libmsx264.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion
+Source: "libmsx264.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]