Modified Mingw32 makefiles to compile with Mingw32 2.95 or earlier;

some wxMSW/gcc compile fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/generic/splitter.cpp

@@ -31,6 +31,7 @@
 #include "wx/string.h"
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"
+#include "wx/settings.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)

src/makeg95.env

@@ -7,7 +7,10 @@
 
 # If using Cygwin, set this to 0.
 # If using Mingw32, set this to 1.
-MINGW32=0
+MINGW32=1
+
+# Set to the version you have
+MINGW32VERSION=2.95
 
 ########################## Compiler ##################################
 
@@ -15,9 +18,13 @@ MINGW32=0
 # Put a comment before --pipe for Cygwin, remove comment for Mingw32 2.95
 
 ifeq ($(MINGW32),1)
-CC = gcc --pipe -fvtable-thunks
+  ifeq ($(MINGW32VERSION),2.95)
+    CC = gcc --pipe -fvtable-thunks
+  else
+    CC = gcc
+  endif
 else
-CC = gcc
+  CC = gcc
 endif
 
 # C compiler for pure C programs
@@ -119,6 +126,14 @@ WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 
+GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 
+
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32),2.95)
+    GNUWIN32EXTRA=
+  endif
+endif
+
 ifeq ($(MINGW32),1)
 INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
 else

src/msw/makefile.g95

@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 15:16, 1999/10/21
+# This file was automatically generated by tmake at 12:32, 1999/10/22
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -258,6 +258,15 @@ MSWOBJS     = \
 		$(MSWDIR)/window.$(OBJSUFF) \
 		$(MSWDIR)/xpmhand.$(OBJSUFF)
 
+ADVANCEDOBJS     = \
+		$(COMMDIR)/odbc.$(OBJSUFF) \
+		$(MSWDIR)/ole/automtn.$(OBJSUFF) \
+		$(MSWDIR)/ole/dataobj.$(OBJSUFF) \
+		$(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
+		$(MSWDIR)/ole/droptgt.$(OBJSUFF) \
+		$(MSWDIR)/ole/oleutils.$(OBJSUFF) \
+		$(MSWDIR)/ole/uuid.$(OBJSUFF)
+
 ZLIBOBJS    = \
 		$(ZLIBDIR)/adler32.$(OBJSUFF) \
 		$(ZLIBDIR)/compress.$(OBJSUFF) \
@@ -353,7 +362,20 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
 OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(ADVANCEDOBJS) # $(XPMOBJECTS)
+
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+  else
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
 	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+  endif
+else
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+endif
 
 all:    $(OBJECTS) $(WXLIB)
 
@@ -403,21 +425,21 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #	mv y.tab.c $(COMMDIR)/y_tab.c
 
 clean:
-	-erase *.o
-	-erase *.bak
-	-erase core
-	-erase ..\common\y_tab.c
-	-erase ..\common\lex_yy.c
-	-erase ..\common\*.o
-	-erase ..\common\*.bak
-	-erase ..\generic\*.o
-	-erase ..\generic\*.bak
-	-erase ..\html\*.o
-	-erase ..\png\*.o
-	-erase ..\png\*.bak
-	-erase ..\zlib\*.o
-	-erase ..\zlib\*.bak
-	-erase ..\jpeg\*.o
-	-erase ..\..\lib\libwx.a
+	rm -f *.o
+	rm -f *.bak
+	rm -f core
+	rm -f ..\common\y_tab.c
+	rm -f ..\common\lex_yy.c
+	rm -f ..\common\*.o
+	rm -f ..\common\*.bak
+	rm -f ..\generic\*.o
+	rm -f ..\generic\*.bak
+	rm -f ..\html\*.o
+	rm -f ..\png\*.o
+	rm -f ..\png\*.bak
+	rm -f ..\zlib\*.o
+	rm -f ..\zlib\*.bak
+	rm -f ..\jpeg\*.o
+	rm -f ..\..\lib\libwx.a
 
 cleanall: clean

src/msw/ole/droptgt.cpp

@@ -417,7 +417,7 @@ wxDataFormat wxDropTarget::GetSupportedFormat(IDataObject *pIDataSource) const
         delete [] formats;
     }
 
-    return n < nFormats ? format : wxDF_INVALID;
+    return (n < nFormats) ? (wxDataFormat) format : (wxDataFormat) wxDF_INVALID;
 }
 
 // ----------------------------------------------------------------------------

src/wxvc.dsp

@@ -87,6 +87,10 @@ SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\clipcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmndata.cpp
 # End Source File
 # Begin Source File
@@ -119,6 +123,10 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dobjcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File

src/wxvc6.dsp

@@ -93,6 +93,10 @@ SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\clipcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmndata.cpp
 # End Source File
 # Begin Source File
@@ -125,6 +129,10 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dobjcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File

src/wxvc_dll.dsp

@@ -100,6 +100,10 @@ SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\clipcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cmndata.cpp
 # End Source File
 # Begin Source File
@@ -132,6 +136,10 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dobjcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File