Cured last focus bug (I hope); some wxMotif mods

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 12306011cba748808f6061fbf95fc5060187675c..5646f3eb9748a4f3c5720b0e093dc7ac37f1401f 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -16,9 +16,8 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 

-EXTRATARGETS = # wxxpm
-EXTRATARGETSCLEAN = # clean_wxxpm
-
+EXTRATARGETS = xpm png zlib
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib

 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 XPMDIR=$(WXDIR)\src\xpm
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 XPMDIR=$(WXDIR)\src\xpm


@@ -48,8 +47,7 @@ NONESSENTIALOBJS= printps.obj &
   msgdlgg.obj &
   helpxlp.obj &
   colrdlgg.obj &
   msgdlgg.obj &
   helpxlp.obj &
   colrdlgg.obj &

-  fontdlgg.obj &
-  postscrp.obj
+  fontdlgg.obj

 
 COMMONOBJS = cmndata.obj &
   config.obj &
 
 COMMONOBJS = cmndata.obj &
   config.obj &


@@ -81,6 +79,7 @@ COMMONOBJS = cmndata.obj &
   timercmn.obj &
   utilscmn.obj &
   validate.obj &
   timercmn.obj &
   utilscmn.obj &
   validate.obj &

+  valgen.obj &

   valtext.obj &
   date.obj &
   hash.obj &
   valtext.obj &
   date.obj &
   hash.obj &


@@ -114,7 +113,7 @@ COMMONOBJS = cmndata.obj &
 #  db.obj &
 #  dbtable.obj &
 
 #  db.obj &
 #  dbtable.obj &
 

-MSWOBJS1 = &
+MSWOBJS = &

   accel.obj &
   app.obj &
   bitmap.obj &
   accel.obj &
   app.obj &
   bitmap.obj &


@@ -169,7 +168,6 @@ MSWOBJS1 = &
   palette.obj &
   pen.obj &
   penwin.obj &
   palette.obj &
   pen.obj &
   penwin.obj &

-  pnghand.obj &

   printdlg.obj &
   printwin.obj &
   radiobox.obj &
   printdlg.obj &
   printwin.obj &
   radiobox.obj &


@@ -193,11 +191,15 @@ MSWOBJS1 = &
   textctrl.obj &
   thread.obj &
   timer.obj &
   textctrl.obj &
   thread.obj &
   timer.obj &

+  tooltip.obj &

   treectrl.obj &
   utils.obj &
   utilsexc.obj &
   wave.obj &
   window.obj &
   treectrl.obj &
   utils.obj &
   utilsexc.obj &
   wave.obj &
   window.obj &

+  xpmhand.obj
+
+#  pnghand.obj &

 
 OLEOBJS = &
   droptgt.obj &
 
 OLEOBJS = &
   droptgt.obj &


@@ -207,33 +209,28 @@ OLEOBJS = &
   uuid.obj &
   automtn.obj
 
   uuid.obj &
   automtn.obj
 

-XPMOBJECTS =   crbuffri.obj&
-               crdatfri.obj&
-               create.obj crifrbuf.obj&
-               crifrdat.obj&
-               data.obj&
-               hashtab.obj misc.obj&
-               parse.obj rdftodat.obj&
-               rdftoi.obj&
-               rgb.obj scan.obj&
-               simx.obj wrffrdat.obj&
-               wrffrp.obj wrffri.obj
-

 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.

-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS) # $(XPMOBJECTS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS)

 
 

-all:        $(OBJECTS) $(LIBTARGET)
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)

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

+
+#test : $(OBJECTS)
+#    %create tmp.lbc
+#    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+#    wlib /b /c /n /p=512 $^@ @tmp.lbc
+       

        
        

-clean:   .SYMBOLIC
+clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)

     -erase *.obj
     -erase $(LIBTARGET)
     -erase *.pch
     -erase *.err
     -erase *.obj
     -erase $(LIBTARGET)
     -erase *.pch
     -erase *.err

+    -erase *.lbc

 
 cleanall:   clean
 
 
 cleanall:   clean
 


@@ -339,12 +336,18 @@ gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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

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

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


@@ -466,6 +469,9 @@ thread.obj:     $(MSWDIR)\thread.cpp
 timer.obj:     $(MSWDIR)\timer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 timer.obj:     $(MSWDIR)\timer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

 treectrl.obj:     $(MSWDIR)\treectrl.cpp
         cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 treectrl.obj:     $(MSWDIR)\treectrl.cpp
         cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<


@@ -482,6 +488,9 @@ wave.obj:     $(MSWDIR)\wave.cpp
 window.obj:     $(MSWDIR)\window.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 window.obj:     $(MSWDIR)\window.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

 droptgt.obj:     $(OLEDIR)\droptgt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 droptgt.obj:     $(OLEDIR)\droptgt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -578,9 +587,6 @@ object.obj:     $(COMMDIR)\object.cpp
 odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -605,6 +611,9 @@ utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
 validate.obj:     $(COMMDIR)\validate.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 validate.obj:     $(COMMDIR)\validate.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -825,15 +834,82 @@ wrffri.obj: $(XPMDIR)\wrffri.c
 wrffrp.obj: $(XPMDIR)\wrffrp.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 wrffrp.obj: $(XPMDIR)\wrffrp.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 

+OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+  trees$(O) 
+OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
+  infutil$(O) inffast$(O) 
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
+   infcodes.h infutil.h
+       $(CC) -c $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
+   infcodes.h inffast.h
+       $(CC) -c $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+       $(CC) -c $(CFLAGS) $*.c
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+       $(CC) -c $(CFLAGS) $*.c
+
+infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+       $(CC) -c $(CFLAGS) $*.c
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+       $(CC) -c $(CFLAGS) $*.c
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+xpm:   .SYMBOLIC
+    cd $(WXDIR)\src\xpm
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_xpm:   .SYMBOLIC
+    cd $(WXDIR)\src\xpm
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw

 
 

-#wxxpm:   .SYMBOLIC
-#    cd $(WXDIR)\contrib\wxxpm
-#    wmake -f makefile.wat all
-#    cd $(WXDIR)\src\msw
+clean_png:   .SYMBOLIC
+    cd $(WXDIR)\src\png
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw

 
 

-#clean_wxxpm:   .SYMBOLIC
-#    cd $(WXDIR)\contrib\wxxpm
-#    wmake -f makefile.wat clean
-#    cd $(WXDIR)\src\msw
+zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw

 
 

+clean_zlib:   .SYMBOLIC
+    cd $(WXDIR)\src\zlib
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw