Commit 637ee654 authored by John van Groningen's avatar John van Groningen
Browse files

Merge branch 'ignore-libraries-starting-with-minus-l-on-windows' into 'master'

Fix previous commit: ignore libraries starting with -l on Windows

See merge request !16
parents dbdb6c52 4e80391f
Pipeline #46019 passed with stage
in 18 seconds
......@@ -1326,12 +1326,12 @@ static int project_node_is_abc_up_to_date (P_NODE project_node)
#endif
);
else if (dependency_type==LIBRARY_DEPENDENCY){
if (dependent_module[0]=='-' && dependent_module[1]=='l')
add_library (dependent_module);
#ifdef _WINDOWS_
else
if (!(dependent_module[0]=='-' && dependent_module[1]=='l'))
add_imported_object_file_to_project_node (dependent_module,project_node,1);
#else
if (dependent_module[0]=='-' && dependent_module[1]=='l')
add_library (dependent_module);
else if (strchr (dependent_module,'.')!=NULL)
add_imported_object_file_to_project_node (dependent_module,project_node);
#endif
......@@ -2329,12 +2329,12 @@ static void get_dependencies (P_NODE project_node)
#endif
);
else if (dependency_type==LIBRARY_DEPENDENCY){
if (dependent_module[0]=='-' && dependent_module[1]=='l')
add_library (dependent_module);
#ifdef _WINDOWS_
else
if (!(dependent_module[0]=='-' && dependent_module[1]=='l'))
add_imported_object_file_to_project_node (dependent_module,project_node,1);
#else
if (dependent_module[0]=='-' && dependent_module[1]=='l')
add_library (dependent_module);
else if (strchr (dependent_module,'.')!=NULL)
add_imported_object_file_to_project_node (dependent_module,project_node);
#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