More contrib compilation fixes & makefiles

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

diff --git a/contrib/samples/gizmos/editlbox/makefile.b32 b/contrib/samples/gizmos/editlbox/makefile.b32
new file mode 100644 (file)
index 0000000..51df7aa
--- /dev/null
+++ b/contrib/samples/gizmos/editlbox/makefile.b32
@@ -0,0 +1,17 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=test
+OBJECTS = $(TARGET).obj
+EXTRALIBS=$(WXDIR)\lib\gizmos.lib
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/contrib/samples/gizmos/editlbox/makefile.g95 b/contrib/samples/gizmos/editlbox/makefile.g95
new file mode 100644 (file)
index 0000000..e8e5ce0
--- /dev/null
+++ b/contrib/samples/gizmos/editlbox/makefile.g95
@@ -0,0 +1,11 @@
+# Purpose: makefile for multicell example (Cygwin/Mingw32)
+# Created 2000-07-28
+
+WXDIR = ../../../..
+
+TARGET=test
+OBJECTS = $(TARGET).o
+EXTRALIBS=$(WXDIR)/lib/libgizmos.a
+
+include $(WXDIR)/src/makeprog.g95
+

diff --git a/contrib/samples/gizmos/multicell/makefile.g95 b/contrib/samples/gizmos/multicell/makefile.g95
index 85dabdf2c179b623028c40d81ef2fef1d1feb40a..5d9b35579fc66f486b63eef538ab2b2a927f8fa8 100644 (file)
--- a/contrib/samples/gizmos/multicell/makefile.g95
+++ b/contrib/samples/gizmos/multicell/makefile.g95
@@ -5,7 +5,7 @@ WXDIR = ../../../..
 
 TARGET=mtest
 OBJECTS = $(TARGET).o
-EXTRALIBS=$(WXDIR)/lib/libgizmos.lib
+EXTRALIBS=$(WXDIR)/lib/libgizmos.a
 
 include $(WXDIR)/src/makeprog.g95
 

diff --git a/contrib/samples/gizmos/splittree/makefile.g95 b/contrib/samples/gizmos/splittree/makefile.g95
index f030c043673e3aab25ca70aacf677f5cf65159fe..9606059bc19076ed3301b02a3b729eb625fb9ea4 100644 (file)
--- a/contrib/samples/gizmos/splittree/makefile.g95
+++ b/contrib/samples/gizmos/splittree/makefile.g95
@@ -7,10 +7,11 @@
 #
 # Makefile for wxWindows sample (Cygwin/Mingw32).
 
-WXDIR = ../..
+WXDIR = ../../../..
 
-TARGET=minimal
+TARGET=tree
 OBJECTS = $(TARGET).o
+EXTRALIBS=$(WXDIR)/lib/libgizmos.a
 
 include $(WXDIR)/src/makeprog.g95
 

diff --git a/contrib/samples/plot/makefile.g95 b/contrib/samples/plot/makefile.g95
index b842c22839e21ec2a296cf1e9bb80c35095d3415..1ca728695a9fb6a9eb04ae8c8c5379fc74d9e845 100644 (file)
--- a/contrib/samples/plot/makefile.g95
+++ b/contrib/samples/plot/makefile.g95
@@ -8,6 +8,7 @@ WXDIR = ../../..
 TARGET = plot
 OBJECTS = $(TARGET).o
 EXTRAINC = -I$(WXDIR)/contrib/include
+RCEXTRAINC = --include-dir $(WXDIR)/contrib/include
 EXTRALIBS = -lplot
 
 include $(WXDIR)/src/makeprog.g95

diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index 71b8145da1dc0518e74f64a0b0ff9d6f17ec5341..86d7b720606b72a6b7130eafec337443b215baf3 100644 (file)
--- a/contrib/src/gizmos/splittree.cpp
+++ b/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"

diff --git a/contrib/src/mmedia/vidwin.cpp b/contrib/src/mmedia/vidwin.cpp
index 2f0c28f1a93ffbb35f608157496884d1829689a9..e763ac8df2a684d8f2f539fb19c74dbc1c953ca2 100644 (file)
--- a/contrib/src/mmedia/vidwin.cpp
+++ b/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

diff --git a/contrib/src/stc/makefile.g95 b/contrib/src/stc/makefile.g95
index 5b0cc020897131717451c49c41ec669127c834a6..ea3cbd9c0ccf58b36bf12e6f6031683020c7d87b 100644 (file)
--- a/contrib/src/stc/makefile.g95
+++ b/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
\ No newline at end of file

diff --git a/src/makeg95.env b/src/makeg95.env
index 888bfee2edfa313c6aa71976e5af1825b63e8595..dcb14319bbd9a0e28bea2c7be2fa67c511c9ef1e 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -83,7 +83,7 @@ RCDEFSWITCH=--define
 
 # Don't make this too long (e.g. by adding contrib/include/wx) because it will
 # truncate the command line
-RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 # Needed to build a DLL if your linker does not support --shared option.
 AS = $(CROSS)as

diff --git a/src/stc/makefile.g95 b/src/stc/makefile.g95
index 5b0cc020897131717451c49c41ec669127c834a6..ea3cbd9c0ccf58b36bf12e6f6031683020c7d87b 100644 (file)
--- a/src/stc/makefile.g95
+++ b/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
\ No newline at end of file