X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32037c4ed95668dc9422efcfb06013a5de31e673..277f2e527e33de039146ab94358ffec9c98f6112:/src/msw/makefile.b32?ds=sidebyside diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index d21dfab1f7..d57aada93b 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 16:36, 2001/11/20 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -15,9 +15,7 @@ # 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 @@ -74,6 +72,7 @@ DOCDIR = $(WXDIR)\docs GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\calctrl.obj \ $(MSWDIR)\choicdgg.obj \ + $(MSWDIR)\dcbuffer.obj \ $(MSWDIR)\dcpsg.obj \ $(MSWDIR)\dirctrlg.obj \ $(MSWDIR)\dragimgg.obj \ @@ -105,7 +104,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ # Not needed: # $(MSWDIR)\colrdlgg.obj \ # $(MSWDIR)\fontdlgg.obj \ -# $(MSWDIR)\helpxlp.obj \ # $(MSWDIR)\msgdlgg.obj \ # $(MSWDIR)\printps.obj \ # $(MSWDIR)\prntdlgg.obj \ @@ -116,6 +114,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ COMMONOBJS = \ $(MSWDIR)\y_tab.obj \ $(MSWDIR)\appcmn.obj \ + $(MSWDIR)\artprov.obj \ + $(MSWDIR)\artstd.obj \ $(MSWDIR)\choiccmn.obj \ $(MSWDIR)\clipcmn.obj \ $(MSWDIR)\clntdata.obj \ @@ -142,6 +142,7 @@ COMMONOBJS = \ $(MSWDIR)\dseldlg.obj \ $(MSWDIR)\dynarray.obj \ $(MSWDIR)\dynlib.obj \ + $(MSWDIR)\dynload.obj \ $(MSWDIR)\effects.obj \ $(MSWDIR)\encconv.obj \ $(MSWDIR)\event.obj \ @@ -165,12 +166,16 @@ COMMONOBJS = \ $(MSWDIR)\geometry.obj \ $(MSWDIR)\gifdecod.obj \ $(MSWDIR)\hash.obj \ + $(MSWDIR)\hashmap.obj \ $(MSWDIR)\helpbase.obj \ $(MSWDIR)\http.obj \ + $(MSWDIR)\iconbndl.obj \ $(MSWDIR)\imagall.obj \ $(MSWDIR)\imagbmp.obj \ $(MSWDIR)\image.obj \ + $(MSWDIR)\imagfill.obj \ $(MSWDIR)\imaggif.obj \ + $(MSWDIR)\imagiff.obj \ $(MSWDIR)\imagjpeg.obj \ $(MSWDIR)\imagpcx.obj \ $(MSWDIR)\imagpng.obj \ @@ -189,10 +194,10 @@ COMMONOBJS = \ $(MSWDIR)\menucmn.obj \ $(MSWDIR)\mimecmn.obj \ $(MSWDIR)\module.obj \ + $(MSWDIR)\msgout.obj \ $(MSWDIR)\mstream.obj \ $(MSWDIR)\nbkbase.obj \ $(MSWDIR)\object.obj \ - $(MSWDIR)\objstrm.obj \ $(MSWDIR)\odbc.obj \ $(MSWDIR)\paper.obj \ $(MSWDIR)\popupcmn.obj \ @@ -207,7 +212,7 @@ COMMONOBJS = \ $(MSWDIR)\sckfile.obj \ $(MSWDIR)\sckipc.obj \ $(MSWDIR)\sckstrm.obj \ - $(MSWDIR)\serbase.obj \ + $(MSWDIR)\settcmn.obj \ $(MSWDIR)\sizer.obj \ $(MSWDIR)\socket.obj \ $(MSWDIR)\statbar.obj \ @@ -294,6 +299,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\helpwin.obj \ $(MSWDIR)\icon.obj \ $(MSWDIR)\imaglist.obj \ + $(MSWDIR)\iniconf.obj \ $(MSWDIR)\joystick.obj \ $(MSWDIR)\listbox.obj \ $(MSWDIR)\listctrl.obj \ @@ -305,6 +311,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\mimetype.obj \ $(MSWDIR)\minifram.obj \ $(MSWDIR)\msgdlg.obj \ + $(MSWDIR)\mslu.obj \ $(MSWDIR)\nativdlg.obj \ $(MSWDIR)\notebook.obj \ $(MSWDIR)\oleutils.obj \ @@ -312,6 +319,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\palette.obj \ $(MSWDIR)\pen.obj \ $(MSWDIR)\penwin.obj \ + $(MSWDIR)\popupwin.obj \ $(MSWDIR)\printdlg.obj \ $(MSWDIR)\printwin.obj \ $(MSWDIR)\radiobox.obj \ @@ -343,6 +351,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\utils.obj \ $(MSWDIR)\utilsexc.obj \ $(MSWDIR)\uuid.obj \ + $(MSWDIR)\volume.obj \ $(MSWDIR)\wave.obj \ $(MSWDIR)\window.obj @@ -364,6 +373,7 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \ $(MSWDIR)\m_list.obj \ $(MSWDIR)\m_meta.obj \ $(MSWDIR)\m_pre.obj \ + $(MSWDIR)\m_style.obj \ $(MSWDIR)\m_tables.obj \ $(MSWDIR)\winpars.obj @@ -371,10 +381,25 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) default: wx -wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) +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 + +# Copy include\wx\msw\setup.h to the architecture-specific location +makearchsetuph: + copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH) + cd $(WXDIR)\src\msw + +$(ARCHINCDIR)\wx: + -mkdir $(ARCHINCDIR) + -mkdir $(ARCHINCDIR)\wx + !if "$(DLL)" == "0" $(LIBTARGET): $(DUMMY).obj $(OBJECTS) @@ -395,15 +420,15 @@ nul $(PERIPH_LIBS) $(LIBS) wxb32 ! - -erase $(WXLIBDIR)\version.res - brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll - !endif dummy.obj: dummy.$(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 # cl @<< @@ -528,6 +553,8 @@ $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF) $(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF) +$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF) + $(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF) $(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF) @@ -550,6 +577,8 @@ $(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF) $(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF) +$(MSWDIR)\mslu.obj: $(MSWDIR)\mslu.$(SRCSUFF) + $(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF) $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF) @@ -564,6 +593,8 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF) $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF) +$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF) + $(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF) $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF) @@ -626,6 +657,8 @@ $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) $(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF) +$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF) + $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF) $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) @@ -637,6 +670,10 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF) +$(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF) + +$(MSWDIR)\artstd.obj: $(COMMDIR)\artstd.$(SRCSUFF) + $(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF) $(MSWDIR)\clipcmn.obj: $(COMMDIR)\clipcmn.$(SRCSUFF) @@ -689,6 +726,8 @@ $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF) $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF) +$(MSWDIR)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF) + $(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF) $(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF) @@ -735,18 +774,26 @@ $(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF) $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF) +$(MSWDIR)\hashmap.obj: $(COMMDIR)\hashmap.$(SRCSUFF) + $(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF) $(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF) +$(MSWDIR)\iconbndl.obj: $(COMMDIR)\iconbndl.$(SRCSUFF) + $(MSWDIR)\imagall.obj: $(COMMDIR)\imagall.$(SRCSUFF) $(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF) $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF) +$(MSWDIR)\imagfill.obj: $(COMMDIR)\imagfill.$(SRCSUFF) + $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF) +$(MSWDIR)\imagiff.obj: $(COMMDIR)\imagiff.$(SRCSUFF) + $(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF) $(MSWDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF) @@ -783,14 +830,14 @@ $(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF) $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF) +$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF) + $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF) $(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF) $(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF) -$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF) - $(MSWDIR)\odbc.obj: $(COMMDIR)\odbc.$(SRCSUFF) $(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF) @@ -819,7 +866,7 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF) $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF) -$(MSWDIR)\serbase.obj: $(COMMDIR)\serbase.$(SRCSUFF) +$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF) $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF) @@ -893,6 +940,8 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF) $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF) +$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF) + $(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF) $(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF) @@ -988,6 +1037,8 @@ $(MSWDIR)\m_meta.obj: $(HTMLDIR)\m_meta.$(SRCSUFF) $(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF) +$(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF) + $(MSWDIR)\m_tables.obj: $(HTMLDIR)\m_tables.$(SRCSUFF) $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF) @@ -997,67 +1048,67 @@ $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF) 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 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 regex: $(CFG) cd $(WXDIR)\src\regex - make -f makefile.b32 lib + ${MAKE} -f makefile.b32 lib cd $(WXDIR)\src\msw clean_regex: cd $(WXDIR)\src\regex - make -f makefile.b32 clean + ${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 @@ -1072,10 +1123,9 @@ $(CFG): makefile.b32 -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/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 @@ -1133,65 +1183,65 @@ 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