Fixed toolbar crash for MinGW/Cygwin

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index badf46127d2f9af87ed44c5729e0a125984413d8..842b28ac72dff2091631c3639f9737d24e20d221 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 22:59, 2002/01/01
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -105,7 +105,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 # Not needed:
 #  $(MSWDIR)\colrdlgg.obj \
 #  $(MSWDIR)\fontdlgg.obj \
-#  $(MSWDIR)\helpxlp.obj \
 #  $(MSWDIR)\msgdlgg.obj \
 #  $(MSWDIR)\printps.obj \
 #  $(MSWDIR)\prntdlgg.obj \
@@ -116,7 +115,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 COMMONOBJS = \
                $(MSWDIR)\y_tab.obj \
                $(MSWDIR)\appcmn.obj \
-               $(MSWDIR)\bmpbase.obj \
                $(MSWDIR)\choiccmn.obj \
                $(MSWDIR)\clipcmn.obj \
                $(MSWDIR)\clntdata.obj \
@@ -167,12 +165,14 @@ COMMONOBJS = \
                $(MSWDIR)\geometry.obj \
                $(MSWDIR)\gifdecod.obj \
                $(MSWDIR)\hash.obj \
+               $(MSWDIR)\hashmap.obj \
                $(MSWDIR)\helpbase.obj \
                $(MSWDIR)\http.obj \
                $(MSWDIR)\imagall.obj \
                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
                $(MSWDIR)\imaggif.obj \
+               $(MSWDIR)\imagiff.obj \
                $(MSWDIR)\imagjpeg.obj \
                $(MSWDIR)\imagpcx.obj \
                $(MSWDIR)\imagpng.obj \
@@ -364,6 +364,7 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
                $(MSWDIR)\m_list.obj \
                $(MSWDIR)\m_meta.obj \
                $(MSWDIR)\m_pre.obj \
+               $(MSWDIR)\m_style.obj \
                $(MSWDIR)\m_tables.obj \
                $(MSWDIR)\winpars.obj
 
@@ -371,7 +372,13 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:       wx
 
-wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+# TODO: put the setup.h under lib
+setuph:
+     cd $(WXDIR)\include\wx\msw
+     if not exist setup.h copy setup0.h setup.h
+     cd $(WXDIR)\src\msw
 
 all:   wx
 
@@ -637,8 +644,6 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
-$(MSWDIR)\bmpbase.obj: $(COMMDIR)\bmpbase.$(SRCSUFF)
-
 $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
 
 $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF)
@@ -739,6 +744,8 @@ $(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
 
 $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
+$(MSWDIR)\hashmap.obj: $(COMMDIR)\hashmap.$(SRCSUFF)
+
 $(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
 $(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
@@ -751,6 +758,8 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
 $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
+$(MSWDIR)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF)
+
 $(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
 
 $(MSWDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF)
@@ -988,6 +997,8 @@ $(MSWDIR)\m_meta.obj: $(HTMLDIR)\m_meta.$(SRCSUFF)
 
 $(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
 
+$(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF)
+
 $(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF)
 
 $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)