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: ###
|
||||
|
||||
CUBE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
CUBE_OBJECTS = \
|
||||
$(__cube_os2_lib_res) \
|
||||
cube_cube.o \
|
||||
|
@@ -36,9 +36,9 @@ top_srcdir = @top_srcdir@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
ISOSURF_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
ISOSURF_OBJECTS = \
|
||||
$(__isosurf___win32rc) \
|
||||
$(__isosurf_os2_lib_res) \
|
||||
|
@@ -39,12 +39,12 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
DESTDIR =
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
PENGUIN_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CFLAGS)
|
||||
PENGUIN_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS)
|
||||
PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
PENGUIN_OBJECTS = \
|
||||
$(__penguin_os2_lib_res) \
|
||||
penguin_penguin.o \
|
||||
|
Reference in New Issue
Block a user