Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added missing bits for static _gl lib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2000-03-26 17:24:58 +00:00
parent fdbd6b7d7c
commit de69e5b8fb
2 changed files with 343 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

655
configure vendored
View File

File diff suppressed because it is too large Load Diff

22
configure.in
View File

@@ -2007,6 +2007,7 @@ if test "$wxUSE_SHARED" = "yes"; then
WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl" WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl"
if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}" WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
else else
WX_ALL="${WX_LIBRARY_NAME_SHARED}" WX_ALL="${WX_LIBRARY_NAME_SHARED}"
@@ -2098,13 +2099,23 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl only static for now dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}" if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
else
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
fi
;; ;;
*-*-mingw32* ) *-*-mingw32* )
dnl only static for now dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}" if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
else
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
fi
;; ;;
*-pc-os2_emx ) *-pc-os2_emx )
dnl only static for now dnl only static for now
@@ -2134,7 +2145,12 @@ else
dnl set target to static dnl set target to static
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}" if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
else
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
fi
WX_TARGET_LIBRARY_TYPE="a" WX_TARGET_LIBRARY_TYPE="a"
fi fi