← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to build/msw/makefile.vc

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/msw/makefile.vc
1
1
# =========================================================================
2
2
#     This makefile was generated by
3
 
#     Bakefile 0.2.8 (http://www.bakefile.org)
 
3
#     Bakefile 0.2.9 (http://www.bakefile.org)
4
4
#     Do not modify, all changes will be overwritten!
5
5
# =========================================================================
6
6
 
4765
4765
build_cfg_file: $(SETUPHDIR)
4766
4766
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
4767
4767
        @echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE)
4768
 
        @echo WXVER_RELEASE=11 >>$(BUILD_CFG_FILE)
 
4768
        @echo WXVER_RELEASE=12 >>$(BUILD_CFG_FILE)
4769
4769
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
4770
4770
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
4771
4771
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)