fixed bakefile so that in-tree headers take precedence over system-installed ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
ABOUT_OBJECTS = \
|
||||
$(__about_os2_lib_res) \
|
||||
about_about.o \
|
||||
|
@@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
HELP_OBJECTS = \
|
||||
$(__help_os2_lib_res) \
|
||||
help_help.o \
|
||||
|
@@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
HELPVIEW_OBJECTS = \
|
||||
$(__helpview_os2_lib_res) \
|
||||
helpview_helpview.o \
|
||||
|
@@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
DESTDIR =
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
PRINTING_OBJECTS = \
|
||||
$(__printing_os2_lib_res) \
|
||||
printing_printing.o \
|
||||
|
@@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
DESTDIR =
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
TEST_OBJECTS = \
|
||||
$(__test_os2_lib_res) \
|
||||
test_test.o \
|
||||
|
@@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
DESTDIR =
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
VIRTUAL_OBJECTS = \
|
||||
$(__virtual_os2_lib_res) \
|
||||
virtual_virtual.o \
|
||||
|
@@ -37,9 +37,9 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
DESTDIR =
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
WIDGET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
WIDGET_OBJECTS = \
|
||||
$(__widget_os2_lib_res) \
|
||||
widget_widget.o \
|
||||
|
@@ -38,9 +38,9 @@ top_srcdir = @top_srcdir@
|
||||
DESTDIR =
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
WX_VERSION = 2.5.1
|
||||
ZIP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
ZIP_OBJECTS = \
|
||||
$(__zip_os2_lib_res) \
|
||||
zip_zip.o \
|
||||
|
Reference in New Issue
Block a user