More contrib compilation fixes & makefiles

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

contrib/src/gizmos/splittree.cpp

@@ -35,6 +35,11 @@
     #include "wx/wx.h"
 #endif
 
+#ifdef __WXMSW__
+#include <windows.h>
+#include "wx/msw/winundef.h"
+#endif
+
 #include "wx/generic/treectlg.h"
 
 #include "wx/gizmos/splittree.h"

contrib/src/mmedia/vidwin.cpp

@@ -18,7 +18,7 @@
 #include "wx/wx.h"
 #endif
 
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
 
 #ifdef __BORLANDC__
     #pragma hdrstop

contrib/src/stc/makefile.g95

@@ -10,7 +10,6 @@ S=$(SCINTILLA)/src
 EXTRAINC=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)/contrib/include
 
 OBJECTS = \
-	$(S)/Accessor.$(OBJSUFF) \
 	$(S)/AutoComplete.$(OBJSUFF) \
 	$(S)/CallTip.$(OBJSUFF) \
 	$(S)/CellBuffer.$(OBJSUFF) \
@@ -41,6 +40,6 @@ OBJECTS = \
 	ScintillaWX.$(OBJSUFF) \
 	stc.$(OBJSUFF)
 
-LIBTARGET = $(WXDIR)/contrib/lib/libstc.a
+LIBTARGET = $(WXDIR)/lib/libstc.a
 
 include $(WXDIR)/src/makelib.g95