Added tmake template for simple wxGTK makefile

  Updated filelist.t for wxGTK
  Compile fixes for MingGW32

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

diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t
index fa697af5e48778fba05755cb8a800792319864ec..3ad997b8e7eec1f3dc1c06b870caf2176e452bab 100644 (file)
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -39,6 +39,12 @@
             $wxGeneric{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "M" ) {
             $wxMSW{$fields[0]} = $fields[2];
             $wxGeneric{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "M" ) {
             $wxMSW{$fields[0]} = $fields[2];

+        } elsif ( $fields[1] eq "R" ) {
+            $wxGTK{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "H" ) {
+            $wxHTML{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "U" ) {
+            $wxUNIX{$fields[0]} = $fields[2];

         } else {
             warn "Unknown file type $fields[1] for $fields[0], ignoring.\n";
             next line;
         } else {
             warn "Unknown file type $fields[1] for $fields[0], ignoring.\n";
             next line;

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 46b0bed554bdf596e631ff384a84b6651f490b99..5c0c4d48cef8099f9e9790ebf20626c951df4d2c 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -6,9 +6,17 @@
 # Version: $Id$
 #
 # Format of this file: TAB separated columns. The first column contains the
 # Version: $Id$
 #
 # Format of this file: TAB separated columns. The first column contains the

-# filename, the second 'G', 'C' or 'M' for generic/common/msw files. Flags
-# column may be empty or contain some additional info about this file (only
-# compile it in 16bit mode, don't compile it with this or that compiler, &c)
+# filename, the second a letter corresonding a directory:
+#  G   /src/generic 
+#  C   /src/common
+#  M   /src/msw
+#  U   /src/unix
+#  R   /src/gtk
+#  H   /src/html
+#
+# The third column may be empty or contain some additional info about this 
+# file (only compile it in 16bit mode, don't compile it with this or that 
+# compiler, &c)

 #
 # Known flags:
 #  16  a generic file implementing Win32 control for Win16
 #
 # Known flags:
 #  16  a generic file implementing Win32 control for Win16


@@ -18,23 +26,25 @@
 #  U   Unix-ish file, normally not compiled under Windows
 #  O   OLE file (needs Win32 and a decent compiler)
 #  S   Socket file (currently doesn't compile under Win16 nor with GNU)
 #  U   Unix-ish file, normally not compiled under Windows
 #  O   OLE file (needs Win32 and a decent compiler)
 #  S   Socket file (currently doesn't compile under Win16 nor with GNU)

+#  R   Not required for the GTK port

 ###############################################################################
 
 # File name    Type    Flags
 
 busyinfo.cpp   G
 ###############################################################################
 
 # File name    Type    Flags
 
 busyinfo.cpp   G

-choicdgg.cpp   G
+caret.cpp      G       U
+choicdgg.cpp   G       R

 colrdlgg.cpp   G       G
 dirdlgg.cpp    G       16
 extdlgg.cpp    G
 fontdlgg.cpp   G       G
 gridg.cpp      G
 colrdlgg.cpp   G       G
 dirdlgg.cpp    G       16
 extdlgg.cpp    G
 fontdlgg.cpp   G       G
 gridg.cpp      G

-helpxlp.cpp    G       G
+helpxlp.cpp    G       G,R

 imaglist.cpp   G       16
 laywin.cpp     G
 listctrl.cpp   G       16
 imaglist.cpp   G       16
 laywin.cpp     G
 listctrl.cpp   G       16

-msgdlgg.cpp    G       G
-notebook.cpp   G       16
+msgdlgg.cpp    G       G,R
+notebook.cpp   G       16,R

 panelg.cpp     G
 printps.cpp    G       PS
 prntdlgg.cpp   G       PS,U
 panelg.cpp     G
 printps.cpp    G       PS
 prntdlgg.cpp   G       PS,U


@@ -46,16 +56,16 @@ sashwin.cpp G
 scrolwin.cpp   G
 splitter.cpp   G
 statusbr.cpp   G
 scrolwin.cpp   G
 splitter.cpp   G
 statusbr.cpp   G

-tabg.cpp       G
+tabg.cpp       G       R

 numdlgg.cpp    G
 numdlgg.cpp    G

-textdlgg.cpp   G
+textdlgg.cpp   G       R

 tipdlg.cpp     G
 treectrl.cpp   G       16
 
 tipdlg.cpp     G
 treectrl.cpp   G       16
 

-choiccmn.cpp   C
+choiccmn.cpp   C       R

 cmndata.cpp    C
 config.cpp     C
 cmndata.cpp    C
 config.cpp     C

-ctrlcmn.cpp    C
+ctrlcmn.cpp    C       R

 date.cpp       C
 datstrm.cpp    C
 db.cpp C
 date.cpp       C
 datstrm.cpp    C
 db.cpp C


@@ -97,7 +107,7 @@ module.cpp   C
 mstream.cpp    C
 object.cpp     C
 objstrm.cpp    C
 mstream.cpp    C
 object.cpp     C
 objstrm.cpp    C

-odbc.cpp       C
+odbc.cpp       C       R

 paper.cpp      C
 prntbase.cpp   C
 process.cpp    C       32
 paper.cpp      C
 prntbase.cpp   C
 process.cpp    C       32


@@ -227,4 +237,87 @@ wave.cpp   M
 window.cpp     M
 xpmhand.cpp    M
 
 window.cpp     M
 xpmhand.cpp    M
 

+threadpsx.cpp  U
+utilsunx.cpp   U
+gsocket.c      U
+
+gsockgtk.c     R
+win_gtk.c      R
+accel.cpp      R
+app.cpp        R
+bitmap.cpp     R
+bmpbuttn.cpp   R
+brush.cpp      R
+button.cpp     R
+checkbox.cpp   R
+checklst.cpp   R
+choice.cpp     R
+choicdlg.cpp   R
+clipbrd.cpp    R
+colour.cpp     R
+combobox.cpp   R
+control.cpp    R
+cursor.cpp     R
+data.cpp       R
+dataobj.cpp    R
+dc.cpp R
+dcclient.cpp   R
+dcmemory.cpp   R
+dcscreen.cpp   R
+dialog.cpp     R
+dnd.cpp        R
+filedlg.cpp    R
+font.cpp       R
+frame.cpp      R
+gauge.cpp      R
+gdiobj.cpp     R
+icon.cpp       R
+listbox.cpp    R
+main.cpp       R
+mdi.cpp        R
+menu.cpp       R
+minifram.cpp   R
+msgdlg.cpp     R
+notebook.cpp   R
+palette.cpp    R
+pen.cpp        R
+radiobox.cpp   R
+radiobut.cpp   R
+region.cpp     R
+scrolbar.cpp   R
+settings.cpp   R
+slider.cpp     R
+spinbutt.cpp   R
+statbmp.cpp    R
+statbox.cpp    R
+statline.cpp   R
+stattext.cpp   R
+tbargtk.cpp    R
+textctrl.cpp   R
+textdlg.cpp    R
+timer.cpp      R
+tooltip.cpp    R
+utilsgtk.cpp   R
+utilsres.cpp   R
+wave.cpp       R
+window.cpp     R
+
+htmlcell.cpp   H
+htmlfilter.cpp H
+htmlhelp.cpp   H
+htmlhelp_io.cpp        H
+htmlparser.cpp H
+htmltag.cpp    H
+htmlwin.cpp    H
+htmlwinparser.cpp      H
+mod_fonts.cpp  H
+mod_hline.cpp  H
+mod_image.cpp  H
+mod_layout.cpp H
+mod_links.cpp  H
+mod_list.cpp   H
+mod_pre.cpp    H
+mod_tables.cpp H
+search.cpp     H
+

 # vi: set noet ts=16 nolist:
 # vi: set noet ts=16 nolist:

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index af071b17ccb973be000f5098e7336ed753a9220f..821ca60f88edfedd4c49b8a6d7adaaa293fe1404 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -43,10 +43,9 @@
         next if $file =~ /^dirdlg\./;
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
         next if $file =~ /^dirdlg\./;
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;

-        $project{"WXMSWOBJS"} .= $file . " "
+        $project{"WXMSWOBJS"} .= '$(MSWDIR)/' . $file . " "

     }
 #$}
     }
 #$}

-

 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 


@@ -74,6 +73,7 @@ EXTRAOBJS=
 
 GENDIR  = $(WXDIR)/src/generic
 COMMDIR = $(WXDIR)/src/common
 
 GENDIR  = $(WXDIR)/src/generic
 COMMDIR = $(WXDIR)/src/common

+HTMLDIR = $(WXDIR)/src/html

 XPMDIR  = $(WXDIR)/src/xpm
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
 XPMDIR  = $(WXDIR)/src/xpm
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg


@@ -90,6 +90,9 @@ COMMONOBJS  = \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
                #$ ExpandList("WXCOMMONOBJS");
 
                $(COMMDIR)/y_tab.$(OBJSUFF) \
                #$ ExpandList("WXCOMMONOBJS");
 

+HTMLOBJS = \
+                #$ ExpandList("WXHTMLOBJS");
+

 MSWOBJS     = \
                #$ ExpandList("WXMSWOBJS");
 
 MSWOBJS     = \
                #$ ExpandList("WXMSWOBJS");
 


@@ -187,7 +190,7 @@ XPMOBJECTS =        $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 

-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) \
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \

          $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)
          $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)


@@ -244,6 +247,7 @@ clean:
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o
        -erase ..\generic\*.o
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o
        -erase ..\generic\*.o

+       -erase ..\html\*.o

        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o
        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o

diff --git a/distrib/msw/tmake/gtk_gnu.t b/distrib/msw/tmake/gtk_gnu.t
new file mode 100644 (file)
index 0000000..76b5629
--- /dev/null
+++ b/distrib/msw/tmake/gtk_gnu.t
@@ -0,0 +1,276 @@
+#!#############################################################################
+#! File:    gtk_gnu.t
+#! Purpose: tmake template file from which makefile.gnu is generated by running
+#!          tmake -t gtk_gnu wxwin.pro -o makefile.gnu
+#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric, %wxHtml, wxUnix and %wxGTK hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxCommon{$file} =~ /\bR\b/;
+
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\bR\b/;
+
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxGTK) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXGTKOBJS"} .= '$(GTKDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxUNIX) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXUNIXOBJS"} .= '$(UNIXDIR)/' . $file . " "
+    }
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GNU.T!
+
+#
+# File:     makefile.gnu
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
+#
+# Makefile for libwx_gtk.a
+
+# GUI
+GUI = gtk
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# C++ compiler
+CC          = gcc
+
+# C compiler
+CCC         = gcc
+
+# Compiler for lex/yacc .c programs
+CCLEX       = $(CCC)
+
+LEX         = lex
+YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
+MAKE        = make
+AROPTIONS   = ruv
+RANLIB      = ranlib
+
+# Debug/trace mode. 1 or more for debugging.
+DEBUG       = 1
+
+# Misc options
+CPPOPTIONS  = __WXGTK__ -D__WXDEBUG__ -fno-rtti -fno-exceptions
+COPTIONS    = __WXGTK__ -D__WXDEBUG__
+CPPWARN     = -Wall
+CWARN       = -Wall
+OPTIMISE    = -O2
+
+# object file suffix
+OBJSUFF     =o
+
+# no changes below this line
+
+GUIINCLUDES  = `gtk-config --cflags`
+
+WXINC       = -I$(WXDIR)/include
+WXLIB       = $(WXDIR)/lib/libwx_$(GUI).a
+INCLUDES    = $(WXINC) $(GUIINCLUDES) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib
+
+CPPFLAGS    = $(INCLUDES) $(CPPOPTIONS) $(CPPWARN) $(OPTIMISE)
+CFLAGS      = $(INCLUDES) $(COPTIONS) $(CWARN) $(OPTIMISE)
+
+# Clears all default suffixes
+.SUFFIXES:     .o .cpp .c
+
+.c.o :
+       $(CCC) -c $(CFLAGS) -o $@ $<
+
+.cpp.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+.C.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+# Subordinate library possibilities
+
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+UNIXDIR = $(WXDIR)/src/unix
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+GTKDIR  = $(WXDIR)/src/gtk
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS = \
+                #$ ExpandList("WXGENERICOBJS");
+
+COMMONOBJS  = \
+               $(COMMDIR)/y_tab.$(OBJSUFF) \
+               #$ ExpandList("WXCOMMONOBJS");
+
+HTMLOBJS = \
+                #$ ExpandList("WXHTMLOBJS");
+
+GTKOBJS     = \
+               #$ ExpandList("WXGTKOBJS");
+
+UINXOBJS     = \
+               #$ ExpandList("WXUNIXOBJS");
+
+ZLIBOBJS    = \
+               $(ZLIBDIR)/adler32.$(OBJSUFF) \
+               $(ZLIBDIR)/compress.$(OBJSUFF) \
+               $(ZLIBDIR)/crc32.$(OBJSUFF) \
+               $(ZLIBDIR)/gzio.$(OBJSUFF) \
+               $(ZLIBDIR)/uncompr.$(OBJSUFF) \
+               $(ZLIBDIR)/deflate.$(OBJSUFF) \
+               $(ZLIBDIR)/trees.$(OBJSUFF) \
+               $(ZLIBDIR)/zutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inflate.$(OBJSUFF) \
+               $(ZLIBDIR)/infblock.$(OBJSUFF) \
+               $(ZLIBDIR)/inftrees.$(OBJSUFF) \
+               $(ZLIBDIR)/infcodes.$(OBJSUFF) \
+               $(ZLIBDIR)/infutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+               $(PNGDIR)/png.$(OBJSUFF) \
+               $(PNGDIR)/pngread.$(OBJSUFF) \
+               $(PNGDIR)/pngrtran.$(OBJSUFF) \
+               $(PNGDIR)/pngrutil.$(OBJSUFF) \
+               $(PNGDIR)/pngpread.$(OBJSUFF) \
+               $(PNGDIR)/pngtrans.$(OBJSUFF) \
+               $(PNGDIR)/pngwrite.$(OBJSUFF) \
+               $(PNGDIR)/pngwtran.$(OBJSUFF) \
+               $(PNGDIR)/pngwutil.$(OBJSUFF) \
+               $(PNGDIR)/pngerror.$(OBJSUFF) \
+               $(PNGDIR)/pngmem.$(OBJSUFF) \
+               $(PNGDIR)/pngwio.$(OBJSUFF) \
+               $(PNGDIR)/pngrio.$(OBJSUFF) \
+               $(PNGDIR)/pngget.$(OBJSUFF) \
+               $(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+               $(JPEGDIR)/jcomapi.$(OBJSUFF) \
+               $(JPEGDIR)/jutils.$(OBJSUFF) \
+               $(JPEGDIR)/jerror.$(OBJSUFF) \
+               $(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+               $(JPEGDIR)/jcapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jcapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jctrans.$(OBJSUFF) \
+               $(JPEGDIR)/jcparam.$(OBJSUFF) \
+               $(JPEGDIR)/jdatadst.$(OBJSUFF) \
+               $(JPEGDIR)/jcinit.$(OBJSUFF) \
+               $(JPEGDIR)/jcmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jcmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jcmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jcprepct.$(OBJSUFF) \
+               $(JPEGDIR)/jccoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jccolor.$(OBJSUFF) \
+               $(JPEGDIR)/jcsample.$(OBJSUFF) \
+               $(JPEGDIR)/jchuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctint.$(OBJSUFF) \
+               $(JPEGDIR)/jdapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jdapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jdtrans.$(OBJSUFF) \
+               $(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+               $(JPEGDIR)/jdmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jdinput.$(OBJSUFF) \
+               $(JPEGDIR)/jdmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jdhuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jdpostct.$(OBJSUFF) \
+               $(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jidctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jidctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jidctint.$(OBJSUFF) \
+               $(JPEGDIR)/jidctred.$(OBJSUFF) \
+               $(JPEGDIR)/jdsample.$(OBJSUFF) \
+               $(JPEGDIR)/jdcolor.$(OBJSUFF) \
+               $(JPEGDIR)/jquant1.$(OBJSUFF) \
+               $(JPEGDIR)/jquant2.$(OBJSUFF) \
+               $(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \
+         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
+
+all:    $(OBJECTS) $(WXLIB)
+
+$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+       $(RANLIB) $@
+
+$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+
+$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
+       $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ $(COMMDIR)/y_tab.c
+
+
+$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
+       $(LEX) -o $(COMMDIR)/lex.yy.c $(COMMDIR)/lexer.l 
+       sed -e "s/BUFSIZ/5000/g" < $(COMMDIR)/lex.yy.c | \
+       sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
+        sed -e "s/YYLMAX 200/YYLMAX 5000/g" > $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/lex.yy.c
+
+# Replace yacc with bison if you run into compilation
+# problems with y_tab.c.
+$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
+       $(YACC) $(COMMDIR)/parser.y
+       mv y.tab.c $(COMMDIR)/y_tab.c
+
+clean:
+       rm -f $(GTKDIR)/*.$(OBJSUFF)
+       rm -f $(COMMDIR)/y_tab.c
+       rm -f $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/*.$(OBJSUFF)
+       rm -f $(GENDIR)/*.$(OBJSUFF)
+       rm -f $(PNGDIR)/*.$(OBJSUFF)
+       rm -f $(ZLIBDIR)/*.$(OBJSUFF)
+       rm -f $(JPEGDIR)/*.$(OBJSUFF)
+       rm -f $(UNIXDIR)/*.$(OBJSUFF)
+       rm -f $(HTMLDIR)/*.$(OBJSUFF)
+       rm -f $(WXWIN)/lib/libwx_$(GUI).a
+
+cleanall: clean
+
+MFTYPE=gnu
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(GUI)_$(MFTYPE).t
+       cd $(WXWIN)\distrib\msw\tmake
+       tmake -t $(GUI)_$(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+       copy makefile.$(MFTYPE) $(WXWIN)\src\$(GUI)

diff --git a/include/wx/choice.h b/include/wx/choice.h
index bfe28e0ed1d5f83541578128107ec792f25391af..9cd08994441861a9a9535e35bb0fbb7ac5e40285 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma interface "choicebase.h"
+    #pragma interface "choiccmn.h"

 #endif
 
 #include "wx/control.h"     // the base class
 #endif
 
 #include "wx/control.h"     // the base class

diff --git a/include/wx/control.h b/include/wx/control.h
index c68cfa4e8442930f4f16bee79832d5f4fde9c392..5641eb3506fdb73ed539aa6ba853d0a68f44c5ab 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma interface "choicebase.h"
+    #pragma interface "ctrlcmn.h"

 #endif
 
 #include "wx/window.h"      // base class
 #endif
 
 #include "wx/window.h"      // base class

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 9f5dfeade9af6fa7c78533b0877ebacea7efd1de..ceeb467b8ebd92d0b4880d5eaf5a3287f5dc208a 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "choicebase.h"
+    #pragma implementation "choiccmn.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index b58927733fb11fe732f711884cc244ba980e5fea..99145cb02993234ca2e837c7ba7e7c7167d32064 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "choicebase.h"
+    #pragma implementation "ctrlcmn.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

diff --git a/src/gtk/makefile.gnu b/src/gtk/makefile.gnu
new file mode 100644 (file)
index 0000000..5d6c28c
--- /dev/null
+++ b/src/gtk/makefile.gnu
@@ -0,0 +1,414 @@
+
+# This file was automatically generated by tmake at 00:12, 1999/07/29
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GNU.T!
+
+#
+# File:     makefile.gnu
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
+#
+# Makefile for libwx_gtk.a
+
+# GUI
+GUI = gtk
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# C++ compiler
+CC          = gcc
+
+# C compiler
+CCC         = gcc
+
+# Compiler for lex/yacc .c programs
+CCLEX       = $(CCC)
+
+LEX         = lex
+YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
+MAKE        = make
+AROPTIONS   = ruv
+RANLIB      = ranlib
+
+# Debug/trace mode. 1 or more for debugging.
+DEBUG       = 1
+
+# Misc options
+CPPOPTIONS  = __WXGTK__ -D__WXDEBUG__ -fno-rtti -fno-exceptions
+COPTIONS    = __WXGTK__ -D__WXDEBUG__
+CPPWARN     = -Wall
+CWARN       = -Wall
+OPTIMISE    = -O2
+
+# object file suffix
+OBJSUFF     =o
+
+# no changes below this line
+
+GUIINCLUDES  = `gtk-config --cflags`
+
+WXINC       = -I$(WXDIR)/include
+WXLIB       = $(WXDIR)/lib/libwx_$(GUI).a
+INCLUDES    = $(WXINC) $(GUIINCLUDES) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib
+
+CPPFLAGS    = $(INCLUDES) $(CPPOPTIONS) $(CPPWARN) $(OPTIMISE)
+CFLAGS      = $(INCLUDES) $(COPTIONS) $(CWARN) $(OPTIMISE)
+
+# Clears all default suffixes
+.SUFFIXES:     .o .cpp .c
+
+.c.o :
+       $(CCC) -c $(CFLAGS) -o $@ $<
+
+.cpp.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+.C.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+# Subordinate library possibilities
+
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+UNIXDIR = $(WXDIR)/src/unix
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+GTKDIR  = $(WXDIR)/src/gtk
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS = \
+                $(GENDIR)/busyinfo.$(OBJSUFF) \
+               $(GENDIR)/caret.$(OBJSUFF) \
+               $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/colrdlgg.$(OBJSUFF) \
+               $(GENDIR)/dirdlgg.$(OBJSUFF) \
+               $(GENDIR)/extdlgg.$(OBJSUFF) \
+               $(GENDIR)/fontdlgg.$(OBJSUFF) \
+               $(GENDIR)/gridg.$(OBJSUFF) \
+               $(GENDIR)/helpxlp.$(OBJSUFF) \
+               $(GENDIR)/imaglist.$(OBJSUFF) \
+               $(GENDIR)/laywin.$(OBJSUFF) \
+               $(GENDIR)/listctrl.$(OBJSUFF) \
+               $(GENDIR)/msgdlgg.$(OBJSUFF) \
+               $(GENDIR)/notebook.$(OBJSUFF) \
+               $(GENDIR)/numdlgg.$(OBJSUFF) \
+               $(GENDIR)/panelg.$(OBJSUFF) \
+               $(GENDIR)/printps.$(OBJSUFF) \
+               $(GENDIR)/prntdlgg.$(OBJSUFF) \
+               $(GENDIR)/progdlgg.$(OBJSUFF) \
+               $(GENDIR)/prop.$(OBJSUFF) \
+               $(GENDIR)/propform.$(OBJSUFF) \
+               $(GENDIR)/proplist.$(OBJSUFF) \
+               $(GENDIR)/sashwin.$(OBJSUFF) \
+               $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/splitter.$(OBJSUFF) \
+               $(GENDIR)/statusbr.$(OBJSUFF) \
+               $(GENDIR)/tabg.$(OBJSUFF) \
+               $(GENDIR)/textdlgg.$(OBJSUFF) \
+               $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/treectrl.$(OBJSUFF)
+
+COMMONOBJS  = \
+               $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/cmndata.$(OBJSUFF) \
+               $(COMMDIR)/config.$(OBJSUFF) \
+               $(COMMDIR)/date.$(OBJSUFF) \
+               $(COMMDIR)/datstrm.$(OBJSUFF) \
+               $(COMMDIR)/db.$(OBJSUFF) \
+               $(COMMDIR)/dbtable.$(OBJSUFF) \
+               $(COMMDIR)/dcbase.$(OBJSUFF) \
+               $(COMMDIR)/dlgcmn.$(OBJSUFF) \
+               $(COMMDIR)/docmdi.$(OBJSUFF) \
+               $(COMMDIR)/docview.$(OBJSUFF) \
+               $(COMMDIR)/dynarray.$(OBJSUFF) \
+               $(COMMDIR)/dynlib.$(OBJSUFF) \
+               $(COMMDIR)/event.$(OBJSUFF) \
+               $(COMMDIR)/extended.$(OBJSUFF) \
+               $(COMMDIR)/ffile.$(OBJSUFF) \
+               $(COMMDIR)/file.$(OBJSUFF) \
+               $(COMMDIR)/fileconf.$(OBJSUFF) \
+               $(COMMDIR)/filefn.$(OBJSUFF) \
+               $(COMMDIR)/filesys.$(OBJSUFF) \
+               $(COMMDIR)/framecmn.$(OBJSUFF) \
+               $(COMMDIR)/fs_inet.$(OBJSUFF) \
+               $(COMMDIR)/fs_zip.$(OBJSUFF) \
+               $(COMMDIR)/ftp.$(OBJSUFF) \
+               $(COMMDIR)/gdicmn.$(OBJSUFF) \
+               $(COMMDIR)/hash.$(OBJSUFF) \
+               $(COMMDIR)/helpbase.$(OBJSUFF) \
+               $(COMMDIR)/http.$(OBJSUFF) \
+               $(COMMDIR)/imagbmp.$(OBJSUFF) \
+               $(COMMDIR)/image.$(OBJSUFF) \
+               $(COMMDIR)/imaggif.$(OBJSUFF) \
+               $(COMMDIR)/imagjpeg.$(OBJSUFF) \
+               $(COMMDIR)/imagpng.$(OBJSUFF) \
+               $(COMMDIR)/intl.$(OBJSUFF) \
+               $(COMMDIR)/ipcbase.$(OBJSUFF) \
+               $(COMMDIR)/layout.$(OBJSUFF) \
+               $(COMMDIR)/list.$(OBJSUFF) \
+               $(COMMDIR)/log.$(OBJSUFF) \
+               $(COMMDIR)/memory.$(OBJSUFF) \
+               $(COMMDIR)/mimetype.$(OBJSUFF) \
+               $(COMMDIR)/module.$(OBJSUFF) \
+               $(COMMDIR)/mstream.$(OBJSUFF) \
+               $(COMMDIR)/object.$(OBJSUFF) \
+               $(COMMDIR)/objstrm.$(OBJSUFF) \
+               $(COMMDIR)/paper.$(OBJSUFF) \
+               $(COMMDIR)/prntbase.$(OBJSUFF) \
+               $(COMMDIR)/process.$(OBJSUFF) \
+               $(COMMDIR)/protocol.$(OBJSUFF) \
+               $(COMMDIR)/resource.$(OBJSUFF) \
+               $(COMMDIR)/sckaddr.$(OBJSUFF) \
+               $(COMMDIR)/sckfile.$(OBJSUFF) \
+               $(COMMDIR)/sckipc.$(OBJSUFF) \
+               $(COMMDIR)/sckstrm.$(OBJSUFF) \
+               $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/stream.$(OBJSUFF) \
+               $(COMMDIR)/string.$(OBJSUFF) \
+               $(COMMDIR)/tbarbase.$(OBJSUFF) \
+               $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
+               $(COMMDIR)/textcmn.$(OBJSUFF) \
+               $(COMMDIR)/textfile.$(OBJSUFF) \
+               $(COMMDIR)/time.$(OBJSUFF) \
+               $(COMMDIR)/timercmn.$(OBJSUFF) \
+               $(COMMDIR)/tokenzr.$(OBJSUFF) \
+               $(COMMDIR)/txtstrm.$(OBJSUFF) \
+               $(COMMDIR)/unzip.$(OBJSUFF) \
+               $(COMMDIR)/url.$(OBJSUFF) \
+               $(COMMDIR)/utilscmn.$(OBJSUFF) \
+               $(COMMDIR)/valgen.$(OBJSUFF) \
+               $(COMMDIR)/validate.$(OBJSUFF) \
+               $(COMMDIR)/valtext.$(OBJSUFF) \
+               $(COMMDIR)/variant.$(OBJSUFF) \
+               $(COMMDIR)/wfstream.$(OBJSUFF) \
+               $(COMMDIR)/wincmn.$(OBJSUFF) \
+               $(COMMDIR)/wxchar.$(OBJSUFF) \
+               $(COMMDIR)/wxexpr.$(OBJSUFF) \
+               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/zstream.$(OBJSUFF)
+
+HTMLOBJS = \
+                $(HTMLDIR)/htmlcell.$(OBJSUFF) \
+               $(HTMLDIR)/htmlfilter.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp_io.$(OBJSUFF) \
+               $(HTMLDIR)/htmlparser.$(OBJSUFF) \
+               $(HTMLDIR)/htmltag.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwin.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwinparser.$(OBJSUFF) \
+               $(HTMLDIR)/mod_fonts.$(OBJSUFF) \
+               $(HTMLDIR)/mod_hline.$(OBJSUFF) \
+               $(HTMLDIR)/mod_image.$(OBJSUFF) \
+               $(HTMLDIR)/mod_layout.$(OBJSUFF) \
+               $(HTMLDIR)/mod_links.cpp \
+               $(HTMLDIR)/mod_list.$(OBJSUFF) \
+               $(HTMLDIR)/mod_pre.$(OBJSUFF) \
+               $(HTMLDIR)/mod_tables.$(OBJSUFF) \
+               $(HTMLDIR)/search.$(OBJSUFF)
+
+GTKOBJS     = \
+               $(GTKDIR)/accel.$(OBJSUFF) \
+               $(GTKDIR)/app.$(OBJSUFF) \
+               $(GTKDIR)/bitmap.$(OBJSUFF) \
+               $(GTKDIR)/bmpbuttn.$(OBJSUFF) \
+               $(GTKDIR)/brush.$(OBJSUFF) \
+               $(GTKDIR)/button.$(OBJSUFF) \
+               $(GTKDIR)/checkbox.$(OBJSUFF) \
+               $(GTKDIR)/checklst.$(OBJSUFF) \
+               $(GTKDIR)/choicdlg.$(OBJSUFF) \
+               $(GTKDIR)/choice.$(OBJSUFF) \
+               $(GTKDIR)/clipbrd.$(OBJSUFF) \
+               $(GTKDIR)/colour.$(OBJSUFF) \
+               $(GTKDIR)/combobox.$(OBJSUFF) \
+               $(GTKDIR)/control.$(OBJSUFF) \
+               $(GTKDIR)/cursor.$(OBJSUFF) \
+               $(GTKDIR)/data.$(OBJSUFF) \
+               $(GTKDIR)/dataobj.$(OBJSUFF) \
+               $(GTKDIR)/dc.$(OBJSUFF) \
+               $(GTKDIR)/dcclient.$(OBJSUFF) \
+               $(GTKDIR)/dcmemory.cpp \
+               $(GTKDIR)/dcscreen.$(OBJSUFF) \
+               $(GTKDIR)/dialog.$(OBJSUFF) \
+               $(GTKDIR)/dnd.$(OBJSUFF) \
+               $(GTKDIR)/filedlg.$(OBJSUFF) \
+               $(GTKDIR)/font.$(OBJSUFF) \
+               $(GTKDIR)/frame.$(OBJSUFF) \
+               $(GTKDIR)/gauge.$(OBJSUFF) \
+               $(GTKDIR)/gdiobj.$(OBJSUFF) \
+               $(GTKDIR)/gsockgtk.$(OBJSUFF) \
+               $(GTKDIR)/icon.$(OBJSUFF) \
+               $(GTKDIR)/listbox.$(OBJSUFF) \
+               $(GTKDIR)/main.$(OBJSUFF) \
+               $(GTKDIR)/mdi.$(OBJSUFF) \
+               $(GTKDIR)/menu.$(OBJSUFF) \
+               $(GTKDIR)/minifram.$(OBJSUFF) \
+               $(GTKDIR)/msgdlg.$(OBJSUFF) \
+               $(GTKDIR)/notebook.$(OBJSUFF) \
+               $(GTKDIR)/palette.$(OBJSUFF) \
+               $(GTKDIR)/pen.$(OBJSUFF) \
+               $(GTKDIR)/radiobox.$(OBJSUFF) \
+               $(GTKDIR)/radiobut.$(OBJSUFF) \
+               $(GTKDIR)/region.$(OBJSUFF) \
+               $(GTKDIR)/scrolbar.$(OBJSUFF) \
+               $(GTKDIR)/settings.$(OBJSUFF) \
+               $(GTKDIR)/slider.$(OBJSUFF) \
+               $(GTKDIR)/spinbutt.$(OBJSUFF) \
+               $(GTKDIR)/statbmp.$(OBJSUFF) \
+               $(GTKDIR)/statbox.$(OBJSUFF) \
+               $(GTKDIR)/statline.$(OBJSUFF) \
+               $(GTKDIR)/stattext.$(OBJSUFF) \
+               $(GTKDIR)/tbargtk.$(OBJSUFF) \
+               $(GTKDIR)/textctrl.$(OBJSUFF) \
+               $(GTKDIR)/textdlg.$(OBJSUFF) \
+               $(GTKDIR)/timer.$(OBJSUFF) \
+               $(GTKDIR)/tooltip.$(OBJSUFF) \
+               $(GTKDIR)/utilsgtk.$(OBJSUFF) \
+               $(GTKDIR)/utilsres.$(OBJSUFF) \
+               $(GTKDIR)/wave.$(OBJSUFF) \
+               $(GTKDIR)/win_gtk.$(OBJSUFF) \
+               $(GTKDIR)/window.$(OBJSUFF)
+
+UINXOBJS     = \
+               $(UNIXDIR)/gsocket.$(OBJSUFF) \
+               $(UNIXDIR)/threadpsx.$(OBJSUFF) \
+               $(UNIXDIR)/utilsunx.$(OBJSUFF)
+
+ZLIBOBJS    = \
+               $(ZLIBDIR)/adler32.$(OBJSUFF) \
+               $(ZLIBDIR)/compress.$(OBJSUFF) \
+               $(ZLIBDIR)/crc32.$(OBJSUFF) \
+               $(ZLIBDIR)/gzio.$(OBJSUFF) \
+               $(ZLIBDIR)/uncompr.$(OBJSUFF) \
+               $(ZLIBDIR)/deflate.$(OBJSUFF) \
+               $(ZLIBDIR)/trees.$(OBJSUFF) \
+               $(ZLIBDIR)/zutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inflate.$(OBJSUFF) \
+               $(ZLIBDIR)/infblock.$(OBJSUFF) \
+               $(ZLIBDIR)/inftrees.$(OBJSUFF) \
+               $(ZLIBDIR)/infcodes.$(OBJSUFF) \
+               $(ZLIBDIR)/infutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+               $(PNGDIR)/png.$(OBJSUFF) \
+               $(PNGDIR)/pngread.$(OBJSUFF) \
+               $(PNGDIR)/pngrtran.$(OBJSUFF) \
+               $(PNGDIR)/pngrutil.$(OBJSUFF) \
+               $(PNGDIR)/pngpread.$(OBJSUFF) \
+               $(PNGDIR)/pngtrans.$(OBJSUFF) \
+               $(PNGDIR)/pngwrite.$(OBJSUFF) \
+               $(PNGDIR)/pngwtran.$(OBJSUFF) \
+               $(PNGDIR)/pngwutil.$(OBJSUFF) \
+               $(PNGDIR)/pngerror.$(OBJSUFF) \
+               $(PNGDIR)/pngmem.$(OBJSUFF) \
+               $(PNGDIR)/pngwio.$(OBJSUFF) \
+               $(PNGDIR)/pngrio.$(OBJSUFF) \
+               $(PNGDIR)/pngget.$(OBJSUFF) \
+               $(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+               $(JPEGDIR)/jcomapi.$(OBJSUFF) \
+               $(JPEGDIR)/jutils.$(OBJSUFF) \
+               $(JPEGDIR)/jerror.$(OBJSUFF) \
+               $(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+               $(JPEGDIR)/jcapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jcapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jctrans.$(OBJSUFF) \
+               $(JPEGDIR)/jcparam.$(OBJSUFF) \
+               $(JPEGDIR)/jdatadst.$(OBJSUFF) \
+               $(JPEGDIR)/jcinit.$(OBJSUFF) \
+               $(JPEGDIR)/jcmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jcmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jcmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jcprepct.$(OBJSUFF) \
+               $(JPEGDIR)/jccoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jccolor.$(OBJSUFF) \
+               $(JPEGDIR)/jcsample.$(OBJSUFF) \
+               $(JPEGDIR)/jchuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctint.$(OBJSUFF) \
+               $(JPEGDIR)/jdapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jdapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jdtrans.$(OBJSUFF) \
+               $(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+               $(JPEGDIR)/jdmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jdinput.$(OBJSUFF) \
+               $(JPEGDIR)/jdmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jdhuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jdpostct.$(OBJSUFF) \
+               $(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jidctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jidctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jidctint.$(OBJSUFF) \
+               $(JPEGDIR)/jidctred.$(OBJSUFF) \
+               $(JPEGDIR)/jdsample.$(OBJSUFF) \
+               $(JPEGDIR)/jdcolor.$(OBJSUFF) \
+               $(JPEGDIR)/jquant1.$(OBJSUFF) \
+               $(JPEGDIR)/jquant2.$(OBJSUFF) \
+               $(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \
+         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
+
+all:    $(OBJECTS) $(WXLIB)
+
+$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+       $(RANLIB) $@
+
+$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+
+$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
+       $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ $(COMMDIR)/y_tab.c
+
+
+$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
+       $(LEX) -o $(COMMDIR)/lex.yy.c $(COMMDIR)/lexer.l 
+       sed -e "s/BUFSIZ/5000/g" < $(COMMDIR)/lex.yy.c | \
+       sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
+        sed -e "s/YYLMAX 200/YYLMAX 5000/g" > $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/lex.yy.c
+
+# Replace yacc with bison if you run into compilation
+# problems with y_tab.c.
+$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
+       $(YACC) $(COMMDIR)/parser.y
+       mv y.tab.c $(COMMDIR)/y_tab.c
+
+clean:
+       rm -f $(GTKDIR)/*.$(OBJSUFF)
+       rm -f $(COMMDIR)/y_tab.c
+       rm -f $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/*.$(OBJSUFF)
+       rm -f $(GENDIR)/*.$(OBJSUFF)
+       rm -f $(PNGDIR)/*.$(OBJSUFF)
+       rm -f $(ZLIBDIR)/*.$(OBJSUFF)
+       rm -f $(JPEGDIR)/*.$(OBJSUFF)
+       rm -f $(UNIXDIR)/*.$(OBJSUFF)
+       rm -f $(HTMLDIR)/*.$(OBJSUFF)
+       rm -f $(WXWIN)/lib/libwx_$(GUI).a
+
+cleanall: clean
+
+MFTYPE=gnu
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(GUI)_$(MFTYPE).t
+       cd $(WXWIN)\distrib\msw\tmake
+       tmake -t $(GUI)_$(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+       copy makefile.$(MFTYPE) $(WXWIN)\src\$(GUI)

diff --git a/src/gtk1/makefile.gnu b/src/gtk1/makefile.gnu
new file mode 100644 (file)
index 0000000..5d6c28c
--- /dev/null
+++ b/src/gtk1/makefile.gnu
@@ -0,0 +1,414 @@
+
+# This file was automatically generated by tmake at 00:12, 1999/07/29
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GNU.T!
+
+#
+# File:     makefile.gnu
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
+#
+# Makefile for libwx_gtk.a
+
+# GUI
+GUI = gtk
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# C++ compiler
+CC          = gcc
+
+# C compiler
+CCC         = gcc
+
+# Compiler for lex/yacc .c programs
+CCLEX       = $(CCC)
+
+LEX         = lex
+YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
+MAKE        = make
+AROPTIONS   = ruv
+RANLIB      = ranlib
+
+# Debug/trace mode. 1 or more for debugging.
+DEBUG       = 1
+
+# Misc options
+CPPOPTIONS  = __WXGTK__ -D__WXDEBUG__ -fno-rtti -fno-exceptions
+COPTIONS    = __WXGTK__ -D__WXDEBUG__
+CPPWARN     = -Wall
+CWARN       = -Wall
+OPTIMISE    = -O2
+
+# object file suffix
+OBJSUFF     =o
+
+# no changes below this line
+
+GUIINCLUDES  = `gtk-config --cflags`
+
+WXINC       = -I$(WXDIR)/include
+WXLIB       = $(WXDIR)/lib/libwx_$(GUI).a
+INCLUDES    = $(WXINC) $(GUIINCLUDES) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib
+
+CPPFLAGS    = $(INCLUDES) $(CPPOPTIONS) $(CPPWARN) $(OPTIMISE)
+CFLAGS      = $(INCLUDES) $(COPTIONS) $(CWARN) $(OPTIMISE)
+
+# Clears all default suffixes
+.SUFFIXES:     .o .cpp .c
+
+.c.o :
+       $(CCC) -c $(CFLAGS) -o $@ $<
+
+.cpp.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+.C.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+# Subordinate library possibilities
+
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+UNIXDIR = $(WXDIR)/src/unix
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+GTKDIR  = $(WXDIR)/src/gtk
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS = \
+                $(GENDIR)/busyinfo.$(OBJSUFF) \
+               $(GENDIR)/caret.$(OBJSUFF) \
+               $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/colrdlgg.$(OBJSUFF) \
+               $(GENDIR)/dirdlgg.$(OBJSUFF) \
+               $(GENDIR)/extdlgg.$(OBJSUFF) \
+               $(GENDIR)/fontdlgg.$(OBJSUFF) \
+               $(GENDIR)/gridg.$(OBJSUFF) \
+               $(GENDIR)/helpxlp.$(OBJSUFF) \
+               $(GENDIR)/imaglist.$(OBJSUFF) \
+               $(GENDIR)/laywin.$(OBJSUFF) \
+               $(GENDIR)/listctrl.$(OBJSUFF) \
+               $(GENDIR)/msgdlgg.$(OBJSUFF) \
+               $(GENDIR)/notebook.$(OBJSUFF) \
+               $(GENDIR)/numdlgg.$(OBJSUFF) \
+               $(GENDIR)/panelg.$(OBJSUFF) \
+               $(GENDIR)/printps.$(OBJSUFF) \
+               $(GENDIR)/prntdlgg.$(OBJSUFF) \
+               $(GENDIR)/progdlgg.$(OBJSUFF) \
+               $(GENDIR)/prop.$(OBJSUFF) \
+               $(GENDIR)/propform.$(OBJSUFF) \
+               $(GENDIR)/proplist.$(OBJSUFF) \
+               $(GENDIR)/sashwin.$(OBJSUFF) \
+               $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/splitter.$(OBJSUFF) \
+               $(GENDIR)/statusbr.$(OBJSUFF) \
+               $(GENDIR)/tabg.$(OBJSUFF) \
+               $(GENDIR)/textdlgg.$(OBJSUFF) \
+               $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/treectrl.$(OBJSUFF)
+
+COMMONOBJS  = \
+               $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/cmndata.$(OBJSUFF) \
+               $(COMMDIR)/config.$(OBJSUFF) \
+               $(COMMDIR)/date.$(OBJSUFF) \
+               $(COMMDIR)/datstrm.$(OBJSUFF) \
+               $(COMMDIR)/db.$(OBJSUFF) \
+               $(COMMDIR)/dbtable.$(OBJSUFF) \
+               $(COMMDIR)/dcbase.$(OBJSUFF) \
+               $(COMMDIR)/dlgcmn.$(OBJSUFF) \
+               $(COMMDIR)/docmdi.$(OBJSUFF) \
+               $(COMMDIR)/docview.$(OBJSUFF) \
+               $(COMMDIR)/dynarray.$(OBJSUFF) \
+               $(COMMDIR)/dynlib.$(OBJSUFF) \
+               $(COMMDIR)/event.$(OBJSUFF) \
+               $(COMMDIR)/extended.$(OBJSUFF) \
+               $(COMMDIR)/ffile.$(OBJSUFF) \
+               $(COMMDIR)/file.$(OBJSUFF) \
+               $(COMMDIR)/fileconf.$(OBJSUFF) \
+               $(COMMDIR)/filefn.$(OBJSUFF) \
+               $(COMMDIR)/filesys.$(OBJSUFF) \
+               $(COMMDIR)/framecmn.$(OBJSUFF) \
+               $(COMMDIR)/fs_inet.$(OBJSUFF) \
+               $(COMMDIR)/fs_zip.$(OBJSUFF) \
+               $(COMMDIR)/ftp.$(OBJSUFF) \
+               $(COMMDIR)/gdicmn.$(OBJSUFF) \
+               $(COMMDIR)/hash.$(OBJSUFF) \
+               $(COMMDIR)/helpbase.$(OBJSUFF) \
+               $(COMMDIR)/http.$(OBJSUFF) \
+               $(COMMDIR)/imagbmp.$(OBJSUFF) \
+               $(COMMDIR)/image.$(OBJSUFF) \
+               $(COMMDIR)/imaggif.$(OBJSUFF) \
+               $(COMMDIR)/imagjpeg.$(OBJSUFF) \
+               $(COMMDIR)/imagpng.$(OBJSUFF) \
+               $(COMMDIR)/intl.$(OBJSUFF) \
+               $(COMMDIR)/ipcbase.$(OBJSUFF) \
+               $(COMMDIR)/layout.$(OBJSUFF) \
+               $(COMMDIR)/list.$(OBJSUFF) \
+               $(COMMDIR)/log.$(OBJSUFF) \
+               $(COMMDIR)/memory.$(OBJSUFF) \
+               $(COMMDIR)/mimetype.$(OBJSUFF) \
+               $(COMMDIR)/module.$(OBJSUFF) \
+               $(COMMDIR)/mstream.$(OBJSUFF) \
+               $(COMMDIR)/object.$(OBJSUFF) \
+               $(COMMDIR)/objstrm.$(OBJSUFF) \
+               $(COMMDIR)/paper.$(OBJSUFF) \
+               $(COMMDIR)/prntbase.$(OBJSUFF) \
+               $(COMMDIR)/process.$(OBJSUFF) \
+               $(COMMDIR)/protocol.$(OBJSUFF) \
+               $(COMMDIR)/resource.$(OBJSUFF) \
+               $(COMMDIR)/sckaddr.$(OBJSUFF) \
+               $(COMMDIR)/sckfile.$(OBJSUFF) \
+               $(COMMDIR)/sckipc.$(OBJSUFF) \
+               $(COMMDIR)/sckstrm.$(OBJSUFF) \
+               $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/stream.$(OBJSUFF) \
+               $(COMMDIR)/string.$(OBJSUFF) \
+               $(COMMDIR)/tbarbase.$(OBJSUFF) \
+               $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
+               $(COMMDIR)/textcmn.$(OBJSUFF) \
+               $(COMMDIR)/textfile.$(OBJSUFF) \
+               $(COMMDIR)/time.$(OBJSUFF) \
+               $(COMMDIR)/timercmn.$(OBJSUFF) \
+               $(COMMDIR)/tokenzr.$(OBJSUFF) \
+               $(COMMDIR)/txtstrm.$(OBJSUFF) \
+               $(COMMDIR)/unzip.$(OBJSUFF) \
+               $(COMMDIR)/url.$(OBJSUFF) \
+               $(COMMDIR)/utilscmn.$(OBJSUFF) \
+               $(COMMDIR)/valgen.$(OBJSUFF) \
+               $(COMMDIR)/validate.$(OBJSUFF) \
+               $(COMMDIR)/valtext.$(OBJSUFF) \
+               $(COMMDIR)/variant.$(OBJSUFF) \
+               $(COMMDIR)/wfstream.$(OBJSUFF) \
+               $(COMMDIR)/wincmn.$(OBJSUFF) \
+               $(COMMDIR)/wxchar.$(OBJSUFF) \
+               $(COMMDIR)/wxexpr.$(OBJSUFF) \
+               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/zstream.$(OBJSUFF)
+
+HTMLOBJS = \
+                $(HTMLDIR)/htmlcell.$(OBJSUFF) \
+               $(HTMLDIR)/htmlfilter.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp_io.$(OBJSUFF) \
+               $(HTMLDIR)/htmlparser.$(OBJSUFF) \
+               $(HTMLDIR)/htmltag.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwin.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwinparser.$(OBJSUFF) \
+               $(HTMLDIR)/mod_fonts.$(OBJSUFF) \
+               $(HTMLDIR)/mod_hline.$(OBJSUFF) \
+               $(HTMLDIR)/mod_image.$(OBJSUFF) \
+               $(HTMLDIR)/mod_layout.$(OBJSUFF) \
+               $(HTMLDIR)/mod_links.cpp \
+               $(HTMLDIR)/mod_list.$(OBJSUFF) \
+               $(HTMLDIR)/mod_pre.$(OBJSUFF) \
+               $(HTMLDIR)/mod_tables.$(OBJSUFF) \
+               $(HTMLDIR)/search.$(OBJSUFF)
+
+GTKOBJS     = \
+               $(GTKDIR)/accel.$(OBJSUFF) \
+               $(GTKDIR)/app.$(OBJSUFF) \
+               $(GTKDIR)/bitmap.$(OBJSUFF) \
+               $(GTKDIR)/bmpbuttn.$(OBJSUFF) \
+               $(GTKDIR)/brush.$(OBJSUFF) \
+               $(GTKDIR)/button.$(OBJSUFF) \
+               $(GTKDIR)/checkbox.$(OBJSUFF) \
+               $(GTKDIR)/checklst.$(OBJSUFF) \
+               $(GTKDIR)/choicdlg.$(OBJSUFF) \
+               $(GTKDIR)/choice.$(OBJSUFF) \
+               $(GTKDIR)/clipbrd.$(OBJSUFF) \
+               $(GTKDIR)/colour.$(OBJSUFF) \
+               $(GTKDIR)/combobox.$(OBJSUFF) \
+               $(GTKDIR)/control.$(OBJSUFF) \
+               $(GTKDIR)/cursor.$(OBJSUFF) \
+               $(GTKDIR)/data.$(OBJSUFF) \
+               $(GTKDIR)/dataobj.$(OBJSUFF) \
+               $(GTKDIR)/dc.$(OBJSUFF) \
+               $(GTKDIR)/dcclient.$(OBJSUFF) \
+               $(GTKDIR)/dcmemory.cpp \
+               $(GTKDIR)/dcscreen.$(OBJSUFF) \
+               $(GTKDIR)/dialog.$(OBJSUFF) \
+               $(GTKDIR)/dnd.$(OBJSUFF) \
+               $(GTKDIR)/filedlg.$(OBJSUFF) \
+               $(GTKDIR)/font.$(OBJSUFF) \
+               $(GTKDIR)/frame.$(OBJSUFF) \
+               $(GTKDIR)/gauge.$(OBJSUFF) \
+               $(GTKDIR)/gdiobj.$(OBJSUFF) \
+               $(GTKDIR)/gsockgtk.$(OBJSUFF) \
+               $(GTKDIR)/icon.$(OBJSUFF) \
+               $(GTKDIR)/listbox.$(OBJSUFF) \
+               $(GTKDIR)/main.$(OBJSUFF) \
+               $(GTKDIR)/mdi.$(OBJSUFF) \
+               $(GTKDIR)/menu.$(OBJSUFF) \
+               $(GTKDIR)/minifram.$(OBJSUFF) \
+               $(GTKDIR)/msgdlg.$(OBJSUFF) \
+               $(GTKDIR)/notebook.$(OBJSUFF) \
+               $(GTKDIR)/palette.$(OBJSUFF) \
+               $(GTKDIR)/pen.$(OBJSUFF) \
+               $(GTKDIR)/radiobox.$(OBJSUFF) \
+               $(GTKDIR)/radiobut.$(OBJSUFF) \
+               $(GTKDIR)/region.$(OBJSUFF) \
+               $(GTKDIR)/scrolbar.$(OBJSUFF) \
+               $(GTKDIR)/settings.$(OBJSUFF) \
+               $(GTKDIR)/slider.$(OBJSUFF) \
+               $(GTKDIR)/spinbutt.$(OBJSUFF) \
+               $(GTKDIR)/statbmp.$(OBJSUFF) \
+               $(GTKDIR)/statbox.$(OBJSUFF) \
+               $(GTKDIR)/statline.$(OBJSUFF) \
+               $(GTKDIR)/stattext.$(OBJSUFF) \
+               $(GTKDIR)/tbargtk.$(OBJSUFF) \
+               $(GTKDIR)/textctrl.$(OBJSUFF) \
+               $(GTKDIR)/textdlg.$(OBJSUFF) \
+               $(GTKDIR)/timer.$(OBJSUFF) \
+               $(GTKDIR)/tooltip.$(OBJSUFF) \
+               $(GTKDIR)/utilsgtk.$(OBJSUFF) \
+               $(GTKDIR)/utilsres.$(OBJSUFF) \
+               $(GTKDIR)/wave.$(OBJSUFF) \
+               $(GTKDIR)/win_gtk.$(OBJSUFF) \
+               $(GTKDIR)/window.$(OBJSUFF)
+
+UINXOBJS     = \
+               $(UNIXDIR)/gsocket.$(OBJSUFF) \
+               $(UNIXDIR)/threadpsx.$(OBJSUFF) \
+               $(UNIXDIR)/utilsunx.$(OBJSUFF)
+
+ZLIBOBJS    = \
+               $(ZLIBDIR)/adler32.$(OBJSUFF) \
+               $(ZLIBDIR)/compress.$(OBJSUFF) \
+               $(ZLIBDIR)/crc32.$(OBJSUFF) \
+               $(ZLIBDIR)/gzio.$(OBJSUFF) \
+               $(ZLIBDIR)/uncompr.$(OBJSUFF) \
+               $(ZLIBDIR)/deflate.$(OBJSUFF) \
+               $(ZLIBDIR)/trees.$(OBJSUFF) \
+               $(ZLIBDIR)/zutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inflate.$(OBJSUFF) \
+               $(ZLIBDIR)/infblock.$(OBJSUFF) \
+               $(ZLIBDIR)/inftrees.$(OBJSUFF) \
+               $(ZLIBDIR)/infcodes.$(OBJSUFF) \
+               $(ZLIBDIR)/infutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+               $(PNGDIR)/png.$(OBJSUFF) \
+               $(PNGDIR)/pngread.$(OBJSUFF) \
+               $(PNGDIR)/pngrtran.$(OBJSUFF) \
+               $(PNGDIR)/pngrutil.$(OBJSUFF) \
+               $(PNGDIR)/pngpread.$(OBJSUFF) \
+               $(PNGDIR)/pngtrans.$(OBJSUFF) \
+               $(PNGDIR)/pngwrite.$(OBJSUFF) \
+               $(PNGDIR)/pngwtran.$(OBJSUFF) \
+               $(PNGDIR)/pngwutil.$(OBJSUFF) \
+               $(PNGDIR)/pngerror.$(OBJSUFF) \
+               $(PNGDIR)/pngmem.$(OBJSUFF) \
+               $(PNGDIR)/pngwio.$(OBJSUFF) \
+               $(PNGDIR)/pngrio.$(OBJSUFF) \
+               $(PNGDIR)/pngget.$(OBJSUFF) \
+               $(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+               $(JPEGDIR)/jcomapi.$(OBJSUFF) \
+               $(JPEGDIR)/jutils.$(OBJSUFF) \
+               $(JPEGDIR)/jerror.$(OBJSUFF) \
+               $(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+               $(JPEGDIR)/jcapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jcapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jctrans.$(OBJSUFF) \
+               $(JPEGDIR)/jcparam.$(OBJSUFF) \
+               $(JPEGDIR)/jdatadst.$(OBJSUFF) \
+               $(JPEGDIR)/jcinit.$(OBJSUFF) \
+               $(JPEGDIR)/jcmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jcmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jcmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jcprepct.$(OBJSUFF) \
+               $(JPEGDIR)/jccoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jccolor.$(OBJSUFF) \
+               $(JPEGDIR)/jcsample.$(OBJSUFF) \
+               $(JPEGDIR)/jchuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctint.$(OBJSUFF) \
+               $(JPEGDIR)/jdapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jdapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jdtrans.$(OBJSUFF) \
+               $(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+               $(JPEGDIR)/jdmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jdinput.$(OBJSUFF) \
+               $(JPEGDIR)/jdmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jdhuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jdpostct.$(OBJSUFF) \
+               $(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jidctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jidctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jidctint.$(OBJSUFF) \
+               $(JPEGDIR)/jidctred.$(OBJSUFF) \
+               $(JPEGDIR)/jdsample.$(OBJSUFF) \
+               $(JPEGDIR)/jdcolor.$(OBJSUFF) \
+               $(JPEGDIR)/jquant1.$(OBJSUFF) \
+               $(JPEGDIR)/jquant2.$(OBJSUFF) \
+               $(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \
+         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
+
+all:    $(OBJECTS) $(WXLIB)
+
+$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+       $(RANLIB) $@
+
+$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+
+$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
+       $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ $(COMMDIR)/y_tab.c
+
+
+$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
+       $(LEX) -o $(COMMDIR)/lex.yy.c $(COMMDIR)/lexer.l 
+       sed -e "s/BUFSIZ/5000/g" < $(COMMDIR)/lex.yy.c | \
+       sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
+        sed -e "s/YYLMAX 200/YYLMAX 5000/g" > $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/lex.yy.c
+
+# Replace yacc with bison if you run into compilation
+# problems with y_tab.c.
+$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
+       $(YACC) $(COMMDIR)/parser.y
+       mv y.tab.c $(COMMDIR)/y_tab.c
+
+clean:
+       rm -f $(GTKDIR)/*.$(OBJSUFF)
+       rm -f $(COMMDIR)/y_tab.c
+       rm -f $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/*.$(OBJSUFF)
+       rm -f $(GENDIR)/*.$(OBJSUFF)
+       rm -f $(PNGDIR)/*.$(OBJSUFF)
+       rm -f $(ZLIBDIR)/*.$(OBJSUFF)
+       rm -f $(JPEGDIR)/*.$(OBJSUFF)
+       rm -f $(UNIXDIR)/*.$(OBJSUFF)
+       rm -f $(HTMLDIR)/*.$(OBJSUFF)
+       rm -f $(WXWIN)/lib/libwx_$(GUI).a
+
+cleanall: clean
+
+MFTYPE=gnu
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(GUI)_$(MFTYPE).t
+       cd $(WXWIN)\distrib\msw\tmake
+       tmake -t $(GUI)_$(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+       copy makefile.$(MFTYPE) $(WXWIN)\src\$(GUI)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index b5a2bbec4857458cde01a9db929bbe39a53403d8..1cfd01d61e0b245b43af39fce9e91f78122e08fe 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 00:42, 1999/07/27
+# This file was automatically generated by tmake at 00:12, 1999/07/29

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #


@@ -27,6 +27,7 @@ EXTRAOBJS=
 
 GENDIR  = $(WXDIR)/src/generic
 COMMDIR = $(WXDIR)/src/common
 
 GENDIR  = $(WXDIR)/src/generic
 COMMDIR = $(WXDIR)/src/common

+HTMLDIR = $(WXDIR)/src/html

 XPMDIR  = $(WXDIR)/src/xpm
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
 XPMDIR  = $(WXDIR)/src/xpm
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg


@@ -137,90 +138,92 @@ COMMONOBJS  = \
                $(COMMDIR)/zipstream.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
                $(COMMDIR)/zipstream.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 

+HTMLOBJS = \
+

 MSWOBJS     = \
 MSWOBJS     = \

-               accel.$(OBJSUFF) \
-               app.$(OBJSUFF) \
-               bitmap.$(OBJSUFF) \
-               bmpbuttn.$(OBJSUFF) \
-               brush.$(OBJSUFF) \
-               button.$(OBJSUFF) \
-               caret.$(OBJSUFF) \
-               checkbox.$(OBJSUFF) \
-               checklst.$(OBJSUFF) \
-               choice.$(OBJSUFF) \
-               clipbrd.$(OBJSUFF) \
-               colordlg.$(OBJSUFF) \
-               colour.$(OBJSUFF) \
-               combobox.$(OBJSUFF) \
-               control.$(OBJSUFF) \
-               curico.$(OBJSUFF) \
-               cursor.$(OBJSUFF) \
-               data.$(OBJSUFF) \
-               dc.$(OBJSUFF) \
-               dcclient.$(OBJSUFF) \
-               dcmemory.$(OBJSUFF) \
-               dcprint.$(OBJSUFF) \
-               dcscreen.$(OBJSUFF) \
-               dde.$(OBJSUFF) \
-               dialog.$(OBJSUFF) \
-               dib.$(OBJSUFF) \
-               dibutils.$(OBJSUFF) \
-               dragimag.$(OBJSUFF) \
-               filedlg.$(OBJSUFF) \
-               font.$(OBJSUFF) \
-               fontdlg.$(OBJSUFF) \
-               frame.$(OBJSUFF) \
-               gauge95.$(OBJSUFF) \
-               gdiobj.$(OBJSUFF) \
-               helpwin.$(OBJSUFF) \
-               icon.$(OBJSUFF) \
-               imaglist.$(OBJSUFF) \
-               joystick.$(OBJSUFF) \
-               listbox.$(OBJSUFF) \
-               listctrl.$(OBJSUFF) \
-               main.$(OBJSUFF) \
-               mdi.$(OBJSUFF) \
-               menu.$(OBJSUFF) \
-               menuitem.$(OBJSUFF) \
-               metafile.$(OBJSUFF) \
-               minifram.$(OBJSUFF) \
-               msgdlg.$(OBJSUFF) \
-               nativdlg.$(OBJSUFF) \
-               notebook.$(OBJSUFF) \
-               ownerdrw.$(OBJSUFF) \
-               palette.$(OBJSUFF) \
-               pen.$(OBJSUFF) \
-               penwin.$(OBJSUFF) \
-               pnghand.$(OBJSUFF) \
-               printdlg.$(OBJSUFF) \
-               printwin.$(OBJSUFF) \
-               radiobox.$(OBJSUFF) \
-               radiobut.$(OBJSUFF) \
-               regconf.$(OBJSUFF) \
-               region.$(OBJSUFF) \
-               registry.$(OBJSUFF) \
-               scrolbar.$(OBJSUFF) \
-               settings.$(OBJSUFF) \
-               slider95.$(OBJSUFF) \
-               spinbutt.$(OBJSUFF) \
-               statbmp.$(OBJSUFF) \
-               statbox.$(OBJSUFF) \
-               statbr95.$(OBJSUFF) \
-               statline.$(OBJSUFF) \
-               stattext.$(OBJSUFF) \
-               tabctrl.$(OBJSUFF) \
-               taskbar.$(OBJSUFF) \
-               tbar95.$(OBJSUFF) \
-               textctrl.$(OBJSUFF) \
-               thread.$(OBJSUFF) \
-               timer.$(OBJSUFF) \
-               tooltip.$(OBJSUFF) \
-               treectrl.$(OBJSUFF) \
-               utils.$(OBJSUFF) \
-               utilsexc.$(OBJSUFF) \
-               wave.$(OBJSUFF) \
-               window.$(OBJSUFF) \
-               xpmhand.$(OBJSUFF)
+               $(MSWDIR)/accel.$(OBJSUFF) \
+               $(MSWDIR)/app.$(OBJSUFF) \
+               $(MSWDIR)/bitmap.$(OBJSUFF) \
+               $(MSWDIR)/bmpbuttn.$(OBJSUFF) \
+               $(MSWDIR)/brush.$(OBJSUFF) \
+               $(MSWDIR)/button.$(OBJSUFF) \
+               $(MSWDIR)/caret.$(OBJSUFF) \
+               $(MSWDIR)/checkbox.$(OBJSUFF) \
+               $(MSWDIR)/checklst.$(OBJSUFF) \
+               $(MSWDIR)/choice.$(OBJSUFF) \
+               $(MSWDIR)/clipbrd.$(OBJSUFF) \
+               $(MSWDIR)/colordlg.$(OBJSUFF) \
+               $(MSWDIR)/colour.$(OBJSUFF) \
+               $(MSWDIR)/combobox.$(OBJSUFF) \
+               $(MSWDIR)/control.$(OBJSUFF) \
+               $(MSWDIR)/curico.$(OBJSUFF) \
+               $(MSWDIR)/cursor.$(OBJSUFF) \
+               $(MSWDIR)/data.$(OBJSUFF) \
+               $(MSWDIR)/dc.$(OBJSUFF) \
+               $(MSWDIR)/dcclient.$(OBJSUFF) \
+               $(MSWDIR)/dcmemory.$(OBJSUFF) \
+               $(MSWDIR)/dcprint.$(OBJSUFF) \
+               $(MSWDIR)/dcscreen.$(OBJSUFF) \
+               $(MSWDIR)/dde.$(OBJSUFF) \
+               $(MSWDIR)/dialog.$(OBJSUFF) \
+               $(MSWDIR)/dib.$(OBJSUFF) \
+               $(MSWDIR)/dibutils.$(OBJSUFF) \
+               $(MSWDIR)/dragimag.$(OBJSUFF) \
+               $(MSWDIR)/filedlg.$(OBJSUFF) \
+               $(MSWDIR)/font.$(OBJSUFF) \
+               $(MSWDIR)/fontdlg.$(OBJSUFF) \
+               $(MSWDIR)/frame.$(OBJSUFF) \
+               $(MSWDIR)/gauge95.$(OBJSUFF) \
+               $(MSWDIR)/gdiobj.$(OBJSUFF) \
+               $(MSWDIR)/helpwin.$(OBJSUFF) \
+               $(MSWDIR)/icon.$(OBJSUFF) \
+               $(MSWDIR)/imaglist.$(OBJSUFF) \
+               $(MSWDIR)/joystick.$(OBJSUFF) \
+               $(MSWDIR)/listbox.$(OBJSUFF) \
+               $(MSWDIR)/listctrl.$(OBJSUFF) \
+               $(MSWDIR)/main.$(OBJSUFF) \
+               $(MSWDIR)/mdi.$(OBJSUFF) \
+               $(MSWDIR)/menu.$(OBJSUFF) \
+               $(MSWDIR)/menuitem.$(OBJSUFF) \
+               $(MSWDIR)/metafile.$(OBJSUFF) \
+               $(MSWDIR)/minifram.$(OBJSUFF) \
+               $(MSWDIR)/msgdlg.$(OBJSUFF) \
+               $(MSWDIR)/nativdlg.$(OBJSUFF) \
+               $(MSWDIR)/notebook.$(OBJSUFF) \
+               $(MSWDIR)/ownerdrw.$(OBJSUFF) \
+               $(MSWDIR)/palette.$(OBJSUFF) \
+               $(MSWDIR)/pen.$(OBJSUFF) \
+               $(MSWDIR)/penwin.$(OBJSUFF) \
+               $(MSWDIR)/pnghand.$(OBJSUFF) \
+               $(MSWDIR)/printdlg.$(OBJSUFF) \
+               $(MSWDIR)/printwin.$(OBJSUFF) \
+               $(MSWDIR)/radiobox.$(OBJSUFF) \
+               $(MSWDIR)/radiobut.$(OBJSUFF) \
+               $(MSWDIR)/regconf.$(OBJSUFF) \
+               $(MSWDIR)/region.$(OBJSUFF) \
+               $(MSWDIR)/registry.$(OBJSUFF) \
+               $(MSWDIR)/scrolbar.$(OBJSUFF) \
+               $(MSWDIR)/settings.$(OBJSUFF) \
+               $(MSWDIR)/slider95.$(OBJSUFF) \
+               $(MSWDIR)/spinbutt.$(OBJSUFF) \
+               $(MSWDIR)/statbmp.$(OBJSUFF) \
+               $(MSWDIR)/statbox.$(OBJSUFF) \
+               $(MSWDIR)/statbr95.$(OBJSUFF) \
+               $(MSWDIR)/statline.$(OBJSUFF) \
+               $(MSWDIR)/stattext.$(OBJSUFF) \
+               $(MSWDIR)/tabctrl.$(OBJSUFF) \
+               $(MSWDIR)/taskbar.$(OBJSUFF) \
+               $(MSWDIR)/tbar95.$(OBJSUFF) \
+               $(MSWDIR)/textctrl.$(OBJSUFF) \
+               $(MSWDIR)/thread.$(OBJSUFF) \
+               $(MSWDIR)/timer.$(OBJSUFF) \
+               $(MSWDIR)/tooltip.$(OBJSUFF) \
+               $(MSWDIR)/treectrl.$(OBJSUFF) \
+               $(MSWDIR)/utils.$(OBJSUFF) \
+               $(MSWDIR)/utilsexc.$(OBJSUFF) \
+               $(MSWDIR)/wave.$(OBJSUFF) \
+               $(MSWDIR)/window.$(OBJSUFF) \
+               $(MSWDIR)/xpmhand.$(OBJSUFF)

 
 ZLIBOBJS    = \
                $(ZLIBDIR)/adler32.$(OBJSUFF) \
 
 ZLIBOBJS    = \
                $(ZLIBDIR)/adler32.$(OBJSUFF) \


@@ -316,7 +319,7 @@ XPMOBJECTS =        $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 

-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) \
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \

          $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)
          $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)


@@ -373,6 +376,7 @@ clean:
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o
        -erase ..\generic\*.o
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o
        -erase ..\generic\*.o

+       -erase ..\html\*.o

        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o
        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o