Some more fixes for OS/2.

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index be1d4b0b243059b67c865593273c6e8e414ee199..6a57d44c710a86070450d58105a1aacc8e21da2c 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -119,7 +119,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="BASE_OS2_SRC" hints="files">
 </set>
 
 <set var="BASE_OS2_SRC" hints="files">

+    src/unix/baseunix.cpp

     src/os2/dir.cpp
     src/os2/dir.cpp

+    src/os2/mimetype.cpp
+    src/os2/thread.cpp

     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>


@@ -1375,7 +1378,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/menu.cpp
     src/os2/menuitem.cpp
     src/os2/metafile.cpp
     src/os2/menu.cpp
     src/os2/menuitem.cpp
     src/os2/metafile.cpp

-    src/os2/mimetype.cpp

     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp
     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp


@@ -1397,7 +1399,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/stattext.cpp
     src/os2/tabctrl.cpp
     src/os2/textctrl.cpp
     src/os2/stattext.cpp
     src/os2/tabctrl.cpp
     src/os2/textctrl.cpp

-    src/os2/thread.cpp

     src/os2/timer.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/timer.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp

diff --git a/configure.in b/configure.in
index 24673db5f2f089e948e290757b59113035c6dd8e..73f6894b52a67382c37c3dae7e69c9d1813a39d1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -73,6 +73,7 @@ dnl ------------------------------------------------------------------------
 
 dnl OS (assume Unix)
 USE_UNIX=1
 
 dnl OS (assume Unix)
 USE_UNIX=1

+USE_OS2=0

 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0


@@ -288,12 +289,14 @@ case "${host}" in
 
   *-pc-os2_emx | *-pc-os2-emx )
     AC_DEFINE(__EMX__)
 
   *-pc-os2_emx | *-pc-os2-emx )
     AC_DEFINE(__EMX__)

+    USE_OS2=1

     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
     dnl "c++" wrapper is not always available, so always use plain gcc.
     CXX=gcc
     dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
     LIBS="$LIBS -lstdcpp"
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
     dnl "c++" wrapper is not always available, so always use plain gcc.
     CXX=gcc
     dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
     LIBS="$LIBS -lstdcpp"

+    LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"

     dnl
     dnl Some special code that's automatically added by autoconf-2.57 for OS/2
     dnl and hopefully also by autoconf-2.58 and newer on all other platforms.
     dnl
     dnl Some special code that's automatically added by autoconf-2.57 for OS/2
     dnl and hopefully also by autoconf-2.58 and newer on all other platforms.


@@ -2789,8 +2792,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
     if test "$wxUSE_PM" = 1; then
         TOOLKIT=PM
         GUIDIST=GTK_DIST
     if test "$wxUSE_PM" = 1; then
         TOOLKIT=PM
         GUIDIST=GTK_DIST

-        AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
-        wxUSE_THREADS="no"

     fi
 
     dnl the name of the directory where the files for this toolkit live
     fi
 
     dnl the name of the directory where the files for this toolkit live


@@ -3745,12 +3746,13 @@ dnl flush the cache
 AC_CACHE_SAVE
 
 dnl ---------------------------------------------------------------------------
 AC_CACHE_SAVE
 
 dnl ---------------------------------------------------------------------------

-dnl thread support for Unix (for Win32 see past the next matching "else")
+dnl thread support for Unix (for Win32 and OS/2 see past
+dnl                          the next matching "else")

 dnl ---------------------------------------------------------------------------
 
 dnl under MSW (except mingw32) we always have thread support
 CPP_MT_FLAG=
 dnl ---------------------------------------------------------------------------
 
 dnl under MSW (except mingw32) we always have thread support
 CPP_MT_FLAG=

-if test "$TOOLKIT" != "MSW"; then
+if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then

 
     dnl the code below:
     dnl
 
     dnl the code below:
     dnl


@@ -4071,6 +4073,11 @@ else
                 CFLAGS="$CFLAGS_OLD"
             fi
         ;;
                 CFLAGS="$CFLAGS_OLD"
             fi
         ;;

+        *-pc-os2*emx )
+            CFLAGS="$CFLAGS -Zmt"
+            CXXFLAGS="$CXXFLAGS -Zmt"
+            LDFLAGS="$LDFLAGS -Zmt"
+        ;;

       esac
     fi
 fi
       esac
     fi
 fi