radiobox now sends notification messages when the selection is changed from

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 15d88838edd243af9558784f43d87ea7983e14d9..780261308d82a87fee9a70f517bdbd50b9f8c99b 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -73,7 +73,6 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= \
   $(MSWDIR)\choicdgg.obj \
   $(MSWDIR)\gridg.obj \
-  $(MSWDIR)\imaglist.obj \
   $(MSWDIR)\laywin.obj \
   $(MSWDIR)\panelg.obj \
   $(MSWDIR)\prop.obj \
@@ -111,6 +110,8 @@ COMMONOBJS = \
   $(MSWDIR)\gdicmn.obj \
   $(MSWDIR)\helpbase.obj \
   $(MSWDIR)\image.obj \
+  $(MSWDIR)\imagpng.obj \
+  $(MSWDIR)\imagjpeg.obj \
   $(MSWDIR)\intl.obj \
   $(MSWDIR)\ipcbase.obj \
   $(MSWDIR)\log.obj \
@@ -127,11 +128,13 @@ COMMONOBJS = \
   $(MSWDIR)\timercmn.obj \
   $(MSWDIR)\utilscmn.obj \
   $(MSWDIR)\validate.obj \
+  $(MSWDIR)\valgen.obj \
   $(MSWDIR)\valtext.obj \
   $(MSWDIR)\variant.obj \
   $(MSWDIR)\date.obj \
   $(MSWDIR)\hash.obj \
   $(MSWDIR)\list.obj \
+  $(MSWDIR)\paper.obj \
   $(MSWDIR)\string.obj \
   $(MSWDIR)\time.obj \
   $(MSWDIR)\wxexpr.obj \
@@ -154,7 +157,8 @@ COMMONOBJS = \
   $(MSWDIR)\http.obj \
   $(MSWDIR)\ftp.obj \
   $(MSWDIR)\sckfile.obj \
-  $(MSWDIR)\sckipc.obj
+  $(MSWDIR)\sckipc.obj \
+  $(MSWDIR)\wxchar.obj
 
 #  $(MSWDIR)\odbc.obj \
 #  $(MSWDIR)\matrix.obj \
@@ -264,16 +268,16 @@ all:      all_libs all_execs
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-        erase $(LIBTARGET)
+        -erase $(LIBTARGET)
        tlib $(LIBTARGET) /P512 @&&!
--+$(OBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
++$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 !else
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-       erase $(LIBTARGET)
-       erase $(WXLIBDIR)\wx.dll
+       -erase $(LIBTARGET)
+       -erase $(WXLIBDIR)\wx.dll
         tlink32 $(LINK_FLAGS) /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
@@ -503,6 +507,12 @@ $(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
 
 $(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
 
+$(MSWDIR)\imagpng.obj:     $(COMMDIR)\imagpng.$(SRCSUFF)
+
+$(MSWDIR)\imagjpeg.obj:     $(COMMDIR)\imagjpeg.$(SRCSUFF)
+
+$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -539,6 +549,8 @@ $(MSWDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.$(SRCSUFF)
 
 $(MSWDIR)\validate.obj:     $(COMMDIR)\validate.$(SRCSUFF)
 
+$(MSWDIR)\valgen.obj:     $(COMMDIR)\valgen.$(SRCSUFF)
+
 $(MSWDIR)\valtext.obj:     $(COMMDIR)\valtext.$(SRCSUFF)
 
 $(MSWDIR)\date.obj:     $(COMMDIR)\date.$(SRCSUFF)
@@ -549,6 +561,8 @@ $(MSWDIR)\hash.obj:     $(COMMDIR)\hash.$(SRCSUFF)
 
 $(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
 
+$(MSWDIR)\paper.obj:     $(COMMDIR)\paper.$(SRCSUFF)
+
 $(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
 
 $(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
@@ -593,6 +607,8 @@ $(MSWDIR)\sckfile.obj:      $(COMMDIR)\sckfile.$(SRCSUFF)
 
 $(MSWDIR)\sckipc.obj:  $(COMMDIR)\sckipc.$(SRCSUFF)
 
+$(MSWDIR)\wxchar.obj:  $(COMMDIR)\wxchar.$(SRCSUFF)
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
@@ -694,7 +710,7 @@ $(CFG): makefile.b32
 -WE
 -tWM
 
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib
@@ -711,13 +727,13 @@ $(WIN95FLAG)
 # -Oxt
 
 clean: $(PERIPH_CLEAN_TARGET)
-    erase $(LIBTARGET)
-    erase *.obj
-    erase *.pch
-    erase *.csm
-    erase *.cfg
-       erase ..\common\y_tab.c
-    erase ..\common\lex_yy.c
+    -erase $(LIBTARGET)
+    -erase *.obj
+    -erase *.pch
+    -erase *.csm
+    -erase *.cfg
+       -erase ..\common\y_tab.c
+    -erase ..\common\lex_yy.c
 
 cleanall: clean