fixed wxTempFile::Commit() broken by last check in

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 73331036f255d5aac3dec300488fe209e2fb06a8..7623ca7f60afff4d73358c29204aececf82a19e1 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -56,7 +56,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mti import32 ole2w32 odbc32 zlib_$(DEBUG_SUFFIX) png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX) regex_$(DEBUG_SUFFIX)
+LIBS= cw32mti import32 ole2w32 odbc32 zlib_bc$(DEBUG_SUFFIX) png_bc$(DEBUG_SUFFIX) jpeg_bc$(DEBUG_SUFFIX) tiff_bc$(DEBUG_SUFFIX) regex_bc$(DEBUG_SUFFIX)
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -88,6 +88,7 @@ GENERICOBJS= $(OBJ_PATH)\busyinfo.obj \
                $(OBJ_PATH)\progdlgg.obj \
                $(OBJ_PATH)\sashwin.obj \
                $(OBJ_PATH)\scrlwing.obj \
+               $(OBJ_PATH)\selstore.obj \
                $(OBJ_PATH)\spinctlg.obj \
                $(OBJ_PATH)\splash.obj \
                $(OBJ_PATH)\splitter.obj \
@@ -103,6 +104,7 @@ MSWOBJS = $(OBJ_PATH)\accel.obj \
                $(OBJ_PATH)\access.obj \
                $(OBJ_PATH)\app.obj \
                $(OBJ_PATH)\automtn.obj \
+               $(OBJ_PATH)\basemsw.obj \
                $(OBJ_PATH)\bitmap.obj \
                $(OBJ_PATH)\bmpbuttn.obj \
                $(OBJ_PATH)\brush.obj \
@@ -205,7 +207,9 @@ MSWOBJS = $(OBJ_PATH)\accel.obj \
                $(OBJ_PATH)\treectrl.obj \
                $(OBJ_PATH)\utils.obj \
                $(OBJ_PATH)\utilsexc.obj \
+               $(OBJ_PATH)\utilsgui.obj \
                $(OBJ_PATH)\uuid.obj \
+               $(OBJ_PATH)\uxtheme.obj \
                $(OBJ_PATH)\volume.obj \
                $(OBJ_PATH)\wave.obj \
                $(OBJ_PATH)\window.obj
@@ -239,6 +243,7 @@ GENERICUNIVOBJS= $(OBJ_PATH)\accel.obj \
                $(OBJ_PATH)\progdlgg.obj \
                $(OBJ_PATH)\sashwin.obj \
                $(OBJ_PATH)\scrlwing.obj \
+               $(OBJ_PATH)\selstore.obj \
                $(OBJ_PATH)\spinctlg.obj \
                $(OBJ_PATH)\splash.obj \
                $(OBJ_PATH)\splitter.obj \
@@ -252,6 +257,7 @@ GENERICUNIVOBJS= $(OBJ_PATH)\accel.obj \
 
 MSWUNIVOBJS = $(OBJ_PATH)\app.obj \
                $(OBJ_PATH)\automtn.obj \
+               $(OBJ_PATH)\basemsw.obj \
                $(OBJ_PATH)\bitmap.obj \
                $(OBJ_PATH)\brush.obj \
                $(OBJ_PATH)\caret.obj \
@@ -291,6 +297,7 @@ MSWUNIVOBJS = $(OBJ_PATH)\app.obj \
                $(OBJ_PATH)\main.obj \
                $(OBJ_PATH)\mimetype.obj \
                $(OBJ_PATH)\minifram.obj \
+               $(OBJ_PATH)\mslu.obj \
                $(OBJ_PATH)\oleutils.obj \
                $(OBJ_PATH)\palette.obj \
                $(OBJ_PATH)\pen.obj \
@@ -307,6 +314,7 @@ MSWUNIVOBJS = $(OBJ_PATH)\app.obj \
                $(OBJ_PATH)\toplevel.obj \
                $(OBJ_PATH)\utils.obj \
                $(OBJ_PATH)\utilsexc.obj \
+               $(OBJ_PATH)\utilsgui.obj \
                $(OBJ_PATH)\uuid.obj \
                $(OBJ_PATH)\volume.obj \
                $(OBJ_PATH)\wave.obj \
@@ -374,6 +382,7 @@ HTMLOBJS = $(OBJ_PATH)\helpctrl.obj \
 
 COMMONOBJS = \
         $(OBJ_PATH)\accesscmn.obj \
+               $(OBJ_PATH)\appbase.obj \
                $(OBJ_PATH)\appcmn.obj \
                $(OBJ_PATH)\artprov.obj \
                $(OBJ_PATH)\artstd.obj \
@@ -417,6 +426,8 @@ COMMONOBJS = \
                $(OBJ_PATH)\filefn.obj \
                $(OBJ_PATH)\filename.obj \
                $(OBJ_PATH)\filesys.obj \
+               $(OBJ_PATH)\fldlgcmn.obj \
+               $(OBJ_PATH)\fmapbase.obj \
                $(OBJ_PATH)\fontcmn.obj \
                $(OBJ_PATH)\fontmap.obj \
                $(OBJ_PATH)\framecmn.obj \
@@ -478,6 +489,7 @@ COMMONOBJS = \
                $(OBJ_PATH)\sizer.obj \
                $(OBJ_PATH)\socket.obj \
                $(OBJ_PATH)\statbar.obj \
+               $(OBJ_PATH)\stopwatch.obj \
                $(OBJ_PATH)\strconv.obj \
                $(OBJ_PATH)\stream.obj \
                $(OBJ_PATH)\string.obj \
@@ -548,8 +560,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 !else
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-    -erase $(LIBTARGET)
-    -erase $(WXDLL)
+    -$(RM) $(LIBTARGET)
+    -$(RM) $(WXDLL)
         $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
 c0d32.obj $(OBJECTS)
 $(WXDLL)
@@ -557,7 +569,7 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-        implib -c $(LIBTARGET) $(WXDLL)
+        implib -c -f $(LIBTARGET) $(WXDLL)
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
@@ -576,6 +588,8 @@ $(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
 $(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
 
+$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF)
+
 $(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 $(OBJ_PATH)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
@@ -654,6 +668,8 @@ $(OBJ_PATH)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
 
 $(OBJ_PATH)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
+$(OBJ_PATH)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF)
+
 $(OBJ_PATH)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
 
 $(OBJ_PATH)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
@@ -686,6 +702,8 @@ $(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 $(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
+$(OBJ_PATH)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF)
+
 $(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
 $(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
@@ -709,6 +727,8 @@ $(OBJ_PATH)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
 $(OBJ_PATH)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
 
+$(OBJ_PATH)\basemsw.obj: $(MSWDIR)\basemsw.$(SRCSUFF)
+
 $(OBJ_PATH)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 $(OBJ_PATH)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
@@ -913,8 +933,12 @@ $(OBJ_PATH)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 $(OBJ_PATH)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
+$(OBJ_PATH)\utilsgui.obj: $(MSWDIR)\utilsgui.$(SRCSUFF)
+
 $(OBJ_PATH)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
 
+$(OBJ_PATH)\uxtheme.obj: $(MSWDIR)\uxtheme.$(SRCSUFF)
+
 $(OBJ_PATH)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
 
 $(OBJ_PATH)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
@@ -1016,6 +1040,8 @@ $(OBJ_PATH)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF)
 
 $(OBJ_PATH)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF)
 
+$(OBJ_PATH)\appbase.obj: $(COMMDIR)\appbase.$(SRCSUFF)
+
 $(OBJ_PATH)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
 $(OBJ_PATH)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
@@ -1102,6 +1128,10 @@ $(OBJ_PATH)\filename.obj: $(COMMDIR)\filename.$(SRCSUFF)
 
 $(OBJ_PATH)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
+$(OBJ_PATH)\fldlgcmn.obj: $(COMMDIR)\fldlgcmn.$(SRCSUFF)
+
+$(OBJ_PATH)\fmapbase.obj: $(COMMDIR)\fmapbase.$(SRCSUFF)
+
 $(OBJ_PATH)\fontcmn.obj: $(COMMDIR)\fontcmn.$(SRCSUFF)
 
 $(OBJ_PATH)\fontmap.obj: $(COMMDIR)\fontmap.$(SRCSUFF)
@@ -1224,6 +1254,8 @@ $(OBJ_PATH)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
 
 $(OBJ_PATH)\statbar.obj: $(COMMDIR)\statbar.$(SRCSUFF)
 
+$(OBJ_PATH)\stopwatch.obj: $(COMMDIR)\stopwatch.$(SRCSUFF)
+
 $(OBJ_PATH)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
 
 $(OBJ_PATH)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
@@ -1345,6 +1377,8 @@ $(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 $(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
 
+$(OBJ_PATH)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF)
+
 $(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
 
 $(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
@@ -1407,6 +1441,8 @@ $(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 $(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
 
+$(OBJ_PATH)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF)
+
 $(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
 
 $(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
@@ -1493,52 +1529,52 @@ all_execs:
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
         cd $(WXDIR)\src\msw
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\jpeg
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
         cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
         cd $(WXDIR)\src\msw
 
 clean_regex:
         cd $(WXDIR)\src\regex
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
         cd $(WXDIR)\src\msw
 
 tiff:   $(CFG)
         cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
         cd $(WXDIR)\src\msw
 
 clean_tiff:
         cd $(WXDIR)\src\tiff
-        ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
+        ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32