corrected warnings when compiling with -Wall -W

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index f100d88dd3ea07863e6a4931377aa1dc7184d108..901fc4bb5e383ea077379c8eab0594203901d4b4 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -15,9 +15,7 @@
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
@@ -213,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 \
@@ -319,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 \
@@ -377,8 +377,6 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\winpars.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
-ARCHINCDIR=$(WXDIR)\lib\msw
-ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
 
 default:       wx
 
@@ -594,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)
@@ -863,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)