Rebake everything using bakefile 0.2.7.
Also updated aclocal inputs and regenerated configure. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -1,128 +1,128 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.6 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
!include ../../build/msw/config.wat
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
# Speed up compilation a bit:
|
||||
!ifdef __LOADDLL__
|
||||
! loaddll wcc wccd
|
||||
! loaddll wccaxp wccdaxp
|
||||
! loaddll wcc386 wccd386
|
||||
! loaddll wpp wppdi86
|
||||
! loaddll wppaxp wppdaxp
|
||||
! loaddll wpp386 wppd386
|
||||
! if $(__VERSION__) >= 1280
|
||||
! loaddll wlink wlinkd
|
||||
! else
|
||||
! loaddll wlink wlink
|
||||
! endif
|
||||
! loaddll wlib wlibd
|
||||
!endif
|
||||
|
||||
# We need these variables in some bakefile-made rules:
|
||||
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
### Variables: ###
|
||||
|
||||
MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
|
||||
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
|
||||
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
|
||||
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
|
||||
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
|
||||
USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
|
||||
USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
|
||||
USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
|
||||
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
|
||||
USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
|
||||
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
|
||||
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
|
||||
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
|
||||
RUNTIME_LIBS="$(RUNTIME_LIBS)"
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all : .SYMBOLIC about help helpview printing test virtual widget zip
|
||||
|
||||
clean : .SYMBOLIC
|
||||
-if exist .\*.obj del .\*.obj
|
||||
-if exist .\*.res del .\*.res
|
||||
-if exist .\*.lbc del .\*.lbc
|
||||
-if exist .\*.ilk del .\*.ilk
|
||||
-if exist .\*.pch del .\*.pch
|
||||
cd about
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd help
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd helpview
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd printing
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd test
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd virtual
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd widget
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd zip
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
about : .SYMBOLIC
|
||||
cd about
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
help : .SYMBOLIC
|
||||
cd help
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
helpview : .SYMBOLIC
|
||||
cd helpview
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
printing : .SYMBOLIC
|
||||
cd printing
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
test : .SYMBOLIC
|
||||
cd test
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
virtual : .SYMBOLIC
|
||||
cd virtual
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
widget : .SYMBOLIC
|
||||
cd widget
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
zip : .SYMBOLIC
|
||||
cd zip
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.7 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
!include ../../build/msw/config.wat
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
# Speed up compilation a bit:
|
||||
!ifdef __LOADDLL__
|
||||
! loaddll wcc wccd
|
||||
! loaddll wccaxp wccdaxp
|
||||
! loaddll wcc386 wccd386
|
||||
! loaddll wpp wppdi86
|
||||
! loaddll wppaxp wppdaxp
|
||||
! loaddll wpp386 wppd386
|
||||
! if $(__VERSION__) >= 1280
|
||||
! loaddll wlink wlinkd
|
||||
! else
|
||||
! loaddll wlink wlink
|
||||
! endif
|
||||
! loaddll wlib wlibd
|
||||
!endif
|
||||
|
||||
# We need these variables in some bakefile-made rules:
|
||||
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
### Variables: ###
|
||||
|
||||
MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
|
||||
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
|
||||
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
|
||||
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
|
||||
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
|
||||
USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" &
|
||||
USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
|
||||
USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
|
||||
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
|
||||
USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
|
||||
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
|
||||
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
|
||||
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
|
||||
RUNTIME_LIBS="$(RUNTIME_LIBS)"
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all : .SYMBOLIC about help helpview printing test virtual widget zip
|
||||
|
||||
clean : .SYMBOLIC
|
||||
-if exist .\*.obj del .\*.obj
|
||||
-if exist .\*.res del .\*.res
|
||||
-if exist .\*.lbc del .\*.lbc
|
||||
-if exist .\*.ilk del .\*.ilk
|
||||
-if exist .\*.pch del .\*.pch
|
||||
cd about
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd help
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd helpview
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd printing
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd test
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd virtual
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd widget
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
cd zip
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
about : .SYMBOLIC
|
||||
cd about
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
help : .SYMBOLIC
|
||||
cd help
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
helpview : .SYMBOLIC
|
||||
cd helpview
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
printing : .SYMBOLIC
|
||||
cd printing
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
test : .SYMBOLIC
|
||||
cd test
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
virtual : .SYMBOLIC
|
||||
cd virtual
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
widget : .SYMBOLIC
|
||||
cd widget
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
zip : .SYMBOLIC
|
||||
cd zip
|
||||
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
|
||||
cd $(WATCOM_CWD)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user