X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76484b24950888c320103816d15287cc5f7f4387..db54b046154f408aa3d688ecc5c92e7e224b0bdf:/src/msw/makefile.b32

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 1e5ff9b40c..b1ebe96ed7 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake 
+# This file was automatically generated by tmake
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -112,8 +112,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 #  $(MSWDIR)\treectrl.obj
 
 COMMONOBJS = \
-		$(MSWDIR)\y_tab.obj \
-		$(MSWDIR)\appcmn.obj \
+        $(MSWDIR)\y_tab.obj \
+        $(MSWDIR)\appcmn.obj \
 		$(MSWDIR)\artprov.obj \
 		$(MSWDIR)\artstd.obj \
 		$(MSWDIR)\choiccmn.obj \
@@ -194,6 +194,7 @@ COMMONOBJS = \
 		$(MSWDIR)\menucmn.obj \
 		$(MSWDIR)\mimecmn.obj \
 		$(MSWDIR)\module.obj \
+		$(MSWDIR)\msgout.obj \
 		$(MSWDIR)\mstream.obj \
 		$(MSWDIR)\nbkbase.obj \
 		$(MSWDIR)\object.obj \
@@ -378,11 +379,11 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
-default:	wx
+default:    wx
 
 wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
-all:	wx
+all:    wx
 
 # Copy the in-CVS setup0.h to setup.h if necessary
 makesetuph:
@@ -403,30 +404,30 @@ $(ARCHINCDIR)\wx:
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
-	tlib "$(LIBTARGET)" /P1024 @&&!
+    tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 !else
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-	-erase $(LIBTARGET)
-	-erase $(WXLIBDIR)\wx.dll
-        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
+    -erase $(LIBTARGET)
+    -erase $(WXDLL)
+        $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
 c0d32.obj $(OBJECTS)
-$(WXLIBDIR)\wx
+$(WXDLL)
 nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-        implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
+        implib -c $(LIBTARGET) $(WXDLL)
 !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
+version.res:
+    brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
 
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
@@ -440,7 +441,7 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-# $(OBJECTS):	$(WXDIR)\include\wx\setup.h
+# $(OBJECTS):   $(WXDIR)\include\wx\setup.h
 
 $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
@@ -829,6 +830,8 @@ $(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(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)
@@ -1045,71 +1048,71 @@ $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
-    make -f makefile.b32
+    ${MAKE} -f makefile.b32
     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
-    make -f makefile.b32 all_execs
+    ${MAKE} -f makefile.b32 all_execs
     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
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         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
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         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
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         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
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         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
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32
-	copy &&!
+    copy &&!
 -Hc
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
@@ -1136,14 +1139,11 @@ $(WIN95FLAG)
 ! $(CFG)
 
 clean: $(PERIPH_CLEAN_TARGET)
-    -erase $(LIBTARGET)
-    -erase $(WXLIBDIR)\wx.dll
     -erase $(WXLIBDIR)\wx.tds
     -erase $(WXLIBDIR)\wx.il?
     -erase *.obj
     -erase *.pch
     -erase *.csm
-    -erase *.cfg
     -erase "wx32.#??"
     -erase ..\common\y_tab.c
     -erase ..\common\lex_yy.c
@@ -1163,82 +1163,82 @@ proprtf: $(DOCDIR)/winhelp/prop.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 proppdfrtf: $(DOCDIR)/pdf/prop.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
-html:	wxhtml portinghtml
-wxhtml:	$(DOCDIR)\html\wx\wx.htm
+html:   wxhtml portinghtml
+wxhtml: $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\html\wx\wx.chm
 prophtml: $(DOCDIR)\html\proplist\prop.htm
 ps:     wxps referencps
-wxps:	$(WXDIR)\docs\ps\wx.ps
-propps:	$(WXDIR)\docs\ps\prop.ps
-referencps:	$(WXDIR)\docs\ps\referenc.ps
+wxps:   $(WXDIR)\docs\ps\wx.ps
+propps: $(WXDIR)\docs\ps\prop.ps
+referencps: $(WXDIR)\docs\ps\referenc.ps
 
 portinghtml: $(DOCDIR)\html\porting\port.htm
 portingrtf: $(DOCDIR)/winhelp/porting.rtf
 portinghlp: $(DOCDIR)/winhelp/porting.hlp
 portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
-portingps:	$(WXDIR)\docs\ps\porting.ps
+portingps:  $(WXDIR)\docs\ps\porting.ps
 
 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
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxtree\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxbuild\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxgrid\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 
 allhtml: wxhtml portinghtml prophtml
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 html
+        ${MAKE} -f makefile.b32 html
         cd $(THISDIR)
 
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\dialoged\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\hytext\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxhelp\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        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
-        make -f makefile.b32 ps
+        ${MAKE} -f makefile.b32 ps
         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
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        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
@@ -1332,9 +1332,9 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
          cd $(THISDIR)
 
 $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
-	cd $(DOCDIR)\html\wx
-	-hhc wx.hhp
-	cd $(THISDIR)
+    cd $(DOCDIR)\html\wx
+    -hhc wx.hhp
+    cd $(THISDIR)
 
 
 $(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
@@ -1357,8 +1357,8 @@ $(DOCDIR)\html\proplist\prop.htm:         $(DOCDIR)\latex\proplist\prop.tex $(DO
         -erase $(DOCDIR)\latex\proplist\*.ref
         cd $(THISDIR)
 
-$(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
-	cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\manual.dvi:  $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
+    cd $(WXDIR)\docs\latex\wx
         -latex manual
         -latex manual
         -makeindx manual
@@ -1367,8 +1367,8 @@ $(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/w
         -latex manual
         cd $(THISDIR)
 
-$(WXDIR)\docs\latex\porting\porting.dvi:	$(DOCDIR)/latex/porting/porting.tex
-	cd $(WXDIR)\docs\latex\porting
+$(WXDIR)\docs\latex\porting\porting.dvi:    $(DOCDIR)/latex/porting/porting.tex
+    cd $(WXDIR)\docs\latex\porting
         -latex porting
         -latex porting
         -makeindx porting
@@ -1377,20 +1377,20 @@ $(WXDIR)\docs\latex\porting\porting.dvi:	$(DOCDIR)/latex/porting/porting.tex
         -latex porting
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\wx.ps:	$(WXDIR)\docs\latex\wx\manual.dvi
-	cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
+    cd $(WXDIR)\docs\latex\wx
         -dvips32 -o wx.ps manual
         move wx.ps $(WXDIR)\docs\ps\wx.ps
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\porting.ps:	$(WXDIR)\docs\latex\porting\porting.dvi
-	cd $(WXDIR)\docs\latex\porting
+$(WXDIR)\docs\ps\porting.ps:    $(WXDIR)\docs\latex\porting\porting.dvi
+    cd $(WXDIR)\docs\latex\porting
         -dvips32 -o porting.ps porting
         move porting.ps $(WXDIR)\docs\ps\porting.ps
         cd $(THISDIR)
 
-$(WXDIR)\docs\latex\wx\referenc.dvi:	$(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
-	cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\referenc.dvi:    $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
+    cd $(WXDIR)\docs\latex\wx
         -latex referenc
         -latex referenc
         -makeindx referenc
@@ -1399,8 +1399,8 @@ $(WXDIR)\docs\latex\wx\referenc.dvi:	$(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/la
         -latex referenc
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
-	cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\referenc.ps:   $(WXDIR)\docs\latex\wx\referenc.dvi
+    cd $(WXDIR)\docs\latex\wx
         -dvips32 -o referenc.ps referenc
         move referenc.ps $(WXDIR)\docs\ps\referenc.ps
         cd $(THISDIR)
@@ -1422,7 +1422,6 @@ MFTYPE=b32
 # makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
 
 self:
-	cd $(WXWIN)\distrib\msw\tmake
-	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
-
+    cd $(WXWIN)\distrib\msw\tmake
+    tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+    copy makefile.$(MFTYPE) $(WXWIN)\src\msw