X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d50d6840ad5eabc1d2267df1c3a8adaa93cdf58..644231539d2ccf9ef873060154079f33ba7a42db:/src/msw/makefile.b32

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 9f095d03b1..7e01ae2e19 100644
--- 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 \
@@ -299,6 +298,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
 		$(MSWDIR)\imaglist.obj \
+		$(MSWDIR)\iniconf.obj \
 		$(MSWDIR)\joystick.obj \
 		$(MSWDIR)\listbox.obj \
 		$(MSWDIR)\listctrl.obj \
@@ -376,8 +376,6 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
 		$(MSWDIR)\winpars.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
-ARCHINCDIR=$(WXDIR)\lib\msw
-ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
 
 default:	wx
 
@@ -553,6 +551,8 @@ $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
 $(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
 
+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
+
 $(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
 $(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
@@ -860,6 +860,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)