detect EOF properly in wxFileInputStream

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 65504b448acab7c499c5f69b5cc4cdc773e994e5..e33b0574462b8e073ad6458891df9d68ac4245c0 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -15,7 +15,7 @@
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 
-#BCCDIR now defined in ../makeb32.env
+# BCCDIR now defined in ../makeb32.env
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
@@ -211,6 +211,7 @@ COMMONOBJS = \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
+               $(MSWDIR)\settcmn.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
                $(MSWDIR)\statbar.obj \
@@ -317,6 +318,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\palette.obj \
                $(MSWDIR)\pen.obj \
                $(MSWDIR)\penwin.obj \
+               $(MSWDIR)\popupwin.obj \
                $(MSWDIR)\printdlg.obj \
                $(MSWDIR)\printwin.obj \
                $(MSWDIR)\radiobox.obj \
@@ -417,15 +419,15 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-       -erase $(WXLIBDIR)\version.res
-        brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
         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
 
+version.res: 
+       brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
+
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<
@@ -590,6 +592,8 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
 $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+
 $(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
@@ -859,6 +863,8 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
+$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
+
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
@@ -1039,67 +1045,67 @@ $(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
@@ -1174,65 +1180,65 @@ 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