..\generic\$D\choicdgg.obj \
..\generic\$D\colrdlgg.obj \
..\generic\$D\dcpsg.obj \
+ ..\generic\$D\dirctrlg.obj \
+ ..\generic\$D\dragimgg.obj \
+ ..\generic\$D\fontdlgg.obj \
..\generic\$D\grid.obj \
+ ..\generic\$D\gridsel.obj \
..\generic\$D\helpext.obj \
..\generic\$D\helphtml.obj \
..\generic\$D\helpwxht.obj \
..\generic\$D\logg.obj \
..\generic\$D\numdlgg.obj \
..\generic\$D\panelg.obj \
- ..\generic\$D\plot.obj \
..\generic\$D\printps.obj \
..\generic\$D\prntdlgg.obj \
..\generic\$D\progdlgg.obj \
..\generic\$D\splitter.obj \
..\generic\$D\statusbr.obj \
..\generic\$D\tabg.obj \
+ ..\generic\$D\tbarsmpl.obj \
..\generic\$D\textdlgg.obj \
..\generic\$D\tipdlg.obj \
- ..\generic\$D\treectrl.obj
+ ..\generic\$D\tipwin.obj \
+ ..\generic\$D\treectlg.obj \
+ ..\generic\$D\treelay.obj \
+ ..\generic\$D\wizard.obj
# ..\generic\$D\gridg.obj \
# ..\generic\$D\notebook.obj \
choicdgg.obj \
colrdlgg.obj \
dcpsg.obj \
+ dirctrlg.obj \
+ dragimgg.obj \
+ fontdlgg.obj \
grid.obj \
+ gridsel.obj \
helpext.obj \
helphtml.obj \
helpwxht.obj \
logg.obj \
numdlgg.obj \
panelg.obj \
- plot.obj \
printps.obj \
prntdlgg.obj \
progdlgg.obj \
splitter.obj \
statusbr.obj \
tabg.obj \
+ tbarsmpl.obj \
textdlgg.obj \
tipdlg.obj \
- treectrl.obj
+ tipwin.obj \
+ treectlg.obj \
+ treelay.obj \
+ wizard.obj
# These are generic things that don't need to be compiled on PM,
# but sometimes it's useful to do so for testing purposes.
NONESSENTIALOBJS= \
- ..\generic\$D\msgdlgg.obj \
- ..\generic\$D\fontdlgg.obj
+ ..\generic\$D\msgdlgg.obj
COMMONOBJS = \
..\common\$D\appcmn.obj \
..\common\$D\choiccmn.obj \
..\common\$D\clipcmn.obj \
+ ..\common\$D\cmdline.obj \
..\common\$D\cmndata.obj \
..\common\$D\config.obj \
+ ..\common\$D\cshelp.obj \
..\common\$D\ctrlcmn.obj \
..\common\$D\ctrlsub.obj \
..\common\$D\datetime.obj \
..\common\$D\datstrm.obj \
+!if "$(WXMAKINGDLL)" != "1"
+# don't have an ODBC database
..\common\$D\db.obj \
..\common\$D\dbtable.obj \
+!endif
..\common\$D\dcbase.obj \
..\common\$D\dlgcmn.obj \
+ ..\common\$D\dndcmn.obj \
..\common\$D\dobjcmn.obj \
..\common\$D\docmdi.obj \
..\common\$D\docview.obj \
..\common\$D\dynarray.obj \
..\common\$D\dynlib.obj \
+ ..\common\$D\effects.obj \
..\common\$D\encconv.obj \
..\common\$D\event.obj \
..\common\$D\extended.obj \
..\common\$D\file.obj \
..\common\$D\fileconf.obj \
..\common\$D\filefn.obj \
+ ..\common\$D\filename.obj \
..\common\$D\filesys.obj \
..\common\$D\fontcmn.obj \
..\common\$D\fontmap.obj \
..\common\$D\framecmn.obj \
..\common\$D\fs_inet.obj \
+ ..\common\$D\fs_mem.obj \
..\common\$D\fs_zip.obj \
..\common\$D\ftp.obj \
..\common\$D\gdicmn.obj \
+ ..\common\$D\geometry.obj \
..\common\$D\gifdecod.obj \
..\common\$D\hash.obj \
..\common\$D\helpbase.obj \
..\common\$D\imagpcx.obj \
..\common\$D\imagpng.obj \
..\common\$D\imagpnm.obj \
+ ..\common\$D\imagtiff.obj \
+ ..\common\$D\imagxpm.obj \
..\common\$D\intl.obj \
..\common\$D\ipcbase.obj \
..\common\$D\layout.obj \
..\common\$D\mstream.obj \
..\common\$D\object.obj \
..\common\$D\objstrm.obj \
+!if "$(WXMAKINGDLL)" != "1"
+# don't have an ODBC database
+ ..\common\$D\odbc.obj \
+!endif
..\common\$D\paper.obj \
..\common\$D\prntbase.obj \
..\common\$D\process.obj \
..\common\$D\protocol.obj \
+ ..\common\$D\quantize.obj \
..\common\$D\resource.obj \
..\common\$D\sckaddr.obj \
..\common\$D\sckfile.obj \
..\common\$D\textfile.obj \
..\common\$D\timercmn.obj \
..\common\$D\tokenzr.obj \
+ ..\common\$D\treebase.obj \
..\common\$D\txtstrm.obj \
..\common\$D\unzip.obj \
..\common\$D\url.obj \
..\common\$D\wincmn.obj \
..\common\$D\wxchar.obj \
..\common\$D\wxexpr.obj \
+ ..\common\$D\xpmdecod.obj \
..\common\$D\y_tab.obj \
..\common\$D\zipstrm.obj \
..\common\$D\zstream.obj
appcmn.obj \
choiccmn.obj \
clipcmn.obj \
+ cmdline.obj \
cmndata.obj \
config.obj \
+ cshelp.obj \
ctrlcmn.obj \
ctrlsub.obj \
datetime.obj \
db.obj \
dbtable.obj \
dcbase.obj \
+ dndcmn.obj \
dlgcmn.obj \
dobjcmn.obj \
docmdi.obj \
docview.obj \
dynarray.obj \
dynlib.obj \
+ effects.obj \
encconv.obj \
event.obj \
extended.obj \
file.obj \
fileconf.obj \
filefn.obj \
+ filename.obj \
filesys.obj \
fontcmn.obj \
fontmap.obj \
framecmn.obj \
fs_inet.obj \
+ fs_mem.obj \
fs_zip.obj \
ftp.obj \
gdicmn.obj \
+ geometry.obj \
gifdecod.obj \
hash.obj \
helpbase.obj \
- http.obj \
+ http.obj
+
+COMLIBOBJS2 = \
imagall.obj \
imagbmp.obj \
image.obj \
imaggif.obj \
imagjpeg.obj \
imagpcx.obj \
- imagpng.obj
-
-COMLIBOBJS2 = \
+ imagpng.obj \
imagpnm.obj \
+ imagtiff.obj \
+ imagxpm.obj \
intl.obj \
ipcbase.obj \
layout.obj \
mstream.obj \
object.obj \
objstrm.obj \
+ odbc.obj \
paper.obj \
prntbase.obj \
process.obj \
protocol.obj \
+ quantize.obj \
resource.obj \
sckaddr.obj \
sckfile.obj \
socket.obj \
strconv.obj \
stream.obj \
- string.obj \
+ string.obj
+
+COMLIBOBJS3 = \
tbarbase.obj \
textcmn.obj \
textfile.obj \
timercmn.obj \
tokenzr.obj \
+ treebase.obj \
txtstrm.obj \
unzip.obj \
url.obj \
utilscmn.obj \
valgen.obj \
- validate.obj
-
-COMLIBOBJS3 = \
+ validate.obj \
valtext.obj \
variant.obj \
wfstream.obj \
wincmn.obj \
wxchar.obj \
wxexpr.obj \
+ xpmdecod.obj \
y_tab.obj \
zipstrm.obj \
zstream.obj
..\os2\$D\dcprint.obj \
..\os2\$D\dcscreen.obj \
..\os2\$D\dialog.obj \
+ ..\os2\$D\dir.obj \
..\os2\$D\dirdlg.obj \
..\os2\$D\dnd.obj \
..\os2\$D\filedlg.obj \
..\os2\$D\fontutil.obj \
..\os2\$D\frame.obj \
..\os2\$D\gauge.obj \
- ..\os2\$D\gdiobj.obj \
..\os2\$D\gdiimage.obj \
+ ..\os2\$D\gdiobj.obj \
..\os2\$D\gsocket.obj \
..\os2\$D\helpwin.obj \
..\os2\$D\icon.obj \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
- ..\os2\$D\window.obj
+ ..\os2\$D\window.obj \
+ ..\os2\$D\xpmhand.obj
OS2LIBOBJS1 = \
accel.obj \
dcprint.obj \
dcscreen.obj \
dialog.obj \
+ dir.obj \
dirdlg.obj \
dnd.obj \
filedlg.obj \
mdi.obj \
menu.obj \
menuitem.obj \
- metafile.obj \
- mimetype.obj
+ metafile.obj
OS2LIBOBJS2 = \
+ mimetype.obj \
minifram.obj \
msgdlg.obj \
nativdlg.obj \
utils.obj \
utilsexc.obj \
wave.obj \
- window.obj
+ window.obj \
+ xpmhand.obj
HTMLOBJS = \
..\html\$D\helpctrl.obj \
..\html\$D\htmltag.obj \
..\html\$D\htmlwin.obj \
..\html\$D\htmprint.obj \
+ ..\html\$D\m_dflist.obj \
..\html\$D\m_fonts.obj \
..\html\$D\m_hline.obj \
..\html\$D\m_image.obj \
..\html\$D\m_layout.obj \
..\html\$D\m_links.obj \
..\html\$D\m_list.obj \
+ ..\html\$D\m_meta.obj \
..\html\$D\m_pre.obj \
..\html\$D\m_tables.obj \
..\html\$D\winpars.obj
htmltag.obj \
htmlwin.obj \
htmprint.obj \
+ m_dflist.obj \
m_fonts.obj \
m_hline.obj \
m_image.obj \
m_layout.obj \
m_links.obj \
m_list.obj \
+ m_meta.obj \
m_pre.obj \
m_tables.obj \
winpars.obj
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
# Normal, static library
-all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm tiff $(LIBTARGET)
+all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
- icc @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+ icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp
$(COMLIBOBJS1):
copy ..\common\$D\appcmn.obj
copy ..\common\$D\choiccmn.obj
copy ..\common\$D\clipcmn.obj
+ copy ..\common\$D\cmdline.obj
copy ..\common\$D\cmndata.obj
copy ..\common\$D\config.obj
+ copy ..\common\$D\cshelp.obj
copy ..\common\$D\ctrlcmn.obj
copy ..\common\$D\ctrlsub.obj
copy ..\common\$D\datetime.obj
copy ..\common\$D\dbtable.obj
copy ..\common\$D\dcbase.obj
copy ..\common\$D\dlgcmn.obj
+ copy ..\common\$D\dndcmn.obj
copy ..\common\$D\dobjcmn.obj
copy ..\common\$D\docmdi.obj
copy ..\common\$D\docview.obj
copy ..\common\$D\dynarray.obj
copy ..\common\$D\dynlib.obj
+ copy ..\common\$D\effects.obj
copy ..\common\$D\encconv.obj
copy ..\common\$D\event.obj
copy ..\common\$D\extended.obj
copy ..\common\$D\file.obj
copy ..\common\$D\fileconf.obj
copy ..\common\$D\filefn.obj
+ copy ..\common\$D\filename.obj
copy ..\common\$D\filesys.obj
copy ..\common\$D\fontcmn.obj
copy ..\common\$D\fontmap.obj
copy ..\common\$D\framecmn.obj
copy ..\common\$D\fs_inet.obj
+ copy ..\common\$D\fs_mem.obj
copy ..\common\$D\fs_zip.obj
copy ..\common\$D\ftp.obj
copy ..\common\$D\gdicmn.obj
+ copy ..\common\$D\geometry.obj
copy ..\common\$D\gifdecod.obj
copy ..\common\$D\hash.obj
copy ..\common\$D\helpbase.obj
copy ..\common\$D\http.obj
+
+$(COMLIBOBJS2):
copy ..\common\$D\imagall.obj
copy ..\common\$D\imagbmp.obj
copy ..\common\$D\image.obj
copy ..\common\$D\imagjpeg.obj
copy ..\common\$D\imagpcx.obj
copy ..\common\$D\imagpng.obj
-
-$(COMLIBOBJS2):
copy ..\common\$D\imagpnm.obj
+ copy ..\common\$D\imagtiff.obj
+ copy ..\common\$D\imagxpm.obj
copy ..\common\$D\intl.obj
copy ..\common\$D\ipcbase.obj
copy ..\common\$D\layout.obj
copy ..\common\$D\mstream.obj
copy ..\common\$D\object.obj
copy ..\common\$D\objstrm.obj
+ copy ..\common\$D\odbc.obj
copy ..\common\$D\paper.obj
copy ..\common\$D\prntbase.obj
copy ..\common\$D\process.obj
copy ..\common\$D\protocol.obj
+ copy ..\common\$D\quantize.obj
copy ..\common\$D\resource.obj
copy ..\common\$D\sckaddr.obj
copy ..\common\$D\sckfile.obj
copy ..\common\$D\strconv.obj
copy ..\common\$D\stream.obj
copy ..\common\$D\string.obj
+
+$(COMLIBOBJS3):
copy ..\common\$D\tbarbase.obj
copy ..\common\$D\textcmn.obj
copy ..\common\$D\textfile.obj
copy ..\common\$D\timercmn.obj
copy ..\common\$D\tokenzr.obj
+ copy ..\common\$D\treebase.obj
copy ..\common\$D\txtstrm.obj
copy ..\common\$D\unzip.obj
copy ..\common\$D\url.obj
copy ..\common\$D\utilscmn.obj
copy ..\common\$D\valgen.obj
copy ..\common\$D\validate.obj
-
-$(COMLIBOBJS3):
copy ..\common\$D\valtext.obj
copy ..\common\$D\variant.obj
copy ..\common\$D\wfstream.obj
copy ..\common\$D\wincmn.obj
copy ..\common\$D\wxchar.obj
copy ..\common\$D\wxexpr.obj
+ copy ..\common\$D\xpmdecod.obj
copy ..\common\$D\y_tab.obj
copy ..\common\$D\zipstrm.obj
copy ..\common\$D\zstream.obj
copy ..\generic\$D\caret.obj
copy ..\generic\$D\choicdgg.obj
copy ..\generic\$D\colrdlgg.obj
+ copy ..\generic\$D\dragimgg.obj
copy ..\generic\$D\dcpsg.obj
+ copy ..\generic\$D\dirctrlg.obj
+ copy ..\generic\$D\fontdlgg.obj
copy ..\generic\$D\grid.obj
+ copy ..\generic\$D\gridsel.obj
copy ..\generic\$D\helpext.obj
copy ..\generic\$D\helphtml.obj
copy ..\generic\$D\helpwxht.obj
copy ..\generic\$D\logg.obj
copy ..\generic\$D\numdlgg.obj
copy ..\generic\$D\panelg.obj
- copy ..\generic\$D\plot.obj
copy ..\generic\$D\printps.obj
copy ..\generic\$D\prntdlgg.obj
copy ..\generic\$D\progdlgg.obj
copy ..\generic\$D\splitter.obj
copy ..\generic\$D\statusbr.obj
copy ..\generic\$D\tabg.obj
+ copy ..\generic\$D\tbarsmpl.obj
copy ..\generic\$D\textdlgg.obj
copy ..\generic\$D\tipdlg.obj
- copy ..\generic\$D\treectrl.obj
+ copy ..\generic\$D\tipwin.obj
+ copy ..\generic\$D\treectlg.obj
+ copy ..\generic\$D\treelay.obj
+ copy ..\generic\$D\wizard.obj
$(HTMLLIBOBJS):
copy ..\html\$D\helpctrl.obj
copy ..\html\$D\htmltag.obj
copy ..\html\$D\htmlwin.obj
copy ..\html\$D\htmprint.obj
+ copy ..\html\$D\m_dflist.obj
copy ..\html\$D\m_fonts.obj
copy ..\html\$D\m_hline.obj
copy ..\html\$D\m_image.obj
copy ..\html\$D\m_layout.obj
copy ..\html\$D\m_links.obj
copy ..\html\$D\m_list.obj
+ copy ..\html\$D\m_meta.obj
copy ..\html\$D\m_pre.obj
copy ..\html\$D\m_tables.obj
copy ..\html\$D\winpars.obj
copy ..\os2\$D\dcprint.obj
copy ..\os2\$D\dcscreen.obj
copy ..\os2\$D\dialog.obj
+ copy ..\os2\$D\dir.obj
copy ..\os2\$D\dirdlg.obj
copy ..\os2\$D\dnd.obj
copy ..\os2\$D\filedlg.obj
copy ..\os2\$D\menu.obj
copy ..\os2\$D\menuitem.obj
copy ..\os2\$D\metafile.obj
- copy ..\os2\$D\mimetype.obj
$(OS2LIBOBJS2):
+ copy ..\os2\$D\mimetype.obj
copy ..\os2\$D\minifram.obj
copy ..\os2\$D\msgdlg.obj
copy ..\os2\$D\nativdlg.obj
copy ..\os2\$D\utilsexc.obj
copy ..\os2\$D\wave.obj
copy ..\os2\$D\window.obj
+ copy ..\os2\$D\xpmhand.obj
# wxWindows library as DLL
dll:
### Static library
$(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1)
- touch $(WXDIR)\lib\wxcom1.lib
- del $(WXDIR)\lib\wxcom1.lib
+ -touch $(WXDIR)\lib\wxcom1.lib
+ -del $(WXDIR)\lib\wxcom1.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2)
- touch $(WXDIR)\lib\wxcom2.lib
- del $(WXDIR)\lib\wxcom2.lib
+ -touch $(WXDIR)\lib\wxcom2.lib
+ -del $(WXDIR)\lib\wxcom2.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3)
- touch $(WXDIR)\lib\wxcom3.lib
- del $(WXDIR)\lib\wxcom3.lib
+ -touch $(WXDIR)\lib\wxcom3.lib
+ -del $(WXDIR)\lib\wxcom3.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
- touch $(WXDIR)\lib\wxgen.lib
- del $(WXDIR)\lib\wxgen.lib
+ -touch $(WXDIR)\lib\wxgen.lib
+ -del $(WXDIR)\lib\wxgen.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS)
- touch $(WXDIR)\lib\wxhtml.lib
- del $(WXDIR)\lib\wxhtml.lib
+ -touch $(WXDIR)\lib\wxhtml.lib
+ -del $(WXDIR)\lib\wxhtml.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
- touch $(WXDIR)\lib\wxnones.lib
- del $(WXDIR)\lib\wxnones.lib
+ -touch $(WXDIR)\lib\wxnones.lib
+ -del $(WXDIR)\lib\wxnones.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1)
- touch $(WXDIR)\lib\wxos21.lib
- del $(WXDIR)\lib\wxos21.lib
+ -touch $(WXDIR)\lib\wxos21.lib
+ -del $(WXDIR)\lib\wxos21.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
- touch $(WXDIR)\lib\wxos22.lib
- del $(WXDIR)\lib\wxos22.lib
+ -touch $(WXDIR)\lib\wxos22.lib
+ -del $(WXDIR)\lib\wxos22.lib
ilib $(LIBFLAGS) $@ @<<
$**;
<<
-# del *.obj
+ del *.obj
$(WXDIR)\lib\wx.lib: \
$D\dummy.obj \
$(OS2TEMPTGT1) \
$(OS2TEMPTGT2) \
$(PERIPH_LIBS)
- touch $(LIBTARGET)
- del $(LIBTARGET)
+ -touch $(LIBTARGET)
+ -del $(LIBTARGET)
ilib $(LIBFLAGS) $@ @<<
$**;
<<
-# del $(COMTEMPTGT1)
-# del $(COMTEMPTGT2)
-# del $(COMTEMPTGT3)
-# del $(GENTEMPTGT)
-# del $(HTMLTEMPTGT)
-# del $(NONESTEMPTGT)
-# del $(OS2TEMPTGT1)
-# del $(OS2TEMPTGT2)
+ del $(COMTEMPTGT1)
+ del $(COMTEMPTGT2)
+ del $(COMTEMPTGT3)
+ del $(GENTEMPTGT)
+ del $(HTMLTEMPTGT)
+ del $(NONESTEMPTGT)
+ del $(OS2TEMPTGT1)
+ del $(OS2TEMPTGT2)
!else
-# Update the import library
-$(WXDIR)\lib\wx214.lib: $(OBJECTS)
- implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
-
# Update the dynamic link library
-$(WXDIR)\lib\wx214.dll: $(OBJECTS) $(WXDIR)\lib\wx214.lib
+$(WXDIR)\lib\wx23.dll: $(OBJECTS)
icc @<<
/B" $(LINKFLAGS)" /Fe$@
$(LIBS)
+ $(DUMMYOBJ)
$(OBJECTS)
- $(WXDIR)\lib\wx214.def
+ $(WXDIR)\src\os2\wx23.def
<<
+ implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
!endif
nmake -f makefile.va clean
cd $(WXDIR)\src\os2
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
- del $(LIBTARGET)
-!if "$(WXMAKINGDLL)" == "1"
- erase /N ..\..\lib\wx214.lib
-!endif
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
erase /N $(GENDIR)\$D\*.obj
erase /N $(COMMDIR)\$D\*.obj
erase /N $(HTMLDIR)\$D\*.obj
rd ..\common\$D
rd ..\html\$D
rd ..\os2\$D
+ del $(LIBTARGET)
+!if "$(WXMAKINGDLL)" == "1"
+ erase /N ..\..\lib\wx23.lib
+!endif
cleanall: clean
projects / wxWidgets.git / blobdiff