diff options
| author | lloyd <[email protected]> | 2008-09-30 13:53:30 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-09-30 13:53:30 +0000 |
| commit | 874f70a26ee716b139feabe1e36ecfcd96dc2c40 (patch) | |
| tree | ad808849e577a767f0c9d33ec7c08b67da9e2bb4 | |
| parent | 66869d7e0fcaf120f5c22eee43277fabd00e94fd (diff) | |
| parent | 7ca3d4e4a8289600d66aafc5d8f746cde0b47beb (diff) | |
propagate from branch 'net.randombit.botan' (head fd327b29aa542e0ad5ff6d37d8392321670f0369)
to branch 'net.randombit.botan.modularized' (head 3f8d05493d4b192243fdc8a7f518ed1013c3be54)
| -rwxr-xr-x | configure.pl | 1 | ||||
| -rw-r--r-- | src/build-data/os/mingw | 22 | ||||
| -rw-r--r-- | src/entropy/win32_stats/info.txt | 1 | ||||
| -rw-r--r-- | src/utils/mutex/win32_crit_section/info.txt | 1 | ||||
| -rw-r--r-- | src/utils/timer/win32_query_perf_ctr/info.txt | 1 |
5 files changed, 26 insertions, 0 deletions
diff --git a/configure.pl b/configure.pl index 16b233fba..c99c81a98 100755 --- a/configure.pl +++ b/configure.pl @@ -1941,6 +1941,7 @@ sub guess_cpu_from_this my $cpu = ''; $cpu = 'ia32' if($cpuinfo =~ /x86/); + $cpu = 'ia32' if($cpuinfo =~ /i686/); $cpu = 'amd64' if($cpuinfo =~ /x86-64/); $cpu = 'amd64' if($cpuinfo =~ /x86_64/); diff --git a/src/build-data/os/mingw b/src/build-data/os/mingw new file mode 100644 index 000000000..8c41fbc21 --- /dev/null +++ b/src/build-data/os/mingw @@ -0,0 +1,22 @@ +realname "MS Windows (MinGW)" +os_type windows + +obj_suffix o +so_suffix dll +static_suffix a + +ar_command "ar crs" +ar_needs_ranlib yes + +install_root /mingw +header_dir include +lib_dir lib +doc_dir share/doc + +install_cmd_data install -m 644 +install_cmd_exec install -m 755 + +<aliases> +msys +mingw32 +</aliases> diff --git a/src/entropy/win32_stats/info.txt b/src/entropy/win32_stats/info.txt index 6be850561..957d93772 100644 --- a/src/entropy/win32_stats/info.txt +++ b/src/entropy/win32_stats/info.txt @@ -20,6 +20,7 @@ buf_es <os> windows cygwin +mingw </os> <libs> diff --git a/src/utils/mutex/win32_crit_section/info.txt b/src/utils/mutex/win32_crit_section/info.txt index d235ff73c..a2d339c3b 100644 --- a/src/utils/mutex/win32_crit_section/info.txt +++ b/src/utils/mutex/win32_crit_section/info.txt @@ -13,4 +13,5 @@ mux_win32.h <os> cygwin windows +mingw </os> diff --git a/src/utils/timer/win32_query_perf_ctr/info.txt b/src/utils/timer/win32_query_perf_ctr/info.txt index e956f99c5..5ac05da95 100644 --- a/src/utils/timer/win32_query_perf_ctr/info.txt +++ b/src/utils/timer/win32_query_perf_ctr/info.txt @@ -13,6 +13,7 @@ tm_win32.h <os> cygwin windows +mingw </os> <libs> |