]> git.saurik.com Git - wxWidgets.git/blobdiff - distrib/msw/tmake/g95.t
1. wxChoice and wxComboBox support client data under MSW
[wxWidgets.git] / distrib / msw / tmake / g95.t
index 888e742eb657e4cf1b270186b9b2931fefa90a73..af071b17ccb973be000f5098e7336ed753a9220f 100644 (file)
@@ -2,7 +2,7 @@
 #! File:    g95.t
 #! Purpose: tmake template file from which makefile.g95 is generated by running
 #!          tmake -t g95 wxwin.pro -o makefile.g95
-#! Author:  Vadim Zeitlin
+#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
 #! Created: 14.07.99
 #! Version: $Id$
 #!#############################################################################
     foreach $file (sort keys %wxGeneric) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         #! so take the generic version
-        if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
             next unless $file =~ /^dirdlgg\./;
         }
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXGENERICOBJS"} .= '$(GENDIR)\\' . $file . " "
+        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
     }
 
     foreach $file (sort keys %wxCommon) {
-        #! socket files don't compile under Win16 currently
-        next if $wxCommon{$file} =~ /\b(32|S)\b/;
+        next if $wxCommon{$file} =~ /\b(16)\b/;
 
         #! needs extra files (sql*.h) so not compiled by default.
         next if $file =~ /^odbc\./;
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)\\' . $file . " "
+        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
     }
 
     foreach $file (sort keys %wxMSW) {
         #! Mingw32 doesn't have the OLE headers and has some troubles with
         #! socket code
-        next if $wxMSW{$file} =~ /\b(O|S|16)\b/;
+        next if $wxMSW{$file} =~ /\b(O|16)\b/;
+
+        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
+        next if $file =~ /^dirdlg\./;
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
         $project{"WXMSWOBJS"} .= $file . " "
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
-# File:     makefile.unx
-# Author:   Julian Smart
+# File:     makefile.g95
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
-# Updated:
-# Copyright:(c) 1993, AIAI, University of Edinburgh
-#
-# "@(#)makefile.unx 1.2 5/9/94"
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
 #
 # Makefile for libwx.a
 
 # Replace this with your own path if necessary
 WXDIR = ../..
 
-# All common UNIX compiler flags and options are now in
+# All common compiler flags and options are now in
 # this central makefile.
 include $(WXDIR)/src/makeg95.env
 
-# IMPORTANT: if you want to link in subsidiary libraries,
-# required for some optional parts of wxWindows, you must
-# set EXTRATARGETS and EXTRAOBJS to match the settings in wx_setup.h.
-# Having done this, you won't have to worry about linking them
-# into each application.
-#
-# Here's the full list.
-#   prologio: Required if using the wxWindows resource facility
-#               USE_WX_RESOURCES should be 1
-#   xmgauge:  Gauge class (required for Motif only)
-#               USE_GAUGE should be 1
-#   xpm:      XPM pixmap support
-#               USE_XPM_IN_X should be 1
-#   wxstring: string class
-#               USE_GNU_WXSTRING should be 1
-#
-# Unfortunately, 'ar' doesn't like combining objects and libraries,
-# so we must identify all the objects from the subordinate libraries. Yuck!
-XPMSRC=../../contrib/wxxpm/objects$(GUISUFFIX)
-XPMOBJS=$(XPMSRC)/crbuffri.$(OBJSUFF) $(XPMSRC)/crbuffrp.$(OBJSUFF) $(XPMSRC)/crdatfri.$(OBJSUFF) $(XPMSRC)/crdatfrp.$(OBJSUFF)\
-  $(XPMSRC)/create.$(OBJSUFF) $(XPMSRC)/crifrbuf.$(OBJSUFF) $(XPMSRC)/crifrdat.$(OBJSUFF) $(XPMSRC)/crpfrbuf.$(OBJSUFF) $(XPMSRC)/crpfrdat.$(OBJSUFF)\
-  $(XPMSRC)/data.$(OBJSUFF) $(XPMSRC)/hashtab.$(OBJSUFF) $(XPMSRC)/misc.$(OBJSUFF) $(XPMSRC)/parse.$(OBJSUFF) $(XPMSRC)/rdftodat.$(OBJSUFF)\
-  $(XPMSRC)/rdftoi.$(OBJSUFF) $(XPMSRC)/rdftop.$(OBJSUFF) $(XPMSRC)/rgb.$(OBJSUFF) $(XPMSRC)/scan.$(OBJSUFF) $(XPMSRC)/simx.$(OBJSUFF)\
-  $(XPMSRC)/wrffrdat.$(OBJSUFF) $(XPMSRC)/wrffri.$(OBJSUFF) $(XPMSRC)/wrffrp.$(OBJSUFF)
-
 # Subordinate library possibilities
 
 EXTRAOBJS=
 
-GENDIR=../generic
-COMMDIR=../common
-XPMDIR=../xpm
-OLEDIR=ole
-MSWDIR=.
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+XPMDIR  = $(WXDIR)/src/xpm
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
+GENERICOBJS = \
+                #$ ExpandList("WXGENERICOBJS");
 
-COMMONOBJS = \
+COMMONOBJS  = \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
                #$ ExpandList("WXCOMMONOBJS");
 
-MSWOBJS = #$ ExpandList("WXMSWOBJS");
+MSWOBJS     = \
+               #$ ExpandList("WXMSWOBJS");
+
+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)
 
 XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/crdatfri.o\
@@ -123,15 +187,11 @@ XPMOBJECTS =      $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) \
+         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)
 
-base:
-       cd $(WXDIR)/src/common; $(MAKE) -f makefile.g95 GUI=$(GUI) GUISUFFIX=$(GUISUFFIX) CC=$(CC)\
- OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
@@ -139,49 +199,60 @@ $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 $(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 $(CPPFLAGS) -o $@ $(COMMDIR)/y_tab.c
+       $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+       copy ..\common\dosyacc.c ..\common\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+       copy ..\common\doslex.c ..\common\lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
-$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
-       $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-
+# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l
+#      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
 # Try one of these if the above line doesn't work.
 # Alternative syntax (1)
 #      $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
 # Alternative syntax (2)
 #      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-
+#
 #      sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
 #       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
 #      rm -f 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) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-
+#
+# $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
+#      $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
+#
 # If you use e.g. gcc on Unix, uncomment these lines
 # and comment out the above.
-
+#
 # $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
 #      $(YACC) $(COMMDIR)/parser.y
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
-# Extra targets
-rcparser:
-       cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
-       cd $(WXDIR)/src/msw
-
-clean_rcp:
-       cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-
 clean:
-       rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core
+       -erase *.o
+       -erase core
+       -erase ..\common\y_tab.c
+       -erase ..\common\lex_yy.c
+       -erase ..\common\*.o
+       -erase ..\generic\*.o
+       -erase ..\png\*.o
+       -erase ..\zlib\*.o
+       -erase ..\jpeg\*.o
+       -erase ..\..\lib\libwx$(GUISUFFIX).a
 
 cleanall: clean
 
+MFTYPE=g95
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+       cd $(WXWIN)\distrib\msw\tmake
+       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+       copy makefile.$(MFTYPE) $(WXWIN)\src\msw