Regenerated from bakefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/build/stc/makefile.bcc b/contrib/build/stc/makefile.bcc
index 133b81e1c2323ca1c98f33a5d284769f77d0d52d..26ec51f1d85163cbf450636013ccbae4f67432db 100644 (file)
--- a/contrib/build/stc/makefile.bcc
+++ b/contrib/build/stc/makefile.bcc
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
 ### Variables: ###
 
 WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \

diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc
index d556ca27ffceba5df8c31de4fccd18cf4a46a443..7e536579ec83037aaaa7675e5537ba165bd51cea 100644 (file)
--- a/contrib/build/stc/makefile.gcc
+++ b/contrib/build/stc/makefile.gcc
@@ -13,7 +13,7 @@ include ../../../build/msw/config.gcc
 ### Variables: ###
 
 WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \

diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc
index d46fd01e472ed1e8dde80b060bc05ff0031a0976..d31810c67f7e3b94b30b9941c65e48921031807c 100644 (file)
--- a/contrib/build/stc/makefile.vc
+++ b/contrib/build/stc/makefile.vc
@@ -13,7 +13,7 @@
 ### Variables: ###
 
 WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \

diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat
index 62b289ead4504fe202560da7b4fa71270ae828e6..cf07a395199a68ea15ad1a4958a46fb5774b07be 100644 (file)
--- a/contrib/build/stc/makefile.wat
+++ b/contrib/build/stc/makefile.wat
@@ -182,7 +182,7 @@ LIBDIRNAME = ..\..\src\stc\..\..\..\lib\wat_dll$(CFG)
 ### Variables: ###
 
 WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index c28b47987e1520b1ba1b4d58871c4e4894f8a625..e7dceeafc2f51fa81a6639720b95665515a2cdcb 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -684,11 +684,14 @@ getmakefiles()
     curl http://biolpc22.york.ac.uk/pub/CVS_Makefiles/wx-mk-evcprj.zip --output /c/transit/wx-mk-evcprj.zip
     echo Getting Digital Mars makefiles...
     curl http://biolpc22.york.ac.uk/pub/CVS_Makefiles/wx-mk-dmars.zip --output /c/transit/wx-mk-dmars.zip
+    echo Getting VC++ makefiles...
+    curl http://biolpc22.york.ac.uk/pub/CVS_Makefiles/wx-mk-msvc.zip --output /c/transit/wx-mk-msvc.zip
 
     cd $APPDIR
     echo Unarchiving makefiles and project files...
     unzip -o -a /c/transit/wx-mk-evcprj.zip
     unzip -o -a /c/transit/wx-mk-dmars.zip
+    unzip -o -a /c/transit/wx-mk-msvc.zip
     echo Done getting makefiles and project files.
 }
 

diff --git a/distrib/msw/makewinceproj.sh b/distrib/msw/makewinceproj.sh
index 534ff76be009ae1453e7631daaa2525f5f1592c7..0a1fc05c37015cb3231e88337350224dd689a75a 100644 (file)
--- a/distrib/msw/makewinceproj.sh
+++ b/distrib/msw/makewinceproj.sh
@@ -4,133 +4,6 @@ mkdir -p build/wince
 echo "<?xml version=\"1.0\"?><bakefile-gen><enable-formats>msevc4prj</enable-formats></bakefile-gen>" > build/bakefiles/Bakefiles.local.bkgen
 cd build/bakefiles
 echo $PATH
-bakefile_gen -b wx.bkl -f msevc4prj
-
-bakefile_gen -b ../../demos/bombs/bombs.bkl -f msevc4prj
-bakefile_gen -b ../../demos/dbbrowse/dbbrowse.bkl -f msevc4prj
-bakefile_gen -b ../../demos/forty/forty.bkl -f msevc4prj
-bakefile_gen -b ../../demos/fractal/fractal.bkl -f msevc4prj
-bakefile_gen -b ../../demos/life/life.bkl -f msevc4prj
-bakefile_gen -b ../../demos/poem/poem.bkl -f msevc4prj
-
-bakefile_gen -b ../../samples/access/access.bkl -f msevc4prj
-bakefile_gen -b ../../samples/artprov/artprov.bkl -f msevc4prj
-bakefile_gen -b ../../samples/calendar/calendar.bkl -f msevc4prj
-bakefile_gen -b ../../samples/caret/caret.bkl -f msevc4prj
-bakefile_gen -b ../../samples/checklst/checklst.bkl -f msevc4prj
-bakefile_gen -b ../../samples/config/config.bkl -f msevc4prj
-bakefile_gen -b ../../samples/console/console.bkl -f msevc4prj
-bakefile_gen -b ../../samples/controls/controls.bkl -f msevc4prj
-bakefile_gen -b ../../samples/db/db.bkl -f msevc4prj
-bakefile_gen -b ../../samples/dialogs/dialogs.bkl -f msevc4prj
-bakefile_gen -b ../../samples/dialup/dialup.bkl -f msevc4prj
-bakefile_gen -b ../../samples/display/display.bkl -f msevc4prj
-bakefile_gen -b ../../samples/dnd/dnd.bkl -f msevc4prj
-bakefile_gen -b ../../samples/docview/docview.bkl -f msevc4prj
-bakefile_gen -b ../../samples/docvwmdi/docvwmdi.bkl -f msevc4prj
-bakefile_gen -b ../../samples/dragimag/dragimag.bkl -f msevc4prj
-bakefile_gen -b ../../samples/drawing/drawing.bkl -f msevc4prj
-bakefile_gen -b ../../samples/dynamic/dynamic.bkl -f msevc4prj
-bakefile_gen -b ../../samples/erase/erase.bkl -f msevc4prj
-bakefile_gen -b ../../samples/event/event.bkl -f msevc4prj
-bakefile_gen -b ../../samples/except/except.bkl -f msevc4prj
-bakefile_gen -b ../../samples/exec/exec.bkl -f msevc4prj
-bakefile_gen -b ../../samples/font/font.bkl -f msevc4prj
-bakefile_gen -b ../../samples/grid/grid.bkl -f msevc4prj
-bakefile_gen -b ../../samples/help/help.bkl -f msevc4prj
-bakefile_gen -b ../../samples/htlbox/htlbox.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/about/about.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/help/help.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/helpview/helpview.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/html_samples.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/htmlctrl/htmlctrl.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/printing/printing.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/test/test.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/virtual/virtual.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/widget/widget.bkl -f msevc4prj
-bakefile_gen -b ../../samples/html/zip/zip.bkl -f msevc4prj
-bakefile_gen -b ../../samples/image/image.bkl -f msevc4prj
-bakefile_gen -b ../../samples/internat/internat.bkl -f msevc4prj
-bakefile_gen -b ../../samples/ipc/ipc.bkl -f msevc4prj
-bakefile_gen -b ../../samples/joytest/joytest.bkl -f msevc4prj
-bakefile_gen -b ../../samples/keyboard/keyboard.bkl -f msevc4prj
-bakefile_gen -b ../../samples/layout/layout.bkl -f msevc4prj
-bakefile_gen -b ../../samples/listbox/listbox.bkl -f msevc4prj
-bakefile_gen -b ../../samples/listctrl/listctrl.bkl -f msevc4prj
-bakefile_gen -b ../../samples/mdi/mdi.bkl -f msevc4prj
-bakefile_gen -b ../../samples/memcheck/memcheck.bkl -f msevc4prj
-bakefile_gen -b ../../samples/menu/menu.bkl -f msevc4prj
-bakefile_gen -b ../../samples/mfc/mfc.bkl -f msevc4prj
-bakefile_gen -b ../../samples/minifram/minifram.bkl -f msevc4prj
-bakefile_gen -b ../../samples/minimal/minimal.bkl -f msevc4prj
-bakefile_gen -b ../../samples/mobile/mobile_samples.bkl -f msevc4prj
-bakefile_gen -b ../../samples/mobile/styles/styles.bkl -f msevc4prj
-bakefile_gen -b ../../samples/mobile/wxedit/wxedit.bkl -f msevc4prj
-bakefile_gen -b ../../samples/multimon/multimon.bkl -f msevc4prj
-bakefile_gen -b ../../samples/nativdlg/nativdlg.bkl -f msevc4prj
-bakefile_gen -b ../../samples/notebook/notebook.bkl -f msevc4prj
-bakefile_gen -b ../../samples/oleauto/oleauto.bkl -f msevc4prj
-bakefile_gen -b ../../samples/opengl/cube/cube.bkl -f msevc4prj
-bakefile_gen -b ../../samples/opengl/isosurf/isosurf.bkl -f msevc4prj
-bakefile_gen -b ../../samples/opengl/opengl_samples.bkl -f msevc4prj
-bakefile_gen -b ../../samples/opengl/penguin/penguin.bkl -f msevc4prj
-bakefile_gen -b ../../samples/ownerdrw/ownerdrw.bkl -f msevc4prj
-bakefile_gen -b ../../samples/png/png.bkl -f msevc4prj
-bakefile_gen -b ../../samples/printing/printing.bkl -f msevc4prj
-bakefile_gen -b ../../samples/propsize/propsize.bkl -f msevc4prj
-bakefile_gen -b ../../samples/regtest/regtest.bkl -f msevc4prj
-bakefile_gen -b ../../samples/render/render.bkl -f msevc4prj
-bakefile_gen -b ../../samples/richedit/richedit.bkl -f msevc4prj
-bakefile_gen -b ../../samples/rotate/rotate.bkl -f msevc4prj
-bakefile_gen -b ../../samples/rttitest/minimal.bkl -f msevc4prj
-bakefile_gen -b ../../samples/sashtest/sashtest.bkl -f msevc4prj
-bakefile_gen -b ../../samples/scroll/scroll.bkl -f msevc4prj
-bakefile_gen -b ../../samples/scrollsub/scrollsub.bkl -f msevc4prj
-bakefile_gen -b ../../samples/shaped/shaped.bkl -f msevc4prj
-bakefile_gen -b ../../samples/sockets/sockets.bkl -f msevc4prj
-bakefile_gen -b ../../samples/sound/sound.bkl -f msevc4prj
-bakefile_gen -b ../../samples/splash/splash.bkl -f msevc4prj
-bakefile_gen -b ../../samples/splitter/splitter.bkl -f msevc4prj
-bakefile_gen -b ../../samples/statbar/statbar.bkl -f msevc4prj
-bakefile_gen -b ../../samples/tab/tab.bkl -f msevc4prj
-bakefile_gen -b ../../samples/taskbar/taskbar.bkl -f msevc4prj
-bakefile_gen -b ../../samples/text/text.bkl -f msevc4prj
-bakefile_gen -b ../../samples/thread/thread.bkl -f msevc4prj
-bakefile_gen -b ../../samples/toolbar/toolbar.bkl -f msevc4prj
-bakefile_gen -b ../../samples/treectrl/treectrl.bkl -f msevc4prj
-bakefile_gen -b ../../samples/typetest/typetest.bkl -f msevc4prj
-bakefile_gen -b ../../samples/validate/validate.bkl -f msevc4prj
-bakefile_gen -b ../../samples/vscroll/vscroll.bkl -f msevc4prj
-bakefile_gen -b ../../samples/widgets/widgets.bkl -f msevc4prj
-bakefile_gen -b ../../samples/wizard/wizard.bkl -f msevc4prj
-
-bakefile_gen -b ../../contrib/build/animate/animate.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/deprecated/deprecated.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/fl/fl.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/gizmos/gizmos.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/mmedia/mmedia.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/net/net.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/ogl/ogl.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/plot/plot.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/stc/stc.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/svg/svg.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/build/xrc/xrc.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/animate/anitest.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/deprecated/proplist/proplist.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/deprecated/resource/resource.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/deprecated/treelay/treelay.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/fl/fl.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/gizmos/dynsash/dynsash.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/gizmos/editlbox/editlbox.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/gizmos/led/led.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/gizmos/multicell/multicell.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/gizmos/splittree/splittree.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/mmedia/mmboard.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/ogl/ogledit/ogledit.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/ogl/studio/studio.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/plot/plot.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/stc/stctest.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/svg/svgtest.bkl -f msevc4prj
-bakefile_gen -b ../../contrib/samples/xrc/xrcdemo.bkl -f msevc4prj
+# bakefile_gen -b wx.bkl -f msevc4prj
+bakefile_gen -f msevc4prj