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

fixed bakefile so that in-tree headers take precedence over system-installed ones

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-10-07 21:37:54 +00:00
parent 4bc89de684
commit e1a098d1ec
135 changed files with 457 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/stc/Makefile.in
View File

@@ -44,11 +44,11 @@ top_srcdir = @top_srcdir@
DESTDIR =
LIBDIRNAME = $(top_builddir)lib
STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-I$(top_srcdir)/include -I$(srcdir)/../../include \
-I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \
-DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) \
$(PIC_FLAG)
-DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) \
$(CPPFLAGS) $(CXXFLAGS)
STCDLL_OBJECTS = \
stcdll_PlatWX.o \
stcdll_ScintillaWX.o \
@@ -103,10 +103,10 @@ STCDLL_OBJECTS = \
stcdll_ViewStyle.o \
stcdll_WindowAccessor.o \
stcdll_XPM.o
STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-I$(top_srcdir)/include -I$(srcdir)/../../include \
-I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \
-DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS)
-DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CXXFLAGS)
STCLIB_OBJECTS = \
stclib_PlatWX.o \
stclib_ScintillaWX.o \

12
src/xrc/Makefile.in
View File

@@ -47,9 +47,9 @@ top_srcdir = @top_srcdir@
DESTDIR =
LIBDIRNAME = $(top_builddir)lib
WX_VERSION = 2.5.1
XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) $(PIC_FLAG)
XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \
-DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
XRCDLL_OBJECTS = \
xrcdll_xmlres.o \
xrcdll_xh_bmp.o \
@@ -88,9 +88,9 @@ XRCDLL_OBJECTS = \
xrcdll_xh_unkwn.o \
xrcdll_xh_wizrd.o \
xrcdll_xmlrsall.o
XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS)
XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-I$(top_srcdir)/include -I$(srcdir)/../../include \
-I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS)
XRCLIB_OBJECTS = \
xrclib_xmlres.o \
xrclib_xh_bmp.o \