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

Borland makefiles now keep output apart

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-05-26 11:34:39 +00:00
parent ba0d56c3c2
commit 2cedc12a6a
11 changed files with 1472 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
$obj = "\$(UNIVDIR)\\" . $file . " "; $obj = "\$(UNIVDIR)\\" . $file . " ";
$project{"WXUNIVOBJS"} .= "\$(MSWDIR)\\" . $file . " " $project{"WXUNIVOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
} }
foreach $file (sort keys %wxUNIV) { foreach $file (sort keys %wxUNIV) {
@@ -26,14 +26,14 @@
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
$obj = "\$(UNIVTHEMEDIR)\\" . $file . " "; $obj = "\$(UNIVTHEMEDIR)\\" . $file . " ";
$project{"WXUNIVTHEMEOBJS"} .= "\$(MSWDIR)\\" . $file . " " $project{"WXUNIVTHEMEOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
} }
foreach $file (sort keys %wxHTML) { foreach $file (sort keys %wxHTML) {
next if $wxHTML{$file} =~ /\b16\b/; next if $wxHTML{$file} =~ /\b16\b/;
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
$project{"WXHTMLOBJS"} .= "\$(MSWDIR)\\" . $file . " " $project{"WXHTMLOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
} }
foreach $file (sort keys %wxCommon) { foreach $file (sort keys %wxCommon) {
@@ -41,7 +41,7 @@
$isCFile = $file =~ /\.c$/; $isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
$obj = "\$(MSWDIR)\\" . $file . " "; $obj = "\$(OBJ_PATH)\\" . $file . " ";
$project{"WXCOMMONOBJS"} .= $obj; $project{"WXCOMMONOBJS"} .= $obj;
$project{"WXCOBJS"} .= $obj if $isCFile; $project{"WXCOBJS"} .= $obj if $isCFile;
} }
@@ -50,18 +50,11 @@
foreach $file (sort keys %wxMSW) { foreach $file (sort keys %wxMSW) {
next if $wxMSW{$file} =~ /\b16\b/; next if $wxMSW{$file} =~ /\b16\b/;
#! if ( $file =~ /^automtn/ ) {
#! #! comment in old makefile.b32 seems to imply that this file can not
#! #! be compiled with Borland (leads to crash in oleauto sample)
#! No longer true, at least for BC++ 5.2
#! next;
#! }
$isCFile = $file =~ /\.c$/; $isCFile = $file =~ /\.c$/;
my $isOleObj = $wxMSW{$file} =~ /\bO\b/; my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
my $obj = "\$(MSWDIR)\\" . $file . " "; my $obj = "\$(OBJ_PATH)\\" . $file . " ";
$project{"WXMSWOBJS"} .= $obj; $project{"WXMSWOBJS"} .= $obj;
if ( $isOleObj ) { if ( $isOleObj ) {
@@ -75,18 +68,11 @@
foreach $file (sort keys %wxMSW) { foreach $file (sort keys %wxMSW) {
next unless $wxMSW{$file} =~ /\b(L|B)\b/; next unless $wxMSW{$file} =~ /\b(L|B)\b/;
#! if ( $file =~ /^automtn/ ) {
#! #! comment in old makefile.b32 seems to imply that this file can not
#! #! be compiled with Borland (leads to crash in oleauto sample)
#! No longer true, at least for BC++ 5.2
#! next;
#! }
$isCFile = $file =~ /\.c$/; $isCFile = $file =~ /\.c$/;
my $isOleObj = $wxMSW{$file} =~ /\bO\b/; my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
my $obj = "\$(MSWDIR)\\" . $file . " "; my $obj = "\$(OBJ_PATH)\\" . $file . " ";
$project{"WXMSWUNIVOBJS"} .= $obj; $project{"WXMSWUNIVOBJS"} .= $obj;
if ( $isOleObj ) { if ( $isOleObj ) {
@@ -102,7 +88,7 @@
next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/; next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
$file =~ s/cp?p?$/obj/; $file =~ s/cp?p?$/obj/;
$project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " " $project{"WXGENERICOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
} }
#! Generic Dir for UNIV Port #! Generic Dir for UNIV Port
@@ -118,7 +104,7 @@
$project{"WXUNIVOBJS"} =~ /\b$filereal\b/; $project{"WXUNIVOBJS"} =~ /\b$filereal\b/;
$project{"WXGENERICUNIVOBJS"} .= "\$(MSWDIR)\\" . $file . " " $project{"WXGENERICUNIVOBJS"} .= "\$(OBJ_PATH)\\" . $file . " "
} }
#$} #$}
@@ -171,7 +157,6 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
!endif !endif
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS= PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET) PERIPH_TARGET=zlib png jpeg tiff regex $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PERIPH_CLEAN_TARGET)
@@ -180,7 +165,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff clean_regex $(PER
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll DUMMY=dummydll
LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex LIBS= cw32mti import32 ole2w32 odbc32 zlib_$(DEBUG_SUFFIX) png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX) regex_$(DEBUG_SUFFIX)
!endif !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@@ -220,7 +205,7 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
default: wx default: wx
wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) wx: $(ARCHINCDIR)\wx makeoutdir makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
all: wx all: wx
@@ -235,15 +220,18 @@ makearchsetuph:
copy $(SETUPSRCDIR)\setup.h $(ARCHSETUPH) copy $(SETUPSRCDIR)\setup.h $(ARCHSETUPH)
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
makeoutdir:
-mkdir $(OBJ_PATH)
$(ARCHINCDIR)\wx: $(ARCHINCDIR)\wx:
-mkdir $(ARCHINCDIR) -mkdir $(ARCHINCDIR)
-mkdir $(ARCHINCDIR)\wx -mkdir $(ARCHINCDIR)\wx
-erase $(CFG) -if exist $(CFG) $(RM) $(CFG)
!if "$(DLL)" == "0" !if "$(DLL)" == "0"
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&! tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
! !
@@ -280,9 +268,10 @@ version.res:
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; } if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/OBJ_PATH/OLEDIR/; }
$suffix = $project{"WXCUNIVOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)'; $suffix = $project{"WXCUNIVOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/obj$/$suffix/; s/obj$/$suffix/;
s/OBJ_PATH/MSWDIR/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
#$} #$}
@@ -297,9 +286,10 @@ version.res:
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; } if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/OBJ_PATH/OLEDIR/; }
$suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)'; $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/obj$/$suffix/; s/obj$/$suffix/;
s/OBJ_PATH/MSWDIR/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
#$} #$}
@@ -313,7 +303,7 @@ version.res:
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
s/MSWDIR/UNIVDIR/; s/OBJ_PATH/UNIVDIR/;
s/obj$/\$(SRCSUFF)/; s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
@@ -328,7 +318,7 @@ version.res:
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
s/MSWDIR/UNIVTHEMEDIR/; s/OBJ_PATH/UNIVTHEMEDIR/;
s/obj$/\$(SRCSUFF)/; s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
@@ -345,7 +335,7 @@ version.res:
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
$suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)'; $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
s/MSWDIR/COMMDIR/; s/OBJ_PATH/COMMDIR/;
s/obj$/$suffix/; s/obj$/$suffix/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
@@ -363,7 +353,7 @@ version.res:
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
s/MSWDIR/GENDIR/; s/OBJ_PATH/GENDIR/;
s/obj$/\$(SRCSUFF)/; s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
@@ -380,7 +370,7 @@ version.res:
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
s/MSWDIR/GENDIR/; s/OBJ_PATH/GENDIR/;
s/obj$/\$(SRCSUFF)/; s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
@@ -395,7 +385,7 @@ version.res:
my @objs = split; my @objs = split;
foreach (@objs) { foreach (@objs) {
$text .= $_ . ": "; $text .= $_ . ": ";
s/MSWDIR/HTMLDIR/; s/OBJ_PATH/HTMLDIR/;
s/obj$/\$(SRCSUFF)/; s/obj$/\$(SRCSUFF)/;
$text .= $_ . "\n\n"; $text .= $_ . "\n\n";
} }
@@ -419,58 +409,58 @@ all_execs:
png: $(CFG) png: $(CFG)
cd $(WXDIR)\src\png cd $(WXDIR)\src\png
${MAKE} -f makefile.b32 FINAL=$(FINAL) ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 clean ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 clean ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 FINAL=$(FINAL) ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 clean ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 clean ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 FINAL=$(FINAL) lib ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) 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 clean ${MAKE} -f makefile.b32 OUTPUTDIR=$(OUTPUTDIR) FINAL=$(FINAL) clean
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
$(CFG): makefile.b32 $(CFG): makefile.b32
copy &&! copy &&!
-Hc -Hc
-H=$(WXDIR)\src\msw\wx32.csm -H=$(OBJ_PATH)\wx32.csm
-3 -3
-d -d
-a1 # byte alignment -a1 # byte alignment
@@ -494,15 +484,21 @@ $(DEBUG_FLAGS)
$(WIN95FLAG) $(WIN95FLAG)
! $(CFG) ! $(CFG)
clean: $(PERIPH_CLEAN_TARGET) cleancfg:
-erase $(WXLIBDIR)\wx.tds -if exist $(OBJ_PATH)\*.cfg $(RM) $(OBJ_PATH)\*.cfg
-erase $(WXLIBDIR)\wx.il?
-erase *.obj
-erase *.pch
-erase *.csm
-erase "wx32.#??"
cleanall: clean clean: $(PERIPH_CLEAN_TARGET)
-if exist $(WXLIBDIR)\wx.il? $(RM) $(WXLIBDIR)\wx.tds
-if exist $(WXLIBDIR)\wx.il? $(RM) $(WXLIBDIR)\wx.il?
-if exist $(OBJ_PATH)\*.obj $(RM) $(OBJ_PATH)\*.obj
-if exist $(OBJ_PATH)\*.csm $(RM) $(OBJ_PATH)\*.csm
-if exist "$(OBJ_PATH)\wx32.#??" $(RM) "$(OBJ_PATH)\wx32.#??"
-if exist *.pch $(RM) *.pch
-if exist *.csm $(RM) *.csm
-if exist *.obj $(RM) *.obj
-if exist "wx32.#??" $(RM) "wx32.#??"
cleanall: clean cleancfg
# Making documents # Making documents
@@ -592,7 +588,7 @@ allpdfrtf: pdfrtf portingpdfrtf
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
cd $(DOCDIR)/latex/wx cd $(DOCDIR)/latex/wx
-erase wx.ph -if exist wx.ph $(RM) wx.ph
hc wx hc wx
move wx.hlp $(DOCDIR)\winhelp\wx.hlp move wx.hlp $(DOCDIR)\winhelp\wx.hlp
move wx.cnt $(DOCDIR)\winhelp\wx.cnt move wx.cnt $(DOCDIR)\winhelp\wx.cnt
@@ -600,7 +596,7 @@ $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
$(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj $(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
cd $(DOCDIR)/latex/porting cd $(DOCDIR)/latex/porting
-erase porting.ph -if exist porting.ph $(RM) porting.ph
hc porting hc porting
move porting.hlp $(DOCDIR)\winhelp\porting.hlp move porting.hlp $(DOCDIR)\winhelp\porting.hlp
move porting.cnt $(DOCDIR)\winhelp\porting.cnt move porting.cnt $(DOCDIR)\winhelp\porting.cnt
@@ -608,7 +604,7 @@ $(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOC
$(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj $(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
cd $(DOCDIR)/latex/techref cd $(DOCDIR)/latex/techref
-erase techref.ph -if exist techref.ph $(RM) techref.ph
hc techref hc techref
move techref.hlp $(DOCDIR)\winhelp\techref.hlp move techref.hlp $(DOCDIR)\winhelp\techref.hlp
move techref.cnt $(DOCDIR)\winhelp\techref.cnt move techref.cnt $(DOCDIR)\winhelp\techref.cnt
@@ -654,10 +650,10 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
cd $(DOCDIR)\latex\wx cd $(DOCDIR)\latex\wx
-mkdir $(DOCDIR)\html\wx -mkdir $(DOCDIR)\html\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-erase $(DOCDIR)\html\wx\*.con -if exist $(DOCDIR)\html\wx\*.con $(RM) $(DOCDIR)\html\wx\*.con
-erase $(DOCDIR)\html\wx\*.ref -if exist $(DOCDIR)\html\wx\*.ref $(RM) $(DOCDIR)\html\wx\*.ref
-erase $(DOCDIR)\latex\wx\*.con -if exist $(DOCDIR)\latex\wx\*.con $(RM) $(DOCDIR)\latex\wx\*.con
-erase $(DOCDIR)\latex\wx\*.ref -if exist $(DOCDIR)\latex\wx\*.ref $(RM) $(DOCDIR)\latex\wx\*.ref
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
@@ -670,10 +666,10 @@ $(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
cd $(DOCDIR)\latex\porting cd $(DOCDIR)\latex\porting
-mkdir $(DOCDIR)\html\porting -mkdir $(DOCDIR)\html\porting
-start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
-erase $(DOCDIR)\html\porting\*.con -if exist $(DOCDIR)\html\porting\*.con $(RM) $(DOCDIR)\html\porting\*.con
-erase $(DOCDIR)\html\porting\*.ref -if exist $(DOCDIR)\html\porting\*.ref $(RM) $(DOCDIR)\html\porting\*.ref
-erase $(DOCDIR)\latex\porting\*.con -if exist $(DOCDIR)\latex\porting\*.con $(RM) $(DOCDIR)\latex\porting\*.con
-erase $(DOCDIR)\latex\porting\*.ref -if exist $(DOCDIR)\latex\porting\*.ref $(RM) $(DOCDIR)\latex\porting\*.ref
cd $(THISDIR) cd $(THISDIR)
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
@@ -741,6 +737,12 @@ MFTYPE=b32
# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t # makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
self: self:
!if "$(TM)"==""
@echo Error in Environment!
@echo Please set TM in the environment to the directory containing tmake binaries
@echo eg set TM=c:\wx\tmake\bin
!else
cd $(WXWIN)\distrib\msw\tmake cd $(WXWIN)\distrib\msw\tmake
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) perl $(TM)\tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
copy makefile.$(MFTYPE) $(WXWIN)\src\msw copy makefile.$(MFTYPE) $(WXWIN)\src\msw
!endif

16
docs/msw/install.txt
View File

@@ -239,12 +239,16 @@ Compiling using the makefiles (updated 24 Sept 02):
You may like to use the short form as shown by a dos directory listing ; You may like to use the short form as shown by a dos directory listing ;
eg instead of c:\wxwindows-2.5.0 use c:\wxwind~1.4 eg instead of c:\wxwindows-2.5.0 use c:\wxwind~1.4
Reboot if needed for the changes to autoexec.bat to take effect. Reboot if needed for the changes to autoexec.bat to take effect.
2. Change directory to src\msw. Type 'make -f makefile.b32' to 2. Change directory to src\msw. Type 'make -f makefile.b32' to
make the wxWindows core library. Ignore the compiler warnings. make the wxWindows core library. Ignore the compiler warnings.
This produces a library in the wxwindows\lib directory called This produces a library in the wxwindows\lib directory called
wx32ds.lib wx32ds.lib
3. Change directory to a sample or demo such as samples\minimal, and type 3. Change directory to a sample or demo such as samples\minimal, and type
'make -f makefile.b32'. This produces a windows exe file 'make -f makefile.b32'. This produces a windows exe file - by default
in the BORL subdirectory (see note 9)
4. For release versions, recompile wxWindows and samples using 4. For release versions, recompile wxWindows and samples using
'make -f makefile.b32 clean' 'make -f makefile.b32 clean'
'make -f makefile.b32 FINAL=1' 'make -f makefile.b32 FINAL=1'
@@ -291,6 +295,14 @@ Compiling using the makefiles (updated 24 Sept 02):
There is a sample\console directory and in this type There is a sample\console directory and in this type
'make -f makefile.b32 wxUSE_GUI=0' 'make -f makefile.b32 wxUSE_GUI=0'
9. OUTPUTDIR may be set to the name of the directory where you want all the
object files to be generated (the library files are always created in
%WXWIN%\lib). Compilation will fail if you set it to an empty string
to create them in the same directory as the source. If you change OUTPUTDIR,
make sure that it does not have a trailing backslash!
In the samples, you may use EXEDIR=adir to build the samples in adir. Setting
EXEDIR=. will build in the current directory,
Note (0): This provides the ability to produce separate wxwindows libraries Note (0): This provides the ability to produce separate wxwindows libraries
for different purposes, and only have to rebuild the applications for different purposes, and only have to rebuild the applications
@@ -397,7 +409,7 @@ There are several makefile variables which may be modified:
- OUTPUTDIR may be set to the name of the directory where you want all the - OUTPUTDIR may be set to the name of the directory where you want all the
object files to be generated (the library files are always created in object files to be generated (the library files are always created in
%WXWIN\lib). Compilation will fail if you set it to an empty string %WXWIN%\lib). Compilation will fail if you set it to an empty string
to create them in the same directory as the source. If you change OUTPUTDIR, to create them in the same directory as the source. If you change OUTPUTDIR,
make sure that it does not have a trailing backslash! make sure that it does not have a trailing backslash!

208
src/jpeg/makefile.b32
View File

@@ -9,70 +9,164 @@
# #
# Makefile : Builds JPEG library (BC++ 32-bit) # Makefile : Builds JPEG library (BC++ 32-bit)
# WXWIN and BCCDIR are set by parent make LIBTARGET=jpeg
WXWIN=..\..
LIBTARGET =..\..\lib\jpeg.lib !include ..\makeb32.env
SYSDEPMEM= jmemnobs.obj SYSDEPMEM= \
$(OBJ_PATH)\jmemnobs.obj
# source files: JPEG library proper
LIBSOURCES= jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c \
jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c \
jcphuff.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c \
jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c \
jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c \
jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c \
jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \
jquant2.c jutils.c jmemmgr.c
# memmgr back ends: compile only one of these into a working library
SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c
# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom
APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \
rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \
rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c
SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)
# files included by source files
INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
jpegint.h jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h
# documentation, test, and support files
DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
coderules.doc filelist.doc change.log
MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
makvms.opt
CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \
jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \
jconfig.vms
CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
testimgp.jpg
DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
$(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
# library object files common to compression and decompression # library object files common to compression and decompression
COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM) COMOBJECTS= \
$(OBJ_PATH)\jcomapi.obj \
$(OBJ_PATH)\jutils.obj \
$(OBJ_PATH)\jerror.obj \
$(OBJ_PATH)\jmemmgr.obj \
$(SYSDEPMEM)
# compression library object files # compression library object files
CLIBOBJECTS= jcapimin.obj jcapistd.obj jctrans.obj jcparam.obj jdatadst.obj \ CLIBOBJECTS= \
jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj jcprepct.obj \ $(OBJ_PATH)\jcapimin.obj \
jccoefct.obj jccolor.obj jcsample.obj jchuff.obj jcphuff.obj \ $(OBJ_PATH)\jcapistd.obj \
jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj $(OBJ_PATH)\jctrans.obj \
$(OBJ_PATH)\jcparam.obj \
$(OBJ_PATH)\jdatadst.obj \
$(OBJ_PATH)\jcinit.obj \
$(OBJ_PATH)\jcmaster.obj \
$(OBJ_PATH)\jcmarker.obj \
$(OBJ_PATH)\jcmainct.obj \
$(OBJ_PATH)\jcprepct.obj \
$(OBJ_PATH)\jccoefct.obj \
$(OBJ_PATH)\jccolor.obj \
$(OBJ_PATH)\jcsample.obj \
$(OBJ_PATH)\jchuff.obj \
$(OBJ_PATH)\jcphuff.obj \
$(OBJ_PATH)\jcdctmgr.obj \
$(OBJ_PATH)\jfdctfst.obj \
$(OBJ_PATH)\jfdctflt.obj \
$(OBJ_PATH)\jfdctint.obj
# decompression library object files # decompression library object files
DLIBOBJECTS= jdapimin.obj jdapistd.obj jdtrans.obj jdatasrc.obj \ DLIBOBJECTS= \
jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdphuff.obj \ $(OBJ_PATH)\jdapimin.obj \
jdmainct.obj jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj \ $(OBJ_PATH)\jdapistd.obj \
jidctflt.obj jidctint.obj jidctred.obj jdsample.obj jdcolor.obj \ $(OBJ_PATH)\jdtrans.obj \
jquant1.obj jquant2.obj jdmerge.obj $(OBJ_PATH)\jdatasrc.obj \
$(OBJ_PATH)\jdmaster.obj \
$(OBJ_PATH)\jdinput.obj \
$(OBJ_PATH)\jdmarker.obj \
$(OBJ_PATH)\jdhuff.obj \
$(OBJ_PATH)\jdphuff.obj \
$(OBJ_PATH)\jdmainct.obj \
$(OBJ_PATH)\jdcoefct.obj \
$(OBJ_PATH)\jdpostct.obj \
$(OBJ_PATH)\jddctmgr.obj \
$(OBJ_PATH)\jidctfst.obj \
$(OBJ_PATH)\jidctflt.obj \
$(OBJ_PATH)\jidctint.obj \
$(OBJ_PATH)\jidctred.obj \
$(OBJ_PATH)\jdsample.obj \
$(OBJ_PATH)\jdcolor.obj \
$(OBJ_PATH)\jquant1.obj \
$(OBJ_PATH)\jquant2.obj \
$(OBJ_PATH)\jdmerge.obj
# These objectfiles are included in libjpeg.lib # These objectfiles are included in libjpeg.lib
OBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS) OBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
# object files for sample applications (excluding library files)
COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj \
rdswitch.obj cdjpeg.obj
DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj \
rdcolmap.obj cdjpeg.obj
TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj
!include $(WXWIN)\src\makelib.b32 $(OBJ_PATH)\jmemnobs.obj: jmemnobs.c
$(OBJ_PATH)\jcomapi.obj: jcomapi.c
$(OBJ_PATH)\jutils.obj: jutils.c
$(OBJ_PATH)\jerror.obj: jerror.c
$(OBJ_PATH)\jmemmgr.obj: jmemmgr.c
$(OBJ_PATH)\jcapimin.obj: jcapimin.c
$(OBJ_PATH)\jcapistd.obj: jcapistd.c
$(OBJ_PATH)\jctrans.obj: jctrans.c
$(OBJ_PATH)\jcparam.obj: jcparam.c
$(OBJ_PATH)\jdatadst.obj: jdatadst.c
$(OBJ_PATH)\jcinit.obj: jcinit.c
$(OBJ_PATH)\jcmaster.obj: jcmaster.c
$(OBJ_PATH)\jcmarker.obj: jcmarker.c
$(OBJ_PATH)\jcmainct.obj: jcmainct.c
$(OBJ_PATH)\jcprepct.obj: jcprepct.c
$(OBJ_PATH)\jccoefct.obj: jccoefct.c
$(OBJ_PATH)\jccolor.obj: jccolor.c
$(OBJ_PATH)\jcsample.obj: jcsample.c
$(OBJ_PATH)\jchuff.obj: jchuff.c
$(OBJ_PATH)\jcphuff.obj: jcphuff.c
$(OBJ_PATH)\jcdctmgr.obj: jcdctmgr.c
$(OBJ_PATH)\jfdctfst.obj: jfdctfst.c
$(OBJ_PATH)\jfdctflt.obj: jfdctflt.c
$(OBJ_PATH)\jfdctint.obj: jfdctint.c
$(OBJ_PATH)\jdapimin.obj: jdapimin.c
$(OBJ_PATH)\jdapistd.obj: jdapistd.c
$(OBJ_PATH)\jdtrans.obj: jdtrans.c
$(OBJ_PATH)\jdatasrc.obj: jdatasrc.c
$(OBJ_PATH)\jdmaster.obj: jdmaster.c
$(OBJ_PATH)\jdinput.obj: jdinput.c
$(OBJ_PATH)\jdmarker.obj: jdmarker.c
$(OBJ_PATH)\jdhuff.obj: jdhuff.c
$(OBJ_PATH)\jdphuff.obj: jdphuff.c
$(OBJ_PATH)\jdmainct.obj: jdmainct.c
$(OBJ_PATH)\jdcoefct.obj: jdcoefct.c
$(OBJ_PATH)\jdpostct.obj: jdpostct.c
$(OBJ_PATH)\jddctmgr.obj: jddctmgr.c
$(OBJ_PATH)\jidctfst.obj: jidctfst.c
$(OBJ_PATH)\jidctflt.obj: jidctflt.c
$(OBJ_PATH)\jidctint.obj: jidctint.c
$(OBJ_PATH)\jidctred.obj: jidctred.c
$(OBJ_PATH)\jdsample.obj: jdsample.c
$(OBJ_PATH)\jdcolor.obj: jdcolor.c
$(OBJ_PATH)\jquant1.obj: jquant1.c
$(OBJ_PATH)\jquant2.obj: jquant2.c
$(OBJ_PATH)\jdmerge.obj: jdmerge.c
!include ..\makelib.b32

72
src/makeb32.env
View File

@@ -4,24 +4,35 @@
RM= erase RM= erase
!endif !endif
WXDIR = $(WXWIN) BORLAND_SUFFIX=bc
CFG = $(WXDIR)\src\msw\wxw32 DEBUG_SUFFIX=
WXDIR = $(WXWIN)
CFG = wxw32
!ifndef OUTPUTDIR
OBJ_PATH=$(WXDIR)\BORL
OUTPUTDIR=$(WXDIR)\BORL
!else
OBJ_PATH=$(OUTPUTDIR)
!endif
!ifndef BCCDIR
BCCDIR=$(MAKEDIR)\.. BCCDIR=$(MAKEDIR)\..
!endif
!if "$(BCCDIR)" == "\.." !if "$(BCCDIR)" == "\.."
!error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4 !error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4
!endif !endif
ARCHINCDIR=$(WXDIR)\lib\msw ARCHINCDIR=$(WXDIR)\lib\$(BORLAND_SUFFIX)
ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
#see below for SETUPSRCDIR #see below for SETUPSRCDIR
!ifndef WXLIBDIR
# Using a config file isn't compatible across all BC++ versions
# LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
WXLIBDIR = $(WXDIR)\lib WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\lib !endif
WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;$(WXDIR)\src\regex; WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;$(WXDIR)\src\regex;
WIN95FLAG = -D__WIN95__ -D__WINDOWS__ WIN95FLAG = -D__WIN95__ -D__WINDOWS__
RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src
@@ -61,6 +72,9 @@ LINKDEBUGFLAGS=/v
!ifndef DLL !ifndef DLL
DLL=0 DLL=0
!else
DLL=1
WXMAKINGDLL=1
!endif !endif
# Target WXMAKINGDLL WXUSINGDLL WXBUILDDLL # Target WXMAKINGDLL WXUSINGDLL WXBUILDDLL
@@ -77,18 +91,14 @@ DLL=0
# options and all the obj files, and note that you must delete the obj files if you # options and all the obj files, and note that you must delete the obj files if you
# change the options so that they are compiled using the correct ones. # change the options so that they are compiled using the correct ones.
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" WXLIBNAME=wx25
WXLIBNAME=wx32
!else
WXLIBNAME=wx32
!endif
## Use this if you want to use the UNIV controls set rather than the native ones ## Use this if you want to use the UNIV controls set rather than the native ones
## make -f makefile.b32 WXUSINGUNIV=1 ## make -f makefile.b32 WXUSINGUNIV=1
!if "$(WXUSINGUNIV)" == "1" !if "$(WXUSINGUNIV)" == "1"
USE_UNIV="UNIV" USE_UNIV="UNIV"
CFG=$(CFG)v BORLAND_SUFFIX=$(BORLAND_SUFFIX)v
WXLIBNAME=$(WXLIBNAME)v
ARCHINCDIR=$(ARCHINCDIR)v ARCHINCDIR=$(ARCHINCDIR)v
SETUPSRCDIR=$(WXDIR)\include\wx\univ SETUPSRCDIR=$(WXDIR)\include\wx\univ
PORT=__WXUNIVERSAL__ PORT=__WXUNIVERSAL__
@@ -98,43 +108,35 @@ PORT=__WXMSW__
SETUPSRCDIR=$(WXDIR)\include\wx\msw SETUPSRCDIR=$(WXDIR)\include\wx\msw
!endif !endif
#not sure what to do with unicode builds - we need to define something ? #unicode builds handled inside setup.h
#!if "$(UNICODE)" == "1"
#WXLIBNAME=$(WXLIBNAME)u
#!endif
#a hybrid , does not set __WXDEBUG__ but sets -v (see above) #a hybrid , does not set __WXDEBUG__ but sets -v (see above)
!if "$(FINAL)" == "hybrid" !if "$(FINAL)" == "hybrid"
WXLIBNAME=$(WXLIBNAME)h DEBUG_SUFFIX=$(DEBUG_SUFFIX)h
CFG=$(CFG)h
!endif !endif
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
WXLIBNAME=$(WXLIBNAME)d DEBUG_SUFFIX=$(DEBUG_SUFFIX)d
CFG=$(CFG)d
!endif !endif
!if "$(wxUSE_GUI)" == "0" !if "$(wxUSE_GUI)" == "0"
WXLIBNAME=$(WXLIBNAME)b BORLAND_SUFFIX=$(BORLAND_SUFFIX)b
CFG=$(CFG)b
CPPFLAGS=-DwxUSE_GUI=0 CPPFLAGS=-DwxUSE_GUI=0
!endif !endif
!if "$(WXMAKINGDLL)" != "1" && "$(WXUSINGDLL)" != "1" !if "$(WXMAKINGDLL)" != "1" && "$(WXUSINGDLL)" != "1"
WXLIBNAME=$(WXLIBNAME)s BORLAND_SUFFIX=$(BORLAND_SUFFIX)s
!endif !endif
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
INCEXT=dll$(INCEXT) INCEXT=dll$(INCEXT)
!endif !endif
!ifndef WXLIBDIR # final names determined here
WXLIBDIR=$(WXDIR)\lib WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib
!endif WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).dll
LIBTARGET=$(WXLIBDIR)\$(LIBTARGET)_$(DEBUG_SUFFIX).lib
WXLIB=$(WXLIBDIR)\$(WXLIBNAME).lib OBJ_PATH=$(OBJ_PATH)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX)
WXDLL=$(WXLIBDIR)\$(WXLIBNAME).dll
!if "$(WXMAKINGDLL)" == "1" !if "$(WXMAKINGDLL)" == "1"
DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
@@ -152,7 +154,7 @@ DLL_FLAGS=
LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS) LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
!endif !endif
CFG=$(CFG).cfg CFG=$(OBJ_PATH)\$(CFG).cfg
CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) @$(CFG) $(EXTRACPPFLAGS) CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) @$(CFG) $(EXTRACPPFLAGS)
DUMMY=dummy DUMMY=dummy
@@ -163,7 +165,7 @@ OBJSUFF = obj
WAITFLAG = /w WAITFLAG = /w
.$(SRCSUFF).obj: .$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< } bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< }
.c.obj: .c.obj:
bcc32 $(CPPFLAGS) -P- -c {$< } bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< }

23
src/makelib.b32
View File

@@ -8,26 +8,25 @@
# Include file for libraries. Set LIBTARGET and OBJECTS # Include file for libraries. Set LIBTARGET and OBJECTS
# before including this file. # before including this file.
# WXWIN and BCCDIR are set by parent make
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env
lib: $(LIBTARGET) lib: $(LIBTARGET)
$(LIBTARGET): $(OBJECTS) $(LIBTARGET): $(OBJECTS)
-$(RM) $(LIBTARGET) -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
echo making $(LIBTARGET)
tlib "$(LIBTARGET)" /P512 @&&! tlib "$(LIBTARGET)" /P512 @&&!
+$(OBJECTS:.obj =.obj +) +$(OBJECTS:.obj =.obj +)
! !
clean: clean:
-$(RM) *.obj ## -if exist $(OBJ_PATH)\*.obj $(RM) $(OBJ_PATH)\*.obj
-$(RM) *.exe -if exist *.res $(RM) *.res
-$(RM) *.res -if exist *.map $(RM) *.map
-$(RM) *.map -if exist *.rws $(RM) *.rws
-$(RM) *.rws -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
-$(RM) $(LIBTARGET)
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< }
.c.obj:
bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< }

59
src/makeprog.b32
View File

@@ -13,18 +13,23 @@
# BCCDIR set in makeb32.env # BCCDIR set in makeb32.env
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
!ifndef EXEDIR
EXEDIR = BORL
!endif
!include $(WXDIR)\src\makeb32.env !include $(WXDIR)\src\makeb32.env
!if "$(wxUSE_GUI)" == "0" !if "$(wxUSE_GUI)" == "0"
IMGLIBS= IMGLIBS=
!else !else
IMGLIBS= winpng jpeg tiff IMGLIBS= png_$(DEBUG_SUFFIX) jpeg_$(DEBUG_SUFFIX) tiff_$(DEBUG_SUFFIX)
!endif !endif
!if "$(WXUSINGDLL)" == "1" !if "$(WXUSINGDLL)" == "1"
LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex zlib $(IMGLIBS) LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
!else !else
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS) LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex_$(DEBUG_SUFFIX) zlib_$(DEBUG_SUFFIX) $(IMGLIBS)
!endif !endif
!if "$(wxUSE_ODBC)" == "1" !if "$(wxUSE_ODBC)" == "1"
@@ -42,12 +47,12 @@ LINKOUT = /aa
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS) #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) LINKFLAGS=/v /c $(LINKOUT) -L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
OPT = -Od OPT = -Od
DEBUG_FLAGS= -v DEBUG_FLAGS= -v
!else !else
#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS) #LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
LINKFLAGS=$(LINKOUT) -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS) LINKFLAGS=$(LINKOUT) -L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
OPT = -Od OPT = -Od
DEBUG_FLAGS = DEBUG_FLAGS =
!endif !endif
@@ -58,37 +63,49 @@ CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
TARGETRES = TARGETRES =
STARTUP = c0x32.obj STARTUP = c0x32.obj
!else !else
TARGETRES = $(TARGET).res TARGETRES = $(EXEDIR)\$(TARGET).res
STARTUP = c0w32.obj STARTUP = c0w32.obj
!endif !endif
all: $(TARGET).exe $(EXTRATARGETS) EXE_TARGET=$(EXEDIR)\$(TARGET)
$(TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES) default : all
$(LINK) $(LINKFLAGS) @&&!
maked:
-if not exist $(EXEDIR) mkdir $(EXEDIR)
wx: $(EXE_TARGET).exe $(EXTRATARGETS)
all: maked wx
$(EXE_TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES)
$(LINK) $(LINKFLAGS) -j$(EXEDIR) @&&!
$(STARTUP) $(OBJECTS) $(STARTUP) $(OBJECTS)
$(TARGET) $(EXE_TARGET)
nul nul
$(LIBS) $(LIBS)
$(TARGETDEF) $(TARGETDEF)
$(TARGETRES) $(TARGETRES)
! !
.path.obj=$(EXEDIR)
.$(SRCSUFF).obj: .$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< } bcc32 $(CPPFLAGS) -c -o$(EXEDIR)\$(<B).obj {$< }
.c.obj: .c.obj:
bcc32 $(CPPFLAGS) -P- -c {$< } bcc32 $(CPPFLAGS) -P- -c -o$(EXEDIR)\$(<B).obj {$< }
$(TARGET).res : $(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 $(TARGET) brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$(EXEDIR)\$(<B).res $(TARGET)
clean: clean:
-erase *.obj -erase $(EXEDIR)\*.obj
-erase *.exe -erase $(EXEDIR)\*.exe
-erase *.res -erase $(EXEDIR)\*.res
-erase *.map -erase $(EXEDIR)\*.map
-erase *.rws -erase $(EXEDIR)\*.rws
-erase *.tds -erase $(EXEDIR)\*.tds
-erase *.il? -erase $(EXEDIR)\*.il?

1790
src/msw/makefile.b32
View File

File diff suppressed because it is too large Load Diff

56
src/png/makefile.b32
View File

@@ -11,15 +11,61 @@
# WXWIN and BCCDIR are set by parent make # WXWIN and BCCDIR are set by parent make
LIBTARGET =..\..\lib\winpng.lib
OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \ WXWIN=..\..
pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \ LIBTARGET=png
pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
!include ..\makeb32.env
OBJECTS = $(OBJ_PATH)\png.obj \
$(OBJ_PATH)\pngread.obj \
$(OBJ_PATH)\pngrtran.obj \
$(OBJ_PATH)\pngrutil.obj \
$(OBJ_PATH)\pngpread.obj \
$(OBJ_PATH)\pngtrans.obj \
$(OBJ_PATH)\pngwrite.obj \
$(OBJ_PATH)\pngwtran.obj \
$(OBJ_PATH)\pngwutil.obj \
$(OBJ_PATH)\pngerror.obj \
$(OBJ_PATH)\pngmem.obj \
$(OBJ_PATH)\pngwio.obj \
$(OBJ_PATH)\pngrio.obj \
$(OBJ_PATH)\pngget.obj \
$(OBJ_PATH)\pngset.obj
# Precompiled headers seem to interfere with correct compilation # Precompiled headers seem to interfere with correct compilation
# of png library, so switch them off # of png library, so switch them off
EXTRACPPFLAGS=-H- EXTRACPPFLAGS=-H-
!include $(WXWIN)\src\makelib.b32
$(OBJ_PATH)\png.obj: png.c
$(OBJ_PATH)\pngread.obj: pngread.c
$(OBJ_PATH)\pngrtran.obj: pngrtran.c
$(OBJ_PATH)\pngrutil.obj: pngrutil.c
$(OBJ_PATH)\pngpread.obj: pngpread.c
$(OBJ_PATH)\pngtrans.obj: pngtrans.c
$(OBJ_PATH)\pngwrite.obj: pngwrite.c
$(OBJ_PATH)\pngwtran.obj: pngwtran.c
$(OBJ_PATH)\pngwutil.obj: pngwutil.c
$(OBJ_PATH)\pngerror.obj: pngerror.c
$(OBJ_PATH)\pngmem.obj: pngmem.c
$(OBJ_PATH)\pngwio.obj: pngwio.c
$(OBJ_PATH)\pngrio.obj: pngrio.c
$(OBJ_PATH)\pngget.obj: pngget.c
$(OBJ_PATH)\pngset.obj: pngset.c
!include ..\makelib.b32

35
src/regex/makefile.b32
View File

@@ -1,13 +1,38 @@
# File: makefile.b32
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright:
#
# "%W% %G%"
#
# Makefile : Builds TIFF library (BC++ 32-bit)
# WXWIN and BCCDIR are set by parent make
WXWIN=..\..
LIBTARGET=regex
!include ..\makeb32.env
LIBTARGET=$(WXDIR)\lib\regex.lib
OBJECTS= \ OBJECTS= \
regcomp.obj \ $(OBJ_PATH)\regcomp.obj \
regexec.obj \ $(OBJ_PATH)\regexec.obj \
regerror.obj \ $(OBJ_PATH)\regerror.obj \
regfree.obj $(OBJ_PATH)\regfree.obj
# Pull in standard variable definitions # Pull in standard variable definitions
$(OBJ_PATH)\regcomp.obj: regcomp.c
$(OBJ_PATH)\regexec.obj: regexec.c
$(OBJ_PATH)\regerror.obj: regerror.c
$(OBJ_PATH)\regfree.obj: regfree.c
!include ..\makelib.b32 !include ..\makelib.b32

151
src/tiff/makefile.b32
View File

@@ -1,44 +1,123 @@
# File: makefile.b32
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright:
#
# "%W% %G%"
#
# Makefile : Builds TIFF library (BC++ 32-bit)
LIBTARGET=$(WXDIR)\lib\tiff.lib # WXWIN and BCCDIR are set by parent make
WXWIN=..\..
LIBTARGET=tiff
!include ..\makeb32.env
OBJECTS= \ OBJECTS= \
tif_aux.obj \ $(OBJ_PATH)\tif_aux.obj \
tif_close.obj \ $(OBJ_PATH)\tif_close.obj \
tif_codec.obj \ $(OBJ_PATH)\tif_codec.obj \
tif_compress.obj \ $(OBJ_PATH)\tif_compress.obj \
tif_dir.obj \ $(OBJ_PATH)\tif_dir.obj \
tif_dirinfo.obj \ $(OBJ_PATH)\tif_dirinfo.obj \
tif_dirread.obj \ $(OBJ_PATH)\tif_dirread.obj \
tif_dirwrite.obj \ $(OBJ_PATH)\tif_dirwrite.obj \
tif_dumpmode.obj \ $(OBJ_PATH)\tif_dumpmode.obj \
tif_error.obj \ $(OBJ_PATH)\tif_error.obj \
tif_fax3.obj \ $(OBJ_PATH)\tif_fax3.obj \
tif_fax3sm.obj \ $(OBJ_PATH)\tif_fax3sm.obj \
tif_flush.obj \ $(OBJ_PATH)\tif_flush.obj \
tif_getimage.obj \ $(OBJ_PATH)\tif_getimage.obj \
tif_jpeg.obj \ $(OBJ_PATH)\tif_jpeg.obj \
tif_luv.obj \ $(OBJ_PATH)\tif_luv.obj \
tif_lzw.obj \ $(OBJ_PATH)\tif_lzw.obj \
tif_next.obj \ $(OBJ_PATH)\tif_next.obj \
tif_open.obj \ $(OBJ_PATH)\tif_open.obj \
tif_packbits.obj \ $(OBJ_PATH)\tif_packbits.obj \
tif_pixarlog.obj \ $(OBJ_PATH)\tif_pixarlog.obj \
tif_predict.obj \ $(OBJ_PATH)\tif_predict.obj \
tif_print.obj \ $(OBJ_PATH)\tif_print.obj \
tif_read.obj \ $(OBJ_PATH)\tif_read.obj \
tif_strip.obj \ $(OBJ_PATH)\tif_strip.obj \
tif_swab.obj \ $(OBJ_PATH)\tif_swab.obj \
tif_thunder.obj \ $(OBJ_PATH)\tif_thunder.obj \
tif_tile.obj \ $(OBJ_PATH)\tif_tile.obj \
tif_version.obj \ $(OBJ_PATH)\tif_version.obj \
tif_warning.obj \ $(OBJ_PATH)\tif_warning.obj \
tif_win32.obj \ $(OBJ_PATH)\tif_win32.obj \
tif_write.obj \ $(OBJ_PATH)\tif_write.obj \
tif_zip.obj \ $(OBJ_PATH)\tif_zip.obj \
# Pull in standard variable definitions # Pull in standard variable definitions
$(OBJ_PATH)\tif_aux.obj: tif_aux.c
$(OBJ_PATH)\tif_close.obj: tif_close.c
$(OBJ_PATH)\tif_codec.obj: tif_codec.c
$(OBJ_PATH)\tif_compress.obj: tif_compress.c
$(OBJ_PATH)\tif_dir.obj: tif_dir.c
$(OBJ_PATH)\tif_dirinfo.obj: tif_dirinfo.c
$(OBJ_PATH)\tif_dirread.obj: tif_dirread.c
$(OBJ_PATH)\tif_dirwrite.obj: tif_dirwrite.c
$(OBJ_PATH)\tif_dumpmode.obj: tif_dumpmode.c
$(OBJ_PATH)\tif_error.obj: tif_error.c
$(OBJ_PATH)\tif_fax3.obj: tif_fax3.c
$(OBJ_PATH)\tif_fax3sm.obj: tif_fax3sm.c
$(OBJ_PATH)\tif_flush.obj: tif_flush.c
$(OBJ_PATH)\tif_getimage.obj: tif_getimage.c
$(OBJ_PATH)\tif_jpeg.obj: tif_jpeg.c
$(OBJ_PATH)\tif_luv.obj: tif_luv.c
$(OBJ_PATH)\tif_lzw.obj: tif_lzw.c
$(OBJ_PATH)\tif_next.obj: tif_next.c
$(OBJ_PATH)\tif_open.obj: tif_open.c
$(OBJ_PATH)\tif_packbits.obj: tif_packbits.c
$(OBJ_PATH)\tif_pixarlog.obj: tif_pixarlog.c
$(OBJ_PATH)\tif_predict.obj: tif_predict.c
$(OBJ_PATH)\tif_print.obj: tif_print.c
$(OBJ_PATH)\tif_read.obj: tif_read.c
$(OBJ_PATH)\tif_strip.obj: tif_strip.c
$(OBJ_PATH)\tif_swab.obj: tif_swab.c
$(OBJ_PATH)\tif_thunder.obj: tif_thunder.c
$(OBJ_PATH)\tif_tile.obj: tif_tile.c
$(OBJ_PATH)\tif_version.obj: tif_version.c
$(OBJ_PATH)\tif_warning.obj: tif_warning.c
$(OBJ_PATH)\tif_win32.obj: tif_win32.c
$(OBJ_PATH)\tif_write.obj: tif_write.c
$(OBJ_PATH)\tif_zip.obj: tif_zip.c
!include ..\makelib.b32 !include ..\makelib.b32

54
src/zlib/makefile.b32
View File

@@ -8,17 +8,61 @@
# switches -WX and -DMSDOS are required. # switches -WX and -DMSDOS are required.
# -- Chris Young 76702.1655@compuserve.com # -- Chris Young 76702.1655@compuserve.com
## modified further for 32 bit windows
# To use, do "make -fmakefile.b32" # To use, do "make -fmakefile.b32"
# See zconf.h for details about the memory requirements. # See zconf.h for details about the memory requirements.
# ------------- Borland C++ ------------- # ------------- Borland C++ -------------
LIBTARGET=..\..\lib\zlib.lib
OBJECTS = adler32.obj compress.obj crc32.obj gzio.obj uncompr.obj deflate.obj \ WXWIN=..\..
trees.obj zutil.obj inflate.obj infblock.obj inftrees.obj infcodes.obj \ LIBTARGET=zlib
infutil.obj inffast.obj
!include $(WXWIN)\src\makelib.b32 !include ..\makeb32.env
OBJECTS = $(OBJ_PATH)\adler32.obj \
$(OBJ_PATH)\compress.obj \
$(OBJ_PATH)\crc32.obj \
$(OBJ_PATH)\gzio.obj \
$(OBJ_PATH)\uncompr.obj \
$(OBJ_PATH)\deflate.obj \
$(OBJ_PATH)\trees.obj \
$(OBJ_PATH)\zutil.obj \
$(OBJ_PATH)\inflate.obj \
$(OBJ_PATH)\infblock.obj \
$(OBJ_PATH)\inftrees.obj \
$(OBJ_PATH)\infcodes.obj \
$(OBJ_PATH)\infutil.obj \
$(OBJ_PATH)\inffast.obj
$(OBJ_PATH)\adler32.obj: adler32.c
$(OBJ_PATH)\compress.obj: compress.c
$(OBJ_PATH)\crc32.obj: crc32.c
$(OBJ_PATH)\gzio.obj: gzio.c
$(OBJ_PATH)\uncompr.obj: uncompr.c
$(OBJ_PATH)\deflate.obj: deflate.c
$(OBJ_PATH)\trees.obj: trees.c
$(OBJ_PATH)\zutil.obj: zutil.c
$(OBJ_PATH)\inflate.obj: inflate.c
$(OBJ_PATH)\infblock.obj: infblock.c
$(OBJ_PATH)\inftrees.obj: inftrees.c
$(OBJ_PATH)\infcodes.obj: infcodes.c
$(OBJ_PATH)\infutil.obj: infutil.c
$(OBJ_PATH)\inffast.obj: inffast.c
!include ..\makelib.b32