From 339022d6cae668e41bdad36a46710e9cc90b95e2 Mon Sep 17 00:00:00 2001 From: midipix Date: Nov 10 2018 20:42:28 +0000 Subject: driver: host flavors: added suffixed suffixes support. --- diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h index 2335ae5..d28cb8d 100644 --- a/include/slibtool/slibtool.h +++ b/include/slibtool/slibtool.h @@ -216,6 +216,8 @@ struct slbt_flavor_settings { const char * arsuffix; const char * dsoprefix; const char * dsosuffix; + const char * osdsuffix; + const char * osdfussix; const char * exeprefix; const char * exesuffix; const char * impprefix; diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c index f013928..a898205 100644 --- a/src/driver/slbt_driver_ctx.c +++ b/src/driver/slbt_driver_ctx.c @@ -35,41 +35,41 @@ static const struct slbt_source_version slbt_src_version = { /* flavor settings */ #define SLBT_FLAVOR_SETTINGS(flavor, \ bfmt,pic, \ - arp,ars,dsop,dsos, \ + arp,ars,dsop,dsos,osds,osdf, \ exep,exes,impp,imps, \ ldenv) \ static const struct slbt_flavor_settings flavor = { \ - bfmt,arp,ars,dsop,dsos, \ + bfmt,arp,ars,dsop,dsos,osds,osdf, \ exep,exes,impp,imps, \ ldenv,pic} SLBT_FLAVOR_SETTINGS(host_flavor_default, \ "elf","-fPIC", \ - "lib",".a","lib",".so", \ + "lib",".a","lib",".so",".so","", \ "","","","", \ "LD_LIBRARY_PATH"); SLBT_FLAVOR_SETTINGS(host_flavor_midipix, \ "pe","-fPIC", \ - "lib",".a","lib",".so", \ + "lib",".a","lib",".so",".so","", \ "","","lib",".lib.a", \ "LD_LIBRARY_PATH"); SLBT_FLAVOR_SETTINGS(host_flavor_mingw, \ "pe",0, \ - "lib",".a","lib",".dll", \ + "lib",".a","lib",".dll","",".dll", \ "",".exe","lib",".dll.a", \ "PATH"); SLBT_FLAVOR_SETTINGS(host_flavor_cygwin, \ "pe",0, \ - "lib",".a","lib",".dll", \ + "lib",".a","lib",".dll","",".dll", \ "",".exe","lib",".dll.a", \ "PATH"); SLBT_FLAVOR_SETTINGS(host_flavor_darwin, \ "macho","-fPIC", \ - "lib",".a","lib",".dylib", \ + "lib",".a","lib",".dylib","",".dylib", \ "","","","", \ "DYLD_LIBRARY_PATH");