don't use win-like names on mingw/cygwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
496d012a89
commit
ec67c47431
14
configure
vendored
14
configure
vendored
@ -24588,18 +24588,8 @@ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
|
||||
|
||||
|
||||
if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then
|
||||
WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
else
|
||||
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
fi
|
||||
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
;;
|
||||
|
||||
*-*-darwin* )
|
||||
|
18
configure.in
18
configure.in
@ -2915,22 +2915,8 @@ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
|
||||
dnl If we are cross compiling we want to use the 'full' unix type name for the
|
||||
dnl lib, but for a native install use the windows style naming convention.
|
||||
dnl (excepting again that we strip the ELF style version numbers off it).
|
||||
|
||||
dnl FIXME: is this GL stuff actually even used for wxMSW? should it be??
|
||||
|
||||
if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then
|
||||
WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
else
|
||||
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
fi
|
||||
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
;;
|
||||
|
||||
*-*-darwin* )
|
||||
|
Loading…
Reference in New Issue
Block a user