wxFileConfig ctor now (again) uses the files in the correct locations if the

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 8713bf3ac26e943d92b5d607d899f31125b238e9..9e09253b3f27102133b270d2b9feeeb2806192cd 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -73,11 +73,13 @@ COMMONOBJS = \
   $(MSWDIR)\config.obj \
   $(MSWDIR)\cmndata.obj \
   $(MSWDIR)\docview.obj \
+  $(MSWDIR)\docmdi.obj \
   $(MSWDIR)\dynarray.obj \
   $(MSWDIR)\event.obj \
   $(MSWDIR)\file.obj \
   $(MSWDIR)\fileconf.obj \
   $(MSWDIR)\filefn.obj \
+  $(MSWDIR)\framecmn.obj \
   $(MSWDIR)\gdicmn.obj \
   $(MSWDIR)\helpbase.obj \
   $(MSWDIR)\intl.obj \
@@ -110,11 +112,13 @@ COMMONOBJS = \
   $(MSWDIR)\mstream.obj \
   $(MSWDIR)\zstream.obj \
   $(MSWDIR)\datstrm.obj \
-  $(MSWDIR)\extended.obj
+  $(MSWDIR)\extended.obj \
+  $(MSWDIR)\wincmn.obj
 
 #  $(MSWDIR)\matrix.obj \
 
 MSWOBJS = \
+  $(MSWDIR)\accel.obj \
   $(MSWDIR)\app.obj \
   $(MSWDIR)\bitmap.obj \
   $(MSWDIR)\bmpbuttn.obj \
@@ -231,6 +235,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 
 #$(OBJECTS):   $(WXDIR)\include\wx\setup.h
 
+$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)
+
 $(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
 
 $(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)
@@ -406,6 +412,8 @@ $(MSWDIR)\cmndata.obj:     $(COMMDIR)\cmndata.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj:     $(COMMDIR)\docview.$(SRCSUFF)
 
+$(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
+
 $(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
@@ -416,6 +424,8 @@ $(MSWDIR)\fileconf.obj:     $(COMMDIR)\fileconf.$(SRCSUFF)
 
 $(MSWDIR)\filefn.obj:     $(COMMDIR)\filefn.$(SRCSUFF)
 
+$(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
+
 $(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
 
 $(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
@@ -480,6 +490,8 @@ $(MSWDIR)\fstream.obj:      $(COMMDIR)\fstream.$(SRCSUFF)
 
 $(MSWDIR)\stream.obj:  $(COMMDIR)\stream.$(SRCSUFF)
 
+$(MSWDIR)\wincmn.obj:  $(COMMDIR)\wincmn.$(SRCSUFF)
+
 $(MSWDIR)\extended.obj:        $(COMMDIR)\extended.c
 
 ########################################################
@@ -564,11 +576,12 @@ $(CFG): makefile.b32
 -WE
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
--I$(WXDIR)\include\msw\gnuwin32
+-I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib
 -D__WXWIN__
 -D__WXMSW__
+-D__WINDOWS__
 -DWIN32
 $(OPT)
 $(DEBUG_FLAGS)