1. wxStaticBitmap now uses mask even for bitmaps (and not only icons)

[wxWidgets.git] / src / xpm / MAKEFILE.VA

diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA
index 21eaf4aa19b8878b699a1fd352e0f6c7c22c5101..1f01650f76a57d3705bae42d752760982635bffc 100644 (file)
--- a/src/xpm/MAKEFILE.VA
+++ b/src/xpm/MAKEFILE.VA
@@ -70,12 +70,15 @@ $(CPPFLAGS) /Fo$@ /Tp $<
 <<
 
 OBJECTS = \
 <<
 
 OBJECTS = \

+  ..\xpm\$D\attrib.obj \

   ..\xpm\$D\crbuffri.obj \
   ..\xpm\$D\crdatfri.obj \
   ..\xpm\$D\create.obj \
   ..\xpm\$D\crifrbuf.obj \
   ..\xpm\$D\crifrdat.obj \
   ..\xpm\$D\data.obj \
   ..\xpm\$D\crbuffri.obj \
   ..\xpm\$D\crdatfri.obj \
   ..\xpm\$D\create.obj \
   ..\xpm\$D\crifrbuf.obj \
   ..\xpm\$D\crifrdat.obj \
   ..\xpm\$D\data.obj \

+  ..\xpm\$D\image.obj \
+  ..\xpm\$D\info.obj \

   ..\xpm\$D\hashtab.obj \
   ..\xpm\$D\misc.obj \
   ..\xpm\$D\parse.obj \
   ..\xpm\$D\hashtab.obj \
   ..\xpm\$D\misc.obj \
   ..\xpm\$D\parse.obj \


@@ -85,7 +88,6 @@ OBJECTS = \
   ..\xpm\$D\scan.obj \
   ..\xpm\$D\simx.obj \
   ..\xpm\$D\wrffrdat.obj \
   ..\xpm\$D\scan.obj \
   ..\xpm\$D\simx.obj \
   ..\xpm\$D\wrffrdat.obj \

-  ..\xpm\$D\wrffrp.obj \

   ..\xpm\$D\wrffri.obj
 
 all:  $(OS2XPMLIB)
   ..\xpm\$D\wrffri.obj
 
 all:  $(OS2XPMLIB)