Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More contrib compilation fixes & makefiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-06-13 16:05:08 +00:00
parent 1a464ed91d
commit d0af5538d6
10 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/samples/gizmos/editlbox/makefile.b32 Normal file
View File

@@ -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

11
contrib/samples/gizmos/editlbox/makefile.g95 Normal file
View File

@@ -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

2
contrib/samples/gizmos/multicell/makefile.g95
View File

@@ -5,7 +5,7 @@ WXDIR = ../../../..
TARGET=mtest TARGET=mtest
OBJECTS = $(TARGET).o OBJECTS = $(TARGET).o
EXTRALIBS=$(WXDIR)/lib/libgizmos.lib EXTRALIBS=$(WXDIR)/lib/libgizmos.a
include $(WXDIR)/src/makeprog.g95 include $(WXDIR)/src/makeprog.g95

5
contrib/samples/gizmos/splittree/makefile.g95
View File

@@ -7,10 +7,11 @@
# #
# Makefile for wxWindows sample (Cygwin/Mingw32). # Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../.. WXDIR = ../../../..
TARGET=minimal TARGET=tree
OBJECTS = $(TARGET).o OBJECTS = $(TARGET).o
EXTRALIBS=$(WXDIR)/lib/libgizmos.a
include $(WXDIR)/src/makeprog.g95 include $(WXDIR)/src/makeprog.g95

1
contrib/samples/plot/makefile.g95
View File

@@ -8,6 +8,7 @@ WXDIR = ../../..
TARGET = plot TARGET = plot
OBJECTS = $(TARGET).o OBJECTS = $(TARGET).o
EXTRAINC = -I$(WXDIR)/contrib/include EXTRAINC = -I$(WXDIR)/contrib/include
RCEXTRAINC = --include-dir $(WXDIR)/contrib/include
EXTRALIBS = -lplot EXTRALIBS = -lplot
include $(WXDIR)/src/makeprog.g95 include $(WXDIR)/src/makeprog.g95

5
contrib/src/gizmos/splittree.cpp
View File

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

2
contrib/src/mmedia/vidwin.cpp
View File

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

3
contrib/src/stc/makefile.g95
View File

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

2
src/makeg95.env
View File

@@ -83,7 +83,7 @@ RCDEFSWITCH=--define
# Don't make this too long (e.g. by adding contrib/include/wx) because it will # Don't make this too long (e.g. by adding contrib/include/wx) because it will
# truncate the command line # 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. # Needed to build a DLL if your linker does not support --shared option.
AS = $(CROSS)as AS = $(CROSS)as

3
src/stc/makefile.g95
View File

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