libwine: Always build preloading code.
This commit is contained in:
parent
9cf7f95483
commit
11e811411c
|
@ -456,7 +456,6 @@ const char *wine_get_build_id(void)
|
||||||
/* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */
|
/* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */
|
||||||
static void preloader_exec( char **argv, int use_preloader )
|
static void preloader_exec( char **argv, int use_preloader )
|
||||||
{
|
{
|
||||||
#ifdef linux
|
|
||||||
if (use_preloader)
|
if (use_preloader)
|
||||||
{
|
{
|
||||||
static const char preloader[] = "wine-preloader";
|
static const char preloader[] = "wine-preloader";
|
||||||
|
@ -483,7 +482,6 @@ static void preloader_exec( char **argv, int use_preloader )
|
||||||
free( new_argv );
|
free( new_argv );
|
||||||
free( full_name );
|
free( full_name );
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
execv( argv[0], argv );
|
execv( argv[0], argv );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -494,7 +492,12 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var )
|
||||||
int use_preloader;
|
int use_preloader;
|
||||||
|
|
||||||
if (!name) name = argv0_name; /* no name means default loader */
|
if (!name) name = argv0_name; /* no name means default loader */
|
||||||
|
|
||||||
|
#ifdef linux
|
||||||
use_preloader = !strendswith( name, "wineserver" );
|
use_preloader = !strendswith( name, "wineserver" );
|
||||||
|
#else
|
||||||
|
use_preloader = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
if ((ptr = strrchr( name, '/' )))
|
if ((ptr = strrchr( name, '/' )))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue