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

Somewhat cleaned up handling of OMF mode for OS/2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2005-03-27 13:03:46 +00:00
parent 6ecd355e0f
commit f47af52bb4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure.in
View File

@@ -840,6 +840,7 @@ WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wx
WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG)
WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL) WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL)
if test "$USE_OS2" = "1"; then if test "$USE_OS2" = "1"; then
DEFAULT_wxUSE_OMF=no
WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF) WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF)
fi fi
@@ -1561,7 +1562,7 @@ case "${host}" in
dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1 dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1
dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5 dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5
dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6. dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6.
AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[ AC_CACHE_CHECK([for gcc/libc version], wx_cv_gccversion,[
AC_TRY_RUN( AC_TRY_RUN(
dnl Check the gcc version macro. dnl Check the gcc version macro.
[ [
@@ -1607,9 +1608,6 @@ case "${host}" in
wxUSE_OMF=yes wxUSE_OMF=yes
enable_omf=yes enable_omf=yes
fi fi
if test "$wxUSE_OMF" = "yes"; then
LDFLAGS="$LDFLAGS -Zomf -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
fi
dnl (end of OS/2-only piece) dnl (end of OS/2-only piece)
;; ;;
*) *)
@@ -6548,6 +6546,15 @@ else
EXE_LINKER="$CXX -o" EXE_LINKER="$CXX -o"
fi fi
if test "$wxUSE_OMF" = "yes"; then
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
LDFLAGS="$LDFLAGS -Zlinker /EXEPACK"
LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
;;
esac
fi
dnl According to Vaclav, if NO_GCC_PRAGMA is used for any reason it needs to dnl According to Vaclav, if NO_GCC_PRAGMA is used for any reason it needs to
dnl be in wx-config output. Not doing so could result in link problems. dnl be in wx-config output. Not doing so could result in link problems.