ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makedep: Add a helper function to check if a string exists in an array.

This commit is contained in:
Alexandre Julliard 2014-04-10 13:15:13 +02:00
parent f9ddafa807
commit 299ce6f9f0
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/makedep.c
View File

@ -342,15 +342,24 @@ static void strarray_addall( struct strarray *array, struct strarray added )
} }
/*******************************************************************
* strarray_exists
*/
static int strarray_exists( struct strarray *array, const char *str )
{
unsigned int i;
for (i = 0; i < array->count; i++) if (!strcmp( array->str[i], str )) return 1;
return 0;
}
/******************************************************************* /*******************************************************************
* strarray_add_uniq * strarray_add_uniq
*/ */
static void strarray_add_uniq( struct strarray *array, const char *str ) static void strarray_add_uniq( struct strarray *array, const char *str )
{ {
unsigned int i; if (!strarray_exists( array, str )) strarray_add( array, str );
for (i = 0; i < array->count; i++) if (!strcmp( array->str[i], str )) return;
strarray_add( array, str );
} }
@ -2417,16 +2426,12 @@ static void update_makefile( const char *path )
if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module;
make->use_msvcrt = 0; make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );
for (i = 0; i < make->appmode.count && !make->use_msvcrt; i++) make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" );
make->use_msvcrt = !strcmp( make->appmode.str[i], "-mno-cygwin" );
for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) for (i = 0; i < make->imports.count && !make->use_msvcrt; i++)
make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ); make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 );
make->is_win16 = 0;
for (i = 0; i < make->extradllflags.count && !make->is_win16; i++)
if (!strcmp( make->extradllflags.str[i], "-m16" )) make->is_win16 = 1;
make->include_args = empty_strarray; make->include_args = empty_strarray;
make->define_args = empty_strarray; make->define_args = empty_strarray;
strarray_add( &make->define_args, "-D__WINESRC__" ); strarray_add( &make->define_args, "-D__WINESRC__" );