From 882a99d84eaee071ddb3a8012bfd61131f894eb3 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 22 Sep 2008 10:34:04 +0000
Subject: [PATCH] - added missing win32 icon - updated to find gtk+ together
 with linphone-deps

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@30 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/gtk-glade/linphone.dev |   5 +++--
 linphone/gtk-glade/linphone.ico | Bin 0 -> 9422 bytes
 linphone/gtk-glade/linphone.iss |  14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100755 linphone/gtk-glade/linphone.ico

diff --git a/linphone/gtk-glade/linphone.dev b/linphone/gtk-glade/linphone.dev
index b4a14f0d9..26e11570b 100755
--- a/linphone/gtk-glade/linphone.dev
+++ b/linphone/gtk-glade/linphone.dev
@@ -108,13 +108,14 @@ ProductName=
 ProductVersion=
 AutoIncBuildNrOnRebuild=0
 AutoIncBuildNrOnCompile=0
+UnitCount=8
 
 [Profile1]
 ProfileName=Mingw 3.4.2
 Type=0
 ObjFiles=
-Includes=C:\Dev-Cpp\gtk+2.12\include\gtk-2.0;C:\Dev-Cpp\gtk+2.12\include\libglade-2.0;../coreapi;C:\Dev-Cpp\gtk+2.12\include\cairo;C:\Dev-Cpp\gtk+2.12\include\pango-1.0;C:\Dev-Cpp\gtk+2.12\include\glib-2.0;C:\Dev-Cpp\gtk+2.12\lib\glib-2.0\include;C:\Dev-Cpp\gtk+2.12\lib\gtk-2.0\include;C:\Dev-Cpp\gtk+2.12\include\atk-1.0;../../linphone-deps/include;../oRTP/include;../mediastreamer2/include;C:\Dev-Cpp\gtk+2.12\include
-Libs=../win32;C:\Dev-Cpp\gtk+2.12\lib;../mediastreamer2/build/win32native;../oRTP/build/win32native;../../linphone-deps/lib
+Includes=../../gtk+2.12\include\gtk-2.0;../../gtk+2.12\include\libglade-2.0;../coreapi;../../gtk+2.12\include\cairo;..\..\gtk+2.12\include\pango-1.0;..\..\gtk+2.12\include\glib-2.0;..\..\gtk+2.12\lib\glib-2.0\include;..\..\gtk+2.12\lib\gtk-2.0\include;..\..\gtk+2.12\include\atk-1.0;../../linphone-deps/include;../oRTP/include;../mediastreamer2/include;..\..\gtk+2.12\include
+Libs=../win32;../../gtk+2.12/lib;../mediastreamer2/build/win32native;../oRTP/build/win32native;../../linphone-deps/lib
 ResourceIncludes=
 MakeIncludes=
 Compiler=-ggdb -O2_@@_-DENABLE_NLS_@@__@@_
diff --git a/linphone/gtk-glade/linphone.ico b/linphone/gtk-glade/linphone.ico
new file mode 100755
index 0000000000000000000000000000000000000000..8c56e069d6131cbdd3e5eb7620ac6ba6c9862c37
GIT binary patch
literal 9422
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
BUqAo=

literal 0
HcmV?d00001

diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss
index 2ea023889..c623f73ab 100755
--- a/linphone/gtk-glade/linphone.iss
+++ b/linphone/gtk-glade/linphone.iss
@@ -50,13 +50,13 @@ Source: "..\share\rings\oldphone.wav"; DestDir: "{app}\rings"; Flags: ignorevers
 
 
 ;;GTK stuff:
-Source: "C:\Dev-Cpp\gtk+2.12\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Dev-Cpp\gtk+2.12\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0\"; Flags: ignoreversion
-Source: "C:\Dev-Cpp\libxml2-2.6.32+.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Dev-Cpp\iconv-1.9.2.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Dev-Cpp\gtk+2.12\lib\gtk-2.0\2.10.0\engines\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion
-Source: "C:\Dev-Cpp\gtk+2.12\lib\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Flags: ignoreversion
-Source: "C:\Dev-Cpp\gtk+2.12\lib\gtk-2.0\2.10.0\immodules\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\immodules"; Flags: ignoreversion
+Source: "..\..\gtk+2.12\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\gtk+2.12\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0\"; Flags: ignoreversion
+Source: "..\..\libxml2-2.6.32+.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\iconv-1.9.2.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\engines\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion
+Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Flags: ignoreversion
+Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\immodules\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\immodules"; Flags: ignoreversion
 
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files