reset virtual root to NULL in DeleteAllItems()

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 59b8a9c1fffab66c00247d42b5aebaf67dcce26d..381a3c760f0069c06fccd61441aef3cce3bd6e3a 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -63,7 +63,7 @@ DOCDIR = $(WXDIR)/docs
 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32
 ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+  ifneq "$(_GCC295)$(_GCC3)" ""
                DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
   else
                DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
@@ -82,6 +82,7 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/dcbuffer.$(OBJSUFF) \
                $(GENDIR)/dcpsg.$(OBJSUFF) \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
@@ -148,6 +149,7 @@ COMMONOBJS_BASE  = \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
+               $(COMMDIR)/msgout.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
@@ -182,6 +184,8 @@ COMMONOBJS_BASEONLY  = \
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/artprov.$(OBJSUFF) \
+               $(COMMDIR)/artstd.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
                $(COMMDIR)/cmdproc.$(OBJSUFF) \
@@ -207,9 +211,11 @@ COMMONOBJS  = \
                $(COMMDIR)/geometry.$(OBJSUFF) \
                $(COMMDIR)/gifdecod.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
+               $(COMMDIR)/iconbndl.$(OBJSUFF) \
                $(COMMDIR)/imagall.$(OBJSUFF) \
                $(COMMDIR)/imagbmp.$(OBJSUFF) \
                $(COMMDIR)/image.$(OBJSUFF) \
+               $(COMMDIR)/imagfill.$(OBJSUFF) \
                $(COMMDIR)/imaggif.$(OBJSUFF) \
                $(COMMDIR)/imagiff.$(OBJSUFF) \
                $(COMMDIR)/imagjpeg.$(OBJSUFF) \
@@ -229,6 +235,7 @@ COMMONOBJS  = \
                $(COMMDIR)/quantize.$(OBJSUFF) \
                $(COMMDIR)/radiocmn.$(OBJSUFF) \
                $(COMMDIR)/resource.$(OBJSUFF) \
+               $(COMMDIR)/settcmn.$(OBJSUFF) \
                $(COMMDIR)/sizer.$(OBJSUFF) \
                $(COMMDIR)/statbar.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -259,7 +266,6 @@ HTMLOBJS = \
                $(HTMLDIR)/m_layout.$(OBJSUFF) \
                $(HTMLDIR)/m_links.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
-               $(HTMLDIR)/m_meta.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_style.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
@@ -328,6 +334,7 @@ MSWOBJS     = \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/icon.$(OBJSUFF) \
                $(MSWDIR)/imaglist.$(OBJSUFF) \
+               $(MSWDIR)/iniconf.$(OBJSUFF) \
                $(MSWDIR)/joystick.$(OBJSUFF) \
                $(MSWDIR)/listbox.$(OBJSUFF) \
                $(MSWDIR)/listctrl.$(OBJSUFF) \
@@ -337,12 +344,14 @@ MSWOBJS     = \
                $(MSWDIR)/metafile.$(OBJSUFF) \
                $(MSWDIR)/minifram.$(OBJSUFF) \
                $(MSWDIR)/msgdlg.$(OBJSUFF) \
+               $(MSWDIR)/mslu.$(OBJSUFF) \
                $(MSWDIR)/nativdlg.$(OBJSUFF) \
                $(MSWDIR)/notebook.$(OBJSUFF) \
                $(MSWDIR)/ownerdrw.$(OBJSUFF) \
                $(MSWDIR)/palette.$(OBJSUFF) \
                $(MSWDIR)/pen.$(OBJSUFF) \
                $(MSWDIR)/penwin.$(OBJSUFF) \
+               $(MSWDIR)/popupwin.$(OBJSUFF) \
                $(MSWDIR)/printdlg.$(OBJSUFF) \
                $(MSWDIR)/printwin.$(OBJSUFF) \
                $(MSWDIR)/radiobox.$(OBJSUFF) \
@@ -499,7 +508,7 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_zip.o
 
 ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+  ifneq "$(_GCC295)$(_GCC3)" ""
     OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
   else
     OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
@@ -511,20 +520,12 @@ ifeq ($(wxUSE_GUI),0)
   OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
 endif
 
-# MBN: if anyone has a better solution for this kludge, step
-#      forward, *please*
-# this tests is we are on cygwin or not ( will _not_ work if you are using
-# ZSH on plain Win32, tought ); it uses the presence of "/"
-# in the PATH variable
-
 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)
-ifeq (,$(findstring /,$(PATH)))
-  IS_CYGWIN=0
+ifeq (,$(findstring $(OSTYPE),"cygwin!msys"))
   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else
-  IS_CYGWIN=1
   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif
@@ -544,9 +545,12 @@ $(ARCHINCDIR)/wx:
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
+# Copy ALWAYS uses forward slashes now.
+
 $(SETUP_H): $(ARCHINCDIR)/wx
-       $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+       $(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
 
+#      $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
 #      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL
@@ -617,7 +621,7 @@ $(TIFFLIB): $(TIFFOBJS)
        $(RANLIB) $@
 
 $(REGEXLIB):
-       $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
+       $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) WXWIN=$(WXDIR)
 
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h