diff options
author | Yann Diorcet <diorcet.yann@gmail.com> | 2012-11-14 13:05:49 (GMT) |
---|---|---|
committer | Yann Diorcet <diorcet.yann@gmail.com> | 2012-11-14 13:05:49 (GMT) |
commit | 3d01e9f2752cd97285d7effdf548f1ea7ec8feb8 (patch) | |
tree | 6d964e1c73e32b55c2a23f53b7088606728711ec /config/libc | |
parent | 79a9f857e2fe6df6be889963dd504b84b1a3ea1a (diff) |
libc/mingw: replace mingw32 with generic mingw
Replace the 32-bit-only mingw32 with mingw-w64 that is capable
of building toolchains for both 32-bit and 64-bit Windows.
kernel/mingw: replace mingw32 with generic Windows
kernel/windows: New windows kernel supporting 32 and 64 bit arch
libc/mingw: Remove old options
patches: Remove old mingw libc options' patches
Signed-off-by: "Yann Diorcet" <diorcet.yann@gmail.com>
[yann.morin.1998@free.fr: array var in libc/mingw.sh, typos]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <b045ac08fc9eac2e5ee3.1352898499@blackmint>
Patchwork-Id: 198901
Diffstat (limited to 'config/libc')
-rw-r--r-- | config/libc/eglibc.in | 2 | ||||
-rw-r--r-- | config/libc/glibc.in | 2 | ||||
-rw-r--r-- | config/libc/mingw.in | 25 | ||||
-rw-r--r-- | config/libc/mingw.in.2 | 72 | ||||
-rw-r--r-- | config/libc/uClibc.in | 2 |
5 files changed, 19 insertions, 84 deletions
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index d44c236..586b234 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -1,6 +1,6 @@ # eglibc options -## depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU +## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU ## ## select LIBC_SUPPORT_NPTL ## select LIBC_SUPPORT_LINUXTHREADS diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 0cf6287..e65c22b 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -1,6 +1,6 @@ # glibc options -## depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU +## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU ## ## select LIBC_SUPPORT_NPTL ## diff --git a/config/libc/mingw.in b/config/libc/mingw.in index c2b10e4..fddf1ed 100644 --- a/config/libc/mingw.in +++ b/config/libc/mingw.in @@ -1,6 +1,6 @@ # mingw options -## depends on MINGW32 +## depends on WINDOWS ## ## select LIBC_SUPPORT_WIN32THREADS ## @@ -8,26 +8,33 @@ choice bool - prompt "Mingw runtime version" + prompt "Windows API version" # Don't remove next line # CT_INSERT_VERSION_BELOW -config MINGWRT_V_3_18 +config WINAPI_V_2_0_7 bool - prompt "3.18" + prompt "2.0.7" -config MINGWRT_V_select +config WINAPI_V_select bool prompt "Other version" endchoice -config MINGWRT_VERSION +config WINAPI_VERSION string - prompt "Mingw runtime version" if MINGWRT_V_select + prompt "Windows API version" if WINAPI_V_select # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "3.18" if MINGWRT_V_3_18 + default "2.0.7" if WINAPI_V_2_0_7 help - Enter the version number of the mingw runtime files to use + Enter the version number of the Windows API files to use +config MINGW_DIRECTX + bool + prompt "Include DirectX development files" + +config MINGW_DDK + bool + prompt "Include DDK development files" diff --git a/config/libc/mingw.in.2 b/config/libc/mingw.in.2 deleted file mode 100644 index e77c21b..0000000 --- a/config/libc/mingw.in.2 +++ /dev/null @@ -1,72 +0,0 @@ -# Part-2 of mingw C library options: development libraries - -config MINGW_DIRECTX - bool - prompt "Include DirectX development files" - -config MINGW_OPENGL - bool - prompt "Include OpenGL development files" - -config MINGW_PDCURSES - bool - prompt "Include PDCurses (NCurses library) development files" - -choice - bool - prompt "PDCurses library version" - depends on MINGW_PDCURSES - -config MINGW_PDCURSES_V_3_4 - bool - prompt "3.4" - -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! - -config MINGW_PDCURSES_V_select - bool - prompt "Other version" - -endchoice - -config MINGW_PDCURSES_VERSION - string - prompt "PDCurses library version" if MINGW_PDCURSES_V_select - default "3.4" if MINGW_PDCURSES_V_3_4 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! - help - Enter the version number of the PDCurses library to use - -config MINGW_GNURX - bool - prompt "Include GnuRX (regex library) development files" - -choice - bool - prompt "GnuRX library version" - depends on MINGW_GNURX - -config MINGW_GNURX_V_2_5_1 - bool - prompt "2.5.1" - -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! - -config MINGW_GNURX_V_select - bool - prompt "Other version" - -endchoice - -config MINGW_GNURX_VERSION - string - prompt "GnuRX library version" if MINGW_GNURX_V_select - default "2.5.1" if MINGW_GNURX_V_2_5_1 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! - help - Enter the version number of the Regex library to use - diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index fc99e27..dec99d1 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -1,6 +1,6 @@ # uClibc options -## depends on ! MINGW32 && ! BARE_METAL +## depends on ! WINDOWS && ! BARE_METAL ## ## select LIBC_SUPPORT_LINUXTHREADS ## select LIBC_SUPPORT_THREADS_NONE |