-# This file was automatically generated by tmake at 23:28, 2001/11/17
+# 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
GENERICOBJS= $(MSWDIR)\busyinfo.obj \
$(MSWDIR)\calctrl.obj \
$(MSWDIR)\choicdgg.obj \
+ $(MSWDIR)\dcbuffer.obj \
$(MSWDIR)\dcpsg.obj \
$(MSWDIR)\dirctrlg.obj \
$(MSWDIR)\dragimgg.obj \
# Not needed:
# $(MSWDIR)\colrdlgg.obj \
# $(MSWDIR)\fontdlgg.obj \
-# $(MSWDIR)\helpxlp.obj \
# $(MSWDIR)\msgdlgg.obj \
# $(MSWDIR)\printps.obj \
# $(MSWDIR)\prntdlgg.obj \
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
$(MSWDIR)\appcmn.obj \
+ $(MSWDIR)\artprov.obj \
+ $(MSWDIR)\artstd.obj \
$(MSWDIR)\choiccmn.obj \
$(MSWDIR)\clipcmn.obj \
$(MSWDIR)\clntdata.obj \
$(MSWDIR)\dseldlg.obj \
$(MSWDIR)\dynarray.obj \
$(MSWDIR)\dynlib.obj \
+ $(MSWDIR)\dynload.obj \
$(MSWDIR)\effects.obj \
$(MSWDIR)\encconv.obj \
$(MSWDIR)\event.obj \
$(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 \
$(MSWDIR)\mstream.obj \
$(MSWDIR)\nbkbase.obj \
$(MSWDIR)\object.obj \
- $(MSWDIR)\objstrm.obj \
$(MSWDIR)\odbc.obj \
$(MSWDIR)\paper.obj \
$(MSWDIR)\popupcmn.obj \
$(MSWDIR)\sckfile.obj \
$(MSWDIR)\sckipc.obj \
$(MSWDIR)\sckstrm.obj \
- $(MSWDIR)\serbase.obj \
+ $(MSWDIR)\settcmn.obj \
$(MSWDIR)\sizer.obj \
$(MSWDIR)\socket.obj \
$(MSWDIR)\statbar.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \
$(MSWDIR)\imaglist.obj \
+ $(MSWDIR)\iniconf.obj \
$(MSWDIR)\joystick.obj \
$(MSWDIR)\listbox.obj \
$(MSWDIR)\listctrl.obj \
$(MSWDIR)\mimetype.obj \
$(MSWDIR)\minifram.obj \
$(MSWDIR)\msgdlg.obj \
+ $(MSWDIR)\mslu.obj \
$(MSWDIR)\nativdlg.obj \
$(MSWDIR)\notebook.obj \
$(MSWDIR)\oleutils.obj \
$(MSWDIR)\palette.obj \
$(MSWDIR)\pen.obj \
$(MSWDIR)\penwin.obj \
+ $(MSWDIR)\popupwin.obj \
$(MSWDIR)\printdlg.obj \
$(MSWDIR)\printwin.obj \
$(MSWDIR)\radiobox.obj \
$(MSWDIR)\utils.obj \
$(MSWDIR)\utilsexc.obj \
$(MSWDIR)\uuid.obj \
+ $(MSWDIR)\volume.obj \
$(MSWDIR)\wave.obj \
$(MSWDIR)\window.obj
$(MSWDIR)\m_list.obj \
$(MSWDIR)\m_meta.obj \
$(MSWDIR)\m_pre.obj \
+ $(MSWDIR)\m_style.obj \
$(MSWDIR)\m_tables.obj \
$(MSWDIR)\winpars.obj
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)
$(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 @<<
$(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
+
$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(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)
$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+
$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(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)
$(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)
$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
+$(MSWDIR)\dynload.obj: $(COMMDIR)\dynload.$(SRCSUFF)
+
$(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
$(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(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)
$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
-$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
-
$(MSWDIR)\odbc.obj: $(COMMDIR)\odbc.$(SRCSUFF)
$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(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)
$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
+$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+
$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(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)
-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