Common subdirectories: fte\src/bmps and c:\apps\txttools\fte\src/bmps
diff fte\src/con_x11.cpp c:\apps\txttools\fte\src/con_x11.cpp
21c21
< #if defined(AIX)
---
> #if defined(AIX) || defined (XF86OS2)
Only in c:\apps\txttools\fte\src: defcfg.cnf
diff fte\src/defcfg.fte c:\apps\txttools\fte\src/defcfg.fte
461c461
<     item "&\\ Goto Dir\t\\"    { DirGoto }
---
>     item "&: Goto Dir\t\\"    { DirGoto }
Only in c:\apps\txttools\fte\src: defcfg.h
diff fte\src/fte-unix.mak c:\apps\txttools\fte\src/fte-unix.mak
10,14d9
< #TARGETS = xfte
< #TARGETS = xfte qfte
< #TARGETS = xfte vfte
< #TARGETS = xfte vfte qfte mfte
< TARGETS = xfte vfte qfte
16c11,15
< PRIMARY = xfte
---
> TARGETS = xfte$(EXESFX)
> #TARGETS = xfte$(EXESFX) qfte$(EXESFX)
> #TARGETS = xfte$(EXESFX) vfte$(EXESFX)
> #TARGETS = xfte$(EXESFX) vfte$(EXESFX) qfte$(EXESFX) mfte$(EXESFX)
> #TARGETS = xfte$(EXESFX) vfte$(EXESFX) qfte$(EXESFX)
17a17,20
> PRIMARY = xfte$(EXESFX)
> 
> CC = g++
> 
28a32,37
> # OS2 XFree86
> UOS        = -DXF86OS2 -DEMX
> EXESFX     = .exe
> CC         = gcc
> 
> #######################################################################
30,31c39,40
< UOS      = -DLINUX
< XLIBDIR  = -L/usr/X386/lib
---
> #UOS      = -DLINUX
> #XLIBDIR  = -L/usr/X386/lib
62d70
< CC       = g++
88,89c96,97
< all:    cfte $(TARGETS)
< 	rm -f fte ; ln -s $(PRIMARY) fte
---
> all:    cfte$(EXESFX) $(TARGETS)
> #	rm -f fte ; ln -s $(PRIMARY) fte
91,92c99,100
< cfte: cfte.o s_files.o
< 	$(LD) $(LDFLAGS) cfte.o s_files.o -o cfte 
---
> cfte$(EXESFX): cfte.o s_files.o
> 	$(LD) $(LDFLAGS) cfte.o s_files.o -o cfte$(EXESFX)
99c107
< defcfg.cnf: defcfg.fte cfte
---
> defcfg.cnf: defcfg.fte cfte$(EXESFX)
102,103c110,111
< xfte: $(OBJS) $(XOBJS)
< 	$(LD) $(LDFLAGS) $(OBJS) $(XOBJS) $(XLIBS) -o xfte
---
> xfte$(EXESFX): $(OBJS) $(XOBJS)
> 	$(LD) $(LDFLAGS) $(OBJS) $(XOBJS) $(XLIBS) -o xfte$(EXESFX)
105,106c113,114
< qfte: g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
< 	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte
---
> qfte$(EXESFX): g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
> 	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte$(EXESFX)
108,109c116,117
< vfte: $(OBJS) $(VOBJS)
< 	$(LD) $(LDFLAGS) $(OBJS) $(VOBJS) $(VLIBS) -o vfte
---
> vfte$(EXESFX): $(OBJS) $(VOBJS)
> 	$(LD) $(LDFLAGS) $(OBJS) $(VOBJS) $(VLIBS) -o vfte$(EXESFX)
111,112c119,120
< mfte: $(OBJS) $(MOBJS)
< 	$(LD) $(LDFLAGS) $(OBJS) $(MOBJS) $(MLIBS) $(XLIBS) -o mfte
---
> mfte$(EXESFX): $(OBJS) $(MOBJS)
> 	$(LD) $(LDFLAGS) $(OBJS) $(MOBJS) $(MLIBS) $(XLIBS) -o mfte$(EXESFX)
diff fte\src/fte.cpp c:\apps\txttools\fte\src/fte.cpp
219c219
< #if defined(EMX)
---
> #if defined(EMX) && !defined(XF86OS2)
Common subdirectories: fte\src/icons and c:\apps\txttools\fte\src/icons
diff fte\src/s_direct.cpp c:\apps\txttools\fte\src/s_direct.cpp
269c269
< #ifdef UNIX
---
> #if defined(UNIX) && !defined(XF86OS2)
diff fte\src/s_files.cpp c:\apps\txttools\fte\src/s_files.cpp
190a191,203
> #if defined(XF86OS2)
>     Name[0]=0; 
>     if(Path[0]=='~')   // used makefile for unix
>       { char home[MAXPATH] = "";
>         char *ph;
>         ph = getenv("HOME");
>         if (ph) { strcpy(Name, ph);
>                   strcat(Name,SSLASH);
>                 }
>         if(strlen(Path)>2)strcat(Name,Path+2);
>       }
>     else strcpy(Name,Path);
> #else    
191a205
> #endif
diff fte\src/s_files.h c:\apps\txttools\fte\src/s_files.h
15c15
< #ifdef UNIX
---
> #if defined (UNIX) && !defined(XF86OS2)
23c23
< #if defined(OS2) || defined(NT) || defined(DOS) || defined(DOSP32)
---
> #if defined(OS2) || defined(NT) || defined(DOS) || defined(DOSP32) || defined(XF86OS2)
diff fte\src/sysdep.h c:\apps\txttools\fte\src/sysdep.h
32c32,33
<     !defined(SUNOS)
---
>     !defined(SUNOS) &&\
>     !defined(XF86OS2)
47c48
< #    if defined(HPUX) || defined(AIX)
---
> #    if defined(HPUX) || defined(AIX) || defined (XF86OS2)
50,53c51,58
< #    define strnicmp strncasecmp
< #    define stricmp strcasecmp
< #    define filecmp strcmp
< #    define memicmp strncasecmp   // FIX, fails for nulls
---
> #    if defined(XF86OS2)
> #        define filecmp stricmp
> #    else
> #        define strnicmp strncasecmp
> #        define stricmp strcasecmp
> #        define filecmp strcmp
> #        define memicmp strncasecmp   // FIX, fails for nulls
> #    endif
128c133
< #if defined(OS2) || defined(NT) || defined(DOSP32) || defined(DOS)
---
> #if defined(OS2) || defined(NT) || defined(DOSP32) || defined(DOS) || defined (XF86OS2)
