This commit was manufactured by cvs2svn to create tag 'WITH_OGL'.

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

contrib/configure.in

@@ -1,79 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id$)dnl
-
-AC_INIT(Makefile.in)
-
-dnl ---------------
-dnl MMedia specific
-dnl ---------------
-
-dnl Check for ESD
-
-ESD_LINK=
-AC_CHECK_HEADER(esd.h, [
-  AC_CHECK_LIB(esd, esd_close, [
-    ESD_LINK="-lesd"
-  ])
-])
-
-if test "$ESD_LINK" != "" ; then
-  echo "ESound detected"
-fi
-
-dnl -----------
-dnl Final subst
-
-PATH_IFS=$wx_cv_path_ifs
-WX_TARGET_LIBRARY=$wx_cv_target_library
-WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
-
-AC_SUBST(PATH_IFS)
-AC_SUBST(ESD_LINK)
-AC_SUBST(WX_TARGET_LIBRARY)
-AC_SUBST(WX_TARGET_LIBRARY_TYPE)
-
-dnl -----------
-dnl File output
-
-
-AC_OUTPUT([
-            src/Makefile
-            src/ogl/Makefile
-            src/mmedia/Makefile
-            src/stc/Makefile
-            src/xrc/Makefile
-            src/canvas/Makefile
-            src/gizmos/Makefile
-            src/plot/Makefile
-            src/applet/Makefile
-            src/fl/Makefile
-            src/net/Makefile
-            samples/Makefile
-            samples/mmedia/Makefile
-            samples/ogl/Makefile
-            samples/ogl/ogledit/Makefile
-            samples/ogl/studio/Makefile
-            samples/stc/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
-            samples/gizmos/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
-            samples/gizmos/dynsash/Makefile
-            samples/gizmos/dynsash_switch/Makefile
-            samples/xrc/Makefile
-            samples/plot/Makefile
-            samples/applet/Makefile
-            samples/fl/Makefile
-            samples/fl/fl_demo1/Makefile
-            samples/fl/fl_demo2/Makefile
-            samples/fl/fl_sample1/Makefile
-            samples/fl/fl_sample2/Makefile
-            samples/fl/fl_sample3/Makefile
-            utils/Makefile
-            utils/wxrc/Makefile
-            utils/wxrcedit/Makefile
-            utils/convertrc/Makefile
-         ])

distrib/msw/tmake/filelist.t

@@ -0,0 +1,84 @@
+#!#############################################################################
+#! File:    filelist.t
+#! Purpose: tmake template file containig Perl code to parse the filelist.txt
+#!          file - this is used by all other templates.
+#! Author:  Vadim Zeitlin
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    open(FILELIST, "filelist.txt") or die "Can't open filelist file: $!\n";
+
+    line: while ( defined($_ = <FILELIST>) ) {
+        chomp;
+
+        #! comment or blank line, skip
+        next line if ( $_ eq "" or /^#/ );
+
+        #! if ( $verbose ) {
+        #!     print STDERR "Processing line: '$_'\n";
+        #! }
+
+        my @fields = split "\t";
+        if ( $#fields > 2 ) {
+            warn "Ignoring malformed line $_ in the filelist file.\n";
+            next line;
+        } elsif ( $#fields == 1 ) {
+            #! add an empty flags string
+            $fields[2] = "";
+        }
+
+        if ( $verbose ) {
+            print STDERR "File $fields[0]: type '$fields[1]', flags '$fields[2]'\n";
+        }
+
+        #! first column is filename, second is type, third is flags
+        if ( $fields[1] eq "C" ) {
+            $wxCommon{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "G" ) {
+            $wxGeneric{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "M" ) {
+            $wxMSW{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "X" ) {
+            $wxMOTIF{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "R" ) {
+            $wxGTK{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "O" ) {
+            $wxOS2PM{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "H" ) {
+            $wxHTML{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "J" ) {
+            $wxOGL{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "U" ) {
+            $wxUNIX{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "B" ) {
+            $wxBase{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "W" ) {
+            $wxWXINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "P" ) {
+            $wxPROTOCOLINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "L" ) {
+            $wxHTMLINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "Z" ) {
+            $wxOGLINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "F" ) {
+            $wxMOTIFINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "9" ) {
+            $wxMSWINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "K" ) {
+            $wxGTKINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "2" ) {
+            $wxOS2PMINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "S" ) {
+            $wxUNIXINCLUDE{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "N" ) {
+            $wxGENERICINCLUDE{$fields[0]} = $fields[2];
+        } else {
+            warn "Unknown file type $fields[1] for $fields[0], ignoring.\n";
+            next line;
+        }
+    }
+
+    close(FILELIST);
+#$}
+#! vim:sw=4:ts=4:list:et

distrib/msw/tmake/gtk.t

@@ -0,0 +1,149 @@
+#!################################################################################
+#! File:    gtk.t
+#! Purpose: tmake template file from which src/gtk/files.lst containing the
+#!          list of files for wxGTK library is generated by tmake
+#! Author:  Vadim Zeitlin
+#! Created: 28.01.00
+#! Version: $Id$
+#!################################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxGTK, %wxMOTIF and
+    #! %wxOS2PM hashes.
+    IncludeTemplate("filelist.t");
+
+    #! find all our sources
+    $project{"COMMONOBJS"} .= "parser.o ";
+    $project{"COMMONDEPS"} .= "parser.d ";
+
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxGeneric{$file} =~ /\bR\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"GTK_SOURCES"} .= "generic/" . $file . " ";
+        $project{"GENERICOBJS"} .= $fileobj . " ";
+        $project{"GENERICDEPS"} .= $filedep . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\bR\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"GTK_SOURCES"} .= "common/" . $file . " ";
+        $project{"COMMONOBJS"} .= $fileobj . " ";
+        $project{"COMMONDEPS"} .= $filedep . " "
+    }
+
+    foreach $file (sort keys %wxGTK) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"GTK_SOURCES"} .= "gtk/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+        $project{"GUIDEPS"} .= $filedep . " "
+    }
+
+    foreach $file (sort keys %wxUNIX) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"GTK_SOURCES"} .= "unix/" . $file . " ";
+        $project{"UNIXOBJS"} .= $fileobj . " ";
+        $project{"UNIXDEPS"} .= $filedep . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"GTK_SOURCES"} .= "html/" . $file . " ";
+        $project{"HTMLOBJS"} .= $fileobj . " ";
+        $project{"HTMLDEPS"} .= $filedep . " "
+    }
+    
+    foreach $file (sort keys %wxOGL) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"GTK_SOURCES"} .= "ogl/" . $file . " ";
+        $project{"OGLOBJS"} .= $fileobj . " ";
+        $project{"OGLDEPS"} .= $filedep . " "
+    }
+    
+    #! find all our headers
+    foreach $file (sort keys %wxWXINCLUDE) {
+        $project{"GTK_HEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxGTKINCLUDE) {
+        $project{"GTK_HEADERS"} .= "gtk/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxGENERICINCLUDE) {
+        $project{"GTK_HEADERS"} .= "generic/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxUNIXINCLUDE) {
+        $project{"GTK_HEADERS"} .= "unix/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxHTMLINCLUDE) {
+        $project{"GTK_HEADERS"} .= "html/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxOGLINCLUDE) {
+        $project{"GTK_HEADERS"} .= "ogl/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxPROTOCOLINCLUDE) {
+        $project{"GTK_HEADERS"} .= "protocol/" . $file . " "
+    }
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
+ALL_SOURCES = \
+		#$ ExpandList("GTK_SOURCES");
+
+ALL_HEADERS = \
+		#$ ExpandList("GTK_HEADERS");
+
+COMMONOBJS = \
+		#$ ExpandList("COMMONOBJS");
+
+COMMONDEPS = \
+		#$ ExpandList("COMMONDEPS");
+
+GENERICOBJS = \
+		#$ ExpandList("GENERICOBJS");
+
+GENERICDEPS = \
+		#$ ExpandList("GENERICDEPS");
+
+GUIOBJS = \
+		#$ ExpandList("GUIOBJS");
+
+GUIDEPS = \
+		#$ ExpandList("GUIDEPS");
+
+UNIXOBJS = \
+		#$ ExpandList("UNIXOBJS");
+
+UNIXDEPS = \
+		#$ ExpandList("UNIXDEPS");
+
+HTMLOBJS = \
+		#$ ExpandList("HTMLOBJS");
+
+HTMLDEPS = \
+		#$ ExpandList("HTMLDEPS");
+
+OGLOBJS = \
+		#$ ExpandList("OGLOBJS");
+
+OGLDEPS = \
+		#$ ExpandList("OGLDEPS");
+