Commit 9169b410 authored by Dimitrie O. Paun's avatar Dimitrie O. Paun Committed by Alexandre Julliard

Add a default .dll extension only when no extension is present.

parent bfc60dfb
...@@ -348,7 +348,7 @@ static void build(struct options* opts) ...@@ -348,7 +348,7 @@ static void build(struct options* opts)
strarray *spec_args, *comp_args, *link_args; strarray *spec_args, *comp_args, *link_args;
char *output_file; char *output_file;
const char *spec_c_name, *spec_o_name; const char *spec_c_name, *spec_o_name;
const char *output_name, *spec_file, *def_ext; const char *output_name, *spec_file;
const char* winebuild = getenv("WINEBUILD"); const char* winebuild = getenv("WINEBUILD");
int generate_app_loader = 1; int generate_app_loader = 1;
int j; int j;
...@@ -378,11 +378,17 @@ static void build(struct options* opts) ...@@ -378,11 +378,17 @@ static void build(struct options* opts)
generate_app_loader = 0; generate_app_loader = 0;
/* normalize the filename a bit: strip .so, ensure it has proper ext */ /* normalize the filename a bit: strip .so, ensure it has proper ext */
def_ext = opts->shared ? ".dll" : ".exe";
if (strendswith(output_file, ".so")) if (strendswith(output_file, ".so"))
output_file[strlen(output_file) - 3] = 0; output_file[strlen(output_file) - 3] = 0;
if(!strendswith(output_file, def_ext)) if (opts->shared)
output_file = strmake("%s%s", output_file, def_ext); {
if ((output_name = strrchr(output_file, '/'))) output_name++;
else output_name = output_file;
if (!strchr(output_name, '.'))
output_file = strmake("%s.dll", output_file);
}
else if (!strendswith(output_file, ".exe"))
output_file = strmake("%s.exe", output_file);
/* get the filename by the path, if present */ /* get the filename by the path, if present */
if ((output_name = strrchr(output_file, '/'))) output_name++; if ((output_name = strrchr(output_file, '/'))) output_name++;
......
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