Corrected points to pixels calculation

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

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 3ea3b709cc5247ea5a9d72383078b0c951500d4e..f720c1d5ad98ab102624e984eb5fc58a22fc4a1d 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!
 
 #


@@ -91,16 +100,20 @@ 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/wx$(WXVERSION).dll
-WXDEF = wx$(WXVERSION).def
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).dll
+WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def

 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \

-                     $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
+                    $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.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 = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
+               $(DLL_BASE_LDLIBS)
+endif

 endif
 
 # Subordinate library possibilities
 endif
 
 # Subordinate library possibilities


@@ -113,16 +126,16 @@ HTMLDIR = $(WXDIR)/src/html
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg

-XPMDIR  = $(WXDIR)/src/xpm

 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw

+REGEXDIR= $(WXDIR)/src/regex

 
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
 
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a

-XPMLIB  = $(WXDIR)/lib/libxpm.a

 TIFFLIB = $(WXDIR)/lib/libtiff.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a

+REGEXLIB= $(WXDIR)/lib/libregex.a

 
 DOCDIR = $(WXDIR)/docs
 
 
 DOCDIR = $(WXDIR)/docs
 


@@ -137,21 +150,43 @@ ifeq ($(MINGW32),1)
 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  = \

+                $(COMMONOBJS_BASE) \

                $(COMMDIR)/y_tab.$(OBJSUFF) \
                #$ ExpandList("WXCOMMONOBJS");
 
 HTMLOBJS = \
                 #$ ExpandList("WXHTMLOBJS");
 
                $(COMMDIR)/y_tab.$(OBJSUFF) \
                #$ 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    = \


@@ -236,27 +271,6 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 

-# NOTE: these filenames are case sensitive!
-XPMOBJS =    $(XPMDIR)/Attrib.o\
-               $(XPMDIR)/CrBufFrI.o\
-               $(XPMDIR)/CrDatFrI.o\
-               $(XPMDIR)/create.o\
-               $(XPMDIR)/CrIFrBuf.o\
-               $(XPMDIR)/CrIFrDat.o\
-               $(XPMDIR)/data.o\
-               $(XPMDIR)/Image.o\
-               $(XPMDIR)/Info.o\
-               $(XPMDIR)/hashtab.o\
-               $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o\
-               $(XPMDIR)/RdFToDat.o\
-               $(XPMDIR)/RdFToI.o\
-               $(XPMDIR)/rgb.o\
-               $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o\
-               $(XPMDIR)/WrFFrDat.o\
-               $(XPMDIR)/WrFFrI.o
-

 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
                $(TIFFDIR)/tif_codec.o \
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
                $(TIFFDIR)/tif_codec.o \


@@ -300,13 +314,48 @@ ifeq ($(MINGW32),1)
 else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif

+ifeq ($(wxUSE_GUI),0)
+  OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
+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
+
+# how do you do "VAR=\" ? BLEAGH!
+BACKSLASH=$(subst a,\,a)
+ifeq (,$(findstring /,$(PATH)))
+  IS_CYGWIN=0
+  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))
+ARCHINCDIR=$(WXDIR)/lib/$(TOOLKIT)$(INCEXT)
+
+SETUP_H=$(ARCHINCDIR)/wx/setup.h

 
 ifndef WXMAKINGDLL
 
 ifndef WXMAKINGDLL

-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+all:    $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)

 else
 else

-all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+all:    $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)

 endif
 
 endif
 

+$(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) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
+

 ifndef WXMAKINGDLL
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 ifndef WXMAKINGDLL
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)


@@ -370,16 +419,14 @@ $(JPEGLIB): $(JPEGOBJS)
        $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
        $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 

-$(XPMLIB): $(XPMOBJS)
-       $(AR) $(AROPTIONS) $@ $(XPMOBJS)
-       $(RANLIB) $@
-

 $(TIFFLIB): $(TIFFOBJS)
        $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
        $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
 

+$(REGEXLIB):
+       $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)

 
 

-$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/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.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
        $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c


@@ -438,18 +485,18 @@ clean:
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak

-       -$(RM) ../xpm/*.o
-       -$(RM) ../xpm/*.bak

        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak

+       -$(RM) ../regex/*.o
+       -$(RM) ../regex/*.bak

 
 cleanall: clean
        -$(RM) $(WXLIB)
        -$(RM) $(ZLIBLIB)
        -$(RM) $(PNGLIB)
        -$(RM) $(JPEGLIB)
 
 cleanall: clean
        -$(RM) $(WXLIB)
        -$(RM) $(ZLIBLIB)
        -$(RM) $(PNGLIB)
        -$(RM) $(JPEGLIB)

-       -$(RM) $(XPMLIB)

        -$(RM) $(TIFFLIB)
        -$(RM) $(TIFFLIB)

+       -$(RM) $(REGEXLIB)

 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)