Added OMF support for OS/2 (no support for DLLs, yet).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 90360b5c6c2f9f72bd17922938fc394524c05d32..14a946b7a9c7e84ad908d95710e2c22ef3bc1d4e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -799,6 +799,7 @@ WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code
 WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 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(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
 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(omf,         [  --enable-omf            use OMF object format on OS/2], wxUSE_OMF)

 
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes
 
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes


@@ -1141,6 +1142,14 @@ dnl Path separator; ':' for unix, ';' for OS/2
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
     PATH_IFS=';'
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
     PATH_IFS=';'

+    dnl Handle OMF support
+    if test "$wxUSE_OMF" = "yes"; then
+      AR=emxomfar
+      RANLIB=:
+      LDFLAGS="-Zomf $LDFLAGS"
+      CFLAGS="-Zomf $CFLAGS"
+      CXXFLAGS="-Zomf $CXXFLAGS"
+    fi

   ;;
   *)
     PATH_IFS=':'
   ;;
   *)
     PATH_IFS=':'


@@ -1536,6 +1545,9 @@ case "${host}" in
               LIBS="$LIBS -lstdc++"
           fi
       fi
               LIBS="$LIBS -lstdc++"
           fi
       fi

+      if test "$wxUSE_OMF" = "yes"; then
+        LDFLAGS="$LDFLAGS -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
+      fi

       dnl (end of OS/2-only piece)
   ;;
   *)
       dnl (end of OS/2-only piece)
   ;;
   *)