Commit a8fc62d1 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

widl: Don't use old typelib format in do_everything mode.

Fixes a regression from 0bffa322.
parent f19c5586
......@@ -317,7 +317,7 @@ void write_typelib_regscript( const statement_list_t *stmts )
error( "Cannot store multiple typelibs into %s\n", typelib_name );
else
{
if (do_old_typelib)
if (old_typelib)
create_sltg_typelib( stmt->u.lib );
else
create_msft_typelib( stmt->u.lib );
......
......@@ -99,7 +99,6 @@ int do_everything = 1;
static int preprocess_only = 0;
int do_header = 0;
int do_typelib = 0;
int do_old_typelib = 0;
int do_proxies = 0;
int do_client = 0;
int do_server = 0;
......@@ -108,6 +107,7 @@ int do_idfile = 0;
int do_dlldata = 0;
static int no_preprocess = 0;
int old_names = 0;
int old_typelib = 0;
int winrt_mode = 0;
int interpreted_mode = 0;
int use_abi_namespace = 0;
......@@ -256,7 +256,6 @@ static void set_everything(int x)
{
do_header = x;
do_typelib = x;
do_old_typelib = x;
do_proxies = x;
do_client = x;
do_server = x;
......@@ -618,7 +617,7 @@ static void option_callback( int optc, char *optarg )
do_typelib = 1;
break;
case OLD_TYPELIB_OPTION:
do_old_typelib = 1;
old_typelib = 1;
break;
case 'T':
typelib_name = xstrdup(optarg);
......
......@@ -39,7 +39,6 @@ extern int pedantic;
extern int do_everything;
extern int do_header;
extern int do_typelib;
extern int do_old_typelib;
extern int do_proxies;
extern int do_client;
extern int do_server;
......@@ -47,6 +46,7 @@ extern int do_regscript;
extern int do_idfile;
extern int do_dlldata;
extern int old_names;
extern int old_typelib;
extern int winrt_mode;
extern int interpreted_mode;
extern int use_abi_namespace;
......
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