always generate the taskbar sample makefile; this was wrong since the line adding it to SAMPLES_SUBDIRS was added in the wrong place in rev 15927
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -7240,13 +7240,8 @@ fi
|
|||||||
|
|
||||||
if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
|
if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
|
||||||
AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
|
AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
|
||||||
if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
|
|
||||||
"$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
|
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if test "$wxUSE_VALIDATORS" = "yes"; then
|
if test "$wxUSE_VALIDATORS" = "yes"; then
|
||||||
AC_DEFINE(wxUSE_VALIDATORS)
|
AC_DEFINE(wxUSE_VALIDATORS)
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
|
||||||
@@ -7583,7 +7578,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
|||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
|
||||||
dynamic erase event exec font image minimal mobile \
|
dynamic erase event exec font image minimal mobile \
|
||||||
mobile/wxedit mobile/styles propsize render \
|
mobile/wxedit mobile/styles propsize render \
|
||||||
rotate shaped vscroll widgets"
|
rotate shaped taskbar vscroll widgets"
|
||||||
|
|
||||||
if test "$wxUSE_MONOLITHIC" != "yes"; then
|
if test "$wxUSE_MONOLITHIC" != "yes"; then
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
|
||||||
|
Reference in New Issue
Block a user