COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
-OS2TEMPTGT=$(WXDIR)\lib\wxos2.lib
+OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
+OS2TEMPTGT2=$(WXDIR)\lib\wxos22.lib
DUMMYOBJ=$D\dummy.obj
!endif
$(CPPFLAGS) /Fo$@ /Tp $<
<<
+{..\os2}.c{..\os2\$D}.obj:
+ @echo $<
+ icc @<<
+$(CPPFLAGS) /Fo$@ /Tp $<
+<<
+
{..\html}.cpp{..\html\$D}.obj:
@echo $<
icc @<<
..\os2\$D\checklst.obj \
..\os2\$D\choice.obj \
..\os2\$D\clipbrd.obj \
- ..\os2\$D\colordlg.obj \
..\os2\$D\colour.obj \
..\os2\$D\combobox.obj \
..\os2\$D\control.obj \
..\os2\$D\cursor.obj \
+ ..\os2\$D\data.obj \
..\os2\$D\dc.obj \
+ ..\os2\$D\dcclient.obj \
+ ..\os2\$D\dcmemory.obj \
+ ..\os2\$D\dcprint.obj \
+ ..\os2\$D\dcscreen.obj \
..\os2\$D\dialog.obj \
+ ..\os2\$D\dirdlg.obj \
+ ..\os2\$D\dnd.obj \
+ ..\os2\$D\filedlg.obj \
+ ..\os2\$D\font.obj \
+ ..\os2\$D\fontdlg.obj \
..\os2\$D\frame.obj \
+ ..\os2\$D\gauge.obj \
+ ..\os2\$D\gdiobj.obj \
+ ..\os2\$D\gsocket.obj \
+ ..\os2\$D\helpwin.obj \
+ ..\os2\$D\icon.obj \
+ ..\os2\$D\imaglist.obj \
+ ..\os2\$D\iniconf.obj \
+ ..\os2\$D\joystick.obj \
+ ..\os2\$D\listbox.obj \
+ ..\os2\$D\listctrl.obj \
+ ..\os2\$D\main.obj \
+ ..\os2\$D\mdi.obj \
+ ..\os2\$D\menu.obj \
+ ..\os2\$D\menuitem.obj \
+ ..\os2\$D\metafile.obj \
+ ..\os2\$D\minifram.obj \
+ ..\os2\$D\msgdlg.obj \
+ ..\os2\$D\nativdlg.obj \
+ ..\os2\$D\notebook.obj \
+ ..\os2\$D\ownerdrw.obj \
+ ..\os2\$D\palette.obj \
+ ..\os2\$D\pen.obj \
+ ..\os2\$D\pnghand.obj \
+ ..\os2\$D\print.obj \
+ ..\os2\$D\radiobox.obj \
+ ..\os2\$D\radiobut.obj \
+ ..\os2\$D\region.obj \
+ ..\os2\$D\scrolbar.obj \
+ ..\os2\$D\settings.obj \
+ ..\os2\$D\slider.obj \
+ ..\os2\$D\spinbutt.obj \
+ ..\os2\$D\spinctrl.obj \
+ ..\os2\$D\statbmp.obj \
+ ..\os2\$D\statbox.obj \
+ ..\os2\$D\stattext.obj \
+ ..\os2\$D\statbrpm.obj \
+ ..\os2\$D\tabctrl.obj \
+ ..\os2\$D\taskbar.obj \
+ ..\os2\$D\textctrl.obj \
+ ..\os2\$D\thread.obj \
+ ..\os2\$D\timer.obj \
+ ..\os2\$D\toolbar.obj \
+ ..\os2\$D\tooltip.obj \
+ ..\os2\$D\treectrl.obj \
+ ..\os2\$D\utils.obj \
+ ..\os2\$D\utilsexc.obj \
+ ..\os2\$D\wave.obj \
..\os2\$D\window.obj
-OS2LIBOBJS = \
+OS2LIBOBJS1 = \
accel.obj \
app.obj \
bitmap.obj \
checklst.obj \
choice.obj \
clipbrd.obj \
- colordlg.obj \
colour.obj \
combobox.obj \
control.obj \
cursor.obj \
+ data.obj \
dc.obj \
+ dcclient.obj \
+ dcmemory.obj \
+ dcprint.obj \
+ dcscreen.obj \
dialog.obj \
+ dirdlg.obj \
+ dnd.obj \
+ filedlg.obj \
+ font.obj \
+ fontdlg.obj \
frame.obj \
+ gauge.obj \
+ gdiobj.obj \
+ gsocket.obj \
+ helpwin.obj \
+ icon.obj \
+ imaglist.obj \
+ iniconf.obj \
+ joystick.obj \
+ listbox.obj \
+ listctrl.obj \
+ main.obj \
+ mdi.obj \
+ menu.obj \
+ menuitem.obj \
+ metafile.obj \
+ minifram.obj \
+ msgdlg.obj \
+ nativdlg.obj
+
+OS2LIBOBJS2 = \
+ notebook.obj \
+ ownerdrw.obj \
+ palette.obj \
+ pen.obj \
+ pnghand.obj \
+ print.obj \
+ radiobox.obj \
+ radiobut.obj \
+ region.obj \
+ scrolbar.obj \
+ settings.obj \
+ slider.obj \
+ spinbutt.obj \
+ spinctrl.obj \
+ statbmp.obj \
+ statbox.obj \
+ stattext.obj \
+ statbrpm.obj \
+ tabctrl.obj \
+ taskbar.obj \
+ textctrl.obj \
+ thread.obj \
+ timer.obj \
+ toolbar.obj \
+ tooltip.obj \
+ treectrl.obj \
+ utils.obj \
+ utilsexc.obj \
+ wave.obj \
window.obj
HTMLOBJS = \
copy ..\generic\$D\tipdlg.obj
copy ..\generic\$D\busyinfo.obj
-$(OS2LIBOBJS):
+$(OS2LIBOBJS1):
copy ..\os2\$D\accel.obj
copy ..\os2\$D\app.obj
copy ..\os2\$D\bitmap.obj
copy ..\os2\$D\checklst.obj
copy ..\os2\$D\choice.obj
copy ..\os2\$D\clipbrd.obj
- copy ..\os2\$D\colordlg.obj
copy ..\os2\$D\colour.obj
copy ..\os2\$D\combobox.obj
copy ..\os2\$D\control.obj
copy ..\os2\$D\cursor.obj
+ copy ..\os2\$D\data.obj
copy ..\os2\$D\dc.obj
+ copy ..\os2\$D\dcclient.obj
+ copy ..\os2\$D\dcmemory.obj
+ copy ..\os2\$D\dcprint.obj
+ copy ..\os2\$D\dcscreen.obj
copy ..\os2\$D\dialog.obj
+ copy ..\os2\$D\dirdlg.obj
+ copy ..\os2\$D\dnd.obj
+ copy ..\os2\$D\filedlg.obj
+ copy ..\os2\$D\font.obj
+ copy ..\os2\$D\fontdlg.obj
copy ..\os2\$D\frame.obj
+ copy ..\os2\$D\gauge.obj
+ copy ..\os2\$D\gdiobj.obj
+ copy ..\os2\$D\gsocket.obj
+ copy ..\os2\$D\helpwin.obj
+ copy ..\os2\$D\icon.obj
+ copy ..\os2\$D\imaglist.obj
+ copy ..\os2\$D\iniconf.obj
+ copy ..\os2\$D\joystick.obj
+ copy ..\os2\$D\listbox.obj
+ copy ..\os2\$D\listctrl.obj
+ copy ..\os2\$D\main.obj
+ copy ..\os2\$D\mdi.obj
+ copy ..\os2\$D\menu.obj
+ copy ..\os2\$D\menuitem.obj
+ copy ..\os2\$D\metafile.obj
+ copy ..\os2\$D\minifram.obj
+ copy ..\os2\$D\msgdlg.obj
+ copy ..\os2\$D\nativdlg.obj
+
+$(OS2LIBOBJS2):
+ copy ..\os2\$D\notebook.obj
+ copy ..\os2\$D\ownerdrw.obj
+ copy ..\os2\$D\palette.obj
+ copy ..\os2\$D\pen.obj
+ copy ..\os2\$D\pnghand.obj
+ copy ..\os2\$D\print.obj
+ copy ..\os2\$D\radiobox.obj
+ copy ..\os2\$D\radiobut.obj
+ copy ..\os2\$D\region.obj
+ copy ..\os2\$D\scrolbar.obj
+ copy ..\os2\$D\settings.obj
+ copy ..\os2\$D\slider.obj
+ copy ..\os2\$D\spinbutt.obj
+ copy ..\os2\$D\spinctrl.obj
+ copy ..\os2\$D\statbmp.obj
+ copy ..\os2\$D\statbox.obj
+ copy ..\os2\$D\stattext.obj
+ copy ..\os2\$D\statbrpm.obj
+ copy ..\os2\$D\tabctrl.obj
+ copy ..\os2\$D\taskbar.obj
+ copy ..\os2\$D\textctrl.obj
+ copy ..\os2\$D\thread.obj
+ copy ..\os2\$D\timer.obj
+ copy ..\os2\$D\toolbar.obj
+ copy ..\os2\$D\tooltip.obj
+ copy ..\os2\$D\treectrl.obj
+ copy ..\os2\$D\utils.obj
+ copy ..\os2\$D\utilsexc.obj
+ copy ..\os2\$D\wave.obj
copy ..\os2\$D\window.obj
# wxWindows library as DLL
$**;
<<
-$(WXDIR)\lib\wxos2.lib: $(OS2LIBOBJS)
- touch $(WXDIR)\lib\wxos2.lib
- del $(WXDIR)\lib\wxos2.lib
+$(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1)
+ 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
ilib $(LIBFLAGS) $@ @<<
$**;
<<
$(COMTEMPTGT2) \
$(GENTEMPTGT) \
$(NONESTEMPTGT) \
- $(OS2TEMPTGT) \
+ $(OS2TEMPTGT1) \
+ $(OS2TEMPTGT2) \
$(PERIPH_LIBS)
touch $(LIBTARGET)
del $(LIBTARGET)
del $(COMTEMPTGT2)
del $(GENTEMPTGT)
del $(NONESTEMPTGT)
- del $(OS2TEMPTGT)
+ del $(OS2TEMPTGT1)
+ del $(OS2TEMPTGT2)
!else
projects / wxWidgets.git / blobdiff