diff options
author | lloyd <[email protected]> | 2008-09-30 13:53:24 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2008-09-30 13:53:24 +0000 |
commit | 7ca3d4e4a8289600d66aafc5d8f746cde0b47beb (patch) | |
tree | 62db1489fe223bfcc70809188b3819ed2c137501 | |
parent | ed51fe5c3d095d307c3ace5c2f3ef37bd1ac80dd (diff) |
Better support for MinGW/MSYS, sent by Zbigniew Zagorski
-rwxr-xr-x | configure.pl | 1 | ||||
-rw-r--r-- | misc/config/os/mingw | 22 | ||||
-rw-r--r-- | modules/es_win32/modinfo.txt | 1 | ||||
-rw-r--r-- | modules/ml_win32/modinfo.txt | 1 | ||||
-rw-r--r-- | modules/mux_win32/modinfo.txt | 1 | ||||
-rw-r--r-- | modules/tm_win32/modinfo.txt | 1 |
6 files changed, 27 insertions, 0 deletions
diff --git a/configure.pl b/configure.pl index a80927a25..a8f0b9d41 100755 --- a/configure.pl +++ b/configure.pl @@ -1800,6 +1800,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/misc/config/os/mingw b/misc/config/os/mingw new file mode 100644 index 000000000..8c41fbc21 --- /dev/null +++ b/misc/config/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/modules/es_win32/modinfo.txt b/modules/es_win32/modinfo.txt index 931760979..825765539 100644 --- a/modules/es_win32/modinfo.txt +++ b/modules/es_win32/modinfo.txt @@ -16,6 +16,7 @@ es_win32.cpp <os> windows cygwin +mingw </os> <libs> diff --git a/modules/ml_win32/modinfo.txt b/modules/ml_win32/modinfo.txt index 92936e1de..6cf14861d 100644 --- a/modules/ml_win32/modinfo.txt +++ b/modules/ml_win32/modinfo.txt @@ -9,4 +9,5 @@ mlock.cpp <os> windows cygwin +mingw </os> diff --git a/modules/mux_win32/modinfo.txt b/modules/mux_win32/modinfo.txt index d235ff73c..a2d339c3b 100644 --- a/modules/mux_win32/modinfo.txt +++ b/modules/mux_win32/modinfo.txt @@ -13,4 +13,5 @@ mux_win32.h <os> cygwin windows +mingw </os> diff --git a/modules/tm_win32/modinfo.txt b/modules/tm_win32/modinfo.txt index 74c4a59ea..e325c74cc 100644 --- a/modules/tm_win32/modinfo.txt +++ b/modules/tm_win32/modinfo.txt @@ -13,6 +13,7 @@ tm_win32.h <os> cygwin windows +mingw </os> <libs> |