Brown paper bag fix to -lwx.dll in wx-config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
2
configure
vendored
2
configure
vendored
@@ -11905,7 +11905,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
|
|||||||
|
|
||||||
WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
|
WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
|
||||||
|
|
||||||
WXCONFIG_LIBS="-l${WX_LIBRARY_NAME_SHARED}"
|
WXCONFIG_LIBS="${WXCONFIG_LIBS}.${SO_SUFFIX}"
|
||||||
|
|
||||||
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
|
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
|
||||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
|
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
|
||||||
|
@@ -2515,7 +2515,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
|||||||
dnl FIXME: this is a hack.. do we need a --static flag to wx-config?
|
dnl FIXME: this is a hack.. do we need a --static flag to wx-config?
|
||||||
dnl or is this just plain wrong?
|
dnl or is this just plain wrong?
|
||||||
dnl This is NOT compatible with both static and dynamic linking
|
dnl This is NOT compatible with both static and dynamic linking
|
||||||
WXCONFIG_LIBS="-l${WX_LIBRARY_NAME_SHARED}"
|
WXCONFIG_LIBS="${WXCONFIG_LIBS}.${SO_SUFFIX}"
|
||||||
|
|
||||||
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
|
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
|
||||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
|
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
|
||||||
|
Reference in New Issue
Block a user