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

Applied a few OS/2 patches for wxGTK.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-06 19:39:09 +00:00
parent 74d38ad8e2
commit 9f2d09aad2
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/gtk/install.txt
View File

@@ -151,11 +151,11 @@ START-UP! Just always use egcs and be happy.
Please send comments and question about the OS/2 installation Please send comments and question about the OS/2 installation
to Andrea Venturoli <a.ventu@flashnet.it> and patches to to Andrea Venturoli <a.ventu@flashnet.it> and patches to
make the installation work (better) to me (Robert Roebling). make to me (Robert Roebling) or the wxWindows mailing list.
You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3), You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer),
gtk+ (?), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), GTK+ (1.2.1 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8),
korn shell (5.2.13), Autoconf (?), GNU file utilities (3.6), korn shell (5.2.13), Autoconf (2.13), GNU file utilities (3.6),
GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4),
sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1). sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
@@ -163,11 +163,17 @@ Open an OS/2 prompt and switch to the directory above.
First set some global environment variables we need: First set some global environment variables we need:
SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__ SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__
SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__
SET OSTYPE=OS2X SET OSTYPE=OS2X
SET COMSPEC=sh SET COMSPEC=sh
Notice you can choose whatever you want, if you don't like OS2X. Notice you can choose whatever you want, if you don't like OS2X.
After running configure, you'll have to apply to modifications manually
to the created Makefile:
- Replace all ":" with ";" in the VPATH variable
- Replace "ley.yy.c" with "lexyy.c"
* Building wxGTK on SGI * Building wxGTK on SGI
-------------------------- --------------------------

10
src/generic/filedlgg.cpp
View File

@@ -109,15 +109,21 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
struct stat buff; struct stat buff;
stat( m_fileName.fn_str(), &buff ); stat( m_fileName.fn_str(), &buff );
#ifndef __EMX__
struct stat lbuff; struct stat lbuff;
lstat( m_fileName.fn_str(), &lbuff ); lstat( m_fileName.fn_str(), &lbuff );
m_isLink = S_ISLNK( lbuff.st_mode );
struct tm *t = localtime( &lbuff.st_mtime ); struct tm *t = localtime( &lbuff.st_mtime );
#else
m_isLink = FALSE;
struct tm *t = localtime( &buff.st_mtime );
#endif
// struct passwd *user = getpwuid( buff.st_uid ); // struct passwd *user = getpwuid( buff.st_uid );
// struct group *grp = getgrgid( buff.st_gid ); // struct group *grp = getgrgid( buff.st_gid );
m_isDir = S_ISDIR( buff.st_mode ); m_isDir = S_ISDIR( buff.st_mode );
m_isLink = S_ISLNK( lbuff.st_mode );
m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR ); m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
m_size = buff.st_size; m_size = buff.st_size;

2
src/unix/utilsunx.cpp
View File

@@ -64,7 +64,7 @@
#ifdef __SUN__ #ifdef __SUN__
int usleep(unsigned int usec); int usleep(unsigned int usec);
#else // !Sun #else // !Sun
#ifdef __EMX #ifdef __EMX__
/* I copied this from the XFree86 diffs. AV. */ /* I copied this from the XFree86 diffs. AV. */
#define INCL_DOSPROCESS #define INCL_DOSPROCESS
#include <os2.h> #include <os2.h>