From d0af5538d676fdc5f7620233ee24f43832b80bff Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 13 Jun 2001 16:05:08 +0000 Subject: [PATCH] More contrib compilation fixes & makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/gizmos/editlbox/makefile.b32 | 17 +++++++++++++++++ contrib/samples/gizmos/editlbox/makefile.g95 | 11 +++++++++++ contrib/samples/gizmos/multicell/makefile.g95 | 2 +- contrib/samples/gizmos/splittree/makefile.g95 | 5 +++-- contrib/samples/plot/makefile.g95 | 1 + contrib/src/gizmos/splittree.cpp | 5 +++++ contrib/src/mmedia/vidwin.cpp | 2 +- contrib/src/stc/makefile.g95 | 3 +-- src/makeg95.env | 2 +- src/stc/makefile.g95 | 3 +-- 10 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 contrib/samples/gizmos/editlbox/makefile.b32 create mode 100644 contrib/samples/gizmos/editlbox/makefile.g95 diff --git a/contrib/samples/gizmos/editlbox/makefile.b32 b/contrib/samples/gizmos/editlbox/makefile.b32 new file mode 100644 index 0000000000..51df7aadb0 --- /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 index 0000000000..e8e5ce09a4 --- /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 85dabdf2c1..5d9b35579f 100644 --- 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 f030c04367..9606059bc1 100644 --- 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 b842c22839..1ca728695a 100644 --- 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 71b8145da1..86d7b72060 100644 --- a/contrib/src/gizmos/splittree.cpp +++ b/contrib/src/gizmos/splittree.cpp @@ -35,6 +35,11 @@ #include "wx/wx.h" #endif +#ifdef __WXMSW__ +#include +#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 2f0c28f1a9..e763ac8df2 100644 --- 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 5b0cc02089..ea3cbd9c0c 100644 --- 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 888bfee2ed..dcb14319bb 100644 --- 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 5b0cc02089..ea3cbd9c0c 100644 --- 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 -- 2.45.2