use wxDIB methods instead of old functions for working with DIBs

[wxWidgets.git] / src / msw / makebase.vc

diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 9339fdb0ac15007993d5e04e33820419b87745a2..670c54fcf356c03c93a099cdf5ff7c3e8764eeb5 100644 (file)
--- a/src/msw/makebase.vc
+++ b/src/msw/makebase.vc
@@ -97,6 +97,7 @@ COMMONOBJS = \
                ..\common\$D\memory.obj \
                ..\common\$D\mimecmn.obj \
                ..\common\$D\module.obj \
+               ..\common\$D\msgout.obj \
                ..\common\$D\mstream.obj \
                ..\common\$D\object.obj \
                ..\common\$D\process.obj \
@@ -142,13 +143,17 @@ MSWOBJS = ..\msw\$D\dde.obj \
 
 OBJECTS = $(COMMONOBJS) $(MSWOBJS) 
 
-ARCHINCDIR=$(WXDIR)\lib\base$(INCEXT)
+ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
 SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
 # Normal, static library
 #all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
 all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET)
 
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
 $(WXDIR)\include\wx\msw\setup.h:
     cd $(WXDIR)\include\wx\msw
     if not exist setup.h copy setup0.h setup.h
@@ -157,7 +162,7 @@ $(WXDIR)\include\wx\msw\setup.h:
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
     copy $(WXDIR)\include\wx\msw\setup.h $@
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D 
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D
 
 $D:
     mkdir $D
@@ -168,6 +173,9 @@ $(COMMDIR)\$D:
 $(MSWDIR)\$D:
     mkdir $(MSWDIR)\$D
 
+$(WXDIR)\$D:
+    mkdir $(WXDIR)\$D
+
 ### Static library
 
 $(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) 
@@ -193,7 +201,7 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 ..\common\lex_yy.c:    ..\common\doslex.c
     copy "..\common"\doslex.c "..\common"\lex_yy.c
 
-$(OBJECTS): $(WXDIR)/include/wx/setup.h
+$(OBJECTS): $(SETUP_H)
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
         cl @<<