Added DoSetSize and DoMoveWindow to generic wxStaticLine.

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 901fc4bb5e383ea077379c8eab0594203901d4b4..d57aada93b7a8e5f1f6ef42d731d3620fb6b36aa 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -194,6 +194,7 @@ COMMONOBJS = \
                $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\mimecmn.obj \
                $(MSWDIR)\module.obj \
                $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\mimecmn.obj \
                $(MSWDIR)\module.obj \

+               $(MSWDIR)\msgout.obj \

                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\nbkbase.obj \
                $(MSWDIR)\object.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\nbkbase.obj \
                $(MSWDIR)\object.obj \


@@ -419,15 +420,15 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !

-       -erase $(WXLIBDIR)\version.res
-        brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc

         implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
         implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll

-

 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
 
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
 

+version.res: 
+       brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
+

 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<


@@ -829,6 +830,8 @@ $(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF)
 
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
 
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 

+$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF)
+

 $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
 $(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)
 $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
 $(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)


@@ -1045,67 +1048,67 @@ $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
 
 all_utils:
     cd $(WXDIR)\utils

-    make -f makefile.b32
+    ${MAKE} -f makefile.b32

     cd $(WXDIR)\src\msw
 
 all_samples:
     cd $(WXDIR)\samples
     cd $(WXDIR)\src\msw
 
 all_samples:
     cd $(WXDIR)\samples

-    make -f makefile.b32
+    ${MAKE} -f makefile.b32

     cd $(WXDIR)\src\msw
 
 all_execs:
     cd $(WXDIR)\utils
     cd $(WXDIR)\src\msw
 
 all_execs:
     cd $(WXDIR)\utils

-    make -f makefile.b32 all_execs
+    ${MAKE} -f makefile.b32 all_execs

     cd $(WXDIR)\src\msw
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
     cd $(WXDIR)\src\msw
 
 png:    $(CFG)
         cd $(WXDIR)\src\png

-        make -f makefile.b32
+        ${MAKE} -f makefile.b32

         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png

-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean

         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib

-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 lib

         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib
         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib

-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean

         cd $(WXDIR)\src\msw
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
         cd $(WXDIR)\src\msw
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg

-        make -f makefile.b32
+        ${MAKE} -f makefile.b32

         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\jpeg
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\jpeg

-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean

         cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex
         cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex

-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 lib

         cd $(WXDIR)\src\msw
 
 clean_regex:
         cd $(WXDIR)\src\regex
         cd $(WXDIR)\src\msw
 
 clean_regex:
         cd $(WXDIR)\src\regex

-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean

         cd $(WXDIR)\src\msw
 
 tiff:   $(CFG)
         cd $(WXDIR)\src\tiff
         cd $(WXDIR)\src\msw
 
 tiff:   $(CFG)
         cd $(WXDIR)\src\tiff

-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 lib

         cd $(WXDIR)\src\msw
 
 clean_tiff:
         cd $(WXDIR)\src\tiff
         cd $(WXDIR)\src\msw
 
 clean_tiff:
         cd $(WXDIR)\src\tiff

-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean

         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32


@@ -1180,65 +1183,65 @@ portingps:      $(WXDIR)\docs\ps\porting.ps
 
 allhlp: wxhlp portinghlp prophlp
         cd $(WXDIR)\utils\dialoged\src
 
 allhlp: wxhlp portinghlp prophlp
         cd $(WXDIR)\utils\dialoged\src

-        make -f makefile.b32 hlp
+        ${MAKE} -f makefile.b32 hlp

         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src
         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src

-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp

 #        cd $(WXDIR)\utils\tex2rtf\src
 #        cd $(WXDIR)\utils\tex2rtf\src

-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp

 #        cd $(WXDIR)\utils\wxgraph\src
 #        cd $(WXDIR)\utils\wxgraph\src

-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp

 #        cd $(WXDIR)\utils\wxchart\src
 #        cd $(WXDIR)\utils\wxchart\src

-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp

 #        cd $(WXDIR)\utils\wxtree\src
 #        cd $(WXDIR)\utils\wxtree\src

-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp

 #        cd $(WXDIR)\utils\wxbuild\src
 #        cd $(WXDIR)\utils\wxbuild\src

-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp

 #        cd $(WXDIR)\utils\wxgrid\src
 #        cd $(WXDIR)\utils\wxgrid\src

-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp

 
 allhtml: wxhtml portinghtml prophtml
         cd $(WXDIR)\utils\dialoged\src
 
 allhtml: wxhtml portinghtml prophtml
         cd $(WXDIR)\utils\dialoged\src

-        make -f makefile.b32 html
+        ${MAKE} -f makefile.b32 html

         cd $(THISDIR)
 
         cd $(THISDIR)
 

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 #        cd $(WXDIR)\utils\dialoged\src
 #        cd $(WXDIR)\utils\dialoged\src

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 #        cd $(WXDIR)\utils\hytext\src
 #        cd $(WXDIR)\utils\hytext\src

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 #        cd $(WXDIR)\utils\wxhelp\src
 #        cd $(WXDIR)\utils\wxhelp\src

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 #        cd $(WXDIR)\utils\tex2rtf\src
 #        cd $(WXDIR)\utils\tex2rtf\src

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 #        cd $(WXDIR)\utils\wxgraph\src
 #        cd $(WXDIR)\utils\wxgraph\src

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 #        cd $(WXDIR)\utils\wxchart\src
 #        cd $(WXDIR)\utils\wxchart\src

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 #        cd $(WXDIR)\utils\wxtree\src
 #        cd $(WXDIR)\utils\wxtree\src

-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html

 
 allps: wxps referencps portingps propps
         cd $(WXDIR)\utils\dialoged\src
 
 allps: wxps referencps portingps propps
         cd $(WXDIR)\utils\dialoged\src

-        make -f makefile.b32 ps
+        ${MAKE} -f makefile.b32 ps

         cd $(THISDIR)
 
 allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
         cd $(WXDIR)\utils\dialoged\src
         cd $(THISDIR)
 
 allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
         cd $(WXDIR)\utils\dialoged\src

-        make -f makefile.b32 pdfrtf
+        ${MAKE} -f makefile.b32 pdfrtf

         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src
         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src

-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps

 #        cd $(WXDIR)\utils\tex2rtf\src
 #        cd $(WXDIR)\utils\tex2rtf\src

-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps

 #        cd $(WXDIR)\utils\wxgraph\src
 #        cd $(WXDIR)\utils\wxgraph\src

-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps

 #        cd $(WXDIR)\utils\wxchart\src
 #        cd $(WXDIR)\utils\wxchart\src

-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps

 #        cd $(WXDIR)\utils\wxtree\src
 #        cd $(WXDIR)\utils\wxtree\src

-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps

 #        cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
 #        cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj