updated configure and the makefiles after the samples move
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
38
configure
vendored
38
configure
vendored
@@ -11516,7 +11516,7 @@ if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
|
|||||||
#define wxUSE_DIALUP_MANAGER 1
|
#define wxUSE_DIALUP_MANAGER 1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_STREAMS" = "yes" ; then
|
if test "$wxUSE_STREAMS" = "yes" ; then
|
||||||
@@ -12056,7 +12056,7 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||||||
#define wxUSE_SOCKETS 1
|
#define wxUSE_SOCKETS 1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
|
||||||
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
|
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -12932,8 +12932,8 @@ LDFLAGS="$LDFLAGS $PROFILE"
|
|||||||
|
|
||||||
if test "$wxUSE_GUI" = "yes"; then
|
if test "$wxUSE_GUI" = "yes"; then
|
||||||
|
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
|
||||||
font forty fractal image minimal richedit wxpoem"
|
font fractal image minimal richedit"
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
|
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
|
||||||
else
|
else
|
||||||
@@ -13143,8 +13143,13 @@ trap 'rm -fr `echo "
|
|||||||
src/makeprog.env
|
src/makeprog.env
|
||||||
src/makelib.env
|
src/makelib.env
|
||||||
Makefile
|
Makefile
|
||||||
|
demos/Makefile
|
||||||
|
demos/bombs/Makefile
|
||||||
|
demos/forty/Makefile
|
||||||
|
demos/fractal/Makefile
|
||||||
|
demos/life/Makefile
|
||||||
|
demos/poem/Makefile
|
||||||
samples/Makefile
|
samples/Makefile
|
||||||
samples/bombs/Makefile
|
|
||||||
samples/caret/Makefile
|
samples/caret/Makefile
|
||||||
samples/calendar/Makefile
|
samples/calendar/Makefile
|
||||||
samples/checklst/Makefile
|
samples/checklst/Makefile
|
||||||
@@ -13157,20 +13162,17 @@ trap 'rm -fr `echo "
|
|||||||
samples/docvwmdi/Makefile
|
samples/docvwmdi/Makefile
|
||||||
samples/dnd/Makefile
|
samples/dnd/Makefile
|
||||||
samples/drawing/Makefile
|
samples/drawing/Makefile
|
||||||
samples/forty/Makefile
|
|
||||||
samples/font/Makefile
|
samples/font/Makefile
|
||||||
samples/fractal/Makefile
|
|
||||||
samples/grid/Makefile
|
samples/grid/Makefile
|
||||||
samples/help/Makefile
|
samples/help/Makefile
|
||||||
samples/image/Makefile
|
samples/image/Makefile
|
||||||
samples/internat/Makefile
|
samples/internat/Makefile
|
||||||
samples/layout/Makefile
|
samples/layout/Makefile
|
||||||
samples/life/Makefile
|
|
||||||
samples/listctrl/Makefile
|
samples/listctrl/Makefile
|
||||||
samples/mdi/Makefile
|
samples/mdi/Makefile
|
||||||
samples/minifram/Makefile
|
samples/minifram/Makefile
|
||||||
samples/minimal/Makefile
|
samples/minimal/Makefile
|
||||||
samples/nettest/Makefile
|
samples/dialup/Makefile
|
||||||
samples/newgrid/Makefile
|
samples/newgrid/Makefile
|
||||||
samples/notebook/Makefile
|
samples/notebook/Makefile
|
||||||
samples/png/Makefile
|
samples/png/Makefile
|
||||||
@@ -13189,8 +13191,7 @@ trap 'rm -fr `echo "
|
|||||||
samples/treectrl/Makefile
|
samples/treectrl/Makefile
|
||||||
samples/typetest/Makefile
|
samples/typetest/Makefile
|
||||||
samples/validate/Makefile
|
samples/validate/Makefile
|
||||||
samples/wxpoem/Makefile
|
samples/sockets/Makefile
|
||||||
samples/wxsocket/Makefile
|
|
||||||
samples/wizard/Makefile
|
samples/wizard/Makefile
|
||||||
samples/html/Makefile
|
samples/html/Makefile
|
||||||
samples/html/about/Makefile
|
samples/html/about/Makefile
|
||||||
@@ -13372,8 +13373,13 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
|
|||||||
src/makeprog.env
|
src/makeprog.env
|
||||||
src/makelib.env
|
src/makelib.env
|
||||||
Makefile
|
Makefile
|
||||||
|
demos/Makefile
|
||||||
|
demos/bombs/Makefile
|
||||||
|
demos/forty/Makefile
|
||||||
|
demos/fractal/Makefile
|
||||||
|
demos/life/Makefile
|
||||||
|
demos/poem/Makefile
|
||||||
samples/Makefile
|
samples/Makefile
|
||||||
samples/bombs/Makefile
|
|
||||||
samples/caret/Makefile
|
samples/caret/Makefile
|
||||||
samples/calendar/Makefile
|
samples/calendar/Makefile
|
||||||
samples/checklst/Makefile
|
samples/checklst/Makefile
|
||||||
@@ -13386,20 +13392,17 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
|
|||||||
samples/docvwmdi/Makefile
|
samples/docvwmdi/Makefile
|
||||||
samples/dnd/Makefile
|
samples/dnd/Makefile
|
||||||
samples/drawing/Makefile
|
samples/drawing/Makefile
|
||||||
samples/forty/Makefile
|
|
||||||
samples/font/Makefile
|
samples/font/Makefile
|
||||||
samples/fractal/Makefile
|
|
||||||
samples/grid/Makefile
|
samples/grid/Makefile
|
||||||
samples/help/Makefile
|
samples/help/Makefile
|
||||||
samples/image/Makefile
|
samples/image/Makefile
|
||||||
samples/internat/Makefile
|
samples/internat/Makefile
|
||||||
samples/layout/Makefile
|
samples/layout/Makefile
|
||||||
samples/life/Makefile
|
|
||||||
samples/listctrl/Makefile
|
samples/listctrl/Makefile
|
||||||
samples/mdi/Makefile
|
samples/mdi/Makefile
|
||||||
samples/minifram/Makefile
|
samples/minifram/Makefile
|
||||||
samples/minimal/Makefile
|
samples/minimal/Makefile
|
||||||
samples/nettest/Makefile
|
samples/dialup/Makefile
|
||||||
samples/newgrid/Makefile
|
samples/newgrid/Makefile
|
||||||
samples/notebook/Makefile
|
samples/notebook/Makefile
|
||||||
samples/png/Makefile
|
samples/png/Makefile
|
||||||
@@ -13418,8 +13421,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
|
|||||||
samples/treectrl/Makefile
|
samples/treectrl/Makefile
|
||||||
samples/typetest/Makefile
|
samples/typetest/Makefile
|
||||||
samples/validate/Makefile
|
samples/validate/Makefile
|
||||||
samples/wxpoem/Makefile
|
samples/sockets/Makefile
|
||||||
samples/wxsocket/Makefile
|
|
||||||
samples/wizard/Makefile
|
samples/wizard/Makefile
|
||||||
samples/html/Makefile
|
samples/html/Makefile
|
||||||
samples/html/about/Makefile
|
samples/html/about/Makefile
|
||||||
|
|||||||
25
configure.in
25
configure.in
@@ -2478,7 +2478,7 @@ fi
|
|||||||
|
|
||||||
if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
|
if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
|
||||||
AC_DEFINE(wxUSE_DIALUP_MANAGER)
|
AC_DEFINE(wxUSE_DIALUP_MANAGER)
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_STREAMS" = "yes" ; then
|
if test "$wxUSE_STREAMS" = "yes" ; then
|
||||||
@@ -2652,7 +2652,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
|
|||||||
AC_LANG_RESTORE
|
AC_LANG_RESTORE
|
||||||
|
|
||||||
AC_DEFINE(wxUSE_SOCKETS)
|
AC_DEFINE(wxUSE_SOCKETS)
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
|
||||||
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
|
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -3159,9 +3159,9 @@ if test "$wxUSE_GUI" = "yes"; then
|
|||||||
dnl library features they need are present)
|
dnl library features they need are present)
|
||||||
|
|
||||||
dnl TODO some samples are never built so far:
|
dnl TODO some samples are never built so far:
|
||||||
dnl mfc, nativdlg, oleauto, ownerdrw, proplist
|
dnl ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
|
||||||
font forty fractal image minimal richedit wxpoem"
|
font fractal image minimal richedit"
|
||||||
|
|
||||||
dnl this is needed to be able to find AFM files
|
dnl this is needed to be able to find AFM files
|
||||||
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
|
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
|
||||||
@@ -3265,8 +3265,13 @@ AC_OUTPUT([
|
|||||||
src/makeprog.env
|
src/makeprog.env
|
||||||
src/makelib.env
|
src/makelib.env
|
||||||
Makefile
|
Makefile
|
||||||
|
demos/Makefile
|
||||||
|
demos/bombs/Makefile
|
||||||
|
demos/forty/Makefile
|
||||||
|
demos/fractal/Makefile
|
||||||
|
demos/life/Makefile
|
||||||
|
demos/poem/Makefile
|
||||||
samples/Makefile
|
samples/Makefile
|
||||||
samples/bombs/Makefile
|
|
||||||
samples/caret/Makefile
|
samples/caret/Makefile
|
||||||
samples/calendar/Makefile
|
samples/calendar/Makefile
|
||||||
samples/checklst/Makefile
|
samples/checklst/Makefile
|
||||||
@@ -3279,20 +3284,17 @@ AC_OUTPUT([
|
|||||||
samples/docvwmdi/Makefile
|
samples/docvwmdi/Makefile
|
||||||
samples/dnd/Makefile
|
samples/dnd/Makefile
|
||||||
samples/drawing/Makefile
|
samples/drawing/Makefile
|
||||||
samples/forty/Makefile
|
|
||||||
samples/font/Makefile
|
samples/font/Makefile
|
||||||
samples/fractal/Makefile
|
|
||||||
samples/grid/Makefile
|
samples/grid/Makefile
|
||||||
samples/help/Makefile
|
samples/help/Makefile
|
||||||
samples/image/Makefile
|
samples/image/Makefile
|
||||||
samples/internat/Makefile
|
samples/internat/Makefile
|
||||||
samples/layout/Makefile
|
samples/layout/Makefile
|
||||||
samples/life/Makefile
|
|
||||||
samples/listctrl/Makefile
|
samples/listctrl/Makefile
|
||||||
samples/mdi/Makefile
|
samples/mdi/Makefile
|
||||||
samples/minifram/Makefile
|
samples/minifram/Makefile
|
||||||
samples/minimal/Makefile
|
samples/minimal/Makefile
|
||||||
samples/nettest/Makefile
|
samples/dialup/Makefile
|
||||||
samples/newgrid/Makefile
|
samples/newgrid/Makefile
|
||||||
samples/notebook/Makefile
|
samples/notebook/Makefile
|
||||||
samples/png/Makefile
|
samples/png/Makefile
|
||||||
@@ -3311,8 +3313,7 @@ AC_OUTPUT([
|
|||||||
samples/treectrl/Makefile
|
samples/treectrl/Makefile
|
||||||
samples/typetest/Makefile
|
samples/typetest/Makefile
|
||||||
samples/validate/Makefile
|
samples/validate/Makefile
|
||||||
samples/wxpoem/Makefile
|
samples/sockets/Makefile
|
||||||
samples/wxsocket/Makefile
|
|
||||||
samples/wizard/Makefile
|
samples/wizard/Makefile
|
||||||
samples/html/Makefile
|
samples/html/Makefile
|
||||||
samples/html/about/Makefile
|
samples/html/about/Makefile
|
||||||
|
|||||||
11
demos/Makefile.in
Normal file
11
demos/Makefile.in
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
#
|
||||||
|
# Makefile : Builds wxWindows demos for Unix.
|
||||||
|
#
|
||||||
|
|
||||||
|
DEMOS_SUBDIRS=bombs forty fractal life poem
|
||||||
|
|
||||||
|
all:
|
||||||
|
@for d in $(DEMOS_SUBDIRS); do (cd $$d && make); done
|
||||||
|
|
||||||
|
clean:
|
||||||
|
@for d in $(DEMOS_SUBDIRS); do (cd $$d && make clean); done
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
program_dir = samples/bombs
|
program_dir = demos/bombs
|
||||||
|
|
||||||
PROGRAM=bombs
|
PROGRAM=bombs
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
program_dir = samples/forty
|
program_dir = demos/forty
|
||||||
|
|
||||||
PROGRAM=forty
|
PROGRAM=forty
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
program_dir = samples/fractal
|
program_dir = demos/fractal
|
||||||
|
|
||||||
PROGRAM=fractal
|
PROGRAM=fractal
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
program_dir = samples/life
|
program_dir = demos/life
|
||||||
|
|
||||||
PROGRAM=life
|
PROGRAM=life
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
top_builddir = ../..
|
top_builddir = ../..
|
||||||
program_dir = samples/wxpoem
|
program_dir = demos/poem
|
||||||
|
|
||||||
DATAFILES = wxpoem.txt wxpoem.dat
|
DATAFILES = wxpoem.txt wxpoem.dat
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ wxBase:
|
|||||||
|
|
||||||
- wxLongLong class provides support for (signed) 64 bit integers
|
- wxLongLong class provides support for (signed) 64 bit integers
|
||||||
|
|
||||||
|
- wxCmdLineParser class for parsing the command line (supporting short and
|
||||||
|
long options, switches and parameters of different types)
|
||||||
|
|
||||||
- it is now possible to build wxBase under Win32 (using VC++ only so far)
|
- it is now possible to build wxBase under Win32 (using VC++ only so far)
|
||||||
and BeOS (without thread support yet)
|
and BeOS (without thread support yet)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user