basic support for encodings for wxMSW::wxFont

[wxWidgets.git] / src / msw / makefile.wat

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 725af9a4db3e08c474ee74b83efcb364c1761b0d..b89805b8c69fb9d5db4ecbdee4fb0fae3cc4cf41 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,8 +1,6 @@
 
 
 
 

-
-
-# This file was automatically generated by tmake at 21:00, 1999/07/14
+# This file was automatically generated by tmake at 20:03, 1999/09/29

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe


@@ -36,9 +34,10 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= busyinfo.obj &
        choicdgg.obj &
 
 GENERICOBJS= busyinfo.obj &
        choicdgg.obj &

-       extdlgg.obj &

        gridg.obj &
        laywin.obj &
        gridg.obj &
        laywin.obj &

+       logg.obj &
+       numdlgg.obj &

        panelg.obj &
        progdlgg.obj &
        prop.obj &
        panelg.obj &
        progdlgg.obj &
        prop.obj &


@@ -47,15 +46,22 @@ GENERICOBJS= busyinfo.obj &
        sashwin.obj &
        scrolwin.obj &
        splitter.obj &
        sashwin.obj &
        scrolwin.obj &
        splitter.obj &

+       statusbr.obj &

        tabg.obj &
        textdlgg.obj &
        tabg.obj &
        textdlgg.obj &

-       tipdlg.obj
+       tipdlg.obj &
+       wizard.obj

 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.

-NONESSENTIALOBJS= colrdlgg.obj &
+NONESSENTIALOBJS= caret.obj &
+       colrdlgg.obj &
+       dcpsg.obj &

        dirdlgg.obj &
        dirdlgg.obj &

+       filedlgg.obj &

        fontdlgg.obj &
        fontdlgg.obj &

+       helphtml.obj &
+       helpwxht.obj &

        helpxlp.obj &
        imaglist.obj &
        listctrl.obj &
        helpxlp.obj &
        imaglist.obj &
        listctrl.obj &


@@ -63,14 +69,15 @@ NONESSENTIALOBJS= colrdlgg.obj &
        notebook.obj &
        printps.obj &
        prntdlgg.obj &
        notebook.obj &
        printps.obj &
        prntdlgg.obj &

-       statusbr.obj &
+       statline.obj &

        treectrl.obj
 
 COMMONOBJS = &
        y_tab.obj &
        treectrl.obj
 
 COMMONOBJS = &
        y_tab.obj &

-       extended.obj &
+       choiccmn.obj &

        cmndata.obj &
        config.obj &
        cmndata.obj &
        config.obj &

+       ctrlcmn.obj &

        date.obj &
        datstrm.obj &
        db.obj &
        date.obj &
        datstrm.obj &
        db.obj &


@@ -82,22 +89,28 @@ COMMONOBJS = &
        dynarray.obj &
        dynlib.obj &
        event.obj &
        dynarray.obj &
        dynlib.obj &
        event.obj &

+       extended.obj &
+       ffile.obj &

        file.obj &
        fileconf.obj &
        filefn.obj &
        filesys.obj &
        file.obj &
        fileconf.obj &
        filefn.obj &
        filesys.obj &

+       fontcmn.obj &

        framecmn.obj &
        fs_inet.obj &
        fs_zip.obj &
        ftp.obj &
        gdicmn.obj &
        framecmn.obj &
        fs_inet.obj &
        fs_zip.obj &
        ftp.obj &
        gdicmn.obj &

+       gifdecod.obj &

        hash.obj &
        helpbase.obj &
        http.obj &
        imagbmp.obj &
        image.obj &
        imaggif.obj &
        hash.obj &
        helpbase.obj &
        http.obj &
        imagbmp.obj &
        image.obj &
        imaggif.obj &

+       imagpcx.obj &

        imagpng.obj &
        imagpng.obj &

+       imagpnm.obj &

        intl.obj &
        ipcbase.obj &
        layout.obj &
        intl.obj &
        ipcbase.obj &
        layout.obj &


@@ -117,14 +130,17 @@ COMMONOBJS = &
        resource.obj &
        sckaddr.obj &
        sckfile.obj &
        resource.obj &
        sckaddr.obj &
        sckfile.obj &

-       sckint.obj &

        sckipc.obj &
        sckstrm.obj &
        sckipc.obj &
        sckstrm.obj &

+       serbase.obj &
+       sizer.obj &

        socket.obj &
        socket.obj &

+       strconv.obj &

        stream.obj &
        string.obj &
        tbarbase.obj &
        tbarsmpl.obj &
        stream.obj &
        string.obj &
        tbarbase.obj &
        tbarsmpl.obj &

+       textcmn.obj &

        textfile.obj &
        time.obj &
        timercmn.obj &
        textfile.obj &
        time.obj &
        timercmn.obj &


@@ -141,7 +157,7 @@ COMMONOBJS = &
        wincmn.obj &
        wxchar.obj &
        wxexpr.obj &
        wincmn.obj &
        wxchar.obj &
        wxexpr.obj &

-       zipstream.obj &
+       zipstrm.obj &

        zstream.obj
 
 MSWOBJS = accel.obj &
        zstream.obj
 
 MSWOBJS = accel.obj &


@@ -184,6 +200,7 @@ MSWOBJS = accel.obj &
        gauge95.obj &
        gaugemsw.obj &
        gdiobj.obj &
        gauge95.obj &
        gaugemsw.obj &
        gdiobj.obj &

+       gsocket.obj &

        helpwin.obj &
        icon.obj &
        iniconf.obj &
        helpwin.obj &
        icon.obj &
        iniconf.obj &


@@ -248,8 +265,8 @@ $(LIBTARGET) : $(OBJECTS)
 #    %create tmp.lbc
 #    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
 #    wlib /b /c /n /p=512 $^@ @tmp.lbc
 #    %create tmp.lbc
 #    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
 #    wlib /b /c /n /p=512 $^@ @tmp.lbc

-       
-       
+
+

 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
     -erase *.obj
     -erase $(LIBTARGET)
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
     -erase *.obj
     -erase $(LIBTARGET)


@@ -379,6 +396,9 @@ gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+gsocket.obj:     $(MSWDIR)\gsocket.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -531,12 +551,18 @@ xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
 ########################################################
 # Common objects (always compiled)
 
 ########################################################
 # Common objects (always compiled)
 

+choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 cmndata.obj:     $(COMMDIR)\cmndata.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 cmndata.obj:     $(COMMDIR)\cmndata.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 date.obj:     $(COMMDIR)\date.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 date.obj:     $(COMMDIR)\date.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -570,6 +596,12 @@ dynlib.obj:     $(COMMDIR)\dynlib.cpp
 event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+extended.obj:     $(COMMDIR)\extended.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ffile.obj:     $(COMMDIR)\ffile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 file.obj:     $(COMMDIR)\file.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 file.obj:     $(COMMDIR)\file.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -582,6 +614,9 @@ filefn.obj:     $(COMMDIR)\filefn.cpp
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -597,6 +632,9 @@ ftp.obj:     $(COMMDIR)\ftp.cpp
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 hash.obj:     $(COMMDIR)\hash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 hash.obj:     $(COMMDIR)\hash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -615,9 +653,15 @@ image.obj:     $(COMMDIR)\image.cpp
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+imagpcx.obj:     $(COMMDIR)\imagpcx.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 imagpng.obj:     $(COMMDIR)\imagpng.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imagpng.obj:     $(COMMDIR)\imagpng.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+imagpnm.obj:     $(COMMDIR)\imagpnm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 intl.obj:     $(COMMDIR)\intl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 intl.obj:     $(COMMDIR)\intl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -675,18 +719,24 @@ sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
 sckfile.obj:     $(COMMDIR)\sckfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckfile.obj:     $(COMMDIR)\sckfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

-sckint.obj:     $(COMMDIR)\sckint.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-

 sckipc.obj:     $(COMMDIR)\sckipc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckipc.obj:     $(COMMDIR)\sckipc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+serbase.obj:     $(COMMDIR)\serbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sizer.obj:     $(COMMDIR)\sizer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+strconv.obj:     $(COMMDIR)\strconv.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 stream.obj:     $(COMMDIR)\stream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 stream.obj:     $(COMMDIR)\stream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -699,6 +749,9 @@ tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
 tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+textcmn.obj:     $(COMMDIR)\textcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -747,7 +800,7 @@ wxchar.obj:     $(COMMDIR)\wxchar.cpp
 wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

-zipstream.obj:     $(COMMDIR)\zipstream.cpp
+zipstrm.obj:     $(COMMDIR)\zipstrm.cpp

   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 zstream.obj:     $(COMMDIR)\zstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 zstream.obj:     $(COMMDIR)\zstream.cpp


@@ -755,9 +808,6 @@ zstream.obj:     $(COMMDIR)\zstream.cpp
 
 
 
 
 
 

-extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
-

 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 


@@ -779,15 +829,18 @@ busyinfo.obj:     $(GENDIR)\busyinfo.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

-extdlgg.obj:     $(GENDIR)\extdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-

 gridg.obj:     $(GENDIR)\gridg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gridg.obj:     $(GENDIR)\gridg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+logg.obj:     $(GENDIR)\logg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+numdlgg.obj:     $(GENDIR)\numdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -812,6 +865,9 @@ scrolwin.obj:     $(GENDIR)\scrolwin.cpp
 splitter.obj:     $(GENDIR)\splitter.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 splitter.obj:     $(GENDIR)\splitter.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+statusbr.obj:     $(GENDIR)\statusbr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 tabg.obj:     $(GENDIR)\tabg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tabg.obj:     $(GENDIR)\tabg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -821,6 +877,9 @@ textdlgg.obj:     $(GENDIR)\textdlgg.cpp
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+wizard.obj:     $(GENDIR)\wizard.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 
 
 crbuffri.obj: $(XPMDIR)\crbuffri.c
 
 
 crbuffri.obj: $(XPMDIR)\crbuffri.c


@@ -891,9 +950,9 @@ wrffrp.obj: $(XPMDIR)\wrffrp.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \

-  trees$(O) 
+  trees$(O)

 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \

-  infutil$(O) inffast$(O) 
+  infutil$(O) inffast$(O)

 
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
        $(CC) -c $(CFLAGS) $*.c
 
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
        $(CC) -c $(CFLAGS) $*.c


@@ -969,3 +1028,8 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 

+MFTYPE=wat
+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