Commit 51924834 authored by aymeric's avatar aymeric

fix compilation for wince without video

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@765 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 6d991a30
......@@ -23,7 +23,9 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_arts_read_desc;
//extern MSFilterDesc ms_arts_write_desc;
//extern MSFilterDesc ms_v4l_desc;
#ifndef __VIDEO_DISABLED__
extern MSFilterDesc ms_v4w_desc;
#endif
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
......@@ -55,7 +57,9 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_arts_read_desc,
//&ms_arts_write_desc,
//&ms_v4l_desc,
#ifndef __VIDEO_DISABLED__
&ms_v4w_desc,
#endif
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
......
......@@ -76,7 +76,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB"
AdditionalDependencies=" ws2.lib iphlpapi.lib mmtimer.lib libcmtd.lib dmoguids.lib strmiids.lib strmbase.lib atlsd.lib d3dmx.lib"
AdditionalDependencies=" ws2.lib iphlpapi.lib mmtimer.lib libcmtd.lib "
IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile="mediastreamer2.def"
GenerateDebugInformation="true"
......@@ -329,7 +329,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB"
AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmt.lib dmoguids.lib strmiids.lib strmbase.lib atls.lib"
AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmt.lib"
IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile="mediastreamer2.def"
/>
......
......@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __VIDEO_DISABLED__
#if !defined(_WIN32_WCE) //Allready defined for wince
#define UNICODE
#endif
......@@ -878,3 +880,5 @@ HRESULT CDXFilterAllocator::SetProperties(
return S_OK;
}
#endif
......@@ -17,7 +17,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//#define AYMERIC_TEST
#ifndef __VIDEO_DISABLED__
/* need to link with "dmoguids.lib strmiids.lib strmbase.lib atls.lib" */
#define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA
#include "mediastreamer2/msvideo.h"
......@@ -996,3 +999,5 @@ MSFilterDesc ms_v4w_desc={
#endif
MS_FILTER_DESC_EXPORT(ms_v4w_desc)
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment