diff options
| author | lloyd <[email protected]> | 2009-07-02 21:59:49 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-07-02 21:59:49 +0000 |
| commit | 1163077648f0ee5719aebf9b1d73c552ada2aab3 (patch) | |
| tree | a0f68d06d368bbad5a5cc9f2dc75862c2a120b48 | |
| parent | 8de767ca1c8b36a4c0f942fbb2fd4c6d6fd520ce (diff) | |
Minor hackery to deal with win32 library dependencies
| -rwxr-xr-x | configure.pl | 5 | ||||
| -rwxr-xr-x | configure.py | 4 | ||||
| -rw-r--r-- | src/entropy/cryptoapi_rng/info.txt | 2 | ||||
| -rw-r--r-- | src/entropy/win32_stats/info.txt | 2 | ||||
| -rw-r--r-- | src/timer/win32_query_perf_ctr/info.txt | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/configure.pl b/configure.pl index 73344b182..00c88913f 100755 --- a/configure.pl +++ b/configure.pl @@ -1673,7 +1673,7 @@ sub get_module_info { read_list($_, $reader, 'libs', sub { my $line = $_[0]; - $line =~ m/^([\w!,]*) -> ([\w,-]*)$/; + $line =~ m/^([\w!,]*) -> ([\w.,-]*)$/; $info{'libs'}{$1} = $2; }); @@ -2097,8 +2097,7 @@ sub generate_makefile { add_to($config, { 'shared' => 'no', - 'link_to' => libs('', '.'.$$config{'static_suffix'}, - @{$$config{'mod_libs'}}), + 'link_to' => libs('', '', '', @{$$config{'mod_libs'}}), }); } diff --git a/configure.py b/configure.py index c27950d75..4d77d8042 100755 --- a/configure.py +++ b/configure.py @@ -407,8 +407,8 @@ class CompilerInfo(object): return ['USE_STD_TR1'] elif self.compiler_has_tr1: return ['USE_STD_TR1'] - else: - return [] + + return [] class OsInfo(object): def __init__(self, infofile): diff --git a/src/entropy/cryptoapi_rng/info.txt b/src/entropy/cryptoapi_rng/info.txt index 40104664b..643c67d2e 100644 --- a/src/entropy/cryptoapi_rng/info.txt +++ b/src/entropy/cryptoapi_rng/info.txt @@ -17,5 +17,5 @@ cygwin </os> <libs> -windows -> advapi32 +windows -> advapi32.lib </libs> diff --git a/src/entropy/win32_stats/info.txt b/src/entropy/win32_stats/info.txt index 825765539..ca7100923 100644 --- a/src/entropy/win32_stats/info.txt +++ b/src/entropy/win32_stats/info.txt @@ -20,5 +20,5 @@ mingw </os> <libs> -windows -> user32 +windows -> user32.lib </libs> diff --git a/src/timer/win32_query_perf_ctr/info.txt b/src/timer/win32_query_perf_ctr/info.txt index e74259184..4bb1ddb34 100644 --- a/src/timer/win32_query_perf_ctr/info.txt +++ b/src/timer/win32_query_perf_ctr/info.txt @@ -17,7 +17,7 @@ mingw </os> <libs> -windows -> user32 +windows -> user32.lib </libs> <requires> |