witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

change devc++ file to use lastest gtk/libglade release

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@299 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
smorlat 2009-03-05 21:25:22 +00:00
parent e84da21601
commit 8120678fe6
5 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linphone/coreapi/liblinphone.dev
View file

@ -185,13 +185,13 @@ BuildCmd=
[Unit18]
FileName=general_state.c
CompileCpp=1
CompileCpp=0
Folder=liblinphone
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
BuildCmd= $(CC) -c general_state.c -o "Default Profile/general_state.o" $(CFLAGS)
[VersionInfo]
Major=0
@ -222,7 +222,7 @@ Libs=../oRTP/build/win32native;../mediastreamer2/build/win32native;../../linphon
PrivateResource=
ResourceIncludes=
MakeIncludes=
Compiler=-Wall -Werror_@@_-D_WIN32_WINNT=0x501_@@_-DINET6_@@_-DORTP_INET6_@@_-DVIDEO_ENABLED_@@_-g_@@_-DOSIP_MT_@@_
Compiler=-Wall -Werror_@@_-D_WIN32_WINNT=0x501_@@_-DINET6_@@_-DORTP_INET6_@@_-DVIDEO_ENABLED_@@_-g_@@_-DOSIP_MT_@@_-DIN_LINPHONE_@@_
CppCompiler=
Linker=
PreprocDefines=
@ -259,7 +259,7 @@ Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CC) -c fonis.c -o "Default Profile/fonis.o" $(CFLAGS)
BuildCmd=$(CC) -c fonis.c -o "Default Profile/fonis.o" $(CFLAGS)
[Unit21]
FileName=sipsetup.c
@ -269,5 +269,5 @@ Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CC) -c sipsetup.c -o "Default Profile/sipsetup.o" $(CFLAGS)
BuildCmd=$(CC) -c sipsetup.c -o "Default Profile/sipsetup.o" $(CFLAGS)

5
linphone/coreapi/sipsetup.c
View file

@ -19,11 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "linphonecore.h"
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
#ifndef LINPHONE_PLUGINS_DIR
#ifdef WIN32
#define LINPHONE_PLUGINS_DIR "liblinphone\plugins\\"
#define LINPHONE_PLUGINS_DIR "liblinphone\\plugins\\"
#else
#define LINPHONE_PLUGINS_DIR "."
#endif

18
linphone/gtk-glade/linphone.dev
View file

@ -1,7 +1,7 @@
[Project]
FileName=linphone.dev
Name=linphone
UnitCount=9
UnitCount=10
PchHead=-1
PchSource=-1
Ver=3
@ -114,11 +114,11 @@ UnitCount=8
ProfileName=Mingw 3.4.2
Type=0
ObjFiles=
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=../coreapi;../../gtk+2.12/lib;../mediastreamer2/build/win32native;../oRTP/build/win32native;../../linphone-deps/lib
Includes=../../gtk+-2.14.7\include\gtk-2.0;../../libglade-2.6.3\include\libglade-2.0;../coreapi;../../gtk+-2.14.7\include\cairo;..\..\gtk+-2.14.7\include\pango-1.0;..\..\gtk+-2.14.7\include\glib-2.0;..\..\gtk+-2.14.7\lib\glib-2.0\include;..\..\gtk+-2.14.7\lib\gtk-2.0\include;..\..\gtk+-2.14.7\include\atk-1.0;../../linphone-deps/include;../oRTP/include;../mediastreamer2/include;..\..\gtk+-2.14.7\include
Libs=../coreapi;../../libglade-2.6.3/lib;../mediastreamer2/build/win32native;../oRTP/build/win32native;../../linphone-deps/lib;../../gtk+-2.14.7/lib
ResourceIncludes=
MakeIncludes=
Compiler=-ggdb -O2_@@_-DENABLE_NLS_@@_-D_WIN32_WINNT=0x0501 _@@_
Compiler=-ggdb -O2_@@_-DENABLE_NLS_@@_-D_WIN32_WINNT=0x0501 _@@_-DIN_LINPHONE_@@_
CppCompiler=
Linker=-mwindows_@@_-Wl,--export-all-symbols_@@_-Wl,--add-stdcall-alias_@@_-llinphone_@@_-lmediastreamer2_@@_-lortp_@@_-lglade-2.0_@@_-lgtk-win32-2.0_@@_-lglib-2.0_@@_-lintl_@@_-lgdk_pixbuf-2.0_@@_-latk-1.0_@@_-lgobject-2.0_@@_-lgthread-2.0_@@_-lgdk-win32-2.0_@@_-losip2_@@_-losipparser2_@@_-leXosip2_@@_-lws2_32_@@_-lwininet_@@_
PreprocDefines=
@ -174,3 +174,13 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=$(CC) -c update.c -o Objects/update.o $(CFLAGS)
[Unit10]
FileName=buddylookup.c
CompileCpp=0
Folder=linphone
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=$(CC) -c buddylookup.c -o Objects/buddylookup.o $(CFLAGS)

6
linphone/gtk-glade/linphone.h
View file

@ -23,12 +23,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define PACKAGE_DATA_DIR "./"
#ifndef LINPHONE_VERSION
#define LINPHONE_VERSION "3.0.0-20090216"
#define LINPHONE_VERSION "3.0.0-20090306"
#endif
#endif
#include <gtk/gtk.h>
#ifdef WIN32
// alloca is already defined by gtk
#undef alloca
#endif
#include "linphonecore.h"
#include <libintl.h>

19
linphone/gtk-glade/linphone.iss
View file

@ -59,16 +59,17 @@ Source: "..\po\fr.gmo"; DestDir: "{app}\share\locale\fr\LC_MESSAGES"; DestName:
Source: "..\po\sv.gmo"; DestDir: "{app}\share\locale\sv\LC_MESSAGES"; DestName: "linphone.mo"; Flags: ignoreversion
;;GTK stuff:
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: "..\..\gtk+-2.14.7\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\libglade-2.6.3\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\gtk+-2.14.7\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0\"; Flags: ignoreversion
Source: "..\..\linphone-deps\bin\libxml2.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
Source: "..\..\gtk+2.12\share\locale\fr\LC_MESSAGES\*"; DestDir: "{app}\share\locale\fr\LC_MESSAGES"; Flags: ignoreversion
Source: "..\..\gtk+2.12\share\locale\sv\LC_MESSAGES\*"; DestDir: "{app}\share\locale\sv\LC_MESSAGES"; Flags: ignoreversion
Source: "..\..\gtk+2.12\share\themes\XLiquid_GTK-1.0.3\gtk-2.0\*"; DestDir: "{app}\share\themes\XLiquid_GTK-1.0.3\gtk-2.0"; Flags: ignoreversion
Source: "..\..\gtk+-2.14.7\lib\gtk-2.0\2.10.0\engines\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion
Source: "..\..\gtk+-2.14.7\lib\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Flags: ignoreversion
;;Source: "..\..\gtk+-2.14.7\lib\gtk-2.0\2.10.0\immodules\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\immodules"; Flags: ignoreversion
Source: "..\..\gtk+-2.14.7\share\locale\fr\LC_MESSAGES\*"; DestDir: "{app}\share\locale\fr\LC_MESSAGES"; Flags: ignoreversion
Source: "..\..\gtk+-2.14.7\share\locale\sv\LC_MESSAGES\*"; DestDir: "{app}\share\locale\sv\LC_MESSAGES"; Flags: ignoreversion
Source: "..\..\XLiquid_GTK-1.0.3\gtk-2.0\*"; DestDir: "{app}\share\themes\XLiquid_GTK-1.0.3\gtk-2.0"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]