}
foreach $file (sort keys %wxCommon) {
+ next if $wxCommon{$file} =~ /\b(16|U)\b/;
+
$isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(MSWDIR)\\" . $file . " ";
foreach $file (sort keys %wxMSW) {
next if $wxMSW{$file} =~ /\b16\b/;
- if ( $file =~ /^automtn/ ) {
- #! comment in old makefile.b32 seems to imply that this file can't
- #! be compiled with Borland (leads to crash in oleauto sample)
- next;
- }
+#! 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$/;
}
#$}
-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
# Makefile : Builds wxWindows library wx.lib for MS Windows,
# and Borland C++ (32-bit).
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=0
-USE_XPM_IN_MSW=1
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
!endif
-!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS)
-PERIPH_TARGET=xpm $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
-!endif
-
-#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
+#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_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)
!if "$(DLL)" == "0"
DUMMY=dummy
!else
DUMMY=dummydll
-LIBS= cw32 import32 ole2w32
+LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff regex
!endif
LIBTARGET=$(WXLIB)
# Not needed:
# $(MSWDIR)\colrdlgg.obj \
# $(MSWDIR)\fontdlgg.obj \
-# $(MSWDIR)\helpxlp.obj \
# $(MSWDIR)\msgdlgg.obj \
# $(MSWDIR)\printps.obj \
# $(MSWDIR)\prntdlgg.obj \
# $(MSWDIR)\treectrl.obj
COMMONOBJS = \
- $(MSWDIR)\y_tab.obj \
- #$ ExpandList("WXCOMMONOBJS");
+ $(MSWDIR)\y_tab.obj \
+ #$ ExpandList("WXCOMMONOBJS");
MSWOBJS = #$ ExpandList("WXMSWOBJS");
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
-default: wx
+default: wx
+
+wx: $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all: wx
+
+# Copy the in-CVS setup0.h to setup.h if necessary
+makesetuph:
+ cd $(WXDIR)\include\wx\msw
+ if not exist setup.h copy setup0.h setup.h
+ cd $(WXDIR)\src\msw
-#wx: $(CFG) $(LNKCFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
-wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+# Copy include\wx\msw\setup.h to the architecture-specific location
+makearchsetuph:
+ copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
+ cd $(WXDIR)\src\msw
-all: all_libs all_execs
+$(ARCHINCDIR)\wx:
+ -mkdir $(ARCHINCDIR)
+ -mkdir $(ARCHINCDIR)\wx
+ -erase $(CFG)
!if "$(DLL)" == "0"
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET)
- tlib $(LIBTARGET) /P1024 @&&!
+ tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
!
!else
$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
- -erase $(LIBTARGET)
- -erase $(WXLIBDIR)\wx.dll
- tlink32 $(LINK_FLAGS) /v @&&!
+ -erase $(LIBTARGET)
+ -erase $(WXDLL)
+ $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
c0d32.obj $(OBJECTS)
-$(WXLIBDIR)\wx
+$(WXDLL)
nul
$(PERIPH_LIBS) $(LIBS)
wxb32
!
- implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
-
+ implib -c $(LIBTARGET) $(WXDLL)
!endif
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
-dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
+
+version.res:
+ brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-# $(OBJECTS): $(WXDIR)\include\wx\setup.h
+# $(OBJECTS): $(WXDIR)\include\wx\setup.h
#${
$_ = $project{"WXMSWOBJS"};
all_utils:
cd $(WXDIR)\utils
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
all_samples:
cd $(WXDIR)\samples
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
all_execs:
cd $(WXDIR)\utils
- make -f makefile.b32 all_execs
+ ${MAKE} -f makefile.b32 all_execs
cd $(WXDIR)\src\msw
-wxxpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
- cd $(WXDIR)\src\msw
-
-clean_wxxpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 clean
- cd $(WXDIR)\src\msw
-
png: $(CFG)
cd $(WXDIR)\src\png
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
clean_png:
cd $(WXDIR)\src\png
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
zlib: $(CFG)
cd $(WXDIR)\src\zlib
- make -f makefile.b32 lib
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_zlib:
cd $(WXDIR)\src\zlib
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
jpeg: $(CFG)
cd $(WXDIR)\src\jpeg
- make -f makefile.b32
+ ${MAKE} -f makefile.b32
cd $(WXDIR)\src\msw
clean_jpeg:
cd $(WXDIR)\src\jpeg
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
-xpm: $(CFG)
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 lib
+regex: $(CFG)
+ cd $(WXDIR)\src\regex
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
-clean_xpm:
- cd $(WXDIR)\src\xpm
- make -f makefile.b32 clean
+clean_regex:
+ cd $(WXDIR)\src\regex
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
tiff: $(CFG)
cd $(WXDIR)\src\tiff
- make -f makefile.b32 lib
+ ${MAKE} -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_tiff:
cd $(WXDIR)\src\tiff
- make -f makefile.b32 clean
+ ${MAKE} -f makefile.b32 clean
cd $(WXDIR)\src\msw
$(CFG): makefile.b32
- copy &&!
+ copy &&!
+-Hc
-H=$(WXDIR)\src\msw\wx32.csm
-3
-d
-w-par
-w-aus
-w-hid # virtual function A hides virtual function B
--WE
-tWM
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
+-I$(ARCHINCDIR);$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
$(WIN95FLAG)
! $(CFG)
-#$(LNKCFG): makefile.b32
-# copy &&!
-#-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
-#! $(LNKCFG)
-
clean: $(PERIPH_CLEAN_TARGET)
- -erase $(LIBTARGET)
+ -erase $(WXLIBDIR)\wx.tds
+ -erase $(WXLIBDIR)\wx.il?
-erase *.obj
-erase *.pch
-erase *.csm
- -erase *.cfg
-erase "wx32.#??"
-erase ..\common\y_tab.c
-erase ..\common\lex_yy.c
pdfrtf: $(DOCDIR)/pdf/wx.rtf
proppdfrtf: $(DOCDIR)/pdf/prop.rtf
refpdfrtf: $(DOCDIR)/pdf/techref.rtf
-html: wxhtml portinghtml
-wxhtml: $(DOCDIR)\html\wx\wx.htm
+html: wxhtml portinghtml
+wxhtml: $(DOCDIR)\html\wx\wx.htm
htmlhelp: $(DOCDIR)\html\wx\wx.chm
prophtml: $(DOCDIR)\html\proplist\prop.htm
ps: wxps referencps
-wxps: $(WXDIR)\docs\ps\wx.ps
-propps: $(WXDIR)\docs\ps\prop.ps
-referencps: $(WXDIR)\docs\ps\referenc.ps
+wxps: $(WXDIR)\docs\ps\wx.ps
+propps: $(WXDIR)\docs\ps\prop.ps
+referencps: $(WXDIR)\docs\ps\referenc.ps
portinghtml: $(DOCDIR)\html\porting\port.htm
portingrtf: $(DOCDIR)/winhelp/porting.rtf
portinghlp: $(DOCDIR)/winhelp/porting.hlp
portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
-portingps: $(WXDIR)\docs\ps\porting.ps
+portingps: $(WXDIR)\docs\ps\porting.ps
allhlp: wxhlp portinghlp prophlp
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 hlp
+ ${MAKE} -f makefile.b32 hlp
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxbuild\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
# cd $(WXDIR)\utils\wxgrid\src
-# make -f makefile.b32 hlp
+# ${MAKE} -f makefile.b32 hlp
allhtml: wxhtml portinghtml prophtml
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 html
+ ${MAKE} -f makefile.b32 html
cd $(THISDIR)
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\dialoged\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\hytext\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 html
+# ${MAKE} -f makefile.b32 html
allps: wxps referencps portingps propps
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 ps
+ ${MAKE} -f makefile.b32 ps
cd $(THISDIR)
allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
cd $(WXDIR)\utils\dialoged\src
- make -f makefile.b32 pdfrtf
+ ${MAKE} -f makefile.b32 pdfrtf
cd $(THISDIR)
# cd $(WXDIR)\utils\wxhelp\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\tex2rtf\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxgraph\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxchart\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(WXDIR)\utils\wxtree\src
-# make -f makefile.b32 ps
+# ${MAKE} -f makefile.b32 ps
# cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
cd $(THISDIR)
$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
- cd $(DOCDIR)\html\wx
- -hhc wx.hhp
- cd $(THISDIR)
+ cd $(DOCDIR)\html\wx
+ -hhc wx.hhp
+ cd $(THISDIR)
$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex
-erase $(DOCDIR)\latex\proplist\*.ref
cd $(THISDIR)
-$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
- cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
+ cd $(WXDIR)\docs\latex\wx
-latex manual
-latex manual
-makeindx manual
-latex manual
cd $(THISDIR)
-$(WXDIR)\docs\latex\porting\porting.dvi: $(DOCDIR)/latex/porting/porting.tex
- cd $(WXDIR)\docs\latex\porting
+$(WXDIR)\docs\latex\porting\porting.dvi: $(DOCDIR)/latex/porting/porting.tex
+ cd $(WXDIR)\docs\latex\porting
-latex porting
-latex porting
-makeindx porting
-latex porting
cd $(THISDIR)
-$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
- cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
+ cd $(WXDIR)\docs\latex\wx
-dvips32 -o wx.ps manual
move wx.ps $(WXDIR)\docs\ps\wx.ps
cd $(THISDIR)
-$(WXDIR)\docs\ps\porting.ps: $(WXDIR)\docs\latex\porting\porting.dvi
- cd $(WXDIR)\docs\latex\porting
+$(WXDIR)\docs\ps\porting.ps: $(WXDIR)\docs\latex\porting\porting.dvi
+ cd $(WXDIR)\docs\latex\porting
-dvips32 -o porting.ps porting
move porting.ps $(WXDIR)\docs\ps\porting.ps
cd $(THISDIR)
-$(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
- cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
+ cd $(WXDIR)\docs\latex\wx
-latex referenc
-latex referenc
-makeindx referenc
-latex referenc
cd $(THISDIR)
-$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi
- cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi
+ cd $(WXDIR)\docs\latex\wx
-dvips32 -o referenc.ps referenc
move referenc.ps $(WXDIR)\docs\ps\referenc.ps
cd $(THISDIR)
# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
self:
- cd $(WXWIN)\distrib\msw\tmake
- tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
- copy makefile.$(MFTYPE) $(WXWIN)\src\msw
-
+ cd $(WXWIN)\distrib\msw\tmake
+ tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+ copy makefile.$(MFTYPE) $(WXWIN)\src\msw
projects / wxWidgets.git / blobdiff