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 6d765757a116eb78f784499772952733e25f0db7..9e09253b3f27102133b270d2b9feeeb2806192cd 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -118,6 +118,7 @@ COMMONOBJS = \
 #  $(MSWDIR)\matrix.obj \
 
 MSWOBJS = \
 #  $(MSWDIR)\matrix.obj \
 
 MSWOBJS = \

+  $(MSWDIR)\accel.obj \

   $(MSWDIR)\app.obj \
   $(MSWDIR)\bitmap.obj \
   $(MSWDIR)\bmpbuttn.obj \
   $(MSWDIR)\app.obj \
   $(MSWDIR)\bitmap.obj \
   $(MSWDIR)\bmpbuttn.obj \


@@ -234,6 +235,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 
 #$(OBJECTS):   $(WXDIR)\include\wx\setup.h
 
 
 #$(OBJECTS):   $(WXDIR)\include\wx\setup.h
 

+$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)
+

 $(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
 
 $(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)
 $(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
 
 $(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)


@@ -573,11 +576,12 @@ $(CFG): makefile.b32
 -WE
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
 -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__
 
 -L$(BCCDIR)\lib
 -D__WXWIN__
 -D__WXMSW__

+-D__WINDOWS__

 -DWIN32
 $(OPT)
 $(DEBUG_FLAGS)
 -DWIN32
 $(OPT)
 $(DEBUG_FLAGS)