diff options
| author | lloyd <[email protected]> | 2009-07-02 22:01:42 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-07-02 22:01:42 +0000 |
| commit | 7ef474d208dabd01a7b3237bed54a3074c44a2cd (patch) | |
| tree | b1fdbec4bcb08bb31d22c238ef4476662428fa20 /src | |
| parent | 90dfb3ea86a76491bd7137d111e10a091ec00267 (diff) | |
| parent | 1163077648f0ee5719aebf9b1d73c552ada2aab3 (diff) | |
propagate from branch 'net.randombit.botan' (head db0cdfa10718d2065e52b6753d1d671b71cb423d)
to branch 'net.randombit.botan.python-configure' (head f106b1e4c7361a0fee6856defb01a9f96a2fd4eb)
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/buildh.in | 10 | ||||
| -rw-r--r-- | src/entropy/cryptoapi_rng/info.txt | 2 | ||||
| -rw-r--r-- | src/entropy/win32_stats/info.txt | 2 | ||||
| -rw-r--r-- | src/math/bigint/mulop_amd64/info.txt | 2 | ||||
| -rw-r--r-- | src/stream/salsa20/info.txt | 4 | ||||
| -rw-r--r-- | src/stream/turing/info.txt | 4 | ||||
| -rw-r--r-- | src/stream/wid_wake/info.txt | 4 | ||||
| -rw-r--r-- | src/timer/win32_query_perf_ctr/info.txt | 2 |
8 files changed, 25 insertions, 5 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in index 496826d91..e4ab0f44b 100644 --- a/src/build-data/buildh.in +++ b/src/build-data/buildh.in @@ -37,8 +37,16 @@ #endif /* Target identification and feature test macros */ +%{target_os_defines} -%{defines} +%{target_cpu_defines} + +%{target_compiler_defines} + +/* Module definitions */ +%{module_defines} + +/* Local configuration options */ %{local_config} /* 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/math/bigint/mulop_amd64/info.txt b/src/math/bigint/mulop_amd64/info.txt index 670780d9c..0960ac4d6 100644 --- a/src/math/bigint/mulop_amd64/info.txt +++ b/src/math/bigint/mulop_amd64/info.txt @@ -2,7 +2,7 @@ realname "BigInt Multiply-Add (x86-64)" mp_bits 64 -load_on dep +load_on request <add> mp_mulop_amd64.S diff --git a/src/stream/salsa20/info.txt b/src/stream/salsa20/info.txt index de1683643..db938307b 100644 --- a/src/stream/salsa20/info.txt +++ b/src/stream/salsa20/info.txt @@ -4,6 +4,10 @@ define SALSA20 load_on auto +<requires> +stream +</requires> + <add> salsa20.cpp salsa20.h diff --git a/src/stream/turing/info.txt b/src/stream/turing/info.txt index 95ae2cf48..c251a0a30 100644 --- a/src/stream/turing/info.txt +++ b/src/stream/turing/info.txt @@ -4,6 +4,10 @@ define TURING load_on auto +<requires> +stream +</requires> + <add> tur_tab.cpp turing.cpp diff --git a/src/stream/wid_wake/info.txt b/src/stream/wid_wake/info.txt index 299ebfdd7..94416417e 100644 --- a/src/stream/wid_wake/info.txt +++ b/src/stream/wid_wake/info.txt @@ -4,6 +4,10 @@ define WID_WAKE load_on auto +<requires> +stream +</requires> + <add> wid_wake.cpp wid_wake.h 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> |