Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Borland makefile as per 2 recent bug reports

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-06-12 15:23:25 +00:00
parent be7a101366
commit cc693a8200
6 changed files with 193 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
distrib/msw/tmake/b32.t
View File

@@ -239,8 +239,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
!else !else
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -$(RM) $(LIBTARGET)
-erase $(WXDLL) -$(RM) $(WXDLL)
$(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&! $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
c0d32.obj $(OBJECTS) c0d32.obj $(OBJECTS)
$(WXDLL) $(WXDLL)
@@ -409,52 +409,52 @@ all_execs:
png: $(CFG) png: $(CFG)
cd $(WXDIR)\src\png cd $(WXDIR)\src\png
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_png: clean_png:
cd $(WXDIR)\src\png cd $(WXDIR)\src\png
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
zlib: $(CFG) zlib: $(CFG)
cd $(WXDIR)\src\zlib cd $(WXDIR)\src\zlib
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_zlib: clean_zlib:
cd $(WXDIR)\src\zlib cd $(WXDIR)\src\zlib
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
jpeg: $(CFG) jpeg: $(CFG)
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_jpeg: clean_jpeg:
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
regex: $(CFG) regex: $(CFG)
cd $(WXDIR)\src\regex cd $(WXDIR)\src\regex
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_regex: clean_regex:
cd $(WXDIR)\src\regex cd $(WXDIR)\src\regex
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
tiff: $(CFG) tiff: $(CFG)
cd $(WXDIR)\src\tiff cd $(WXDIR)\src\tiff
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_tiff: clean_tiff:
cd $(WXDIR)\src\tiff cd $(WXDIR)\src\tiff
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
$(CFG): makefile.b32 $(CFG): makefile.b32

277
samples/makefile.b32
View File

@@ -21,280 +21,295 @@ THISDIR=$(WXDIR)\samples
# #
# No makefile.vc file # No makefile.vc file
NOMAKE=1 NOMAKE=1
# No 16 bit version
#ONLY32=1
# Misc. compilation errors # Misc. compilation errors
COMPIL=1 COMPIL=1
# Need PNG
PNGSETUP=
# Need wxUSE_ODBC; define this to compile db sample # Need wxUSE_ODBC; define this to compile db sample
ODBCSETUP= ODBCSETUP=
!if "$(WXUSINGDLL)" == ""
WXUSINGDLL=0 WXUSINGDLL=0
!endif
#assume debug
!if "$(FINAL)" == ""
FINAL=0
!endif
!if "$(EXEDIR)" == ""
EXEDIR=BORL
!endif
!if "$(OUTPUTDIR)" == ""
OUTPUTDIR=$(WXDIR)\BORL
!endif
MAKEFLAGS=FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) OUTPUTDIR=$(OUTPUTDIR) EXEDIR=$(EXEDIR)
# #
# Please keep samples list up-to-date, in alphabetical order # Please keep samples list up-to-date, in alphabetical order
# not alphabetically organised ; 29 Nov 01 # not alphabetically organised ; 29 Nov 01
all: all:
cd $(WXDIR)\samples\artprov cd $(WXDIR)\samples\artprov
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\calendar cd $(WXDIR)\samples\calendar
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\caret cd $(WXDIR)\samples\caret
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\checklst cd $(WXDIR)\samples\checklst
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\config cd $(WXDIR)\samples\config
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\controls
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!if "$(ODBCSETUP)"=="1" !if "$(ODBCSETUP)"=="1"
cd $(WXDIR)\samples\db cd $(WXDIR)\samples\db
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!endif !endif
cd $(WXDIR)\samples\ipc cd $(WXDIR)\samples\ipc
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\dialogs cd $(WXDIR)\samples\dialogs
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\dnd cd $(WXDIR)\samples\dnd
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\docview cd $(WXDIR)\samples\docview
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\docvwmdi cd $(WXDIR)\samples\docvwmdi
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\drawing cd $(WXDIR)\samples\drawing
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\dynamic cd $(WXDIR)\samples\dynamic
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\font cd $(WXDIR)\samples\font
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\grid cd $(WXDIR)\samples\grid
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\help cd $(WXDIR)\samples\help
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\html cd $(WXDIR)\samples\html
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!endif
cd $(WXDIR)\samples\keyboard cd $(WXDIR)\samples\keyboard
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\image cd $(WXDIR)\samples\image
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\internat cd $(WXDIR)\samples\internat
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\layout cd $(WXDIR)\samples\layout
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\listctrl cd $(WXDIR)\samples\listctrl
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\mdi cd $(WXDIR)\samples\mdi
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\menu cd $(WXDIR)\samples\menu
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!if "$(FINAL)" == "0" !if "$(COMPIL)" == "0"
cd $(WXDIR)\samples\memcheck cd $(WXDIR)\samples\memcheck
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!endif !endif
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\mfc cd $(WXDIR)\samples\mfc
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!endif !endif
cd $(WXDIR)\samples\minifram cd $(WXDIR)\samples\minifram
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\minimal cd $(WXDIR)\samples\minimal
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\nativdlg
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\dialup cd $(WXDIR)\samples\dialup
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!endif !endif
cd $(WXDIR)\samples\notebook cd $(WXDIR)\samples\notebook
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\oleauto cd $(WXDIR)\samples\oleauto
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\ownerdrw cd $(WXDIR)\samples\ownerdrw
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\png cd $(WXDIR)\samples\png
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\printing
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\regtest cd $(WXDIR)\samples\regtest
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\rotate cd $(WXDIR)\samples\rotate
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\scrollsub cd $(WXDIR)\samples\scrollsub
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\splitter
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\tab cd $(WXDIR)\samples\tab
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
!endif !endif
cd $(WXDIR)\samples\taskbar cd $(WXDIR)\samples\taskbar
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\text cd $(WXDIR)\samples\text
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\thread cd $(WXDIR)\samples\thread
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\toolbar cd $(WXDIR)\samples\toolbar
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\treectrl cd $(WXDIR)\samples\treectrl
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\typetest cd $(WXDIR)\samples\typetest
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\validate cd $(WXDIR)\samples\validate
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\wizard cd $(WXDIR)\samples\wizard
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\dragimag cd $(WXDIR)\samples\dragimag
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\exec cd $(WXDIR)\samples\exec
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\statbar cd $(WXDIR)\samples\statbar
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\sockets cd $(WXDIR)\samples\sockets
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\widgets cd $(WXDIR)\samples\widgets
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\tab cd $(WXDIR)\samples\tab
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\erase cd $(WXDIR)\samples\erase
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\event cd $(WXDIR)\samples\event
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
cd $(WXDIR)\samples\propsize cd $(WXDIR)\samples\propsize
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 $(MAKEFLAGS)
clean: clean:
cd $(WXDIR)\samples\artprov cd $(WXDIR)\samples\artprov
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\calendar cd $(WXDIR)\samples\calendar
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\caret cd $(WXDIR)\samples\caret
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\checklst cd $(WXDIR)\samples\checklst
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\config cd $(WXDIR)\samples\config
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\controls
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\db cd $(WXDIR)\samples\db
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\ipc cd $(WXDIR)\samples\ipc
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\dialogs cd $(WXDIR)\samples\dialogs
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\dnd cd $(WXDIR)\samples\dnd
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\docview cd $(WXDIR)\samples\docview
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\docvwmdi cd $(WXDIR)\samples\docvwmdi
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\drawing cd $(WXDIR)\samples\drawing
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\dynamic cd $(WXDIR)\samples\dynamic
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\font cd $(WXDIR)\samples\font
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\grid cd $(WXDIR)\samples\grid
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\help cd $(WXDIR)\samples\help
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\html cd $(WXDIR)\samples\html
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\image cd $(WXDIR)\samples\image
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\internat cd $(WXDIR)\samples\internat
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\keyboard cd $(WXDIR)\samples\keyboard
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\layout cd $(WXDIR)\samples\layout
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\listctrl cd $(WXDIR)\samples\listctrl
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\mdi cd $(WXDIR)\samples\mdi
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\memcheck cd $(WXDIR)\samples\memcheck
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\mfc cd $(WXDIR)\samples\mfc
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\menu cd $(WXDIR)\samples\menu
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\minifram cd $(WXDIR)\samples\minifram
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\minimal cd $(WXDIR)\samples\minimal
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\nativdlg
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\dialup cd $(WXDIR)\samples\dialup
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\notebook cd $(WXDIR)\samples\notebook
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\oleauto cd $(WXDIR)\samples\oleauto
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\ownerdrw cd $(WXDIR)\samples\ownerdrw
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\png cd $(WXDIR)\samples\png
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\printing
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\regtest cd $(WXDIR)\samples\regtest
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\rotate cd $(WXDIR)\samples\rotate
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\scrollsub cd $(WXDIR)\samples\scrollsub
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\splitter
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\tab cd $(WXDIR)\samples\tab
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\taskbar cd $(WXDIR)\samples\taskbar
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\text cd $(WXDIR)\samples\text
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\thread cd $(WXDIR)\samples\thread
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\toolbar cd $(WXDIR)\samples\toolbar
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\treectrl cd $(WXDIR)\samples\treectrl
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\typetest cd $(WXDIR)\samples\typetest
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\validate cd $(WXDIR)\samples\validate
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\wizard cd $(WXDIR)\samples\wizard
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\dragimag cd $(WXDIR)\samples\dragimag
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\erase cd $(WXDIR)\samples\erase
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\exec cd $(WXDIR)\samples\exec
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\event cd $(WXDIR)\samples\event
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\statbar cd $(WXDIR)\samples\statbar
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\propsize cd $(WXDIR)\samples\propsize
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\sockets cd $(WXDIR)\samples\sockets
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\treectrl cd $(WXDIR)\samples\treectrl
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\tab cd $(WXDIR)\samples\tab
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\samples\widgets cd $(WXDIR)\samples\widgets
make -f makefile.b32 clean make -f makefile.b32 $(MAKEFLAGS) clean

8
src/makeb32.env
View File

@@ -1,12 +1,14 @@
# Common settings for Borland 32-bit compilation (makefile.b32 files) # Common settings for Borland 32-bit compilation (makefile.b32 files)
!if "$(RM)" == "" !if "$(RM)" == ""
RM= erase RM= del
!endif !endif
BORLAND_SUFFIX=bc BORLAND_SUFFIX=bc
DEBUG_SUFFIX= DEBUG_SUFFIX=
MAKEFLAGS=FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) OUTPUTDIR=$(OUTPUTDIR) EXEDIR=$(EXEDIR)
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
CFG = wxw32 CFG = wxw32
@@ -165,7 +167,7 @@ OBJSUFF = obj
WAITFLAG = /w WAITFLAG = /w
.$(SRCSUFF).obj: .$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< } bcc32 $(CPPFLAGS) -c -n$(OBJ_PATH) {$< }
.c.obj: .c.obj:
bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< } bcc32 $(CPPFLAGS) -P- -c -n$(OBJ_PATH) {$< }

4
src/makelib.b32
View File

@@ -26,7 +26,7 @@ clean:
-if exist $(LIBTARGET) $(RM) $(LIBTARGET) -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
.$(SRCSUFF).obj: .$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< } bcc32 $(CPPFLAGS) -c -n$(OBJ_PATH) {$< }
.c.obj: .c.obj:
bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< } bcc32 $(CPPFLAGS) -P- -c -n$(OBJ_PATH) {$< }

22
src/makeprog.b32
View File

@@ -42,8 +42,6 @@ LIBS=$(WXLIB) $(EX_LIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DE
LIBS=$(LIBS) odbc32 LIBS=$(LIBS) odbc32
!endif !endif
# Note: you may need to remove some libraries for earlier versions of BC++, as below
#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff
!if "$(wxUSE_GUI)" == "0" !if "$(wxUSE_GUI)" == "0"
LINKOUT = /ap LINKOUT = /ap
@@ -78,7 +76,7 @@ EXE_TARGET=$(EXEDIR)\$(TARGET)
default : all default : all
maked: maked:
-if not exist $(EXEDIR) mkdir $(EXEDIR) -if not exist $(EXEDIR)\nul mkdir $(EXEDIR)
wx: $(EXE_TARGET).exe $(EXTRATARGETS) wx: $(EXE_TARGET).exe $(EXTRATARGETS)
@@ -98,20 +96,20 @@ $(TARGETRES)
.path.obj=$(EXEDIR) .path.obj=$(EXEDIR)
.$(SRCSUFF).obj: .$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c -o$(EXEDIR)\$(<B).obj {$< } bcc32 $(CPPFLAGS) -c -n$(EXEDIR) {$< }
.c.obj: .c.obj:
bcc32 $(CPPFLAGS) -P- -c -o$(EXEDIR)\$(<B).obj {$< } bcc32 $(CPPFLAGS) -P- -c -n$(EXEDIR) {$< }
$(TARGETRES) : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc $(TARGETRES) : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$(EXEDIR)\$(<B).res $(TARGET) brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$(EXEDIR)\$(<B).res $(TARGET)
clean: clean:
-erase $(EXEDIR)\*.obj -$(RM) $(EXEDIR)\*.obj
-erase $(EXEDIR)\*.exe -$(RM) $(EXEDIR)\*.exe
-erase $(EXEDIR)\*.res -$(RM) $(EXEDIR)\*.res
-erase $(EXEDIR)\*.map -$(RM) $(EXEDIR)\*.map
-erase $(EXEDIR)\*.rws -$(RM) $(EXEDIR)\*.rws
-erase $(EXEDIR)\*.tds -$(RM) $(EXEDIR)\*.tds
-erase $(EXEDIR)\*.il? -$(RM) $(EXEDIR)\*.il?

30
src/msw/makefile.b32
View File

@@ -88,6 +88,7 @@ GENERICOBJS= $(OBJ_PATH)\busyinfo.obj \
$(OBJ_PATH)\progdlgg.obj \ $(OBJ_PATH)\progdlgg.obj \
$(OBJ_PATH)\sashwin.obj \ $(OBJ_PATH)\sashwin.obj \
$(OBJ_PATH)\scrlwing.obj \ $(OBJ_PATH)\scrlwing.obj \
$(OBJ_PATH)\selstore.obj \
$(OBJ_PATH)\spinctlg.obj \ $(OBJ_PATH)\spinctlg.obj \
$(OBJ_PATH)\splash.obj \ $(OBJ_PATH)\splash.obj \
$(OBJ_PATH)\splitter.obj \ $(OBJ_PATH)\splitter.obj \
@@ -240,6 +241,7 @@ GENERICUNIVOBJS= $(OBJ_PATH)\accel.obj \
$(OBJ_PATH)\progdlgg.obj \ $(OBJ_PATH)\progdlgg.obj \
$(OBJ_PATH)\sashwin.obj \ $(OBJ_PATH)\sashwin.obj \
$(OBJ_PATH)\scrlwing.obj \ $(OBJ_PATH)\scrlwing.obj \
$(OBJ_PATH)\selstore.obj \
$(OBJ_PATH)\spinctlg.obj \ $(OBJ_PATH)\spinctlg.obj \
$(OBJ_PATH)\splash.obj \ $(OBJ_PATH)\splash.obj \
$(OBJ_PATH)\splitter.obj \ $(OBJ_PATH)\splitter.obj \
@@ -549,8 +551,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
!else !else
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -$(RM) $(LIBTARGET)
-erase $(WXDLL) -$(RM) $(WXDLL)
$(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&! $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
c0d32.obj $(OBJECTS) c0d32.obj $(OBJECTS)
$(WXDLL) $(WXDLL)
@@ -1348,6 +1350,8 @@ $(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
$(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) $(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
$(OBJ_PATH)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF)
$(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) $(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
$(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) $(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
@@ -1410,6 +1414,8 @@ $(OBJ_PATH)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
$(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) $(OBJ_PATH)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
$(OBJ_PATH)\selstore.obj: $(GENDIR)\selstore.$(SRCSUFF)
$(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF) $(OBJ_PATH)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
$(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF) $(OBJ_PATH)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
@@ -1496,52 +1502,52 @@ all_execs:
png: $(CFG) png: $(CFG)
cd $(WXDIR)\src\png cd $(WXDIR)\src\png
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_png: clean_png:
cd $(WXDIR)\src\png cd $(WXDIR)\src\png
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
zlib: $(CFG) zlib: $(CFG)
cd $(WXDIR)\src\zlib cd $(WXDIR)\src\zlib
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_zlib: clean_zlib:
cd $(WXDIR)\src\zlib cd $(WXDIR)\src\zlib
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
jpeg: $(CFG) jpeg: $(CFG)
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_jpeg: clean_jpeg:
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
regex: $(CFG) regex: $(CFG)
cd $(WXDIR)\src\regex cd $(WXDIR)\src\regex
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_regex: clean_regex:
cd $(WXDIR)\src\regex cd $(WXDIR)\src\regex
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
tiff: $(CFG) tiff: $(CFG)
cd $(WXDIR)\src\tiff cd $(WXDIR)\src\tiff
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 $(MAKEFLAGS) lib
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_tiff: clean_tiff:
cd $(WXDIR)\src\tiff cd $(WXDIR)\src\tiff
${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean ${MAKE} -f makefile.b32 $(MAKEFLAGS) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
$(CFG): makefile.b32 $(CFG): makefile.b32