Changeset 296:3968c1ec2358 in mediastreamer2


Ignore:
Timestamp:
Mar 5, 2009 10:25:22 PM (4 years ago)
Author:
smorlat <smorlat@…>
Branch:
default
Message:

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

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@299 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:
linphone
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • linphone/coreapi/liblinphone.dev

    r231 r296  
    186186[Unit18] 
    187187FileName=general_state.c 
    188 CompileCpp=1 
    189 Folder=liblinphone 
    190 Compile=1 
    191 Link=1 
    192 Priority=1000 
    193 OverrideBuildCmd=0 
    194 BuildCmd= 
     188CompileCpp=0 
     189Folder=liblinphone 
     190Compile=1 
     191Link=1 
     192Priority=1000 
     193OverrideBuildCmd=0 
     194BuildCmd=       $(CC) -c general_state.c -o "Default Profile/general_state.o" $(CFLAGS) 
    195195 
    196196[VersionInfo] 
    … …  
    223223ResourceIncludes= 
    224224MakeIncludes= 
    225 Compiler=-Wall -Werror_@@_-D_WIN32_WINNT=0x501_@@_-DINET6_@@_-DORTP_INET6_@@_-DVIDEO_ENABLED_@@_-g_@@_-DOSIP_MT_@@_ 
     225Compiler=-Wall -Werror_@@_-D_WIN32_WINNT=0x501_@@_-DINET6_@@_-DORTP_INET6_@@_-DVIDEO_ENABLED_@@_-g_@@_-DOSIP_MT_@@_-DIN_LINPHONE_@@_ 
    226226CppCompiler= 
    227227Linker= 
    … …  
    260260Priority=1000 
    261261OverrideBuildCmd=0 
    262 BuildCmd=       $(CC) -c fonis.c -o "Default Profile/fonis.o" $(CFLAGS) 
     262BuildCmd=$(CC) -c fonis.c -o "Default Profile/fonis.o" $(CFLAGS) 
    263263 
    264264[Unit21] 
    … …  
    270270Priority=1000 
    271271OverrideBuildCmd=0 
    272 BuildCmd=       $(CC) -c sipsetup.c -o "Default Profile/sipsetup.o" $(CFLAGS) 
    273  
     272BuildCmd=$(CC) -c sipsetup.c -o "Default Profile/sipsetup.o" $(CFLAGS) 
     273 

  • linphone/coreapi/sipsetup.c

    r295 r296  
    2020 
    2121#include "linphonecore.h" 
     22 
     23#ifdef HAVE_CONFIG_H 
    2224#include "../config.h" 
     25#endif 
    2326 
    2427#ifndef LINPHONE_PLUGINS_DIR 
    2528#ifdef WIN32 
    26 #define LINPHONE_PLUGINS_DIR "liblinphone\plugins\\" 
     29#define LINPHONE_PLUGINS_DIR "liblinphone\\plugins\\" 
    2730#else 
    2831#define LINPHONE_PLUGINS_DIR "." 

  • linphone/gtk-glade/linphone.dev

    r263 r296  
    22FileName=linphone.dev 
    33Name=linphone 
    4 UnitCount=9 
     4UnitCount=10 
    55PchHead=-1 
    66PchSource=-1 
    … …  
    115115Type=0 
    116116ObjFiles= 
    117 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 
    118 Libs=../coreapi;../../gtk+2.12/lib;../mediastreamer2/build/win32native;../oRTP/build/win32native;../../linphone-deps/lib 
     117Includes=../../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 
     118Libs=../coreapi;../../libglade-2.6.3/lib;../mediastreamer2/build/win32native;../oRTP/build/win32native;../../linphone-deps/lib;../../gtk+-2.14.7/lib 
    119119ResourceIncludes= 
    120120MakeIncludes= 
    121 Compiler=-ggdb -O2_@@_-DENABLE_NLS_@@_-D_WIN32_WINNT=0x0501 _@@_ 
     121Compiler=-ggdb -O2_@@_-DENABLE_NLS_@@_-D_WIN32_WINNT=0x0501 _@@_-DIN_LINPHONE_@@_ 
    122122CppCompiler= 
    123123Linker=-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_@@_ 
    … …  
    175175BuildCmd=$(CC) -c update.c -o Objects/update.o $(CFLAGS) 
    176176 
     177[Unit10] 
     178FileName=buddylookup.c 
     179CompileCpp=0 
     180Folder=linphone 
     181Compile=1 
     182Link=1 
     183Priority=1000 
     184OverrideBuildCmd=0 
     185BuildCmd=$(CC) -c buddylookup.c -o Objects/buddylookup.o $(CFLAGS) 
     186 

  • linphone/gtk-glade/linphone.h

    r276 r296  
    2424 
    2525#ifndef LINPHONE_VERSION 
    26 #define LINPHONE_VERSION "3.0.0-20090216" 
     26#define LINPHONE_VERSION "3.0.0-20090306" 
    2727#endif 
    2828 
    … …  
    3030 
    3131#include <gtk/gtk.h> 
     32#ifdef WIN32 
     33// alloca is already defined by gtk 
     34#undef alloca 
     35#endif 
    3236#include "linphonecore.h" 
    3337 

  • linphone/gtk-glade/linphone.iss

    r263 r296  
    6060 
    6161;;GTK stuff: 
    62 Source: "..\..\gtk+2.12\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion 
    63 Source: "..\..\gtk+2.12\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0\"; Flags: ignoreversion 
    64 Source: "..\..\libxml2-2.6.32+.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion 
     62Source: "..\..\gtk+-2.14.7\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion 
     63Source: "..\..\libglade-2.6.3\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion 
     64Source: "..\..\gtk+-2.14.7\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0\"; Flags: ignoreversion 
     65Source: "..\..\linphone-deps\bin\libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion 
    6566Source: "..\..\iconv-1.9.2.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion 
    66 Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\engines\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion 
    67 Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Flags: ignoreversion 
    68 Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\immodules\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\immodules"; Flags: ignoreversion 
    69 Source: "..\..\gtk+2.12\share\locale\fr\LC_MESSAGES\*"; DestDir: "{app}\share\locale\fr\LC_MESSAGES"; Flags: ignoreversion 
    70 Source: "..\..\gtk+2.12\share\locale\sv\LC_MESSAGES\*"; DestDir: "{app}\share\locale\sv\LC_MESSAGES"; Flags: ignoreversion 
    71 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 
     67Source: "..\..\gtk+-2.14.7\lib\gtk-2.0\2.10.0\engines\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion 
     68Source: "..\..\gtk+-2.14.7\lib\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Flags: ignoreversion 
     69;;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 
     70Source: "..\..\gtk+-2.14.7\share\locale\fr\LC_MESSAGES\*"; DestDir: "{app}\share\locale\fr\LC_MESSAGES"; Flags: ignoreversion 
     71Source: "..\..\gtk+-2.14.7\share\locale\sv\LC_MESSAGES\*"; DestDir: "{app}\share\locale\sv\LC_MESSAGES"; Flags: ignoreversion 
     72Source: "..\..\XLiquid_GTK-1.0.3\gtk-2.0\*"; DestDir: "{app}\share\themes\XLiquid_GTK-1.0.3\gtk-2.0"; Flags: ignoreversion 
    7273; NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    7374 
Note: See TracChangeset for help on using the changeset viewer.