copy install.txt and readme.txt

[wxWidgets.git] / distrib / msw / tmake / g95.t

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 15b3cb19301a5b2380c89f929a9d3e61519d5a6b..9cafefc98ad139a7946cd528aee928e96fac09c1 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -15,49 +15,58 @@
     foreach $file (sort keys %wxGeneric) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         #! so take the generic version
     foreach $file (sort keys %wxGeneric) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         #! so take the generic version

+        $base = ( $wxGeneric{$file} =~ /\bB\b/ ) ? '_BASE' : '';
+

         if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
             next #! unless $file =~ /^dirdlgg\./;
         }
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
         if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
             next #! unless $file =~ /^dirdlgg\./;
         }
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;

-        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
+        $project{"WXGENERICOBJS$base"} .= '$(GENDIR)/' . $file . " "

     }
 
     foreach $file (sort keys %wxCommon) {
     }
 
     foreach $file (sort keys %wxCommon) {

-        next if $wxCommon{$file} =~ /\b(16)\b/;
+        next if $wxCommon{$file} =~ /\b(16|U)\b/;

 
         #! needs extra files (sql*.h) so not compiled by default.
         #! next if $file =~ /^odbc\./;
 
 
         #! needs extra files (sql*.h) so not compiled by default.
         #! next if $file =~ /^odbc\./;
 

+        $base = ( $wxCommon{$file} =~ /\bB\b/ ) ? '_BASE' : '';

         if ( $file =~ /^odbc\./ )
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;
         if ( $file =~ /^odbc\./ )
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;

-          $project{"ADVANCEDOBJS"} .= '$(COMMDIR)/' . $file . " "
+          $project{"ADVANCEDOBJS$base"} .= '$(COMMDIR)/' . $file . " "

         }
         else
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;
         }
         else
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;

-          $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+          $project{"WXCOMMONOBJS$base"} .= '$(COMMDIR)/' . $file . " "

         }
     }
 
         }
     }
 

+    foreach $file (sort keys %wxBase) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXCOMMONOBJS_BASEONLY"} .= '$(COMMDIR)/' . $file . " "
+    }
+

     foreach $file (sort keys %wxMSW) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         next if $file =~ /^dirdlg\./;
 
         next if $wxMSW{$file} =~ /\b(16)\b/;
     foreach $file (sort keys %wxMSW) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         next if $file =~ /^dirdlg\./;
 
         next if $wxMSW{$file} =~ /\b(16)\b/;

+        $base = ( $wxMSW{$file} =~ /\bB\b/ ) ? '_BASE' : '';

 
         #! Mingw32 doesn't have the OLE headers and has some troubles with
         #! socket code, so put in  ADVANCEDOBJS
         if ( $wxMSW{$file} =~ /\b(O)\b/ )
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;
 
         #! Mingw32 doesn't have the OLE headers and has some troubles with
         #! socket code, so put in  ADVANCEDOBJS
         if ( $wxMSW{$file} =~ /\b(O)\b/ )
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;

-          $project{"ADVANCEDOBJS"} .= '$(MSWDIR)/ole/' . $file . " "
+          $project{"ADVANCEDOBJS$base"} .= '$(MSWDIR)/ole/' . $file . " "

         }
         else
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;
         }
         else
         {
           $file =~ s/cp?p?$/\$(OBJSUFF)/;

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

         }
 
     }
         }
 
     }


@@ -68,7 +77,7 @@
     }
 
 #$}
     }
 
 #$}

-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake 

 # 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!
 
 #


@@ -76,7 +85,6 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
 # Updated:  1999
 # 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
 #
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 #


@@ -91,16 +99,22 @@ include $(WXDIR)/src/makeg95.env
 
 # DLL Name, if building wxWindows as a DLL.
 ifdef WXMAKINGDLL
 
 # DLL Name, if building wxWindows as a DLL.
 ifdef WXMAKINGDLL

-WXDLL = $(WXDIR)/lib/wxmsw$(WXVERSION)$(UNIEXT).dll
-WXDEF = wxmsw$(WXVERSION)$(UNIEXT).def
-DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
-                 $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-                    $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).dll
+WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libpng$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libregex$(MIN_SUFFIX).a

 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDFLAGS = -L$(WXDIR)/lib

-DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
-             -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
-             -lwsock32 $(DLL_EXTRA_LIBS) \
-                 -lstdc++
+DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
+ifeq ($(wxUSE_GUI),0)
+  DLL_LDLIBS = $(DLL_BASE_LDLIBS)
+else
+  DLL_LDLIBS = -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
+               $(DLL_BASE_LDLIBS)
+endif

 endif
 
 # Subordinate library possibilities
 endif
 
 # Subordinate library possibilities


@@ -118,40 +132,58 @@ OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 REGEXDIR= $(WXDIR)/src/regex
 
 MSWDIR  = $(WXDIR)/src/msw
 REGEXDIR= $(WXDIR)/src/regex
 

-ZLIBLIB = $(WXDIR)/lib/libzlib.a
-PNGLIB  = $(WXDIR)/lib/libpng.a
-JPEGLIB = $(WXDIR)/lib/libjpeg.a
-TIFFLIB = $(WXDIR)/lib/libtiff.a
-REGEXLIB= $(WXDIR)/lib/libregex.a
+ZLIBLIB = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a
+PNGLIB  = $(WXDIR)/lib/libpng$(MIN_SUFFIX).a
+JPEGLIB = $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a
+TIFFLIB = $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a
+REGEXLIB= $(WXDIR)/lib/libregex$(MIN_SUFFIX).a

 
 DOCDIR = $(WXDIR)/docs
 
 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32
 
 DOCDIR = $(WXDIR)/docs
 
 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32

-ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+ifeq "$(strip $(RECENT_MINGW))" "yes"

                DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
                DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)

-  else
-               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
-  endif

 else
                DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
 endif
 
 else
                DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
 endif
 

+ifeq ($(wxUSE_GUI),0)
+  DIRDLGOBJ =
+endif
+
+GENERICOBJS_BASE = \
+                #$ ExpandList("WXGENERICOBJS_BASE");
+

 GENERICOBJS = \
 GENERICOBJS = \

+                $(GENERICOBJS_BASE) \

                 #$ ExpandList("WXGENERICOBJS");
 
                 #$ ExpandList("WXGENERICOBJS");
 

+COMMONOBJS_BASE  = \
+                #$ ExpandList("WXCOMMONOBJS_BASE");
+
+COMMONOBJS_BASEONLY  = \
+                #$ ExpandList("WXCOMMONOBJS_BASEONLY");
+

 COMMONOBJS  = \
 COMMONOBJS  = \

-               $(COMMDIR)/y_tab.$(OBJSUFF) \
+                $(COMMONOBJS_BASE) \

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

+MSWOBJS_BASE = \
+                #$ ExpandList("WXMSWOBJS_BASE");
+

 MSWOBJS     = \
 MSWOBJS     = \

+                $(MSWOBJS_BASE) \

                #$ ExpandList("WXMSWOBJS");
 
                #$ ExpandList("WXMSWOBJS");
 

+ADVANCEDOBJS_BASE = \
+                #$ ExpandList("ADVANCEDOBJS_BASE");
+

 ADVANCEDOBJS     = \
 ADVANCEDOBJS     = \

+                $(ADVANCEDOBJS_BASE) \

                #$ ExpandList("ADVANCEDOBJS");
 
 ZLIBOBJS    = \
                #$ ExpandList("ADVANCEDOBJS");
 
 ZLIBOBJS    = \


@@ -270,36 +302,27 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_write.o \
                $(TIFFDIR)/tif_zip.o
 
                $(TIFFDIR)/tif_write.o \
                $(TIFFDIR)/tif_zip.o
 

-ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
-  else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
-  endif
+ifeq "$(strip $(RECENT_MINGW))" "yes"
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)

 else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif

-
-# MBN: if anyone has a better solution for this kludge, step
-#      forward, *please*
-# this tests is we are on cygwin or not ( will _not_ work if you are using
-# ZSH on plain Win32, tought ); it uses the presence of "/"
-# in the PATH variable
+ifeq ($(wxUSE_GUI),0)
+  OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
+endif

 
 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)
 
 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)

-ifeq (,$(findstring /,$(PATH)))
-  IS_CYGWIN=0
+ifeq (,$(findstring $(OSTYPE),"cygwin!msys"))

   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else
   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else

-  IS_CYGWIN=1

   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif
 
 #ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif
 
 #ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))

-ARCHINCDIR=(WXDIR)/lib/msw$(INCEXT)
+ARCHINCDIR=$(WXDIR)/lib/$(TOOLKIT)$(INCEXT)

 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 
 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 


@@ -313,9 +336,12 @@ $(ARCHINCDIR)/wx:
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 

-$(SETUP_H): $(ARCHINCDIR)/wx
-       $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+# Copy ALWAYS uses forward slashes now.
+
+$(SETUP_H): $(ARCHINCDIR)/wx $(WXDIR)/include/wx/msw/setup.h
+       $(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)

 
 

+#      $(COPY) $(WXDIR)/include/wx/msw/setup.h $@

 #      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL
 #      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL


@@ -331,11 +357,12 @@ else
 ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS)
 ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS)

-       $(CC) -shared -o $@ \
+       $(CXX) -shared -o $@ \

          -Wl,--output-def,$(WXDEF) \
          -Wl,--out-implib,$(WXLIB) \
          $(OBJECTS) $(EXTRAOBJS) \
          -Wl,--output-def,$(WXDEF) \
          -Wl,--out-implib,$(WXLIB) \
          $(OBJECTS) $(EXTRAOBJS) \

-         $(DLL_LDFLAGS) $(DLL_LDLIBS)
+         $(DLL_LDFLAGS) $(DLL_LDLIBS) \
+      $(ALL_LDFLAGS_DLL)

 else
 
 ifeq ($(MINGW32),1)
 else
 
 ifeq ($(MINGW32),1)


@@ -356,11 +383,11 @@ $(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
          $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)
          $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
 
 $(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)

-       $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF)
+       $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)

        $(DLLTOOL) $(DLL_STUFF)
        $(DLLTOOL) $(DLL_STUFF)

-       $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF)
+       $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)

        $(DLLTOOL) $(DLL_STUFF)
        $(DLLTOOL) $(DLL_STUFF)

-       $(CC) -mdll wx.exp -o $@ $(LD_STUFF)
+       $(CC) -mdll wx.exp -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)

        -$(RM) wx.base
        -$(RM) wx.exp
 
        -$(RM) wx.base
        -$(RM) wx.exp
 


@@ -386,56 +413,15 @@ $(TIFFLIB): $(TIFFOBJS)
        $(RANLIB) $@
 
 $(REGEXLIB):
        $(RANLIB) $@
 
 $(REGEXLIB):

-       $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
+       $(MAKE) -C $(REGEXDIR) -f makefile.g95 MINGW32=$(MINGW32) WXDIR=$(WXDIR) WXWIN=$(WXDIR)

 
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
 
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 

-$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.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
-#
-# 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
-#
-# 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
-

 clean:
        -$(RM) *.o
        -$(RM) ole/*.o
        -$(RM) *.bak
        -$(RM) core
 clean:
        -$(RM) *.o
        -$(RM) ole/*.o
        -$(RM) *.bak
        -$(RM) core

-       -$(RM) ../common/y_tab.c
-       -$(RM) ../common/lex_yy.c

        -$(RM) ../common/*.o
        -$(RM) ../common/*.bak
        -$(RM) ../generic/*.o
        -$(RM) ../common/*.o
        -$(RM) ../common/*.bak
        -$(RM) ../generic/*.o