diff --git a/build/os2/config.wat b/build/os2/config.wat index faebd30e90..d36ccc9c64 100644 --- a/build/os2/config.wat +++ b/build/os2/config.wat @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) +# Bakefile 0.2.8 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= @@ -98,6 +98,9 @@ USE_RTTI = 1 # Enable threading in compiled code. [0,1] USE_THREADS = 1 +# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] +USE_CAIRO = 0 + # Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] USE_GDIPLUS = 0 diff --git a/build/os2/makefile.wat b/build/os2/makefile.wat index 73770ff3e9..d521a726d1 100644 --- a/build/os2/makefile.wat +++ b/build/os2/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) +# Bakefile 0.2.8 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif @@ -154,6 +158,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_notbk.obj & $(OBJS)\monodll_xh_odcombo.obj & $(OBJS)\monodll_xh_panel.obj & + $(OBJS)\monodll_xh_propdlg.obj & $(OBJS)\monodll_xh_radbt.obj & $(OBJS)\monodll_xh_radbx.obj & $(OBJS)\monodll_xh_scrol.obj & @@ -182,6 +187,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_floatpane.obj & $(OBJS)\monodll_auibook.obj & $(OBJS)\monodll_tabmdi.obj & + $(OBJS)\monodll_auibar.obj & $(OBJS)\monodll_richtextctrl.obj & $(OBJS)\monodll_richtextbuffer.obj & $(OBJS)\monodll_richtextstyles.obj & @@ -204,20 +210,20 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_listctrl.obj & $(OBJS)\monodll_mdig.obj & $(OBJS)\monodll_prntdlgg.obj & - $(OBJS)\monodll_statusbr.obj & - $(OBJS)\monodll_accel.obj & + $(OBJS)\monodll_generic_statusbr.obj & + $(OBJS)\monodll_os2_accel.obj & $(OBJS)\monodll_app.obj & $(OBJS)\monodll_bitmap.obj & - $(OBJS)\monodll_bmpbuttn.obj & + $(OBJS)\monodll_os2_bmpbuttn.obj & $(OBJS)\monodll_brush.obj & - $(OBJS)\monodll_button.obj & - $(OBJS)\monodll_checkbox.obj & - $(OBJS)\monodll_checklst.obj & - $(OBJS)\monodll_choice.obj & + $(OBJS)\monodll_os2_button.obj & + $(OBJS)\monodll_os2_checkbox.obj & + $(OBJS)\monodll_os2_checklst.obj & + $(OBJS)\monodll_os2_choice.obj & $(OBJS)\monodll_clipbrd.obj & $(OBJS)\monodll_colour.obj & - $(OBJS)\monodll_combobox.obj & - $(OBJS)\monodll_control.obj & + $(OBJS)\monodll_os2_combobox.obj & + $(OBJS)\monodll_os2_control.obj & $(OBJS)\monodll_cursor.obj & $(OBJS)\monodll_data.obj & $(OBJS)\monodll_dataobj.obj & @@ -226,7 +232,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcmemory.obj & $(OBJS)\monodll_dcprint.obj & $(OBJS)\monodll_dcscreen.obj & - $(OBJS)\monodll_dialog.obj & + $(OBJS)\monodll_os2_dialog.obj & $(OBJS)\monodll_dnd.obj & $(OBJS)\monodll_evtloop.obj & $(OBJS)\monodll_filedlg.obj & @@ -235,42 +241,42 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_fontenum.obj & $(OBJS)\monodll_fontutil.obj & $(OBJS)\monodll_frame.obj & - $(OBJS)\monodll_gauge.obj & + $(OBJS)\monodll_os2_gauge.obj & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gsockpm.obj & $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_iniconf.obj & - $(OBJS)\monodll_listbox.obj & + $(OBJS)\monodll_os2_listbox.obj & $(OBJS)\monodll_main.obj & - $(OBJS)\monodll_menu.obj & + $(OBJS)\monodll_os2_menu.obj & $(OBJS)\monodll_menuitem.obj & $(OBJS)\monodll_metafile.obj & $(OBJS)\monodll_msgdlg.obj & $(OBJS)\monodll_nativdlg.obj & - $(OBJS)\monodll_notebook.obj & + $(OBJS)\monodll_os2_notebook.obj & $(OBJS)\monodll_ownerdrw.obj & $(OBJS)\monodll_palette.obj & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_popupwin.obj & $(OBJS)\monodll_print.obj & - $(OBJS)\monodll_radiobox.obj & - $(OBJS)\monodll_radiobut.obj & + $(OBJS)\monodll_os2_radiobox.obj & + $(OBJS)\monodll_os2_radiobut.obj & $(OBJS)\monodll_region.obj & - $(OBJS)\monodll_scrolbar.obj & + $(OBJS)\monodll_os2_scrolbar.obj & $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_slider.obj & - $(OBJS)\monodll_spinbutt.obj & + $(OBJS)\monodll_os2_slider.obj & + $(OBJS)\monodll_os2_spinbutt.obj & $(OBJS)\monodll_spinctrl.obj & - $(OBJS)\monodll_statbmp.obj & - $(OBJS)\monodll_statbox.obj & - $(OBJS)\monodll_statline.obj & - $(OBJS)\monodll_stattext.obj & + $(OBJS)\monodll_os2_statbmp.obj & + $(OBJS)\monodll_os2_statbox.obj & + $(OBJS)\monodll_os2_statline.obj & + $(OBJS)\monodll_os2_stattext.obj & $(OBJS)\monodll_tabctrl.obj & - $(OBJS)\monodll_textctrl.obj & - $(OBJS)\monodll_tglbtn.obj & + $(OBJS)\monodll_os2_textctrl.obj & + $(OBJS)\monodll_os2_tglbtn.obj & $(OBJS)\monodll_timer.obj & - $(OBJS)\monodll_toolbar.obj & + $(OBJS)\monodll_os2_toolbar.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_utilsgui.obj & @@ -377,6 +383,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dragimgg.obj & $(OBJS)\monodll_filepickerg.obj & $(OBJS)\monodll_fontpickerg.obj & + $(OBJS)\monodll_graphicc.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & @@ -401,7 +408,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_accel.obj & + $(OBJS)\monodll_generic_accel.obj & $(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_dirdlgg.obj & $(OBJS)\monodll_fdrepdlg.obj & @@ -412,40 +419,40 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_msgdlgg.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_tabg.obj & - $(OBJS)\monodll_bmpbuttn.obj & - $(OBJS)\monodll_button.obj & - $(OBJS)\monodll_checkbox.obj & - $(OBJS)\monodll_checklst.obj & - $(OBJS)\monodll_choice.obj & + $(OBJS)\monodll_univ_bmpbuttn.obj & + $(OBJS)\monodll_univ_button.obj & + $(OBJS)\monodll_univ_checkbox.obj & + $(OBJS)\monodll_univ_checklst.obj & + $(OBJS)\monodll_univ_choice.obj & $(OBJS)\monodll_colschem.obj & - $(OBJS)\monodll_combobox.obj & - $(OBJS)\monodll_control.obj & + $(OBJS)\monodll_univ_combobox.obj & + $(OBJS)\monodll_univ_control.obj & $(OBJS)\monodll_ctrlrend.obj & - $(OBJS)\monodll_dialog.obj & + $(OBJS)\monodll_univ_dialog.obj & $(OBJS)\monodll_framuniv.obj & - $(OBJS)\monodll_gauge.obj & + $(OBJS)\monodll_univ_gauge.obj & $(OBJS)\monodll_inpcons.obj & $(OBJS)\monodll_inphand.obj & - $(OBJS)\monodll_listbox.obj & - $(OBJS)\monodll_menu.obj & - $(OBJS)\monodll_notebook.obj & - $(OBJS)\monodll_radiobox.obj & - $(OBJS)\monodll_radiobut.obj & + $(OBJS)\monodll_univ_listbox.obj & + $(OBJS)\monodll_univ_menu.obj & + $(OBJS)\monodll_univ_notebook.obj & + $(OBJS)\monodll_univ_radiobox.obj & + $(OBJS)\monodll_univ_radiobut.obj & $(OBJS)\monodll_scrarrow.obj & - $(OBJS)\monodll_scrolbar.obj & + $(OBJS)\monodll_univ_scrolbar.obj & $(OBJS)\monodll_scrthumb.obj & - $(OBJS)\monodll_slider.obj & - $(OBJS)\monodll_spinbutt.obj & - $(OBJS)\monodll_statbmp.obj & - $(OBJS)\monodll_statbox.obj & - $(OBJS)\monodll_statline.obj & - $(OBJS)\monodll_stattext.obj & - $(OBJS)\monodll_statusbr.obj & + $(OBJS)\monodll_univ_slider.obj & + $(OBJS)\monodll_univ_spinbutt.obj & + $(OBJS)\monodll_univ_statbmp.obj & + $(OBJS)\monodll_univ_statbox.obj & + $(OBJS)\monodll_univ_statline.obj & + $(OBJS)\monodll_univ_stattext.obj & + $(OBJS)\monodll_univ_statusbr.obj & $(OBJS)\monodll_stdrend.obj & - $(OBJS)\monodll_textctrl.obj & - $(OBJS)\monodll_tglbtn.obj & + $(OBJS)\monodll_univ_textctrl.obj & + $(OBJS)\monodll_univ_tglbtn.obj & $(OBJS)\monodll_theme.obj & - $(OBJS)\monodll_toolbar.obj & + $(OBJS)\monodll_univ_toolbar.obj & $(OBJS)\monodll_topluniv.obj & $(OBJS)\monodll_winuniv.obj & $(OBJS)\monodll_gtk.obj & @@ -554,6 +561,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dragimgg.obj & $(OBJS)\monodll_filepickerg.obj & $(OBJS)\monodll_fontpickerg.obj & + $(OBJS)\monodll_graphicc.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & @@ -699,6 +707,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_notbk.obj & $(OBJS)\monolib_xh_odcombo.obj & $(OBJS)\monolib_xh_panel.obj & + $(OBJS)\monolib_xh_propdlg.obj & $(OBJS)\monolib_xh_radbt.obj & $(OBJS)\monolib_xh_radbx.obj & $(OBJS)\monolib_xh_scrol.obj & @@ -727,6 +736,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_floatpane.obj & $(OBJS)\monolib_auibook.obj & $(OBJS)\monolib_tabmdi.obj & + $(OBJS)\monolib_auibar.obj & $(OBJS)\monolib_richtextctrl.obj & $(OBJS)\monolib_richtextbuffer.obj & $(OBJS)\monolib_richtextstyles.obj & @@ -749,20 +759,20 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_listctrl.obj & $(OBJS)\monolib_mdig.obj & $(OBJS)\monolib_prntdlgg.obj & - $(OBJS)\monolib_statusbr.obj & - $(OBJS)\monolib_accel.obj & + $(OBJS)\monolib_generic_statusbr.obj & + $(OBJS)\monolib_os2_accel.obj & $(OBJS)\monolib_app.obj & $(OBJS)\monolib_bitmap.obj & - $(OBJS)\monolib_bmpbuttn.obj & + $(OBJS)\monolib_os2_bmpbuttn.obj & $(OBJS)\monolib_brush.obj & - $(OBJS)\monolib_button.obj & - $(OBJS)\monolib_checkbox.obj & - $(OBJS)\monolib_checklst.obj & - $(OBJS)\monolib_choice.obj & + $(OBJS)\monolib_os2_button.obj & + $(OBJS)\monolib_os2_checkbox.obj & + $(OBJS)\monolib_os2_checklst.obj & + $(OBJS)\monolib_os2_choice.obj & $(OBJS)\monolib_clipbrd.obj & $(OBJS)\monolib_colour.obj & - $(OBJS)\monolib_combobox.obj & - $(OBJS)\monolib_control.obj & + $(OBJS)\monolib_os2_combobox.obj & + $(OBJS)\monolib_os2_control.obj & $(OBJS)\monolib_cursor.obj & $(OBJS)\monolib_data.obj & $(OBJS)\monolib_dataobj.obj & @@ -771,7 +781,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcmemory.obj & $(OBJS)\monolib_dcprint.obj & $(OBJS)\monolib_dcscreen.obj & - $(OBJS)\monolib_dialog.obj & + $(OBJS)\monolib_os2_dialog.obj & $(OBJS)\monolib_dnd.obj & $(OBJS)\monolib_evtloop.obj & $(OBJS)\monolib_filedlg.obj & @@ -780,42 +790,42 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_fontenum.obj & $(OBJS)\monolib_fontutil.obj & $(OBJS)\monolib_frame.obj & - $(OBJS)\monolib_gauge.obj & + $(OBJS)\monolib_os2_gauge.obj & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gsockpm.obj & $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_iniconf.obj & - $(OBJS)\monolib_listbox.obj & + $(OBJS)\monolib_os2_listbox.obj & $(OBJS)\monolib_main.obj & - $(OBJS)\monolib_menu.obj & + $(OBJS)\monolib_os2_menu.obj & $(OBJS)\monolib_menuitem.obj & $(OBJS)\monolib_metafile.obj & $(OBJS)\monolib_msgdlg.obj & $(OBJS)\monolib_nativdlg.obj & - $(OBJS)\monolib_notebook.obj & + $(OBJS)\monolib_os2_notebook.obj & $(OBJS)\monolib_ownerdrw.obj & $(OBJS)\monolib_palette.obj & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_popupwin.obj & $(OBJS)\monolib_print.obj & - $(OBJS)\monolib_radiobox.obj & - $(OBJS)\monolib_radiobut.obj & + $(OBJS)\monolib_os2_radiobox.obj & + $(OBJS)\monolib_os2_radiobut.obj & $(OBJS)\monolib_region.obj & - $(OBJS)\monolib_scrolbar.obj & + $(OBJS)\monolib_os2_scrolbar.obj & $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_slider.obj & - $(OBJS)\monolib_spinbutt.obj & + $(OBJS)\monolib_os2_slider.obj & + $(OBJS)\monolib_os2_spinbutt.obj & $(OBJS)\monolib_spinctrl.obj & - $(OBJS)\monolib_statbmp.obj & - $(OBJS)\monolib_statbox.obj & - $(OBJS)\monolib_statline.obj & - $(OBJS)\monolib_stattext.obj & + $(OBJS)\monolib_os2_statbmp.obj & + $(OBJS)\monolib_os2_statbox.obj & + $(OBJS)\monolib_os2_statline.obj & + $(OBJS)\monolib_os2_stattext.obj & $(OBJS)\monolib_tabctrl.obj & - $(OBJS)\monolib_textctrl.obj & - $(OBJS)\monolib_tglbtn.obj & + $(OBJS)\monolib_os2_textctrl.obj & + $(OBJS)\monolib_os2_tglbtn.obj & $(OBJS)\monolib_timer.obj & - $(OBJS)\monolib_toolbar.obj & + $(OBJS)\monolib_os2_toolbar.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_utilsgui.obj & @@ -922,6 +932,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dragimgg.obj & $(OBJS)\monolib_filepickerg.obj & $(OBJS)\monolib_fontpickerg.obj & + $(OBJS)\monolib_graphicc.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & @@ -946,7 +957,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_accel.obj & + $(OBJS)\monolib_generic_accel.obj & $(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_dirdlgg.obj & $(OBJS)\monolib_fdrepdlg.obj & @@ -957,40 +968,40 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_msgdlgg.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_tabg.obj & - $(OBJS)\monolib_bmpbuttn.obj & - $(OBJS)\monolib_button.obj & - $(OBJS)\monolib_checkbox.obj & - $(OBJS)\monolib_checklst.obj & - $(OBJS)\monolib_choice.obj & + $(OBJS)\monolib_univ_bmpbuttn.obj & + $(OBJS)\monolib_univ_button.obj & + $(OBJS)\monolib_univ_checkbox.obj & + $(OBJS)\monolib_univ_checklst.obj & + $(OBJS)\monolib_univ_choice.obj & $(OBJS)\monolib_colschem.obj & - $(OBJS)\monolib_combobox.obj & - $(OBJS)\monolib_control.obj & + $(OBJS)\monolib_univ_combobox.obj & + $(OBJS)\monolib_univ_control.obj & $(OBJS)\monolib_ctrlrend.obj & - $(OBJS)\monolib_dialog.obj & + $(OBJS)\monolib_univ_dialog.obj & $(OBJS)\monolib_framuniv.obj & - $(OBJS)\monolib_gauge.obj & + $(OBJS)\monolib_univ_gauge.obj & $(OBJS)\monolib_inpcons.obj & $(OBJS)\monolib_inphand.obj & - $(OBJS)\monolib_listbox.obj & - $(OBJS)\monolib_menu.obj & - $(OBJS)\monolib_notebook.obj & - $(OBJS)\monolib_radiobox.obj & - $(OBJS)\monolib_radiobut.obj & + $(OBJS)\monolib_univ_listbox.obj & + $(OBJS)\monolib_univ_menu.obj & + $(OBJS)\monolib_univ_notebook.obj & + $(OBJS)\monolib_univ_radiobox.obj & + $(OBJS)\monolib_univ_radiobut.obj & $(OBJS)\monolib_scrarrow.obj & - $(OBJS)\monolib_scrolbar.obj & + $(OBJS)\monolib_univ_scrolbar.obj & $(OBJS)\monolib_scrthumb.obj & - $(OBJS)\monolib_slider.obj & - $(OBJS)\monolib_spinbutt.obj & - $(OBJS)\monolib_statbmp.obj & - $(OBJS)\monolib_statbox.obj & - $(OBJS)\monolib_statline.obj & - $(OBJS)\monolib_stattext.obj & - $(OBJS)\monolib_statusbr.obj & + $(OBJS)\monolib_univ_slider.obj & + $(OBJS)\monolib_univ_spinbutt.obj & + $(OBJS)\monolib_univ_statbmp.obj & + $(OBJS)\monolib_univ_statbox.obj & + $(OBJS)\monolib_univ_statline.obj & + $(OBJS)\monolib_univ_stattext.obj & + $(OBJS)\monolib_univ_statusbr.obj & $(OBJS)\monolib_stdrend.obj & - $(OBJS)\monolib_textctrl.obj & - $(OBJS)\monolib_tglbtn.obj & + $(OBJS)\monolib_univ_textctrl.obj & + $(OBJS)\monolib_univ_tglbtn.obj & $(OBJS)\monolib_theme.obj & - $(OBJS)\monolib_toolbar.obj & + $(OBJS)\monolib_univ_toolbar.obj & $(OBJS)\monolib_topluniv.obj & $(OBJS)\monolib_winuniv.obj & $(OBJS)\monolib_gtk.obj & @@ -1099,6 +1110,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dragimgg.obj & $(OBJS)\monolib_filepickerg.obj & $(OBJS)\monolib_fontpickerg.obj & + $(OBJS)\monolib_graphicc.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & @@ -1220,20 +1232,20 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_listctrl.obj & $(OBJS)\coredll_mdig.obj & $(OBJS)\coredll_prntdlgg.obj & - $(OBJS)\coredll_statusbr.obj & - $(OBJS)\coredll_accel.obj & + $(OBJS)\coredll_generic_statusbr.obj & + $(OBJS)\coredll_os2_accel.obj & $(OBJS)\coredll_app.obj & $(OBJS)\coredll_bitmap.obj & - $(OBJS)\coredll_bmpbuttn.obj & + $(OBJS)\coredll_os2_bmpbuttn.obj & $(OBJS)\coredll_brush.obj & - $(OBJS)\coredll_button.obj & - $(OBJS)\coredll_checkbox.obj & - $(OBJS)\coredll_checklst.obj & - $(OBJS)\coredll_choice.obj & + $(OBJS)\coredll_os2_button.obj & + $(OBJS)\coredll_os2_checkbox.obj & + $(OBJS)\coredll_os2_checklst.obj & + $(OBJS)\coredll_os2_choice.obj & $(OBJS)\coredll_clipbrd.obj & $(OBJS)\coredll_colour.obj & - $(OBJS)\coredll_combobox.obj & - $(OBJS)\coredll_control.obj & + $(OBJS)\coredll_os2_combobox.obj & + $(OBJS)\coredll_os2_control.obj & $(OBJS)\coredll_cursor.obj & $(OBJS)\coredll_data.obj & $(OBJS)\coredll_dataobj.obj & @@ -1242,7 +1254,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcmemory.obj & $(OBJS)\coredll_dcprint.obj & $(OBJS)\coredll_dcscreen.obj & - $(OBJS)\coredll_dialog.obj & + $(OBJS)\coredll_os2_dialog.obj & $(OBJS)\coredll_dnd.obj & $(OBJS)\coredll_evtloop.obj & $(OBJS)\coredll_filedlg.obj & @@ -1251,42 +1263,42 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_fontenum.obj & $(OBJS)\coredll_fontutil.obj & $(OBJS)\coredll_frame.obj & - $(OBJS)\coredll_gauge.obj & + $(OBJS)\coredll_os2_gauge.obj & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gsockpm.obj & $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_iniconf.obj & - $(OBJS)\coredll_listbox.obj & + $(OBJS)\coredll_os2_listbox.obj & $(OBJS)\coredll_main.obj & - $(OBJS)\coredll_menu.obj & + $(OBJS)\coredll_os2_menu.obj & $(OBJS)\coredll_menuitem.obj & $(OBJS)\coredll_metafile.obj & $(OBJS)\coredll_msgdlg.obj & $(OBJS)\coredll_nativdlg.obj & - $(OBJS)\coredll_notebook.obj & + $(OBJS)\coredll_os2_notebook.obj & $(OBJS)\coredll_ownerdrw.obj & $(OBJS)\coredll_palette.obj & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_popupwin.obj & $(OBJS)\coredll_print.obj & - $(OBJS)\coredll_radiobox.obj & - $(OBJS)\coredll_radiobut.obj & + $(OBJS)\coredll_os2_radiobox.obj & + $(OBJS)\coredll_os2_radiobut.obj & $(OBJS)\coredll_region.obj & - $(OBJS)\coredll_scrolbar.obj & + $(OBJS)\coredll_os2_scrolbar.obj & $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_slider.obj & - $(OBJS)\coredll_spinbutt.obj & + $(OBJS)\coredll_os2_slider.obj & + $(OBJS)\coredll_os2_spinbutt.obj & $(OBJS)\coredll_spinctrl.obj & - $(OBJS)\coredll_statbmp.obj & - $(OBJS)\coredll_statbox.obj & - $(OBJS)\coredll_statline.obj & - $(OBJS)\coredll_stattext.obj & + $(OBJS)\coredll_os2_statbmp.obj & + $(OBJS)\coredll_os2_statbox.obj & + $(OBJS)\coredll_os2_statline.obj & + $(OBJS)\coredll_os2_stattext.obj & $(OBJS)\coredll_tabctrl.obj & - $(OBJS)\coredll_textctrl.obj & - $(OBJS)\coredll_tglbtn.obj & + $(OBJS)\coredll_os2_textctrl.obj & + $(OBJS)\coredll_os2_tglbtn.obj & $(OBJS)\coredll_timer.obj & - $(OBJS)\coredll_toolbar.obj & + $(OBJS)\coredll_os2_toolbar.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_utilsgui.obj & @@ -1393,6 +1405,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dragimgg.obj & $(OBJS)\coredll_filepickerg.obj & $(OBJS)\coredll_fontpickerg.obj & + $(OBJS)\coredll_graphicc.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & @@ -1417,7 +1430,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\coredll_accel.obj & + $(OBJS)\coredll_generic_accel.obj & $(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_dirdlgg.obj & $(OBJS)\coredll_fdrepdlg.obj & @@ -1428,40 +1441,40 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_msgdlgg.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_tabg.obj & - $(OBJS)\coredll_bmpbuttn.obj & - $(OBJS)\coredll_button.obj & - $(OBJS)\coredll_checkbox.obj & - $(OBJS)\coredll_checklst.obj & - $(OBJS)\coredll_choice.obj & + $(OBJS)\coredll_univ_bmpbuttn.obj & + $(OBJS)\coredll_univ_button.obj & + $(OBJS)\coredll_univ_checkbox.obj & + $(OBJS)\coredll_univ_checklst.obj & + $(OBJS)\coredll_univ_choice.obj & $(OBJS)\coredll_colschem.obj & - $(OBJS)\coredll_combobox.obj & - $(OBJS)\coredll_control.obj & + $(OBJS)\coredll_univ_combobox.obj & + $(OBJS)\coredll_univ_control.obj & $(OBJS)\coredll_ctrlrend.obj & - $(OBJS)\coredll_dialog.obj & + $(OBJS)\coredll_univ_dialog.obj & $(OBJS)\coredll_framuniv.obj & - $(OBJS)\coredll_gauge.obj & + $(OBJS)\coredll_univ_gauge.obj & $(OBJS)\coredll_inpcons.obj & $(OBJS)\coredll_inphand.obj & - $(OBJS)\coredll_listbox.obj & - $(OBJS)\coredll_menu.obj & - $(OBJS)\coredll_notebook.obj & - $(OBJS)\coredll_radiobox.obj & - $(OBJS)\coredll_radiobut.obj & + $(OBJS)\coredll_univ_listbox.obj & + $(OBJS)\coredll_univ_menu.obj & + $(OBJS)\coredll_univ_notebook.obj & + $(OBJS)\coredll_univ_radiobox.obj & + $(OBJS)\coredll_univ_radiobut.obj & $(OBJS)\coredll_scrarrow.obj & - $(OBJS)\coredll_scrolbar.obj & + $(OBJS)\coredll_univ_scrolbar.obj & $(OBJS)\coredll_scrthumb.obj & - $(OBJS)\coredll_slider.obj & - $(OBJS)\coredll_spinbutt.obj & - $(OBJS)\coredll_statbmp.obj & - $(OBJS)\coredll_statbox.obj & - $(OBJS)\coredll_statline.obj & - $(OBJS)\coredll_stattext.obj & - $(OBJS)\coredll_statusbr.obj & + $(OBJS)\coredll_univ_slider.obj & + $(OBJS)\coredll_univ_spinbutt.obj & + $(OBJS)\coredll_univ_statbmp.obj & + $(OBJS)\coredll_univ_statbox.obj & + $(OBJS)\coredll_univ_statline.obj & + $(OBJS)\coredll_univ_stattext.obj & + $(OBJS)\coredll_univ_statusbr.obj & $(OBJS)\coredll_stdrend.obj & - $(OBJS)\coredll_textctrl.obj & - $(OBJS)\coredll_tglbtn.obj & + $(OBJS)\coredll_univ_textctrl.obj & + $(OBJS)\coredll_univ_tglbtn.obj & $(OBJS)\coredll_theme.obj & - $(OBJS)\coredll_toolbar.obj & + $(OBJS)\coredll_univ_toolbar.obj & $(OBJS)\coredll_topluniv.obj & $(OBJS)\coredll_winuniv.obj & $(OBJS)\coredll_gtk.obj & @@ -1570,6 +1583,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dragimgg.obj & $(OBJS)\coredll_filepickerg.obj & $(OBJS)\coredll_fontpickerg.obj & + $(OBJS)\coredll_graphicc.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & @@ -1612,20 +1626,20 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_listctrl.obj & $(OBJS)\corelib_mdig.obj & $(OBJS)\corelib_prntdlgg.obj & - $(OBJS)\corelib_statusbr.obj & - $(OBJS)\corelib_accel.obj & + $(OBJS)\corelib_generic_statusbr.obj & + $(OBJS)\corelib_os2_accel.obj & $(OBJS)\corelib_app.obj & $(OBJS)\corelib_bitmap.obj & - $(OBJS)\corelib_bmpbuttn.obj & + $(OBJS)\corelib_os2_bmpbuttn.obj & $(OBJS)\corelib_brush.obj & - $(OBJS)\corelib_button.obj & - $(OBJS)\corelib_checkbox.obj & - $(OBJS)\corelib_checklst.obj & - $(OBJS)\corelib_choice.obj & + $(OBJS)\corelib_os2_button.obj & + $(OBJS)\corelib_os2_checkbox.obj & + $(OBJS)\corelib_os2_checklst.obj & + $(OBJS)\corelib_os2_choice.obj & $(OBJS)\corelib_clipbrd.obj & $(OBJS)\corelib_colour.obj & - $(OBJS)\corelib_combobox.obj & - $(OBJS)\corelib_control.obj & + $(OBJS)\corelib_os2_combobox.obj & + $(OBJS)\corelib_os2_control.obj & $(OBJS)\corelib_cursor.obj & $(OBJS)\corelib_data.obj & $(OBJS)\corelib_dataobj.obj & @@ -1634,7 +1648,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcmemory.obj & $(OBJS)\corelib_dcprint.obj & $(OBJS)\corelib_dcscreen.obj & - $(OBJS)\corelib_dialog.obj & + $(OBJS)\corelib_os2_dialog.obj & $(OBJS)\corelib_dnd.obj & $(OBJS)\corelib_evtloop.obj & $(OBJS)\corelib_filedlg.obj & @@ -1643,42 +1657,42 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_fontenum.obj & $(OBJS)\corelib_fontutil.obj & $(OBJS)\corelib_frame.obj & - $(OBJS)\corelib_gauge.obj & + $(OBJS)\corelib_os2_gauge.obj & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gsockpm.obj & $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_iniconf.obj & - $(OBJS)\corelib_listbox.obj & + $(OBJS)\corelib_os2_listbox.obj & $(OBJS)\corelib_main.obj & - $(OBJS)\corelib_menu.obj & + $(OBJS)\corelib_os2_menu.obj & $(OBJS)\corelib_menuitem.obj & $(OBJS)\corelib_metafile.obj & $(OBJS)\corelib_msgdlg.obj & $(OBJS)\corelib_nativdlg.obj & - $(OBJS)\corelib_notebook.obj & + $(OBJS)\corelib_os2_notebook.obj & $(OBJS)\corelib_ownerdrw.obj & $(OBJS)\corelib_palette.obj & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_popupwin.obj & $(OBJS)\corelib_print.obj & - $(OBJS)\corelib_radiobox.obj & - $(OBJS)\corelib_radiobut.obj & + $(OBJS)\corelib_os2_radiobox.obj & + $(OBJS)\corelib_os2_radiobut.obj & $(OBJS)\corelib_region.obj & - $(OBJS)\corelib_scrolbar.obj & + $(OBJS)\corelib_os2_scrolbar.obj & $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_slider.obj & - $(OBJS)\corelib_spinbutt.obj & + $(OBJS)\corelib_os2_slider.obj & + $(OBJS)\corelib_os2_spinbutt.obj & $(OBJS)\corelib_spinctrl.obj & - $(OBJS)\corelib_statbmp.obj & - $(OBJS)\corelib_statbox.obj & - $(OBJS)\corelib_statline.obj & - $(OBJS)\corelib_stattext.obj & + $(OBJS)\corelib_os2_statbmp.obj & + $(OBJS)\corelib_os2_statbox.obj & + $(OBJS)\corelib_os2_statline.obj & + $(OBJS)\corelib_os2_stattext.obj & $(OBJS)\corelib_tabctrl.obj & - $(OBJS)\corelib_textctrl.obj & - $(OBJS)\corelib_tglbtn.obj & + $(OBJS)\corelib_os2_textctrl.obj & + $(OBJS)\corelib_os2_tglbtn.obj & $(OBJS)\corelib_timer.obj & - $(OBJS)\corelib_toolbar.obj & + $(OBJS)\corelib_os2_toolbar.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_utilsgui.obj & @@ -1785,6 +1799,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dragimgg.obj & $(OBJS)\corelib_filepickerg.obj & $(OBJS)\corelib_fontpickerg.obj & + $(OBJS)\corelib_graphicc.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & @@ -1809,7 +1824,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\corelib_accel.obj & + $(OBJS)\corelib_generic_accel.obj & $(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_dirdlgg.obj & $(OBJS)\corelib_fdrepdlg.obj & @@ -1820,40 +1835,40 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_msgdlgg.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_tabg.obj & - $(OBJS)\corelib_bmpbuttn.obj & - $(OBJS)\corelib_button.obj & - $(OBJS)\corelib_checkbox.obj & - $(OBJS)\corelib_checklst.obj & - $(OBJS)\corelib_choice.obj & + $(OBJS)\corelib_univ_bmpbuttn.obj & + $(OBJS)\corelib_univ_button.obj & + $(OBJS)\corelib_univ_checkbox.obj & + $(OBJS)\corelib_univ_checklst.obj & + $(OBJS)\corelib_univ_choice.obj & $(OBJS)\corelib_colschem.obj & - $(OBJS)\corelib_combobox.obj & - $(OBJS)\corelib_control.obj & + $(OBJS)\corelib_univ_combobox.obj & + $(OBJS)\corelib_univ_control.obj & $(OBJS)\corelib_ctrlrend.obj & - $(OBJS)\corelib_dialog.obj & + $(OBJS)\corelib_univ_dialog.obj & $(OBJS)\corelib_framuniv.obj & - $(OBJS)\corelib_gauge.obj & + $(OBJS)\corelib_univ_gauge.obj & $(OBJS)\corelib_inpcons.obj & $(OBJS)\corelib_inphand.obj & - $(OBJS)\corelib_listbox.obj & - $(OBJS)\corelib_menu.obj & - $(OBJS)\corelib_notebook.obj & - $(OBJS)\corelib_radiobox.obj & - $(OBJS)\corelib_radiobut.obj & + $(OBJS)\corelib_univ_listbox.obj & + $(OBJS)\corelib_univ_menu.obj & + $(OBJS)\corelib_univ_notebook.obj & + $(OBJS)\corelib_univ_radiobox.obj & + $(OBJS)\corelib_univ_radiobut.obj & $(OBJS)\corelib_scrarrow.obj & - $(OBJS)\corelib_scrolbar.obj & + $(OBJS)\corelib_univ_scrolbar.obj & $(OBJS)\corelib_scrthumb.obj & - $(OBJS)\corelib_slider.obj & - $(OBJS)\corelib_spinbutt.obj & - $(OBJS)\corelib_statbmp.obj & - $(OBJS)\corelib_statbox.obj & - $(OBJS)\corelib_statline.obj & - $(OBJS)\corelib_stattext.obj & - $(OBJS)\corelib_statusbr.obj & + $(OBJS)\corelib_univ_slider.obj & + $(OBJS)\corelib_univ_spinbutt.obj & + $(OBJS)\corelib_univ_statbmp.obj & + $(OBJS)\corelib_univ_statbox.obj & + $(OBJS)\corelib_univ_statline.obj & + $(OBJS)\corelib_univ_stattext.obj & + $(OBJS)\corelib_univ_statusbr.obj & $(OBJS)\corelib_stdrend.obj & - $(OBJS)\corelib_textctrl.obj & - $(OBJS)\corelib_tglbtn.obj & + $(OBJS)\corelib_univ_textctrl.obj & + $(OBJS)\corelib_univ_tglbtn.obj & $(OBJS)\corelib_theme.obj & - $(OBJS)\corelib_toolbar.obj & + $(OBJS)\corelib_univ_toolbar.obj & $(OBJS)\corelib_topluniv.obj & $(OBJS)\corelib_winuniv.obj & $(OBJS)\corelib_gtk.obj & @@ -1962,6 +1977,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dragimgg.obj & $(OBJS)\corelib_filepickerg.obj & $(OBJS)\corelib_fontpickerg.obj & + $(OBJS)\corelib_graphicc.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & @@ -2404,6 +2420,10 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__ !ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif __EXCEPTIONS_DEFINE_p = !ifeq USE_EXCEPTIONS 0 __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS @@ -2424,6 +2444,10 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif +____CAIRO_INCLUDEDIR_FILENAMES = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +!endif __SETUP_H_SUBDIR_FILENAMES = !ifeq WXUNIV 0 __SETUP_H_SUBDIR_FILENAMES = os2 @@ -2443,9 +2467,10 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" & USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & + USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" & + USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" & + VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" & + WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 28 @@ -2593,17 +2618,19 @@ WXEXPAT_OBJECTS = & $(OBJS)\wxexpat_xmltok.obj MONODLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL & /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -2676,6 +2703,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_zstream.obj & $(OBJS)\monodll_dir.obj & $(OBJS)\monodll_mimetype.obj & + $(OBJS)\monodll_snglinst.obj & $(OBJS)\monodll_stdpaths.obj & $(OBJS)\monodll_thread.obj & $(OBJS)\monodll_utils.obj & @@ -2700,17 +2728,19 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_xtixml.obj MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_monolib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = & @@ -2782,6 +2812,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_zstream.obj & $(OBJS)\monolib_dir.obj & $(OBJS)\monolib_mimetype.obj & + $(OBJS)\monolib_snglinst.obj & $(OBJS)\monolib_stdpaths.obj & $(OBJS)\monolib_thread.obj & $(OBJS)\monolib_utils.obj & @@ -2806,18 +2837,20 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_xtixml.obj BASEDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 & $(CPPFLAGS) $(CFLAGS) BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 & /fh=$(OBJS)\wxprec_basedll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -2890,6 +2923,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_zstream.obj & $(OBJS)\basedll_dir.obj & $(OBJS)\basedll_mimetype.obj & + $(OBJS)\basedll_snglinst.obj & $(OBJS)\basedll_stdpaths.obj & $(OBJS)\basedll_thread.obj & $(OBJS)\basedll_utils.obj & @@ -2900,17 +2934,19 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_utilscmn.obj BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 & /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -2983,6 +3019,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_zstream.obj & $(OBJS)\baselib_dir.obj & $(OBJS)\baselib_mimetype.obj & + $(OBJS)\baselib_snglinst.obj & $(OBJS)\baselib_stdpaths.obj & $(OBJS)\baselib_thread.obj & $(OBJS)\baselib_utils.obj & @@ -2993,10 +3030,11 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_utilscmn.obj NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET & /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3015,10 +3053,11 @@ NETDLL_OBJECTS = & $(OBJS)\netdll_gsocket.obj NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_netlib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = & @@ -3036,10 +3075,11 @@ NETLIB_OBJECTS = & $(OBJS)\netlib_gsocket.obj COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 & /fh=$(OBJS)\wxprec_coredll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3052,10 +3092,11 @@ COREDLL_OBJECTS = & $(____CORE_SRC_FILENAMES_2_OBJECTS) CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_corelib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = & @@ -3067,10 +3108,11 @@ CORELIB_OBJECTS = & $(____CORE_SRC_FILENAMES_3_OBJECTS) ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV & /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3079,10 +3121,11 @@ ADVDLL_OBJECTS = & $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = & @@ -3090,10 +3133,11 @@ ADVLIB_OBJECTS = & $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA & /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3102,10 +3146,11 @@ MEDIADLL_OBJECTS = & $(OBJS)\mediadll_mediactrlcmn.obj MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) MEDIALIB_OBJECTS = & @@ -3113,10 +3158,11 @@ MEDIALIB_OBJECTS = & $(OBJS)\medialib_mediactrlcmn.obj ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC & /fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3126,10 +3172,11 @@ ODBCDLL_OBJECTS = & $(OBJS)\odbcdll_dbtable.obj ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = & @@ -3138,10 +3185,11 @@ ODBCLIB_OBJECTS = & $(OBJS)\odbclib_dbtable.obj DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID & /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3150,10 +3198,11 @@ DBGRIDDLL_OBJECTS = & $(OBJS)\dbgriddll_dbgrid.obj DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = & @@ -3161,10 +3210,11 @@ DBGRIDLIB_OBJECTS = & $(OBJS)\dbgridlib_dbgrid.obj HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML & /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3195,10 +3245,11 @@ HTMLDLL_OBJECTS = & $(OBJS)\htmldll_htmllbox.obj HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = & @@ -3228,10 +3279,11 @@ HTMLLIB_OBJECTS = & $(OBJS)\htmllib_htmllbox.obj QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA & /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3241,10 +3293,11 @@ QADLL_OBJECTS = & $(OBJS)\qadll_dbgrptg.obj QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) QALIB_OBJECTS = & @@ -3253,10 +3306,11 @@ QALIB_OBJECTS = & $(OBJS)\qalib_dbgrptg.obj XMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML & /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3266,10 +3320,11 @@ XMLDLL_OBJECTS = & $(OBJS)\xmldll_xtixml.obj XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_xmllib.pch & $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = & @@ -3278,10 +3333,11 @@ XMLLIB_OBJECTS = & $(OBJS)\xmllib_xtixml.obj XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC & /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3319,6 +3375,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_notbk.obj & $(OBJS)\xrcdll_xh_odcombo.obj & $(OBJS)\xrcdll_xh_panel.obj & + $(OBJS)\xrcdll_xh_propdlg.obj & $(OBJS)\xrcdll_xh_radbt.obj & $(OBJS)\xrcdll_xh_radbx.obj & $(OBJS)\xrcdll_xh_scrol.obj & @@ -3344,10 +3401,11 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xmlrsall.obj XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = & @@ -3384,6 +3442,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_notbk.obj & $(OBJS)\xrclib_xh_odcombo.obj & $(OBJS)\xrclib_xh_panel.obj & + $(OBJS)\xrclib_xh_propdlg.obj & $(OBJS)\xrclib_xh_radbt.obj & $(OBJS)\xrclib_xh_radbx.obj & $(OBJS)\xrclib_xh_scrol.obj & @@ -3409,10 +3468,11 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xmlrsall.obj AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI & /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3422,13 +3482,15 @@ AUIDLL_OBJECTS = & $(OBJS)\auidll_dockart.obj & $(OBJS)\auidll_floatpane.obj & $(OBJS)\auidll_auibook.obj & - $(OBJS)\auidll_tabmdi.obj + $(OBJS)\auidll_tabmdi.obj & + $(OBJS)\auidll_auibar.obj AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) AUILIB_OBJECTS = & @@ -3437,13 +3499,15 @@ AUILIB_OBJECTS = & $(OBJS)\auilib_dockart.obj & $(OBJS)\auilib_floatpane.obj & $(OBJS)\auilib_auibook.obj & - $(OBJS)\auilib_tabmdi.obj + $(OBJS)\auilib_tabmdi.obj & + $(OBJS)\auilib_auibar.obj RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT & /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & $(CPPFLAGS) $(CXXFLAGS) @@ -3460,10 +3524,11 @@ RICHTEXTDLL_OBJECTS = & $(OBJS)\richtextdll_richtextprint.obj RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = & @@ -3479,10 +3544,11 @@ RICHTEXTLIB_OBJECTS = & $(OBJS)\richtextlib_richtextprint.obj GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL & /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & $(CXXFLAGS) @@ -3491,10 +3557,11 @@ GLDLL_OBJECTS = & $(OBJS)\gldll_glcanvas.obj GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff & + -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = & @@ -3617,9 +3684,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\monodll.lbc option quiet @%append $(OBJS)\monodll.lbc name $^@ @%append $(OBJS)\monodll.lbc option caseexact - @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\monodll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib ) do @%append $(OBJS)\monodll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib ) do @%append $(OBJS)\monodll.lbc library %i @%append $(OBJS)\monodll.lbc @%append $(OBJS)\monodll.lbc system os2v2 dll wlink @$(OBJS)\monodll.lbc @@ -3643,7 +3710,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL @%append $(OBJS)\basedll.lbc option quiet @%append $(OBJS)\basedll.lbc name $^@ @%append $(OBJS)\basedll.lbc option caseexact - @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\basedll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\basedll.lbc library %i @%append $(OBJS)\basedll.lbc @@ -3669,7 +3736,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL @%append $(OBJS)\netdll.lbc option quiet @%append $(OBJS)\netdll.lbc name $^@ @%append $(OBJS)\netdll.lbc option caseexact - @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\netdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i @%append $(OBJS)\netdll.lbc @@ -3696,7 +3763,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\coredll.lbc option quiet @%append $(OBJS)\coredll.lbc name $^@ @%append $(OBJS)\coredll.lbc option caseexact - @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\coredll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i @%append $(OBJS)\coredll.lbc @@ -3726,7 +3793,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\advdll.lbc option quiet @%append $(OBJS)\advdll.lbc name $^@ @%append $(OBJS)\advdll.lbc option caseexact - @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\advdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i @%append $(OBJS)\advdll.lbc @@ -3757,9 +3824,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\mediadll.lbc option quiet @%append $(OBJS)\mediadll.lbc name $^@ @%append $(OBJS)\mediadll.lbc option caseexact - @%append $(OBJS)\mediadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\mediadll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\mediadll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\mediadll.lbc library %i @%append $(OBJS)\mediadll.lbc @%append $(OBJS)\mediadll.lbc system os2v2 dll wlink @$(OBJS)\mediadll.lbc @@ -3790,7 +3857,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL @%append $(OBJS)\odbcdll.lbc option quiet @%append $(OBJS)\odbcdll.lbc name $^@ @%append $(OBJS)\odbcdll.lbc option caseexact - @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\odbcdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i @%append $(OBJS)\odbcdll.lbc @@ -3821,7 +3888,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\dbgriddll.lbc option quiet @%append $(OBJS)\dbgriddll.lbc name $^@ @%append $(OBJS)\dbgriddll.lbc option caseexact - @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\dbgriddll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\dbgriddll.lbc library %i @%append $(OBJS)\dbgriddll.lbc @@ -3855,7 +3922,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\htmldll.lbc option quiet @%append $(OBJS)\htmldll.lbc name $^@ @%append $(OBJS)\htmldll.lbc option caseexact - @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\htmldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i @%append $(OBJS)\htmldll.lbc @@ -3889,7 +3956,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\qadll.lbc option quiet @%append $(OBJS)\qadll.lbc name $^@ @%append $(OBJS)\qadll.lbc option caseexact - @%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\qadll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i @%append $(OBJS)\qadll.lbc @@ -3921,7 +3988,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL @%append $(OBJS)\xmldll.lbc option quiet @%append $(OBJS)\xmldll.lbc name $^@ @%append $(OBJS)\xmldll.lbc option caseexact - @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\xmldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i @%append $(OBJS)\xmldll.lbc @@ -3948,7 +4015,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\xrcdll.lbc option quiet @%append $(OBJS)\xrcdll.lbc name $^@ @%append $(OBJS)\xrcdll.lbc option caseexact - @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\xrcdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i @%append $(OBJS)\xrcdll.lbc @@ -3978,7 +4045,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\auidll.lbc option quiet @%append $(OBJS)\auidll.lbc name $^@ @%append $(OBJS)\auidll.lbc option caseexact - @%append $(OBJS)\auidll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\auidll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i @%append $(OBJS)\auidll.lbc @@ -4008,7 +4075,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\richtextdll.lbc option quiet @%append $(OBJS)\richtextdll.lbc name $^@ @%append $(OBJS)\richtextdll.lbc option caseexact - @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\richtextdll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i @%append $(OBJS)\richtextdll.lbc @@ -4033,12 +4100,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) @%create $(OBJS)\gldll.lbc @%append $(OBJS)\gldll.lbc option quiet @%append $(OBJS)\gldll.lbc name $^@ @%append $(OBJS)\gldll.lbc option caseexact - @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) + @%append $(OBJS)\gldll.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) ) do @%append $(OBJS)\gldll.lbc library %i @%append $(OBJS)\gldll.lbc @@ -4083,7 +4150,7 @@ $(SETUPHDIR)\wx\setup.h : build_cfg_file : .SYMBOLIC $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=11 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -4668,6 +4735,9 @@ $(OBJS)\monodll_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp $(OBJS)\monodll_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_snglinst.obj : .AUTODEPEND ..\..\src\os2\snglinst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4731,21 +4801,48 @@ $(OBJS)\monodll_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(OBJS)\monodll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4770,6 +4867,9 @@ $(OBJS)\monodll_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp $(OBJS)\monodll_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4794,6 +4894,9 @@ $(OBJS)\monodll_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp $(OBJS)\monodll_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4809,9 +4912,15 @@ $(OBJS)\monodll_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp $(OBJS)\monodll_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4824,6 +4933,9 @@ $(OBJS)\monodll_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp $(OBJS)\monodll_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4839,21 +4951,57 @@ $(OBJS)\monodll_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp $(OBJS)\monodll_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_os2_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_os2_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4866,6 +5014,9 @@ $(OBJS)\monodll_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp $(OBJS)\monodll_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4878,33 +5029,108 @@ $(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(OBJS)\monodll_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5106,6 +5332,9 @@ $(OBJS)\monodll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\monodll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5190,6 +5419,9 @@ $(OBJS)\monodll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5253,370 +5485,6 @@ $(OBJS)\monodll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6127,6 +5995,11 @@ $(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6536,6 +6409,9 @@ $(OBJS)\monolib_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp $(OBJS)\monolib_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_snglinst.obj : .AUTODEPEND ..\..\src\os2\snglinst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6599,21 +6475,48 @@ $(OBJS)\monolib_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(OBJS)\monolib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6638,6 +6541,9 @@ $(OBJS)\monolib_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp $(OBJS)\monolib_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6662,6 +6568,9 @@ $(OBJS)\monolib_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp $(OBJS)\monolib_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6677,9 +6586,15 @@ $(OBJS)\monolib_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp $(OBJS)\monolib_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6692,6 +6607,9 @@ $(OBJS)\monolib_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp $(OBJS)\monolib_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6707,21 +6625,57 @@ $(OBJS)\monolib_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp $(OBJS)\monolib_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_os2_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_os2_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6734,6 +6688,9 @@ $(OBJS)\monolib_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp $(OBJS)\monolib_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6746,33 +6703,108 @@ $(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(OBJS)\monolib_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -6974,6 +7006,9 @@ $(OBJS)\monolib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\monolib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7058,6 +7093,9 @@ $(OBJS)\monolib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7121,370 +7159,6 @@ $(OBJS)\monolib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7995,6 +7669,11 @@ $(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8404,6 +8083,9 @@ $(OBJS)\basedll_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp $(OBJS)\basedll_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_snglinst.obj : .AUTODEPEND ..\..\src\os2\snglinst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -8632,6 +8314,9 @@ $(OBJS)\baselib_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp $(OBJS)\baselib_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_snglinst.obj : .AUTODEPEND ..\..\src\os2\snglinst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -8749,21 +8434,48 @@ $(OBJS)\coredll_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(OBJS)\coredll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8788,6 +8500,9 @@ $(OBJS)\coredll_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp $(OBJS)\coredll_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8812,6 +8527,9 @@ $(OBJS)\coredll_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp $(OBJS)\coredll_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8827,9 +8545,15 @@ $(OBJS)\coredll_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp $(OBJS)\coredll_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8842,6 +8566,9 @@ $(OBJS)\coredll_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp $(OBJS)\coredll_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8857,21 +8584,57 @@ $(OBJS)\coredll_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp $(OBJS)\coredll_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_os2_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_os2_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8884,6 +8647,9 @@ $(OBJS)\coredll_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp $(OBJS)\coredll_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8896,33 +8662,108 @@ $(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(OBJS)\coredll_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -8971,370 +8812,6 @@ $(OBJS)\coredll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9845,6 +9322,11 @@ $(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9961,21 +9443,48 @@ $(OBJS)\corelib_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(OBJS)\corelib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10000,6 +9509,9 @@ $(OBJS)\corelib_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp $(OBJS)\corelib_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10024,6 +9536,9 @@ $(OBJS)\corelib_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp $(OBJS)\corelib_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10039,9 +9554,15 @@ $(OBJS)\corelib_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp $(OBJS)\corelib_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10054,6 +9575,9 @@ $(OBJS)\corelib_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp $(OBJS)\corelib_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10069,21 +9593,57 @@ $(OBJS)\corelib_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp $(OBJS)\corelib_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_os2_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_os2_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10096,6 +9656,9 @@ $(OBJS)\corelib_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp $(OBJS)\corelib_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10108,33 +9671,108 @@ $(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp $(OBJS)\corelib_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -10183,370 +9821,6 @@ $(OBJS)\corelib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11057,6 +10331,11 @@ $(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11611,6 +10890,9 @@ $(OBJS)\xrcdll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\xrcdll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -11779,6 +11061,9 @@ $(OBJS)\xrclib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\xrclib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< @@ -11866,6 +11151,9 @@ $(OBJS)\auidll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< +$(OBJS)\auidll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< + $(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< @@ -11884,6 +11172,9 @@ $(OBJS)\auilib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp $(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< +$(OBJS)\auilib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< + $(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat index 64a8d44f0a..5c155cc7c1 100644 --- a/contrib/build/deprecated/makefile.wat +++ b/contrib/build/deprecated/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __deprecateddll___depname = !ifeq SHARED 1 __deprecateddll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include & @@ -257,7 +238,7 @@ DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & -dWXBUILDING -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL & -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS) DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) & - $(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) & $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & @@ -278,7 +259,7 @@ DEPRECATEDDLL_OBJECTS = & $(OBJS)\deprecateddll_wxexpr.obj & $(OBJS)\deprecateddll_dosyacc.obj DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include & @@ -286,7 +267,7 @@ DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & -dWXBUILDING -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated & $(CPPFLAGS) $(CFLAGS) DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include & @@ -320,21 +301,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll : $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.dll : $(DEPRECATEDDLL_OBJECTS) @%create $(OBJS)\deprecateddll.lbc @%append $(OBJS)\deprecateddll.lbc option quiet @%append $(OBJS)\deprecateddll.lbc name $^@ @%append $(OBJS)\deprecateddll.lbc option caseexact - @%append $(OBJS)\deprecateddll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\deprecateddll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i - @%append $(OBJS)\deprecateddll.lbc option resource=$(OBJS)\deprecateddll_version.res - @%append $(OBJS)\deprecateddll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i + @%append $(OBJS)\deprecateddll.lbc + @%append $(OBJS)\deprecateddll.lbc system os2v2 dll wlink @$(OBJS)\deprecateddll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib +$^@ !endif @@ -347,59 +328,56 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ..\..\src\deprecated\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< - -$(OBJS)\deprecateddll_version.res : .AUTODEPEND ..\..\src\deprecated\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_prop.obj : .AUTODEPEND ..\..\src\deprecated\prop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_propform.obj : .AUTODEPEND ..\..\src\deprecated\propform.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_proplist.obj : .AUTODEPEND ..\..\src\deprecated\proplist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_resource.obj : .AUTODEPEND ..\..\src\deprecated\resource.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_tbarsmpl.obj : .AUTODEPEND ..\..\src\deprecated\tbarsmpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_treelay.obj : .AUTODEPEND ..\..\src\deprecated\treelay.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_wxexpr.obj : .AUTODEPEND ..\..\src\deprecated\wxexpr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< $(OBJS)\deprecateddll_dosyacc.obj : .AUTODEPEND ..\..\src\deprecated\dosyacc.c - $(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $< + $(CC) -bt=os2 -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $< $(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ..\..\src\deprecated\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_prop.obj : .AUTODEPEND ..\..\src\deprecated\prop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_propform.obj : .AUTODEPEND ..\..\src\deprecated\propform.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_proplist.obj : .AUTODEPEND ..\..\src\deprecated\proplist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_resource.obj : .AUTODEPEND ..\..\src\deprecated\resource.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_tbarsmpl.obj : .AUTODEPEND ..\..\src\deprecated\tbarsmpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_treelay.obj : .AUTODEPEND ..\..\src\deprecated\treelay.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_wxexpr.obj : .AUTODEPEND ..\..\src\deprecated\wxexpr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< $(OBJS)\deprecatedlib_dosyacc.obj : .AUTODEPEND ..\..\src\deprecated\dosyacc.c - $(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $< + $(CC) -bt=os2 -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $< diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat index ff5a0bbabb..88e106b804 100644 --- a/contrib/build/fl/makefile.wat +++ b/contrib/build/fl/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __fldll___depname = !ifeq SHARED 1 __fldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\fl\..\..\..\include & @@ -277,7 +258,7 @@ FLDLL_OBJECTS = & $(OBJS)\fldll_toolwnd.obj & $(OBJS)\fldll_updatesmgr.obj FLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\fl\..\..\..\include & @@ -319,21 +300,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll : $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.dll : $(FLDLL_OBJECTS) @%create $(OBJS)\fldll.lbc @%append $(OBJS)\fldll.lbc option quiet @%append $(OBJS)\fldll.lbc name $^@ @%append $(OBJS)\fldll.lbc option caseexact - @%append $(OBJS)\fldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\fldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i - @%append $(OBJS)\fldll.lbc option resource=$(OBJS)\fldll_version.res - @%append $(OBJS)\fldll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i + @%append $(OBJS)\fldll.lbc + @%append $(OBJS)\fldll.lbc system os2v2 dll wlink @$(OBJS)\fldll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib +$^@ !endif @@ -346,113 +327,110 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\fldll_dummy.obj : .AUTODEPEND ..\..\src\fl\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< - -$(OBJS)\fldll_version.res : .AUTODEPEND ..\..\src\fl\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\fl\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG) -i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_antiflickpl.obj : .AUTODEPEND ..\..\src\fl\antiflickpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_bardragpl.obj : .AUTODEPEND ..\..\src\fl\bardragpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_barhintspl.obj : .AUTODEPEND ..\..\src\fl\barhintspl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_cbcustom.obj : .AUTODEPEND ..\..\src\fl\cbcustom.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_controlbar.obj : .AUTODEPEND ..\..\src\fl\controlbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_dyntbar.obj : .AUTODEPEND ..\..\src\fl\dyntbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_dyntbarhnd.obj : .AUTODEPEND ..\..\src\fl\dyntbarhnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_frmview.obj : .AUTODEPEND ..\..\src\fl\frmview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_garbagec.obj : .AUTODEPEND ..\..\src\fl\garbagec.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_gcupdatesmgr.obj : .AUTODEPEND ..\..\src\fl\gcupdatesmgr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_hintanimpl.obj : .AUTODEPEND ..\..\src\fl\hintanimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_newbmpbtn.obj : .AUTODEPEND ..\..\src\fl\newbmpbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_panedrawpl.obj : .AUTODEPEND ..\..\src\fl\panedrawpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_rowdragpl.obj : .AUTODEPEND ..\..\src\fl\rowdragpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_rowlayoutpl.obj : .AUTODEPEND ..\..\src\fl\rowlayoutpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_toolwnd.obj : .AUTODEPEND ..\..\src\fl\toolwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fldll_updatesmgr.obj : .AUTODEPEND ..\..\src\fl\updatesmgr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< $(OBJS)\fllib_dummy.obj : .AUTODEPEND ..\..\src\fl\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_antiflickpl.obj : .AUTODEPEND ..\..\src\fl\antiflickpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_bardragpl.obj : .AUTODEPEND ..\..\src\fl\bardragpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_barhintspl.obj : .AUTODEPEND ..\..\src\fl\barhintspl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_cbcustom.obj : .AUTODEPEND ..\..\src\fl\cbcustom.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_controlbar.obj : .AUTODEPEND ..\..\src\fl\controlbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_dyntbar.obj : .AUTODEPEND ..\..\src\fl\dyntbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_dyntbarhnd.obj : .AUTODEPEND ..\..\src\fl\dyntbarhnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_frmview.obj : .AUTODEPEND ..\..\src\fl\frmview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_garbagec.obj : .AUTODEPEND ..\..\src\fl\garbagec.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_gcupdatesmgr.obj : .AUTODEPEND ..\..\src\fl\gcupdatesmgr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_hintanimpl.obj : .AUTODEPEND ..\..\src\fl\hintanimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_newbmpbtn.obj : .AUTODEPEND ..\..\src\fl\newbmpbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_panedrawpl.obj : .AUTODEPEND ..\..\src\fl\panedrawpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_rowdragpl.obj : .AUTODEPEND ..\..\src\fl\rowdragpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_rowlayoutpl.obj : .AUTODEPEND ..\..\src\fl\rowlayoutpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_toolwnd.obj : .AUTODEPEND ..\..\src\fl\toolwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< $(OBJS)\fllib_updatesmgr.obj : .AUTODEPEND ..\..\src\fl\updatesmgr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< diff --git a/contrib/build/foldbar/makefile.wat b/contrib/build/foldbar/makefile.wat index 2c4c90ba82..a2d96a7fda 100644 --- a/contrib/build/foldbar/makefile.wat +++ b/contrib/build/foldbar/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __foldbardll___depname = !ifeq SHARED 1 __foldbardll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FOLDBARDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\..\include & @@ -263,7 +244,7 @@ FOLDBARDLL_OBJECTS = & $(OBJS)\foldbardll_foldpanelbar.obj & $(OBJS)\foldbardll_foldpanelitem.obj FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\..\include & @@ -292,21 +273,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll : $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.dll : $(FOLDBARDLL_OBJECTS) @%create $(OBJS)\foldbardll.lbc @%append $(OBJS)\foldbardll.lbc option quiet @%append $(OBJS)\foldbardll.lbc name $^@ @%append $(OBJS)\foldbardll.lbc option caseexact - @%append $(OBJS)\foldbardll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\foldbardll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(FOLDBARDLL_OBJECTS)) do @%append $(OBJS)\foldbardll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i - @%append $(OBJS)\foldbardll.lbc option resource=$(OBJS)\foldbardll_version.res - @%append $(OBJS)\foldbardll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i + @%append $(OBJS)\foldbardll.lbc + @%append $(OBJS)\foldbardll.lbc system os2v2 dll wlink @$(OBJS)\foldbardll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib +$^@ !endif @@ -319,29 +300,26 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\foldbardll_dummy.obj : .AUTODEPEND ..\..\src\foldbar\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< - -$(OBJS)\foldbardll_version.res : .AUTODEPEND ..\..\src\foldbar\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG) -i=..\..\src\foldbar\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FOLDBAR $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< $(OBJS)\foldbardll_captionbar.obj : .AUTODEPEND ..\..\src\foldbar\captionbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< $(OBJS)\foldbardll_foldpanelbar.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< $(OBJS)\foldbardll_foldpanelitem.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $< $(OBJS)\foldbarlib_dummy.obj : .AUTODEPEND ..\..\src\foldbar\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< $(OBJS)\foldbarlib_captionbar.obj : .AUTODEPEND ..\..\src\foldbar\captionbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< $(OBJS)\foldbarlib_foldpanelbar.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< $(OBJS)\foldbarlib_foldpanelitem.obj : .AUTODEPEND ..\..\src\foldbar\foldpanelitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $< diff --git a/contrib/build/gizmos/makefile.wat b/contrib/build/gizmos/makefile.wat index 80dd8fc25c..f172d020f4 100644 --- a/contrib/build/gizmos/makefile.wat +++ b/contrib/build/gizmos/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,13 +76,13 @@ EXTRALIBS_FOR_BASE = __gizmosdll___depname = !ifeq SHARED 1 __gizmosdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.dll !endif __gizmos_xrcdll___depname = !ifeq SHARED 1 !ifeq USE_XRC 1 __gizmos_xrcdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.dll !endif !endif __WXLIB_XRC_p = @@ -148,18 +141,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -273,7 +254,7 @@ LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) GIZMOSDLL_CXXFLAGS = -bd $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include & @@ -290,7 +271,7 @@ GIZMOSDLL_OBJECTS = & $(OBJS)\gizmosdll_splittree.obj & $(OBJS)\gizmosdll_statpict.obj GIZMOS_XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) & - $(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) & $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include & @@ -302,7 +283,7 @@ GIZMOS_XRCDLL_OBJECTS = & $(OBJS)\gizmos_xrcdll_dummy.obj & $(OBJS)\gizmos_xrcdll_xh_statpict.obj GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include & @@ -319,7 +300,7 @@ GIZMOSLIB_OBJECTS = & $(OBJS)\gizmoslib_splittree.obj & $(OBJS)\gizmoslib_statpict.obj GIZMOS_XRCLIB_CXXFLAGS = $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include & @@ -346,40 +327,40 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll : $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.dll : $(GIZMOSDLL_OBJECTS) @%create $(OBJS)\gizmosdll.lbc @%append $(OBJS)\gizmosdll.lbc option quiet @%append $(OBJS)\gizmosdll.lbc name $^@ @%append $(OBJS)\gizmosdll.lbc option caseexact - @%append $(OBJS)\gizmosdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\gizmosdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i - @%append $(OBJS)\gizmosdll.lbc option resource=$(OBJS)\gizmosdll_version.res - @%append $(OBJS)\gizmosdll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i + @%append $(OBJS)\gizmosdll.lbc + @%append $(OBJS)\gizmosdll.lbc system os2v2 dll wlink @$(OBJS)\gizmosdll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib +$^@ !endif !ifeq SHARED 1 !ifeq USE_XRC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll : $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.dll : $(GIZMOS_XRCDLL_OBJECTS) $(__gizmosdll___depname) @%create $(OBJS)\gizmos_xrcdll.lbc @%append $(OBJS)\gizmos_xrcdll.lbc option quiet @%append $(OBJS)\gizmos_xrcdll.lbc name $^@ @%append $(OBJS)\gizmos_xrcdll.lbc option caseexact - @%append $(OBJS)\gizmos_xrcdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\gizmos_xrcdll.lbc $(__DEBUGINFO) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(GIZMOS_XRCDLL_OBJECTS)) do @%append $(OBJS)\gizmos_xrcdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i - @%append $(OBJS)\gizmos_xrcdll.lbc option resource=$(OBJS)\gizmos_xrcdll_version.res - @%append $(OBJS)\gizmos_xrcdll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i + @%append $(OBJS)\gizmos_xrcdll.lbc + @%append $(OBJS)\gizmos_xrcdll.lbc system os2v2 dll wlink @$(OBJS)\gizmos_xrcdll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib +$^@ !endif @@ -402,62 +383,56 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< - -$(OBJS)\gizmosdll_version.res : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG) -i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmosdll_dynamicsash.obj : .AUTODEPEND ..\..\src\gizmos\dynamicsash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmosdll_editlbox.obj : .AUTODEPEND ..\..\src\gizmos\editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmosdll_ledctrl.obj : .AUTODEPEND ..\..\src\gizmos\ledctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmosdll_multicell.obj : .AUTODEPEND ..\..\src\gizmos\multicell.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmosdll_splittree.obj : .AUTODEPEND ..\..\src\gizmos\splittree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmosdll_statpict.obj : .AUTODEPEND ..\..\src\gizmos\statpict.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmos_xrcdll_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $< - -$(OBJS)\gizmos_xrcdll_version.res : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\gizmos\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG) -i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS_XRC $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $< $(OBJS)\gizmos_xrcdll_xh_statpict.obj : .AUTODEPEND ..\..\src\gizmos\xh_statpict.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $< $(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< $(OBJS)\gizmoslib_dynamicsash.obj : .AUTODEPEND ..\..\src\gizmos\dynamicsash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< $(OBJS)\gizmoslib_editlbox.obj : .AUTODEPEND ..\..\src\gizmos\editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< $(OBJS)\gizmoslib_ledctrl.obj : .AUTODEPEND ..\..\src\gizmos\ledctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< $(OBJS)\gizmoslib_multicell.obj : .AUTODEPEND ..\..\src\gizmos\multicell.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< $(OBJS)\gizmoslib_splittree.obj : .AUTODEPEND ..\..\src\gizmos\splittree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< $(OBJS)\gizmoslib_statpict.obj : .AUTODEPEND ..\..\src\gizmos\statpict.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< $(OBJS)\gizmos_xrclib_dummy.obj : .AUTODEPEND ..\..\src\gizmos\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $< $(OBJS)\gizmos_xrclib_xh_statpict.obj : .AUTODEPEND ..\..\src\gizmos\xh_statpict.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $< diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat index ac90ec028f..f58e259342 100644 --- a/contrib/build/mmedia/makefile.wat +++ b/contrib/build/mmedia/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __mmediadll___depname = !ifeq SHARED 1 __mmediadll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include & @@ -259,9 +240,6 @@ MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) MMEDIADLL_OBJECTS = & $(OBJS)\mmediadll_dummy.obj & - $(OBJS)\mmediadll_cdwin.obj & - $(OBJS)\mmediadll_sndwin.obj & - $(OBJS)\mmediadll_vidwin.obj & $(OBJS)\mmediadll_cdbase.obj & $(OBJS)\mmediadll_g711.obj & $(OBJS)\mmediadll_g721.obj & @@ -280,7 +258,7 @@ MMEDIADLL_OBJECTS = & $(OBJS)\mmediadll_sndwav.obj & $(OBJS)\mmediadll_vidbase.obj MMEDIALIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include & @@ -290,9 +268,6 @@ MMEDIALIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = & $(OBJS)\mmedialib_dummy.obj & - $(OBJS)\mmedialib_cdwin.obj & - $(OBJS)\mmedialib_sndwin.obj & - $(OBJS)\mmedialib_vidwin.obj & $(OBJS)\mmedialib_cdbase.obj & $(OBJS)\mmedialib_g711.obj & $(OBJS)\mmedialib_g721.obj & @@ -326,21 +301,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll : $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.dll : $(MMEDIADLL_OBJECTS) @%create $(OBJS)\mmediadll.lbc @%append $(OBJS)\mmediadll.lbc option quiet @%append $(OBJS)\mmediadll.lbc name $^@ @%append $(OBJS)\mmediadll.lbc option caseexact - @%append $(OBJS)\mmediadll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\mmediadll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i - @%append $(OBJS)\mmediadll.lbc option resource=$(OBJS)\mmediadll_version.res - @%append $(OBJS)\mmediadll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i + @%append $(OBJS)\mmediadll.lbc + @%append $(OBJS)\mmediadll.lbc system os2v2 dll wlink @$(OBJS)\mmediadll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib +$^@ !endif @@ -353,131 +328,110 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ..\..\src\mmedia\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< - -$(OBJS)\mmediadll_version.res : .AUTODEPEND ..\..\src\mmedia\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) -i=..\..\src\mmedia\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA $< - -$(OBJS)\mmediadll_cdwin.obj : .AUTODEPEND ..\..\src\mmedia\cdwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< - -$(OBJS)\mmediadll_sndwin.obj : .AUTODEPEND ..\..\src\mmedia\sndwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< - -$(OBJS)\mmediadll_vidwin.obj : .AUTODEPEND ..\..\src\mmedia\vidwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_cdbase.obj : .AUTODEPEND ..\..\src\mmedia\cdbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_g711.obj : .AUTODEPEND ..\..\src\mmedia\g711.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_g721.obj : .AUTODEPEND ..\..\src\mmedia\g721.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_g723_24.obj : .AUTODEPEND ..\..\src\mmedia\g723_24.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_g723_40.obj : .AUTODEPEND ..\..\src\mmedia\g723_40.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_g72x.obj : .AUTODEPEND ..\..\src\mmedia\g72x.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndaiff.obj : .AUTODEPEND ..\..\src\mmedia\sndaiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndbase.obj : .AUTODEPEND ..\..\src\mmedia\sndbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndcodec.obj : .AUTODEPEND ..\..\src\mmedia\sndcodec.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndcpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndcpcm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndfile.obj : .AUTODEPEND ..\..\src\mmedia\sndfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndg72x.obj : .AUTODEPEND ..\..\src\mmedia\sndg72x.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndmsad.obj : .AUTODEPEND ..\..\src\mmedia\sndmsad.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndpcm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndulaw.obj : .AUTODEPEND ..\..\src\mmedia\sndulaw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_sndwav.obj : .AUTODEPEND ..\..\src\mmedia\sndwav.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_vidbase.obj : .AUTODEPEND ..\..\src\mmedia\vidbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ..\..\src\mmedia\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< - -$(OBJS)\mmedialib_cdwin.obj : .AUTODEPEND ..\..\src\mmedia\cdwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< - -$(OBJS)\mmedialib_sndwin.obj : .AUTODEPEND ..\..\src\mmedia\sndwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< - -$(OBJS)\mmedialib_vidwin.obj : .AUTODEPEND ..\..\src\mmedia\vidwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_cdbase.obj : .AUTODEPEND ..\..\src\mmedia\cdbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_g711.obj : .AUTODEPEND ..\..\src\mmedia\g711.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_g721.obj : .AUTODEPEND ..\..\src\mmedia\g721.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_g723_24.obj : .AUTODEPEND ..\..\src\mmedia\g723_24.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_g723_40.obj : .AUTODEPEND ..\..\src\mmedia\g723_40.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_g72x.obj : .AUTODEPEND ..\..\src\mmedia\g72x.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndaiff.obj : .AUTODEPEND ..\..\src\mmedia\sndaiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndbase.obj : .AUTODEPEND ..\..\src\mmedia\sndbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndcodec.obj : .AUTODEPEND ..\..\src\mmedia\sndcodec.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndcpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndcpcm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndfile.obj : .AUTODEPEND ..\..\src\mmedia\sndfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndg72x.obj : .AUTODEPEND ..\..\src\mmedia\sndg72x.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndmsad.obj : .AUTODEPEND ..\..\src\mmedia\sndmsad.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndpcm.obj : .AUTODEPEND ..\..\src\mmedia\sndpcm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndulaw.obj : .AUTODEPEND ..\..\src\mmedia\sndulaw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_sndwav.obj : .AUTODEPEND ..\..\src\mmedia\sndwav.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_vidbase.obj : .AUTODEPEND ..\..\src\mmedia\vidbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat index deff45d9ae..8c4b5ca9fb 100644 --- a/contrib/build/net/makefile.wat +++ b/contrib/build/net/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __netutilsdll___depname = !ifeq SHARED 1 __netutilsdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\net\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NETUTILSDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\net\..\..\..\include & @@ -263,7 +244,7 @@ NETUTILSDLL_OBJECTS = & $(OBJS)\netutilsdll_smapi.obj & $(OBJS)\netutilsdll_web.obj NETUTILSLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\net\..\..\..\include & @@ -292,21 +273,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll : $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.dll : $(NETUTILSDLL_OBJECTS) @%create $(OBJS)\netutilsdll.lbc @%append $(OBJS)\netutilsdll.lbc option quiet @%append $(OBJS)\netutilsdll.lbc name $^@ @%append $(OBJS)\netutilsdll.lbc option caseexact - @%append $(OBJS)\netutilsdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\netutilsdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i - @%append $(OBJS)\netutilsdll.lbc option resource=$(OBJS)\netutilsdll_version.res - @%append $(OBJS)\netutilsdll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i + @%append $(OBJS)\netutilsdll.lbc + @%append $(OBJS)\netutilsdll.lbc system os2v2 dll wlink @$(OBJS)\netutilsdll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib +$^@ !endif @@ -319,29 +300,26 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\netutilsdll_dummy.obj : .AUTODEPEND ..\..\src\net\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< - -$(OBJS)\netutilsdll_version.res : .AUTODEPEND ..\..\src\net\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\net\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG) -i=..\..\src\net\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_NETUTILS $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< $(OBJS)\netutilsdll_email.obj : .AUTODEPEND ..\..\src\net\email.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< $(OBJS)\netutilsdll_smapi.obj : .AUTODEPEND ..\..\src\net\smapi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< $(OBJS)\netutilsdll_web.obj : .AUTODEPEND ..\..\src\net\web.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< $(OBJS)\netutilslib_dummy.obj : .AUTODEPEND ..\..\src\net\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< $(OBJS)\netutilslib_email.obj : .AUTODEPEND ..\..\src\net\email.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< $(OBJS)\netutilslib_smapi.obj : .AUTODEPEND ..\..\src\net\smapi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< $(OBJS)\netutilslib_web.obj : .AUTODEPEND ..\..\src\net\web.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat index 3ab492e9a4..4987236d56 100644 --- a/contrib/build/ogl/makefile.wat +++ b/contrib/build/ogl/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __ogldll___depname = !ifeq SHARED 1 __ogldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include & @@ -272,7 +253,7 @@ OGLDLL_OBJECTS = & $(OBJS)\ogldll_lines.obj & $(OBJS)\ogldll_ogldiag.obj OGLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include & @@ -309,21 +290,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll : $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll : $(OGLDLL_OBJECTS) @%create $(OBJS)\ogldll.lbc @%append $(OBJS)\ogldll.lbc option quiet @%append $(OBJS)\ogldll.lbc name $^@ @%append $(OBJS)\ogldll.lbc option caseexact - @%append $(OBJS)\ogldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\ogldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i - @%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res - @%append $(OBJS)\ogldll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i + @%append $(OBJS)\ogldll.lbc + @%append $(OBJS)\ogldll.lbc system os2v2 dll wlink @$(OBJS)\ogldll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib +$^@ !endif @@ -336,83 +317,80 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\ogldll_dummy.obj : .AUTODEPEND ..\..\src\ogl\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< - -$(OBJS)\ogldll_version.res : .AUTODEPEND ..\..\src\ogl\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_basic2.obj : .AUTODEPEND ..\..\src\ogl\basic2.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_canvas.obj : .AUTODEPEND ..\..\src\ogl\canvas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_divided.obj : .AUTODEPEND ..\..\src\ogl\divided.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_mfutils.obj : .AUTODEPEND ..\..\src\ogl\mfutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_oglmisc.obj : .AUTODEPEND ..\..\src\ogl\oglmisc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_basic.obj : .AUTODEPEND ..\..\src\ogl\basic.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_composit.obj : .AUTODEPEND ..\..\src\ogl\composit.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_drawn.obj : .AUTODEPEND ..\..\src\ogl\drawn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_bmpshape.obj : .AUTODEPEND ..\..\src\ogl\bmpshape.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_constrnt.obj : .AUTODEPEND ..\..\src\ogl\constrnt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_lines.obj : .AUTODEPEND ..\..\src\ogl\lines.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogldll_ogldiag.obj : .AUTODEPEND ..\..\src\ogl\ogldiag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< $(OBJS)\ogllib_dummy.obj : .AUTODEPEND ..\..\src\ogl\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_basic2.obj : .AUTODEPEND ..\..\src\ogl\basic2.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_canvas.obj : .AUTODEPEND ..\..\src\ogl\canvas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_divided.obj : .AUTODEPEND ..\..\src\ogl\divided.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_mfutils.obj : .AUTODEPEND ..\..\src\ogl\mfutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_oglmisc.obj : .AUTODEPEND ..\..\src\ogl\oglmisc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_basic.obj : .AUTODEPEND ..\..\src\ogl\basic.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_composit.obj : .AUTODEPEND ..\..\src\ogl\composit.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_drawn.obj : .AUTODEPEND ..\..\src\ogl\drawn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_bmpshape.obj : .AUTODEPEND ..\..\src\ogl\bmpshape.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_constrnt.obj : .AUTODEPEND ..\..\src\ogl\constrnt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_lines.obj : .AUTODEPEND ..\..\src\ogl\lines.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< $(OBJS)\ogllib_ogldiag.obj : .AUTODEPEND ..\..\src\ogl\ogldiag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat index 0034bec76a..bbdee505f9 100644 --- a/contrib/build/plot/makefile.wat +++ b/contrib/build/plot/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __plotdll___depname = !ifeq SHARED 1 __plotdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\plot\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include & @@ -261,7 +242,7 @@ PLOTDLL_OBJECTS = & $(OBJS)\plotdll_dummy.obj & $(OBJS)\plotdll_plot.obj PLOTLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include & @@ -288,21 +269,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll : $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.dll : $(PLOTDLL_OBJECTS) @%create $(OBJS)\plotdll.lbc @%append $(OBJS)\plotdll.lbc option quiet @%append $(OBJS)\plotdll.lbc name $^@ @%append $(OBJS)\plotdll.lbc option caseexact - @%append $(OBJS)\plotdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\plotdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i - @%append $(OBJS)\plotdll.lbc option resource=$(OBJS)\plotdll_version.res - @%append $(OBJS)\plotdll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i + @%append $(OBJS)\plotdll.lbc + @%append $(OBJS)\plotdll.lbc system os2v2 dll wlink @$(OBJS)\plotdll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib +$^@ !endif @@ -315,17 +296,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\plotdll_dummy.obj : .AUTODEPEND ..\..\src\plot\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< - -$(OBJS)\plotdll_version.res : .AUTODEPEND ..\..\src\plot\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG) -i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< $(OBJS)\plotdll_plot.obj : .AUTODEPEND ..\..\src\plot\plot.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< $(OBJS)\plotlib_dummy.obj : .AUTODEPEND ..\..\src\plot\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $< $(OBJS)\plotlib_plot.obj : .AUTODEPEND ..\..\src\plot\plot.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $< diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat index eb89c7765a..e78dc9aa6d 100644 --- a/contrib/build/stc/makefile.wat +++ b/contrib/build/stc/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __stcdll___depname = !ifeq SHARED 1 __stcdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\stc\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STCDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\stc\..\..\..\include & @@ -344,7 +325,7 @@ STCDLL_OBJECTS = & $(OBJS)\stcdll_WindowAccessor.obj & $(OBJS)\stcdll_XPM.obj STCLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\stc\..\..\..\include & @@ -454,21 +435,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll : $(STCDLL_OBJECTS) $(OBJS)\stcdll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll : $(STCDLL_OBJECTS) @%create $(OBJS)\stcdll.lbc @%append $(OBJS)\stcdll.lbc option quiet @%append $(OBJS)\stcdll.lbc name $^@ @%append $(OBJS)\stcdll.lbc option caseexact - @%append $(OBJS)\stcdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\stcdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i - @%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res - @%append $(OBJS)\stcdll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i + @%append $(OBJS)\stcdll.lbc + @%append $(OBJS)\stcdll.lbc system os2v2 dll wlink @$(OBJS)\stcdll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +$^@ !endif @@ -481,509 +462,506 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\stcdll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_AutoComplete.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\AutoComplete.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_CallTip.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CallTip.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_CellBuffer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CellBuffer.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_CharClassify.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CharClassify.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_ContractionState.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ContractionState.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_Document.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Document.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_DocumentAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\DocumentAccessor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_Editor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Editor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_ExternalLexer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ExternalLexer.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_Indicator.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Indicator.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_KeyMap.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyMap.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_KeyWords.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyWords.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexAPDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAPDL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexAU3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAU3.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexAVE.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAVE.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexAda.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAda.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexAsm.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsm.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexAsn1.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsn1.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexBaan.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBaan.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexBash.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBash.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexBasic.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBasic.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexBullant.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBullant.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexCLW.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCLW.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexCPP.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCPP.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexCSS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCSS.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexCaml.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCaml.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexCsound.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCsound.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexConf.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexConf.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexCrontab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCrontab.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexEScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEScript.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexEiffel.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEiffel.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexErlang.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexErlang.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexFlagship.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFlagship.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexForth.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexForth.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexFortran.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFortran.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexGui4Cli.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexGui4Cli.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexHTML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHTML.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexHaskell.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHaskell.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexInno.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexInno.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexKix.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexKix.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexLisp.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLisp.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexLout.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLout.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexLua.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLua.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexMMIXAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMMIXAL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexMPT.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMPT.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexMSSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMSSQL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexMatlab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMatlab.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexMetapost.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMetapost.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexNsis.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexNsis.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexOpal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOpal.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexOthers.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOthers.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexPB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPB.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexPOV.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPOV.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexPS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPS.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexPascal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPascal.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexPerl.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPerl.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexPython.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPython.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexRebol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRebol.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexRuby.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRuby.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSQL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexSmalltalk.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSmalltalk.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexTADS3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTADS3.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexScriptol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexScriptol.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexSpecman.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpecman.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexSpice.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpice.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexTCL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTCL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexTeX.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTeX.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexVB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVB.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexVHDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVHDL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexVerilog.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVerilog.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LexYAML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexYAML.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_LineMarker.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LineMarker.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_PropSet.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PropSet.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_RESearch.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RESearch.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_ScintillaBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ScintillaBase.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_Style.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Style.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_StyleContext.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\StyleContext.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_UniConversion.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\UniConversion.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_ViewStyle.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ViewStyle.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_WindowAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\WindowAccessor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stcdll_XPM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\XPM.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stcdll_version.res : .AUTODEPEND ..\..\src\stc\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\stc\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG) -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< $(OBJS)\stclib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_AutoComplete.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\AutoComplete.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_CallTip.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CallTip.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_CellBuffer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CellBuffer.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_CharClassify.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CharClassify.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_ContractionState.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ContractionState.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_Document.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Document.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_DocumentAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\DocumentAccessor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_Editor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Editor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_ExternalLexer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ExternalLexer.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_Indicator.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Indicator.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_KeyMap.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyMap.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_KeyWords.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyWords.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexAPDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAPDL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexAU3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAU3.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexAVE.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAVE.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexAda.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAda.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexAsm.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsm.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexAsn1.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsn1.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexBaan.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBaan.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexBash.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBash.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexBasic.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBasic.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexBullant.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBullant.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexCLW.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCLW.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexCPP.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCPP.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexCSS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCSS.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexCaml.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCaml.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexCsound.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCsound.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexConf.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexConf.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexCrontab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCrontab.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexEScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEScript.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexEiffel.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEiffel.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexErlang.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexErlang.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexFlagship.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFlagship.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexForth.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexForth.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexFortran.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFortran.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexGui4Cli.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexGui4Cli.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexHTML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHTML.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexHaskell.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHaskell.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexInno.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexInno.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexKix.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexKix.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexLisp.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLisp.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexLout.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLout.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexLua.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLua.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexMMIXAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMMIXAL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexMPT.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMPT.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexMSSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMSSQL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexMatlab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMatlab.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexMetapost.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMetapost.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexNsis.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexNsis.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexOpal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOpal.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexOthers.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOthers.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexPB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPB.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexPOV.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPOV.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexPS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPS.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexPascal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPascal.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexPerl.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPerl.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexPython.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPython.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexRebol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRebol.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexRuby.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRuby.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSQL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexSmalltalk.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSmalltalk.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexTADS3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTADS3.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexScriptol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexScriptol.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexSpecman.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpecman.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexSpice.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpice.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexTCL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTCL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexTeX.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTeX.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexVB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVB.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexVHDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVHDL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexVerilog.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVerilog.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LexYAML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexYAML.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_LineMarker.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LineMarker.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_PropSet.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PropSet.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_RESearch.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RESearch.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_ScintillaBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ScintillaBase.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_Style.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Style.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_StyleContext.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\StyleContext.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_UniConversion.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\UniConversion.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_ViewStyle.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ViewStyle.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_WindowAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\WindowAccessor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< $(OBJS)\stclib_XPM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\XPM.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< diff --git a/contrib/build/svg/makefile.wat b/contrib/build/svg/makefile.wat index e30f2309b1..96677417a2 100644 --- a/contrib/build/svg/makefile.wat +++ b/contrib/build/svg/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,14 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -68,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE = __svgdll___depname = !ifeq SHARED 1 __svgdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.dll !endif __DEBUGINFO_2 = !ifeq BUILD debug @@ -119,18 +112,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\svg\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SVGDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\svg\..\..\..\include & @@ -261,7 +242,7 @@ SVGDLL_OBJECTS = & $(OBJS)\svgdll_dummy.obj & $(OBJS)\svgdll_dcsvg.obj SVGLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=..\..\src\svg\..\..\..\include & @@ -287,21 +268,21 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG).dll : $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.dll : $(SVGDLL_OBJECTS) @%create $(OBJS)\svgdll.lbc @%append $(OBJS)\svgdll.lbc option quiet @%append $(OBJS)\svgdll.lbc name $^@ @%append $(OBJS)\svgdll.lbc option caseexact - @%append $(OBJS)\svgdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\svgdll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(SVGDLL_OBJECTS)) do @%append $(OBJS)\svgdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i - @%append $(OBJS)\svgdll.lbc option resource=$(OBJS)\svgdll_version.res - @%append $(OBJS)\svgdll.lbc system nt_dll + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i + @%append $(OBJS)\svgdll.lbc + @%append $(OBJS)\svgdll.lbc system os2v2 dll wlink @$(OBJS)\svgdll.lbc wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib +$^@ !endif @@ -314,17 +295,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif $(OBJS)\svgdll_dummy.obj : .AUTODEPEND ..\..\src\svg\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $< - -$(OBJS)\svgdll_version.res : .AUTODEPEND ..\..\src\svg\..\..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\svg\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_wat$(VENDORTAG) -i=..\..\src\svg\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_SVG $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $< $(OBJS)\svgdll_dcsvg.obj : .AUTODEPEND ..\..\src\svg\dcsvg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $< $(OBJS)\svglib_dummy.obj : .AUTODEPEND ..\..\src\svg\..\..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $< $(OBJS)\svglib_dcsvg.obj : .AUTODEPEND ..\..\src\svg\dcsvg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $< diff --git a/contrib/samples/deprecated/proplist/makefile.wat b/contrib/samples/deprecated/proplist/makefile.wat index f30b365768..c2baadd0c3 100644 --- a/contrib/samples/deprecated/proplist/makefile.wat +++ b/contrib/samples/deprecated/proplist/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PROPLIST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) PROPLIST_OBJECTS = & $(OBJS)\proplist_proplist.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\proplist.exe del $(OBJS)\proplist.exe + -del $(OBJS)\proplist.exe -$(OBJS)\proplist.exe : $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res +$(OBJS)\proplist.exe : $(PROPLIST_OBJECTS) @%create $(OBJS)\proplist.lbc @%append $(OBJS)\proplist.lbc option quiet @%append $(OBJS)\proplist.lbc name $^@ @%append $(OBJS)\proplist.lbc option caseexact - @%append $(OBJS)\proplist.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\proplist.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(PROPLIST_OBJECTS)) do @%append $(OBJS)\proplist.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\proplist.lbc library %i - @%append $(OBJS)\proplist.lbc option resource=$(OBJS)\proplist_proplist.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\proplist.lbc library %i + @%append $(OBJS)\proplist.lbc @for %i in () do @%append $(OBJS)\proplist.lbc option stack=%i wlink @$(OBJS)\proplist.lbc $(OBJS)\proplist_proplist.obj : .AUTODEPEND .\proplist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPLIST_CXXFLAGS) $< - -$(OBJS)\proplist_proplist.res : .AUTODEPEND .\proplist.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PROPLIST_CXXFLAGS) $< diff --git a/contrib/samples/deprecated/resource/makefile.wat b/contrib/samples/deprecated/resource/makefile.wat index 66a117b3fc..703a66053a 100644 --- a/contrib/samples/deprecated/resource/makefile.wat +++ b/contrib/samples/deprecated/resource/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) RESOURCE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) RESOURCE_OBJECTS = & $(OBJS)\resource_resource.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\resource.exe del $(OBJS)\resource.exe + -del $(OBJS)\resource.exe -$(OBJS)\resource.exe : $(RESOURCE_OBJECTS) $(OBJS)\resource_resource.res +$(OBJS)\resource.exe : $(RESOURCE_OBJECTS) @%create $(OBJS)\resource.lbc @%append $(OBJS)\resource.lbc option quiet @%append $(OBJS)\resource.lbc name $^@ @%append $(OBJS)\resource.lbc option caseexact - @%append $(OBJS)\resource.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\resource.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(RESOURCE_OBJECTS)) do @%append $(OBJS)\resource.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\resource.lbc library %i - @%append $(OBJS)\resource.lbc option resource=$(OBJS)\resource_resource.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\resource.lbc library %i + @%append $(OBJS)\resource.lbc @for %i in () do @%append $(OBJS)\resource.lbc option stack=%i wlink @$(OBJS)\resource.lbc $(OBJS)\resource_resource.obj : .AUTODEPEND .\resource.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RESOURCE_CXXFLAGS) $< - -$(OBJS)\resource_resource.res : .AUTODEPEND .\resource.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(RESOURCE_CXXFLAGS) $< diff --git a/contrib/samples/deprecated/treelay/makefile.wat b/contrib/samples/deprecated/treelay/makefile.wat index dca39a0201..92aa01f5bd 100644 --- a/contrib/samples/deprecated/treelay/makefile.wat +++ b/contrib/samples/deprecated/treelay/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TREELAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) TREELAY_OBJECTS = & $(OBJS)\treelay_treelay.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\treelay.exe del $(OBJS)\treelay.exe + -del $(OBJS)\treelay.exe -$(OBJS)\treelay.exe : $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res +$(OBJS)\treelay.exe : $(TREELAY_OBJECTS) @%create $(OBJS)\treelay.lbc @%append $(OBJS)\treelay.lbc option quiet @%append $(OBJS)\treelay.lbc name $^@ @%append $(OBJS)\treelay.lbc option caseexact - @%append $(OBJS)\treelay.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\treelay.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TREELAY_OBJECTS)) do @%append $(OBJS)\treelay.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\treelay.lbc library %i - @%append $(OBJS)\treelay.lbc option resource=$(OBJS)\treelay_treelay.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\treelay.lbc library %i + @%append $(OBJS)\treelay.lbc @for %i in () do @%append $(OBJS)\treelay.lbc option stack=%i wlink @$(OBJS)\treelay.lbc $(OBJS)\treelay_treelay.obj : .AUTODEPEND .\treelay.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TREELAY_CXXFLAGS) $< - -$(OBJS)\treelay_treelay.res : .AUTODEPEND .\treelay.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TREELAY_CXXFLAGS) $< diff --git a/contrib/samples/fl/makefile.wat b/contrib/samples/fl/makefile.wat index b4bf83aa43..1208f36076 100644 --- a/contrib/samples/fl/makefile.wat +++ b/contrib/samples/fl/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -226,6 +187,33 @@ __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,7 +224,7 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -246,7 +234,7 @@ FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & FL_DEMO1_OBJECTS = & $(OBJS)\fl_demo1_fl_demo1.obj FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -256,7 +244,7 @@ FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & FL_DEMO2_OBJECTS = & $(OBJS)\fl_demo2_fl_demo2.obj FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -266,7 +254,7 @@ FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & FL_SAMPLE1_OBJECTS = & $(OBJS)\fl_sample1_fl_sample1.obj FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -276,7 +264,7 @@ FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & FL_SAMPLE2_OBJECTS = & $(OBJS)\fl_sample2_fl_sample2.obj FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -301,69 +289,69 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\fl_demo1.exe del $(OBJS)\fl_demo1.exe - -if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe - -if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe - -if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe - -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe + -del $(OBJS)\fl_demo1.exe + -del $(OBJS)\fl_demo2.exe + -del $(OBJS)\fl_sample1.exe + -del $(OBJS)\fl_sample2.exe + -del $(OBJS)\fl_sample3.exe -$(OBJS)\fl_demo1.exe : $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res +$(OBJS)\fl_demo1.exe : $(FL_DEMO1_OBJECTS) @%create $(OBJS)\fl_demo1.lbc @%append $(OBJS)\fl_demo1.lbc option quiet @%append $(OBJS)\fl_demo1.lbc name $^@ @%append $(OBJS)\fl_demo1.lbc option caseexact - @%append $(OBJS)\fl_demo1.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\fl_demo1.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FL_DEMO1_OBJECTS)) do @%append $(OBJS)\fl_demo1.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_demo1.lbc library %i - @%append $(OBJS)\fl_demo1.lbc option resource=$(OBJS)\fl_demo1_fl_demo1.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\fl_demo1.lbc library %i + @%append $(OBJS)\fl_demo1.lbc @for %i in () do @%append $(OBJS)\fl_demo1.lbc option stack=%i wlink @$(OBJS)\fl_demo1.lbc -$(OBJS)\fl_demo2.exe : $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res +$(OBJS)\fl_demo2.exe : $(FL_DEMO2_OBJECTS) @%create $(OBJS)\fl_demo2.lbc @%append $(OBJS)\fl_demo2.lbc option quiet @%append $(OBJS)\fl_demo2.lbc name $^@ @%append $(OBJS)\fl_demo2.lbc option caseexact - @%append $(OBJS)\fl_demo2.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\fl_demo2.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FL_DEMO2_OBJECTS)) do @%append $(OBJS)\fl_demo2.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_demo2.lbc library %i - @%append $(OBJS)\fl_demo2.lbc option resource=$(OBJS)\fl_demo2_fl_demo2.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\fl_demo2.lbc library %i + @%append $(OBJS)\fl_demo2.lbc @for %i in () do @%append $(OBJS)\fl_demo2.lbc option stack=%i wlink @$(OBJS)\fl_demo2.lbc -$(OBJS)\fl_sample1.exe : $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res +$(OBJS)\fl_sample1.exe : $(FL_SAMPLE1_OBJECTS) @%create $(OBJS)\fl_sample1.lbc @%append $(OBJS)\fl_sample1.lbc option quiet @%append $(OBJS)\fl_sample1.lbc name $^@ @%append $(OBJS)\fl_sample1.lbc option caseexact - @%append $(OBJS)\fl_sample1.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\fl_sample1.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FL_SAMPLE1_OBJECTS)) do @%append $(OBJS)\fl_sample1.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_sample1.lbc library %i - @%append $(OBJS)\fl_sample1.lbc option resource=$(OBJS)\fl_sample1_fl_sample1.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\fl_sample1.lbc library %i + @%append $(OBJS)\fl_sample1.lbc @for %i in () do @%append $(OBJS)\fl_sample1.lbc option stack=%i wlink @$(OBJS)\fl_sample1.lbc -$(OBJS)\fl_sample2.exe : $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res +$(OBJS)\fl_sample2.exe : $(FL_SAMPLE2_OBJECTS) @%create $(OBJS)\fl_sample2.lbc @%append $(OBJS)\fl_sample2.lbc option quiet @%append $(OBJS)\fl_sample2.lbc name $^@ @%append $(OBJS)\fl_sample2.lbc option caseexact - @%append $(OBJS)\fl_sample2.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\fl_sample2.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FL_SAMPLE2_OBJECTS)) do @%append $(OBJS)\fl_sample2.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_sample2.lbc library %i - @%append $(OBJS)\fl_sample2.lbc option resource=$(OBJS)\fl_sample2_fl_sample2.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\fl_sample2.lbc library %i + @%append $(OBJS)\fl_sample2.lbc @for %i in () do @%append $(OBJS)\fl_sample2.lbc option stack=%i wlink @$(OBJS)\fl_sample2.lbc -$(OBJS)\fl_sample3.exe : $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res +$(OBJS)\fl_sample3.exe : $(FL_SAMPLE3_OBJECTS) @%create $(OBJS)\fl_sample3.lbc @%append $(OBJS)\fl_sample3.lbc option quiet @%append $(OBJS)\fl_sample3.lbc name $^@ @%append $(OBJS)\fl_sample3.lbc option caseexact - @%append $(OBJS)\fl_sample3.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\fl_sample3.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FL_SAMPLE3_OBJECTS)) do @%append $(OBJS)\fl_sample3.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_sample3.lbc library %i - @%append $(OBJS)\fl_sample3.lbc option resource=$(OBJS)\fl_sample3_fl_sample3.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\fl_sample3.lbc library %i + @%append $(OBJS)\fl_sample3.lbc @for %i in () do @%append $(OBJS)\fl_sample3.lbc option stack=%i wlink @$(OBJS)\fl_sample3.lbc @@ -372,32 +360,17 @@ data_files : .SYMBOLIC for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps $(OBJS)\fl_demo1_fl_demo1.obj : .AUTODEPEND .\fl_demo1.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FL_DEMO1_CXXFLAGS) $< - -$(OBJS)\fl_demo1_fl_demo1.res : .AUTODEPEND .\fl_demo1.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FL_DEMO1_CXXFLAGS) $< $(OBJS)\fl_demo2_fl_demo2.obj : .AUTODEPEND .\fl_demo2.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FL_DEMO2_CXXFLAGS) $< - -$(OBJS)\fl_demo2_fl_demo2.res : .AUTODEPEND .\fl_demo2.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FL_DEMO2_CXXFLAGS) $< $(OBJS)\fl_sample1_fl_sample1.obj : .AUTODEPEND .\fl_sample1.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE1_CXXFLAGS) $< - -$(OBJS)\fl_sample1_fl_sample1.res : .AUTODEPEND .\fl_sample1.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FL_SAMPLE1_CXXFLAGS) $< $(OBJS)\fl_sample2_fl_sample2.obj : .AUTODEPEND .\fl_sample2.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE2_CXXFLAGS) $< - -$(OBJS)\fl_sample2_fl_sample2.res : .AUTODEPEND .\fl_sample2.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FL_SAMPLE2_CXXFLAGS) $< $(OBJS)\fl_sample3_fl_sample3.obj : .AUTODEPEND .\fl_sample3.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE3_CXXFLAGS) $< - -$(OBJS)\fl_sample3_fl_sample3.res : .AUTODEPEND .\fl_sample3.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FL_SAMPLE3_CXXFLAGS) $< diff --git a/contrib/samples/foldbar/extended/makefile.wat b/contrib/samples/foldbar/extended/makefile.wat index 34ca63298f..8f0c167233 100644 --- a/contrib/samples/foldbar/extended/makefile.wat +++ b/contrib/samples/foldbar/extended/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,13 +239,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EXTENDED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) EXTENDED_OBJECTS = & $(OBJS)\extended_extended.obj @@ -276,23 +264,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\extended.exe del $(OBJS)\extended.exe + -del $(OBJS)\extended.exe -$(OBJS)\extended.exe : $(EXTENDED_OBJECTS) $(OBJS)\extended_extended.res +$(OBJS)\extended.exe : $(EXTENDED_OBJECTS) @%create $(OBJS)\extended.lbc @%append $(OBJS)\extended.lbc option quiet @%append $(OBJS)\extended.lbc name $^@ @%append $(OBJS)\extended.lbc option caseexact - @%append $(OBJS)\extended.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\extended.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(EXTENDED_OBJECTS)) do @%append $(OBJS)\extended.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\extended.lbc library %i - @%append $(OBJS)\extended.lbc option resource=$(OBJS)\extended_extended.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\extended.lbc library %i + @%append $(OBJS)\extended.lbc @for %i in () do @%append $(OBJS)\extended.lbc option stack=%i wlink @$(OBJS)\extended.lbc $(OBJS)\extended_extended.obj : .AUTODEPEND .\extended.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EXTENDED_CXXFLAGS) $< - -$(OBJS)\extended_extended.res : .AUTODEPEND .\extended.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(EXTENDED_CXXFLAGS) $< diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.wat b/contrib/samples/foldbar/foldpanelbar/makefile.wat index 677de44f33..45058bc1f6 100644 --- a/contrib/samples/foldbar/foldpanelbar/makefile.wat +++ b/contrib/samples/foldbar/foldpanelbar/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FOLDTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) FOLDTEST_OBJECTS = & $(OBJS)\foldtest_foldpanelbartest.obj & $(OBJS)\foldtest_foldtestpanel.obj & @@ -264,32 +252,29 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe + -del $(OBJS)\foldtest.exe -$(OBJS)\foldtest.exe : $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res +$(OBJS)\foldtest.exe : $(FOLDTEST_OBJECTS) @%create $(OBJS)\foldtest.lbc @%append $(OBJS)\foldtest.lbc option quiet @%append $(OBJS)\foldtest.lbc name $^@ @%append $(OBJS)\foldtest.lbc option caseexact - @%append $(OBJS)\foldtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\foldtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FOLDTEST_OBJECTS)) do @%append $(OBJS)\foldtest.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\foldtest.lbc library %i - @%append $(OBJS)\foldtest.lbc option resource=$(OBJS)\foldtest_foldpanelbartest.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\foldtest.lbc library %i + @%append $(OBJS)\foldtest.lbc @for %i in () do @%append $(OBJS)\foldtest.lbc option stack=%i wlink @$(OBJS)\foldtest.lbc $(OBJS)\foldtest_foldpanelbartest.obj : .AUTODEPEND .\foldpanelbartest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< $(OBJS)\foldtest_foldtestpanel.obj : .AUTODEPEND .\foldtestpanel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< $(OBJS)\foldtest_layouttest.obj : .AUTODEPEND .\layouttest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< $(OBJS)\foldtest_test.obj : .AUTODEPEND .\test.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< - -$(OBJS)\foldtest_foldpanelbartest.res : .AUTODEPEND .\foldpanelbartest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/dynsash/makefile.wat b/contrib/samples/gizmos/dynsash/makefile.wat index b7fa242b54..81be375833 100644 --- a/contrib/samples/gizmos/dynsash/makefile.wat +++ b/contrib/samples/gizmos/dynsash/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,13 +229,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DYNSASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DYNSASH_OBJECTS = & $(OBJS)\dynsash_dynsash.obj @@ -266,23 +254,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dynsash.exe del $(OBJS)\dynsash.exe + -del $(OBJS)\dynsash.exe -$(OBJS)\dynsash.exe : $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res +$(OBJS)\dynsash.exe : $(DYNSASH_OBJECTS) @%create $(OBJS)\dynsash.lbc @%append $(OBJS)\dynsash.lbc option quiet @%append $(OBJS)\dynsash.lbc name $^@ @%append $(OBJS)\dynsash.lbc option caseexact - @%append $(OBJS)\dynsash.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dynsash.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DYNSASH_OBJECTS)) do @%append $(OBJS)\dynsash.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dynsash.lbc library %i - @%append $(OBJS)\dynsash.lbc option resource=$(OBJS)\dynsash_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dynsash.lbc library %i + @%append $(OBJS)\dynsash.lbc @for %i in () do @%append $(OBJS)\dynsash.lbc option stack=%i wlink @$(OBJS)\dynsash.lbc -$(OBJS)\dynsash_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< - $(OBJS)\dynsash_dynsash.obj : .AUTODEPEND .\dynsash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DYNSASH_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DYNSASH_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.wat b/contrib/samples/gizmos/dynsash_switch/makefile.wat index 9fd9f194e4..50ed40e938 100644 --- a/contrib/samples/gizmos/dynsash_switch/makefile.wat +++ b/contrib/samples/gizmos/dynsash_switch/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,12 +224,12 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DYNSASH_SWITCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) & - $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) & $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = & $(OBJS)\dynsash_switch_dynsash_switch.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe + -del $(OBJS)\dynsash_switch.exe -$(OBJS)\dynsash_switch.exe : $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample.res +$(OBJS)\dynsash_switch.exe : $(DYNSASH_SWITCH_OBJECTS) @%create $(OBJS)\dynsash_switch.lbc @%append $(OBJS)\dynsash_switch.lbc option quiet @%append $(OBJS)\dynsash_switch.lbc name $^@ @%append $(OBJS)\dynsash_switch.lbc option caseexact - @%append $(OBJS)\dynsash_switch.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dynsash_switch.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DYNSASH_SWITCH_OBJECTS)) do @%append $(OBJS)\dynsash_switch.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dynsash_switch.lbc library %i - @%append $(OBJS)\dynsash_switch.lbc option resource=$(OBJS)\dynsash_switch_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dynsash_switch.lbc library %i + @%append $(OBJS)\dynsash_switch.lbc @for %i in () do @%append $(OBJS)\dynsash_switch.lbc option stack=%i wlink @$(OBJS)\dynsash_switch.lbc -$(OBJS)\dynsash_switch_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< - $(OBJS)\dynsash_switch_dynsash_switch.obj : .AUTODEPEND .\dynsash_switch.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DYNSASH_SWITCH_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DYNSASH_SWITCH_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/editlbox/makefile.wat b/contrib/samples/gizmos/editlbox/makefile.wat index 9496e2ae41..d45c829235 100644 --- a/contrib/samples/gizmos/editlbox/makefile.wat +++ b/contrib/samples/gizmos/editlbox/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & $(OBJS)\test_test.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + -del $(OBJS)\test.exe -$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_sample.res +$(OBJS)\test.exe : $(TEST_OBJECTS) @%create $(OBJS)\test.lbc @%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc name $^@ @%append $(OBJS)\test.lbc option caseexact - @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i - @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\test.lbc library %i + @%append $(OBJS)\test.lbc @for %i in () do @%append $(OBJS)\test.lbc option stack=%i wlink @$(OBJS)\test.lbc -$(OBJS)\test_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< - $(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/led/makefile.wat b/contrib/samples/gizmos/led/makefile.wat index 697dcd2107..b1efe4b2ce 100644 --- a/contrib/samples/gizmos/led/makefile.wat +++ b/contrib/samples/gizmos/led/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) LED_OBJECTS = & $(OBJS)\led_led.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\led.exe del $(OBJS)\led.exe + -del $(OBJS)\led.exe -$(OBJS)\led.exe : $(LED_OBJECTS) $(OBJS)\led_sample.res +$(OBJS)\led.exe : $(LED_OBJECTS) @%create $(OBJS)\led.lbc @%append $(OBJS)\led.lbc option quiet @%append $(OBJS)\led.lbc name $^@ @%append $(OBJS)\led.lbc option caseexact - @%append $(OBJS)\led.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\led.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(LED_OBJECTS)) do @%append $(OBJS)\led.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\led.lbc library %i - @%append $(OBJS)\led.lbc option resource=$(OBJS)\led_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\led.lbc library %i + @%append $(OBJS)\led.lbc @for %i in () do @%append $(OBJS)\led.lbc option stack=%i wlink @$(OBJS)\led.lbc -$(OBJS)\led_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< - $(OBJS)\led_led.obj : .AUTODEPEND .\led.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LED_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LED_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/multicell/makefile.wat b/contrib/samples/gizmos/multicell/makefile.wat index 51040c989a..e06d889c17 100644 --- a/contrib/samples/gizmos/multicell/makefile.wat +++ b/contrib/samples/gizmos/multicell/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MTEST_OBJECTS = & $(OBJS)\mtest_mtest.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mtest.exe del $(OBJS)\mtest.exe + -del $(OBJS)\mtest.exe -$(OBJS)\mtest.exe : $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res +$(OBJS)\mtest.exe : $(MTEST_OBJECTS) @%create $(OBJS)\mtest.lbc @%append $(OBJS)\mtest.lbc option quiet @%append $(OBJS)\mtest.lbc name $^@ @%append $(OBJS)\mtest.lbc option caseexact - @%append $(OBJS)\mtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\mtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MTEST_OBJECTS)) do @%append $(OBJS)\mtest.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mtest.lbc library %i - @%append $(OBJS)\mtest.lbc option resource=$(OBJS)\mtest_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\mtest.lbc library %i + @%append $(OBJS)\mtest.lbc @for %i in () do @%append $(OBJS)\mtest.lbc option stack=%i wlink @$(OBJS)\mtest.lbc -$(OBJS)\mtest_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< - $(OBJS)\mtest_mtest.obj : .AUTODEPEND .\mtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MTEST_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/splittree/makefile.wat b/contrib/samples/gizmos/splittree/makefile.wat index 535496cd99..12e7408234 100644 --- a/contrib/samples/gizmos/splittree/makefile.wat +++ b/contrib/samples/gizmos/splittree/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SPLITTREE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SPLITTREE_OBJECTS = & $(OBJS)\splittree_tree.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\splittree.exe del $(OBJS)\splittree.exe + -del $(OBJS)\splittree.exe -$(OBJS)\splittree.exe : $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res +$(OBJS)\splittree.exe : $(SPLITTREE_OBJECTS) @%create $(OBJS)\splittree.lbc @%append $(OBJS)\splittree.lbc option quiet @%append $(OBJS)\splittree.lbc name $^@ @%append $(OBJS)\splittree.lbc option caseexact - @%append $(OBJS)\splittree.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\splittree.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SPLITTREE_OBJECTS)) do @%append $(OBJS)\splittree.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\splittree.lbc library %i - @%append $(OBJS)\splittree.lbc option resource=$(OBJS)\splittree_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\splittree.lbc library %i + @%append $(OBJS)\splittree.lbc @for %i in () do @%append $(OBJS)\splittree.lbc option stack=%i wlink @$(OBJS)\splittree.lbc -$(OBJS)\splittree_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< - $(OBJS)\splittree_tree.obj : .AUTODEPEND .\tree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTREE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SPLITTREE_CXXFLAGS) $< diff --git a/contrib/samples/mmedia/makefile.wat b/contrib/samples/mmedia/makefile.wat index eb6f47eaaf..4d3b76b59f 100644 --- a/contrib/samples/mmedia/makefile.wat +++ b/contrib/samples/mmedia/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MMBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MMBOARD_OBJECTS = & $(OBJS)\mmboard_mmboard.obj & $(OBJS)\mmboard_mmbman.obj @@ -262,26 +250,23 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mmboard.exe del $(OBJS)\mmboard.exe + -del $(OBJS)\mmboard.exe -$(OBJS)\mmboard.exe : $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res +$(OBJS)\mmboard.exe : $(MMBOARD_OBJECTS) @%create $(OBJS)\mmboard.lbc @%append $(OBJS)\mmboard.lbc option quiet @%append $(OBJS)\mmboard.lbc name $^@ @%append $(OBJS)\mmboard.lbc option caseexact - @%append $(OBJS)\mmboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\mmboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MMBOARD_OBJECTS)) do @%append $(OBJS)\mmboard.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mmboard.lbc library %i - @%append $(OBJS)\mmboard.lbc option resource=$(OBJS)\mmboard_mmboard.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\mmboard.lbc library %i + @%append $(OBJS)\mmboard.lbc @for %i in () do @%append $(OBJS)\mmboard.lbc option stack=%i wlink @$(OBJS)\mmboard.lbc $(OBJS)\mmboard_mmboard.obj : .AUTODEPEND .\mmboard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $< $(OBJS)\mmboard_mmbman.obj : .AUTODEPEND .\mmbman.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $< - -$(OBJS)\mmboard_mmboard.res : .AUTODEPEND .\mmboard.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $< diff --git a/contrib/samples/ogl/ogledit/makefile.wat b/contrib/samples/ogl/ogledit/makefile.wat index a1e9df2f32..4c63bc8634 100644 --- a/contrib/samples/ogl/ogledit/makefile.wat +++ b/contrib/samples/ogl/ogledit/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) OGLEDIT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) OGLEDIT_OBJECTS = & $(OBJS)\ogledit_ogledit.obj & $(OBJS)\ogledit_doc.obj & @@ -264,32 +252,29 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe + -del $(OBJS)\ogledit.exe -$(OBJS)\ogledit.exe : $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res +$(OBJS)\ogledit.exe : $(OGLEDIT_OBJECTS) @%create $(OBJS)\ogledit.lbc @%append $(OBJS)\ogledit.lbc option quiet @%append $(OBJS)\ogledit.lbc name $^@ @%append $(OBJS)\ogledit.lbc option caseexact - @%append $(OBJS)\ogledit.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\ogledit.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\ogledit.lbc library %i - @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_ogledit.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\ogledit.lbc library %i + @%append $(OBJS)\ogledit.lbc @for %i in () do @%append $(OBJS)\ogledit.lbc option stack=%i wlink @$(OBJS)\ogledit.lbc $(OBJS)\ogledit_ogledit.obj : .AUTODEPEND .\ogledit.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< $(OBJS)\ogledit_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< $(OBJS)\ogledit_view.obj : .AUTODEPEND .\view.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< $(OBJS)\ogledit_palette.obj : .AUTODEPEND .\palette.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< - -$(OBJS)\ogledit_ogledit.res : .AUTODEPEND .\ogledit.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat index a0683a2387..a2feea5794 100644 --- a/contrib/samples/ogl/studio/makefile.wat +++ b/contrib/samples/ogl/studio/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../../build/msw/config.wat +!include ../../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,13 +239,13 @@ LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STUDIO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include & + $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) STUDIO_OBJECTS = & $(OBJS)\studio_studio.obj & $(OBJS)\studio_doc.obj & @@ -285,17 +273,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe + -del $(OBJS)\studio.exe -$(OBJS)\studio.exe : $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res +$(OBJS)\studio.exe : $(STUDIO_OBJECTS) @%create $(OBJS)\studio.lbc @%append $(OBJS)\studio.lbc option quiet @%append $(OBJS)\studio.lbc name $^@ @%append $(OBJS)\studio.lbc option caseexact - @%append $(OBJS)\studio.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\studio.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\studio.lbc library %i - @%append $(OBJS)\studio.lbc option resource=$(OBJS)\studio_studio.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\studio.lbc library %i + @%append $(OBJS)\studio.lbc @for %i in () do @%append $(OBJS)\studio.lbc option stack=%i wlink @$(OBJS)\studio.lbc @@ -304,35 +292,32 @@ data : .SYMBOLIC for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\studio_studio.obj : .AUTODEPEND .\studio.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_shapes.obj : .AUTODEPEND .\shapes.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_symbols.obj : .AUTODEPEND .\symbols.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_view.obj : .AUTODEPEND .\view.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_cspalette.obj : .AUTODEPEND .\cspalette.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_mainfrm.obj : .AUTODEPEND .\mainfrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_project.obj : .AUTODEPEND .\project.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_dialogs.obj : .AUTODEPEND .\dialogs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< $(OBJS)\studio_csprint.obj : .AUTODEPEND .\csprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< - -$(OBJS)\studio_studio.res : .AUTODEPEND .\studio.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< diff --git a/contrib/samples/plot/makefile.wat b/contrib/samples/plot/makefile.wat index 13c1e0a6b0..33c7614c3a 100644 --- a/contrib/samples/plot/makefile.wat +++ b/contrib/samples/plot/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PLOT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) PLOT_OBJECTS = & $(OBJS)\plot_plot.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe + -del $(OBJS)\plot.exe -$(OBJS)\plot.exe : $(PLOT_OBJECTS) $(OBJS)\plot_plot.res +$(OBJS)\plot.exe : $(PLOT_OBJECTS) @%create $(OBJS)\plot.lbc @%append $(OBJS)\plot.lbc option quiet @%append $(OBJS)\plot.lbc name $^@ @%append $(OBJS)\plot.lbc option caseexact - @%append $(OBJS)\plot.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\plot.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(PLOT_OBJECTS)) do @%append $(OBJS)\plot.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\plot.lbc library %i - @%append $(OBJS)\plot.lbc option resource=$(OBJS)\plot_plot.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\plot.lbc library %i + @%append $(OBJS)\plot.lbc @for %i in () do @%append $(OBJS)\plot.lbc option stack=%i wlink @$(OBJS)\plot.lbc $(OBJS)\plot_plot.obj : .AUTODEPEND .\plot.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PLOT_CXXFLAGS) $< - -$(OBJS)\plot_plot.res : .AUTODEPEND .\plot.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PLOT_CXXFLAGS) $< diff --git a/contrib/samples/stc/makefile.wat b/contrib/samples/stc/makefile.wat index 0cd4a7b176..23c77cdfb8 100644 --- a/contrib/samples/stc/makefile.wat +++ b/contrib/samples/stc/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = & $(OBJS)\stctest_stctest.obj & $(OBJS)\stctest_edit.obj & @@ -263,17 +251,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe + -del $(OBJS)\stctest.exe -$(OBJS)\stctest.exe : $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res +$(OBJS)\stctest.exe : $(STCTEST_OBJECTS) @%create $(OBJS)\stctest.lbc @%append $(OBJS)\stctest.lbc option quiet @%append $(OBJS)\stctest.lbc name $^@ @%append $(OBJS)\stctest.lbc option caseexact - @%append $(OBJS)\stctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\stctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\stctest.lbc library %i - @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\stctest.lbc library %i + @%append $(OBJS)\stctest.lbc @for %i in () do @%append $(OBJS)\stctest.lbc option stack=%i wlink @$(OBJS)\stctest.lbc @@ -281,15 +269,12 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -$(OBJS)\stctest_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $< - $(OBJS)\stctest_stctest.obj : .AUTODEPEND .\stctest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< $(OBJS)\stctest_edit.obj : .AUTODEPEND .\edit.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< $(OBJS)\stctest_prefs.obj : .AUTODEPEND .\prefs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat index a176e20763..211f97da64 100644 --- a/contrib/samples/svg/makefile.wat +++ b/contrib/samples/svg/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,13 +224,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = & $(OBJS)\svgtest_svgtest.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + -del $(OBJS)\svgtest.exe -$(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res +$(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) @%create $(OBJS)\svgtest.lbc @%append $(OBJS)\svgtest.lbc option quiet @%append $(OBJS)\svgtest.lbc name $^@ @%append $(OBJS)\svgtest.lbc option caseexact - @%append $(OBJS)\svgtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\svgtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\svgtest.lbc library %i - @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\svgtest.lbc library %i + @%append $(OBJS)\svgtest.lbc @for %i in () do @%append $(OBJS)\svgtest.lbc option stack=%i wlink @$(OBJS)\svgtest.lbc -$(OBJS)\svgtest_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $< - $(OBJS)\svgtest_svgtest.obj : .AUTODEPEND .\svgtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $< diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index ba91041030..3eb40525dd 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -107,7 +107,7 @@ DEPRECATEDLIB_ODEP = \ @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -159,9 +159,9 @@ COND_WINDOWS_IMPLIB_1___deprecateddll___importlib = \ @COND_USE_SOVERSION_0@__deprecateddll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__deprecateddll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index f8a1b8aaf9..40f86870a8 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -110,7 +110,7 @@ FLLIB_ODEP = $(_____pch_wxprec_fllib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -160,9 +160,9 @@ COND_WINDOWS_IMPLIB_1___fldll___importlib = \ @COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__fldll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__fldll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__fldll___targetsuf3 \ diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in index eb9c8e2e50..5f5171a38b 100644 --- a/contrib/src/foldbar/Makefile.in +++ b/contrib/src/foldbar/Makefile.in @@ -83,7 +83,7 @@ FOLDBARLIB_ODEP = $(_____pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -133,9 +133,9 @@ COND_WINDOWS_IMPLIB_1___foldbardll___importlib = \ @COND_USE_SOVERSION_0@__foldbardll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__foldbardll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__foldbardll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \ diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index c4f02c93a6..80fccf25c0 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -107,7 +107,7 @@ GIZMOS_XRCLIB_ODEP = \ @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -303,8 +303,8 @@ COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \ @COND_USE_SOVERSION_0@__gizmos = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__gizmos_0 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__gizmos_0 = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmos_0 = .$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__gizmos_0 = .$(SO_SUFFIX).0 diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index 76b47cb664..209edd5de9 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -114,7 +114,7 @@ MMEDIALIB_ODEP = $(_____pch_wxprec_mmedialib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -164,9 +164,9 @@ COND_WINDOWS_IMPLIB_1___mmediadll___importlib = \ @COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__mmediadll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \ diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index 0542a393a8..3e2b7e5bf4 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -83,7 +83,7 @@ NETUTILSLIB_ODEP = $(_____pch_wxprec_netutilslib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -134,9 +134,9 @@ COND_WINDOWS_IMPLIB_1___netutilsdll___importlib = \ @COND_USE_SOVERSION_0@__netutilsdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__netutilsdll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 798adc21b5..1ef946f0da 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -100,7 +100,7 @@ OGLLIB_ODEP = $(_____pch_wxprec_ogllib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -150,9 +150,9 @@ COND_WINDOWS_IMPLIB_1___ogldll___importlib = \ @COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__ogldll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__ogldll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index 5934baa2d5..f933db48ab 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -79,7 +79,7 @@ PLOTLIB_ODEP = $(_____pch_wxprec_plotlib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -129,9 +129,9 @@ COND_WINDOWS_IMPLIB_1___plotdll___importlib = \ @COND_USE_SOVERSION_0@__plotdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__plotdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__plotdll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__plotdll___targetsuf3 \ diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index b3be90531c..dd0c056f7f 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -243,7 +243,7 @@ STCLIB_OBJECTS = \ @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -288,9 +288,9 @@ COND_WINDOWS_IMPLIB_1___stcdll___importlib = \ @COND_USE_SOVERSION_0@__stcdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__stcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__stcdll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__stcdll___targetsuf3 \ diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 3127932ce3..7cd27cc8c1 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -78,7 +78,7 @@ SVGLIB_ODEP = $(_____pch_wxprec_svglib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 7.0 -current_version 7.1 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 8.0 -current_version 8.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -128,9 +128,9 @@ COND_WINDOWS_IMPLIB_1___svgdll___importlib = \ @COND_USE_SOVERSION_0@__svgdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__svgdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.6.1 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.7.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.6.1.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.7.0.$(SO_SUFFIX) @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__svgdll___targetsuf3 \ @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).0 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ diff --git a/contrib/utils/convertrc/makefile.wat b/contrib/utils/convertrc/makefile.wat index 5d46b2b60d..259d76c6fc 100644 --- a/contrib/utils/convertrc/makefile.wat +++ b/contrib/utils/convertrc/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,13 +229,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CONVERTRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) CONVERTRC_OBJECTS = & $(OBJS)\convertrc_convert.obj & $(OBJS)\convertrc_rc2wxr.obj & @@ -269,32 +257,29 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\convertrc.exe del $(OBJS)\convertrc.exe + -del $(OBJS)\convertrc.exe -$(OBJS)\convertrc.exe : $(CONVERTRC_OBJECTS) $(OBJS)\convertrc_wxconvert.res +$(OBJS)\convertrc.exe : $(CONVERTRC_OBJECTS) @%create $(OBJS)\convertrc.lbc @%append $(OBJS)\convertrc.lbc option quiet @%append $(OBJS)\convertrc.lbc name $^@ @%append $(OBJS)\convertrc.lbc option caseexact - @%append $(OBJS)\convertrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\convertrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CONVERTRC_OBJECTS)) do @%append $(OBJS)\convertrc.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\convertrc.lbc library %i - @%append $(OBJS)\convertrc.lbc option resource=$(OBJS)\convertrc_wxconvert.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\convertrc.lbc library %i + @%append $(OBJS)\convertrc.lbc @for %i in () do @%append $(OBJS)\convertrc.lbc option stack=%i wlink @$(OBJS)\convertrc.lbc $(OBJS)\convertrc_convert.obj : .AUTODEPEND .\convert.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< $(OBJS)\convertrc_rc2wxr.obj : .AUTODEPEND .\rc2wxr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< $(OBJS)\convertrc_rc2xml.obj : .AUTODEPEND .\rc2xml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< $(OBJS)\convertrc_wxr2xml.obj : .AUTODEPEND .\wxr2xml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< - -$(OBJS)\convertrc_wxconvert.res : .AUTODEPEND .\wxconvert.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $< diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat index 232b2122ff..2776f1a586 100644 --- a/demos/bombs/makefile.wat +++ b/demos/bombs/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = & @@ -262,29 +250,26 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe + -del $(OBJS)\bombs.exe -$(OBJS)\bombs.exe : $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res +$(OBJS)\bombs.exe : $(BOMBS_OBJECTS) @%create $(OBJS)\bombs.lbc @%append $(OBJS)\bombs.lbc option quiet @%append $(OBJS)\bombs.lbc name $^@ @%append $(OBJS)\bombs.lbc option caseexact - @%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\bombs.lbc library %i - @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\bombs.lbc library %i + @%append $(OBJS)\bombs.lbc @for %i in () do @%append $(OBJS)\bombs.lbc option stack=%i wlink @$(OBJS)\bombs.lbc $(OBJS)\bombs_bombs.obj : .AUTODEPEND .\bombs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< $(OBJS)\bombs_bombs1.obj : .AUTODEPEND .\bombs1.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< $(OBJS)\bombs_game.obj : .AUTODEPEND .\game.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< - -$(OBJS)\bombs_bombs.res : .AUTODEPEND .\bombs.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< diff --git a/demos/dbbrowse/makefile.wat b/demos/dbbrowse/makefile.wat index ae5f49aa3e..4149ac4e58 100644 --- a/demos/dbbrowse/makefile.wat +++ b/demos/dbbrowse/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -146,6 +146,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_DBGRID_p = !ifeq MONOLITHIC 0 __WXLIB_DBGRID_p = & @@ -200,63 +245,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -267,10 +255,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DBBROWSE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DBBROWSE_OBJECTS = & @@ -298,18 +286,18 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dbbrowse.exe del $(OBJS)\dbbrowse.exe + -del $(OBJS)\dbbrowse.exe !ifeq USE_ODBC 1 -$(OBJS)\dbbrowse.exe : $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse.res +$(OBJS)\dbbrowse.exe : $(DBBROWSE_OBJECTS) @%create $(OBJS)\dbbrowse.lbc @%append $(OBJS)\dbbrowse.lbc option quiet @%append $(OBJS)\dbbrowse.lbc name $^@ @%append $(OBJS)\dbbrowse.lbc option caseexact - @%append $(OBJS)\dbbrowse.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dbbrowse.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DBBROWSE_OBJECTS)) do @%append $(OBJS)\dbbrowse.lbc file %i - @for %i in ( $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dbbrowse.lbc library %i - @%append $(OBJS)\dbbrowse.lbc option resource=$(OBJS)\dbbrowse_dbbrowse.res + @for %i in ( $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dbbrowse.lbc library %i + @%append $(OBJS)\dbbrowse.lbc @for %i in () do @%append $(OBJS)\dbbrowse.lbc option stack=%i wlink @$(OBJS)\dbbrowse.lbc !endif @@ -323,29 +311,26 @@ data_help_png : .SYMBOLIC for %f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%f copy .\help.png\%f $(OBJS)\help.png $(OBJS)\dbbrowse_dbbrowse.obj : .AUTODEPEND .\dbbrowse.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< $(OBJS)\dbbrowse_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< $(OBJS)\dbbrowse_pgmctrl.obj : .AUTODEPEND .\pgmctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< $(OBJS)\dbbrowse_tabpgwin.obj : .AUTODEPEND .\tabpgwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< $(OBJS)\dbbrowse_browsedb.obj : .AUTODEPEND .\browsedb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< $(OBJS)\dbbrowse_dbtree.obj : .AUTODEPEND .\dbtree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< $(OBJS)\dbbrowse_dbgrid.obj : .AUTODEPEND .\dbgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< $(OBJS)\dbbrowse_dlguser.obj : .AUTODEPEND .\dlguser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< - -$(OBJS)\dbbrowse_dbbrowse.res : .AUTODEPEND .\dbbrowse.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $< diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index bbd1ad9788..0cf9f54385 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_HTML_p = !ifeq MONOLITHIC 0 __WXLIB_HTML_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = & @@ -282,17 +270,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe + -del $(OBJS)\forty.exe -$(OBJS)\forty.exe : $(FORTY_OBJECTS) $(OBJS)\forty_forty.res +$(OBJS)\forty.exe : $(FORTY_OBJECTS) @%create $(OBJS)\forty.lbc @%append $(OBJS)\forty.lbc option quiet @%append $(OBJS)\forty.lbc name $^@ @%append $(OBJS)\forty.lbc option caseexact - @%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\forty.lbc library %i - @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\forty.lbc library %i + @%append $(OBJS)\forty.lbc @for %i in () do @%append $(OBJS)\forty.lbc option stack=%i wlink @$(OBJS)\forty.lbc @@ -301,29 +289,26 @@ data : .SYMBOLIC for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\forty_forty.obj : .AUTODEPEND .\forty.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(OBJS)\forty_canvas.obj : .AUTODEPEND .\canvas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(OBJS)\forty_card.obj : .AUTODEPEND .\card.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(OBJS)\forty_game.obj : .AUTODEPEND .\game.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(OBJS)\forty_pile.obj : .AUTODEPEND .\pile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(OBJS)\forty_playerdg.obj : .AUTODEPEND .\playerdg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(OBJS)\forty_scoredg.obj : .AUTODEPEND .\scoredg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< $(OBJS)\forty_scorefil.obj : .AUTODEPEND .\scorefil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_forty.res : .AUTODEPEND .\forty.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FORTY_CXXFLAGS) $< diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat index e31c8fd51a..b627b7a8c6 100644 --- a/demos/fractal/makefile.wat +++ b/demos/fractal/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe + -del $(OBJS)\fractal.exe -$(OBJS)\fractal.exe : $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res +$(OBJS)\fractal.exe : $(FRACTAL_OBJECTS) @%create $(OBJS)\fractal.lbc @%append $(OBJS)\fractal.lbc option quiet @%append $(OBJS)\fractal.lbc name $^@ @%append $(OBJS)\fractal.lbc option caseexact - @%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fractal.lbc library %i - @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\fractal.lbc library %i + @%append $(OBJS)\fractal.lbc @for %i in () do @%append $(OBJS)\fractal.lbc option stack=%i wlink @$(OBJS)\fractal.lbc $(OBJS)\fractal_fractal.obj : .AUTODEPEND .\fractal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $< - -$(OBJS)\fractal_fractal.res : .AUTODEPEND .\fractal.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $< diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat index 384e0e7d1a..c606a3d71c 100644 --- a/demos/life/makefile.wat +++ b/demos/life/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) LIFE_OBJECTS = & @@ -263,17 +251,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\life.exe del $(OBJS)\life.exe + -del $(OBJS)\life.exe -$(OBJS)\life.exe : $(LIFE_OBJECTS) $(OBJS)\life_life.res +$(OBJS)\life.exe : $(LIFE_OBJECTS) @%create $(OBJS)\life.lbc @%append $(OBJS)\life.lbc option quiet @%append $(OBJS)\life.lbc name $^@ @%append $(OBJS)\life.lbc option caseexact - @%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\life.lbc library %i - @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\life.lbc library %i + @%append $(OBJS)\life.lbc @for %i in () do @%append $(OBJS)\life.lbc option stack=%i wlink @$(OBJS)\life.lbc @@ -282,17 +270,14 @@ data : .SYMBOLIC for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\life_life.obj : .AUTODEPEND .\life.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LIFE_CXXFLAGS) $< $(OBJS)\life_dialogs.obj : .AUTODEPEND .\dialogs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LIFE_CXXFLAGS) $< $(OBJS)\life_game.obj : .AUTODEPEND .\game.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LIFE_CXXFLAGS) $< $(OBJS)\life_reader.obj : .AUTODEPEND .\reader.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< - -$(OBJS)\life_life.res : .AUTODEPEND .\life.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LIFE_CXXFLAGS) $< diff --git a/demos/makefile.wat b/demos/makefile.wat index ae31d73d07..2ddc4350be 100644 --- a/demos/makefile.wat +++ b/demos/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../build/msw/config.wat +!include ../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index 9a2f655e02..722e13309e 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,10 +229,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = & @@ -265,17 +253,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe + -del $(OBJS)\wxpoem.exe -$(OBJS)\wxpoem.exe : $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res +$(OBJS)\wxpoem.exe : $(WXPOEM_OBJECTS) @%create $(OBJS)\wxpoem.lbc @%append $(OBJS)\wxpoem.lbc option quiet @%append $(OBJS)\wxpoem.lbc name $^@ @%append $(OBJS)\wxpoem.lbc option caseexact - @%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\wxpoem.lbc library %i - @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\wxpoem.lbc library %i + @%append $(OBJS)\wxpoem.lbc @for %i in () do @%append $(OBJS)\wxpoem.lbc option stack=%i wlink @$(OBJS)\wxpoem.lbc @@ -284,8 +272,5 @@ data : .SYMBOLIC for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\wxpoem_wxpoem.obj : .AUTODEPEND .\wxpoem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $< - -$(OBJS)\wxpoem_wxpoem.res : .AUTODEPEND .\wxpoem.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $< diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat index 54cad543c1..ba81676453 100644 --- a/samples/access/makefile.wat +++ b/samples/access/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe + -del $(OBJS)\accesstest.exe -$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res +$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) @%create $(OBJS)\accesstest.lbc @%append $(OBJS)\accesstest.lbc option quiet @%append $(OBJS)\accesstest.lbc name $^@ @%append $(OBJS)\accesstest.lbc option caseexact - @%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\accesstest.lbc library %i - @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\accesstest.lbc library %i + @%append $(OBJS)\accesstest.lbc @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i wlink @$(OBJS)\accesstest.lbc $(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $< - -$(OBJS)\accesstest_accesstest.res : .AUTODEPEND .\accesstest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $< diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat index 108c89df2d..42e55d1b61 100644 --- a/samples/animate/makefile.wat +++ b/samples/animate/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,10 +229,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) ANITEST_OBJECTS = & @@ -265,17 +253,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe + -del $(OBJS)\anitest.exe -$(OBJS)\anitest.exe : $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res +$(OBJS)\anitest.exe : $(ANITEST_OBJECTS) @%create $(OBJS)\anitest.lbc @%append $(OBJS)\anitest.lbc option quiet @%append $(OBJS)\anitest.lbc name $^@ @%append $(OBJS)\anitest.lbc option caseexact - @%append $(OBJS)\anitest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\anitest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\anitest.lbc library %i - @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\anitest.lbc library %i + @%append $(OBJS)\anitest.lbc @for %i in () do @%append $(OBJS)\anitest.lbc option stack=%i wlink @$(OBJS)\anitest.lbc @@ -284,8 +272,5 @@ catalog : .SYMBOLIC for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\anitest_anitest.obj : .AUTODEPEND .\anitest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ANITEST_CXXFLAGS) $< - -$(OBJS)\anitest_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ANITEST_CXXFLAGS) $< diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index f52c02028f..f6b57fc4c3 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = & @@ -261,26 +249,23 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe + -del $(OBJS)\arttest.exe -$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res +$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) @%create $(OBJS)\arttest.lbc @%append $(OBJS)\arttest.lbc option quiet @%append $(OBJS)\arttest.lbc name $^@ @%append $(OBJS)\arttest.lbc option caseexact - @%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\arttest.lbc library %i - @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\arttest.lbc library %i + @%append $(OBJS)\arttest.lbc @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i wlink @$(OBJS)\arttest.lbc $(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< $(OBJS)\arttest_artbrows.obj : .AUTODEPEND .\artbrows.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< - -$(OBJS)\arttest_arttest.res : .AUTODEPEND .\arttest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat index 987bd293ad..8b8d1fc8d5 100644 --- a/samples/aui/makefile.wat +++ b/samples/aui/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_AUI_p = !ifeq MONOLITHIC 0 __WXLIB_AUI_p = & @@ -189,63 +234,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -256,10 +244,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) AUIDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) AUIDEMO_OBJECTS = & @@ -280,23 +268,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe + -del $(OBJS)\auidemo.exe -$(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res +$(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) @%create $(OBJS)\auidemo.lbc @%append $(OBJS)\auidemo.lbc option quiet @%append $(OBJS)\auidemo.lbc name $^@ @%append $(OBJS)\auidemo.lbc option caseexact - @%append $(OBJS)\auidemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\auidemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i - @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\auidemo.lbc library %i - @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res + @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\auidemo.lbc library %i + @%append $(OBJS)\auidemo.lbc @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i wlink @$(OBJS)\auidemo.lbc -$(OBJS)\auidemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\auidemo_auidemo.obj : .AUTODEPEND .\auidemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $< diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat index 5484ef2fd4..bedcc21fd5 100644 --- a/samples/calendar/makefile.wat +++ b/samples/calendar/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = & @@ -275,23 +263,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe + -del $(OBJS)\calendar.exe -$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res +$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) @%create $(OBJS)\calendar.lbc @%append $(OBJS)\calendar.lbc option quiet @%append $(OBJS)\calendar.lbc name $^@ @%append $(OBJS)\calendar.lbc option caseexact - @%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\calendar.lbc library %i - @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\calendar.lbc library %i + @%append $(OBJS)\calendar.lbc @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i wlink @$(OBJS)\calendar.lbc $(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $< - -$(OBJS)\calendar_calendar.res : .AUTODEPEND .\calendar.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $< diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat index 5dbe3aa452..abd7505af2 100644 --- a/samples/caret/makefile.wat +++ b/samples/caret/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe + -del $(OBJS)\caret.exe -$(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res +$(OBJS)\caret.exe : $(CARET_OBJECTS) @%create $(OBJS)\caret.lbc @%append $(OBJS)\caret.lbc option quiet @%append $(OBJS)\caret.lbc name $^@ @%append $(OBJS)\caret.lbc option caseexact - @%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\caret.lbc library %i - @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\caret.lbc library %i + @%append $(OBJS)\caret.lbc @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i wlink @$(OBJS)\caret.lbc $(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $< - -$(OBJS)\caret_caret.res : .AUTODEPEND .\caret.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CARET_CXXFLAGS) $< diff --git a/samples/checklst/makefile.wat b/samples/checklst/makefile.wat index e0131f3ed3..5c4c7504da 100644 --- a/samples/checklst/makefile.wat +++ b/samples/checklst/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CHECKLST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) CHECKLST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\checklst.exe del $(OBJS)\checklst.exe + -del $(OBJS)\checklst.exe -$(OBJS)\checklst.exe : $(CHECKLST_OBJECTS) $(OBJS)\checklst_checklst.res +$(OBJS)\checklst.exe : $(CHECKLST_OBJECTS) @%create $(OBJS)\checklst.lbc @%append $(OBJS)\checklst.lbc option quiet @%append $(OBJS)\checklst.lbc name $^@ @%append $(OBJS)\checklst.lbc option caseexact - @%append $(OBJS)\checklst.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\checklst.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CHECKLST_OBJECTS)) do @%append $(OBJS)\checklst.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\checklst.lbc library %i - @%append $(OBJS)\checklst.lbc option resource=$(OBJS)\checklst_checklst.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\checklst.lbc library %i + @%append $(OBJS)\checklst.lbc @for %i in () do @%append $(OBJS)\checklst.lbc option stack=%i wlink @$(OBJS)\checklst.lbc $(OBJS)\checklst_checklst.obj : .AUTODEPEND .\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CHECKLST_CXXFLAGS) $< - -$(OBJS)\checklst_checklst.res : .AUTODEPEND .\checklst.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CHECKLST_CXXFLAGS) $< diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat index ead26d168f..aa973d9397 100644 --- a/samples/collpane/makefile.wat +++ b/samples/collpane/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,10 +229,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) COLLPANE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) COLLPANE_OBJECTS = & @@ -265,23 +253,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe + -del $(OBJS)\collpane.exe -$(OBJS)\collpane.exe : $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res +$(OBJS)\collpane.exe : $(COLLPANE_OBJECTS) @%create $(OBJS)\collpane.lbc @%append $(OBJS)\collpane.lbc option quiet @%append $(OBJS)\collpane.lbc name $^@ @%append $(OBJS)\collpane.lbc option caseexact - @%append $(OBJS)\collpane.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\collpane.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\collpane.lbc library %i - @%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\collpane.lbc library %i + @%append $(OBJS)\collpane.lbc @for %i in () do @%append $(OBJS)\collpane.lbc option stack=%i wlink @$(OBJS)\collpane.lbc $(OBJS)\collpane_collpane.obj : .AUTODEPEND .\collpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $< - -$(OBJS)\collpane_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $< diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat index fbc5c9fe65..f647f465c5 100644 --- a/samples/combo/makefile.wat +++ b/samples/combo/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,10 +229,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) COMBO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) COMBO_OBJECTS = & @@ -265,17 +253,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe + -del $(OBJS)\combo.exe -$(OBJS)\combo.exe : $(COMBO_OBJECTS) $(OBJS)\combo_sample.res +$(OBJS)\combo.exe : $(COMBO_OBJECTS) @%create $(OBJS)\combo.lbc @%append $(OBJS)\combo.lbc option quiet @%append $(OBJS)\combo.lbc name $^@ @%append $(OBJS)\combo.lbc option caseexact - @%append $(OBJS)\combo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\combo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\combo.lbc library %i - @%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\combo.lbc library %i + @%append $(OBJS)\combo.lbc @for %i in () do @%append $(OBJS)\combo.lbc option stack=%i wlink @$(OBJS)\combo.lbc @@ -283,9 +271,6 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -$(OBJS)\combo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\combo_combo.obj : .AUTODEPEND .\combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COMBO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(COMBO_CXXFLAGS) $< diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat index 8f2d7a4e07..3f69441d1b 100644 --- a/samples/config/makefile.wat +++ b/samples/config/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe + -del $(OBJS)\conftest.exe -$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res +$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) @%create $(OBJS)\conftest.lbc @%append $(OBJS)\conftest.lbc option quiet @%append $(OBJS)\conftest.lbc name $^@ @%append $(OBJS)\conftest.lbc option caseexact - @%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\conftest.lbc library %i - @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\conftest.lbc library %i + @%append $(OBJS)\conftest.lbc @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i wlink @$(OBJS)\conftest.lbc $(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $< - -$(OBJS)\conftest_conftest.res : .AUTODEPEND .\conftest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $< diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat index af5908846a..07b053192f 100644 --- a/samples/console/makefile.wat +++ b/samples/console/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -209,18 +209,6 @@ __WXLIB_MONO_p = __WXLIB_MONO_p = & wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif ### Variables: ### @@ -231,7 +219,7 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CONSOLE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & @@ -255,16 +243,16 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\console.exe del $(OBJS)\console.exe + -del $(OBJS)\console.exe $(OBJS)\console.exe : $(CONSOLE_OBJECTS) @%create $(OBJS)\console.lbc @%append $(OBJS)\console.lbc option quiet @%append $(OBJS)\console.lbc name $^@ @%append $(OBJS)\console.lbc option caseexact - @%append $(OBJS)\console.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\console.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2 $(LDFLAGS) @for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_ODBC_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\console.lbc library %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_ODBC_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\console.lbc library %i @%append $(OBJS)\console.lbc @for %i in () do @%append $(OBJS)\console.lbc option stack=%i wlink @$(OBJS)\console.lbc @@ -274,5 +262,5 @@ data : .SYMBOLIC for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\console_console.obj : .AUTODEPEND .\console.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONSOLE_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CONSOLE_CXXFLAGS) $< diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat index 2ed5397357..8dff364a96 100644 --- a/samples/controls/makefile.wat +++ b/samples/controls/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe + -del $(OBJS)\controls.exe -$(OBJS)\controls.exe : $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res +$(OBJS)\controls.exe : $(CONTROLS_OBJECTS) @%create $(OBJS)\controls.lbc @%append $(OBJS)\controls.lbc option quiet @%append $(OBJS)\controls.lbc name $^@ @%append $(OBJS)\controls.lbc option caseexact - @%append $(OBJS)\controls.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\controls.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\controls.lbc library %i - @%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\controls.lbc library %i + @%append $(OBJS)\controls.lbc @for %i in () do @%append $(OBJS)\controls.lbc option stack=%i wlink @$(OBJS)\controls.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\controls_controls.obj : .AUTODEPEND .\controls.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $< - -$(OBJS)\controls_controls.res : .AUTODEPEND .\controls.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $< diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat index 50d7c638df..de6e10d2c2 100644 --- a/samples/dataview/makefile.wat +++ b/samples/dataview/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,10 +229,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DATAVIEW_OBJECTS = & @@ -265,23 +253,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe + -del $(OBJS)\dataview.exe -$(OBJS)\dataview.exe : $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res +$(OBJS)\dataview.exe : $(DATAVIEW_OBJECTS) @%create $(OBJS)\dataview.lbc @%append $(OBJS)\dataview.lbc option quiet @%append $(OBJS)\dataview.lbc name $^@ @%append $(OBJS)\dataview.lbc option caseexact - @%append $(OBJS)\dataview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dataview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dataview.lbc library %i - @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dataview.lbc library %i + @%append $(OBJS)\dataview.lbc @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i wlink @$(OBJS)\dataview.lbc $(OBJS)\dataview_dataview.obj : .AUTODEPEND .\dataview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $< - -$(OBJS)\dataview_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $< diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat index 1dd2c409ef..7d67635e8d 100644 --- a/samples/db/makefile.wat +++ b/samples/db/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -146,6 +146,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_DBGRID_p = !ifeq MONOLITHIC 0 __WXLIB_DBGRID_p = & @@ -200,63 +245,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -267,10 +255,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DBTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DBTEST_OBJECTS = & @@ -292,28 +280,25 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe + -del $(OBJS)\dbtest.exe !ifeq USE_ODBC 1 -$(OBJS)\dbtest.exe : $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res +$(OBJS)\dbtest.exe : $(DBTEST_OBJECTS) @%create $(OBJS)\dbtest.lbc @%append $(OBJS)\dbtest.lbc option quiet @%append $(OBJS)\dbtest.lbc name $^@ @%append $(OBJS)\dbtest.lbc option caseexact - @%append $(OBJS)\dbtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dbtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DBTEST_OBJECTS)) do @%append $(OBJS)\dbtest.lbc file %i - @for %i in ( $(__WXLIB_DBGRID_p) $(__WXLIB_ODBC_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dbtest.lbc library %i - @%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res + @for %i in ( $(__WXLIB_DBGRID_p) $(__WXLIB_ODBC_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dbtest.lbc library %i + @%append $(OBJS)\dbtest.lbc @for %i in () do @%append $(OBJS)\dbtest.lbc option stack=%i wlink @$(OBJS)\dbtest.lbc !endif $(OBJS)\dbtest_dbtest.obj : .AUTODEPEND .\dbtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBTEST_CXXFLAGS) $< $(OBJS)\dbtest_listdb.obj : .AUTODEPEND .\listdb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DBTEST_CXXFLAGS) $< - -$(OBJS)\dbtest_dbtest.res : .AUTODEPEND .\dbtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DBTEST_CXXFLAGS) $< diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat index 2f4f4ee3ea..5e1004c0a8 100644 --- a/samples/debugrpt/makefile.wat +++ b/samples/debugrpt/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,55 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_QA_p = -!ifeq MONOLITHIC 0 -__WXLIB_QA_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -228,14 +179,51 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_QA_p = +!ifeq MONOLITHIC 0 +__WXLIB_QA_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -246,10 +234,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DEBUGRPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DEBUGRPT_OBJECTS = & @@ -270,23 +258,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe + -del $(OBJS)\debugrpt.exe -$(OBJS)\debugrpt.exe : $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res +$(OBJS)\debugrpt.exe : $(DEBUGRPT_OBJECTS) @%create $(OBJS)\debugrpt.lbc @%append $(OBJS)\debugrpt.lbc option quiet @%append $(OBJS)\debugrpt.lbc name $^@ @%append $(OBJS)\debugrpt.lbc option caseexact - @%append $(OBJS)\debugrpt.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\debugrpt.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i - @for %i in ( $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\debugrpt.lbc library %i - @%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res + @for %i in ( $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\debugrpt.lbc library %i + @%append $(OBJS)\debugrpt.lbc @for %i in () do @%append $(OBJS)\debugrpt.lbc option stack=%i wlink @$(OBJS)\debugrpt.lbc -$(OBJS)\debugrpt_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\debugrpt_debugrpt.obj : .AUTODEPEND .\debugrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $< diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index 7f5e00b00b..0c3b202d7d 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,14 +142,57 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif ____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = !ifeq SHARED 0 !ifeq WXUNIV 0 ____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = & - $(OBJS)\dialogs_colrdlgg.obj & - $(OBJS)\dialogs_dirdlgg.obj & - $(OBJS)\dialogs_filedlgg.obj & - $(OBJS)\dialogs_fontdlgg.obj + $(OBJS)\dialogs_fontdlgg.obj & + $(OBJS)\dialogs_filedlgg.obj !endif !endif __WXLIB_ADV_p = @@ -194,63 +237,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -261,10 +247,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = & @@ -286,17 +272,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe + -del $(OBJS)\dialogs.exe -$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res +$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) @%create $(OBJS)\dialogs.lbc @%append $(OBJS)\dialogs.lbc option quiet @%append $(OBJS)\dialogs.lbc name $^@ @%append $(OBJS)\dialogs.lbc option caseexact - @%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dialogs.lbc library %i - @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dialogs.lbc library %i + @%append $(OBJS)\dialogs.lbc @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i wlink @$(OBJS)\dialogs.lbc @@ -305,20 +291,11 @@ data : .SYMBOLIC for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dialogs_dialogs.obj : .AUTODEPEND .\dialogs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_colrdlgg.obj : .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_dirdlgg.obj : .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< $(OBJS)\dialogs_fontdlgg.obj : .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< -$(OBJS)\dialogs_dialogs.res : .AUTODEPEND .\dialogs.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< +$(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index 05a1780954..23f3329f62 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NETTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe + -del $(OBJS)\nettest.exe -$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res +$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) @%create $(OBJS)\nettest.lbc @%append $(OBJS)\nettest.lbc option quiet @%append $(OBJS)\nettest.lbc name $^@ @%append $(OBJS)\nettest.lbc option caseexact - @%append $(OBJS)\nettest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\nettest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\nettest.lbc library %i - @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\nettest.lbc library %i + @%append $(OBJS)\nettest.lbc @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i wlink @$(OBJS)\nettest.lbc $(OBJS)\nettest_nettest.obj : .AUTODEPEND .\nettest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $< - -$(OBJS)\nettest_nettest.res : .AUTODEPEND .\nettest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NETTEST_CXXFLAGS) $< diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat index f5d0555fa5..61e47afd8c 100644 --- a/samples/display/makefile.wat +++ b/samples/display/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DISPLAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\display.exe del $(OBJS)\display.exe + -del $(OBJS)\display.exe -$(OBJS)\display.exe : $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res +$(OBJS)\display.exe : $(DISPLAY_OBJECTS) @%create $(OBJS)\display.lbc @%append $(OBJS)\display.lbc option quiet @%append $(OBJS)\display.lbc name $^@ @%append $(OBJS)\display.lbc option caseexact - @%append $(OBJS)\display.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\display.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DISPLAY_OBJECTS)) do @%append $(OBJS)\display.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\display.lbc library %i - @%append $(OBJS)\display.lbc option resource=$(OBJS)\display_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\display.lbc library %i + @%append $(OBJS)\display.lbc @for %i in () do @%append $(OBJS)\display.lbc option stack=%i wlink @$(OBJS)\display.lbc -$(OBJS)\display_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\display_display.obj : .AUTODEPEND .\display.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DISPLAY_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DISPLAY_CXXFLAGS) $< diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat index 52959eb372..df7c7947d0 100644 --- a/samples/dnd/makefile.wat +++ b/samples/dnd/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe + -del $(OBJS)\dnd.exe -$(OBJS)\dnd.exe : $(DND_OBJECTS) $(OBJS)\dnd_dnd.res +$(OBJS)\dnd.exe : $(DND_OBJECTS) @%create $(OBJS)\dnd.lbc @%append $(OBJS)\dnd.lbc option quiet @%append $(OBJS)\dnd.lbc name $^@ @%append $(OBJS)\dnd.lbc option caseexact - @%append $(OBJS)\dnd.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dnd.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DND_OBJECTS)) do @%append $(OBJS)\dnd.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dnd.lbc library %i - @%append $(OBJS)\dnd.lbc option resource=$(OBJS)\dnd_dnd.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dnd.lbc library %i + @%append $(OBJS)\dnd.lbc @for %i in () do @%append $(OBJS)\dnd.lbc option stack=%i wlink @$(OBJS)\dnd.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dnd_dnd.obj : .AUTODEPEND .\dnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DND_CXXFLAGS) $< - -$(OBJS)\dnd_dnd.res : .AUTODEPEND .\dnd.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DND_CXXFLAGS) $< diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat index 2b1d8d9a56..b46199cdad 100644 --- a/samples/docview/makefile.wat +++ b/samples/docview/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DOCVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = & @@ -262,29 +250,26 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe + -del $(OBJS)\docview.exe -$(OBJS)\docview.exe : $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res +$(OBJS)\docview.exe : $(DOCVIEW_OBJECTS) @%create $(OBJS)\docview.lbc @%append $(OBJS)\docview.lbc option quiet @%append $(OBJS)\docview.lbc name $^@ @%append $(OBJS)\docview.lbc option caseexact - @%append $(OBJS)\docview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\docview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DOCVIEW_OBJECTS)) do @%append $(OBJS)\docview.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\docview.lbc library %i - @%append $(OBJS)\docview.lbc option resource=$(OBJS)\docview_docview.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\docview.lbc library %i + @%append $(OBJS)\docview.lbc @for %i in () do @%append $(OBJS)\docview.lbc option stack=%i wlink @$(OBJS)\docview.lbc $(OBJS)\docview_docview.obj : .AUTODEPEND .\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< $(OBJS)\docview_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< $(OBJS)\docview_view.obj : .AUTODEPEND .\view.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< - -$(OBJS)\docview_docview.res : .AUTODEPEND .\docview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< diff --git a/samples/docvwmdi/makefile.wat b/samples/docvwmdi/makefile.wat index 01baaefb90..d26e1a988f 100644 --- a/samples/docvwmdi/makefile.wat +++ b/samples/docvwmdi/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DOCVWMDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DOCVWMDI_OBJECTS = & @@ -262,29 +250,26 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe + -del $(OBJS)\docvwmdi.exe -$(OBJS)\docvwmdi.exe : $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res +$(OBJS)\docvwmdi.exe : $(DOCVWMDI_OBJECTS) @%create $(OBJS)\docvwmdi.lbc @%append $(OBJS)\docvwmdi.lbc option quiet @%append $(OBJS)\docvwmdi.lbc name $^@ @%append $(OBJS)\docvwmdi.lbc option caseexact - @%append $(OBJS)\docvwmdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\docvwmdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DOCVWMDI_OBJECTS)) do @%append $(OBJS)\docvwmdi.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\docvwmdi.lbc library %i - @%append $(OBJS)\docvwmdi.lbc option resource=$(OBJS)\docvwmdi_docview.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\docvwmdi.lbc library %i + @%append $(OBJS)\docvwmdi.lbc @for %i in () do @%append $(OBJS)\docvwmdi.lbc option stack=%i wlink @$(OBJS)\docvwmdi.lbc $(OBJS)\docvwmdi_docview.obj : .AUTODEPEND .\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< $(OBJS)\docvwmdi_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< $(OBJS)\docvwmdi_view.obj : .AUTODEPEND .\view.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< - -$(OBJS)\docvwmdi_docview.res : .AUTODEPEND .\docview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat index c6b016937e..a9dd25050c 100644 --- a/samples/dragimag/makefile.wat +++ b/samples/dragimag/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DRAGIMAG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe + -del $(OBJS)\dragimag.exe -$(OBJS)\dragimag.exe : $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res +$(OBJS)\dragimag.exe : $(DRAGIMAG_OBJECTS) @%create $(OBJS)\dragimag.lbc @%append $(OBJS)\dragimag.lbc option quiet @%append $(OBJS)\dragimag.lbc name $^@ @%append $(OBJS)\dragimag.lbc option caseexact - @%append $(OBJS)\dragimag.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dragimag.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DRAGIMAG_OBJECTS)) do @%append $(OBJS)\dragimag.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dragimag.lbc library %i - @%append $(OBJS)\dragimag.lbc option resource=$(OBJS)\dragimag_dragimag.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dragimag.lbc library %i + @%append $(OBJS)\dragimag.lbc @for %i in () do @%append $(OBJS)\dragimag.lbc option stack=%i wlink @$(OBJS)\dragimag.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dragimag_dragimag.obj : .AUTODEPEND .\dragimag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DRAGIMAG_CXXFLAGS) $< - -$(OBJS)\dragimag_dragimag.res : .AUTODEPEND .\dragimag.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DRAGIMAG_CXXFLAGS) $< diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat index ae3913dad4..5305285c75 100644 --- a/samples/drawing/makefile.wat +++ b/samples/drawing/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DRAWING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe + -del $(OBJS)\drawing.exe -$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res +$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) @%create $(OBJS)\drawing.lbc @%append $(OBJS)\drawing.lbc option quiet @%append $(OBJS)\drawing.lbc name $^@ @%append $(OBJS)\drawing.lbc option caseexact - @%append $(OBJS)\drawing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\drawing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\drawing.lbc library %i - @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\drawing.lbc library %i + @%append $(OBJS)\drawing.lbc @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i wlink @$(OBJS)\drawing.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\drawing_drawing.obj : .AUTODEPEND .\drawing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $< - -$(OBJS)\drawing_drawing.res : .AUTODEPEND .\drawing.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DRAWING_CXXFLAGS) $< diff --git a/samples/dynamic/makefile.wat b/samples/dynamic/makefile.wat index 59cb25e166..9fa81af3ee 100644 --- a/samples/dynamic/makefile.wat +++ b/samples/dynamic/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DYNAMIC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) DYNAMIC_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dynamic.exe del $(OBJS)\dynamic.exe + -del $(OBJS)\dynamic.exe -$(OBJS)\dynamic.exe : $(DYNAMIC_OBJECTS) $(OBJS)\dynamic_dynamic.res +$(OBJS)\dynamic.exe : $(DYNAMIC_OBJECTS) @%create $(OBJS)\dynamic.lbc @%append $(OBJS)\dynamic.lbc option quiet @%append $(OBJS)\dynamic.lbc name $^@ @%append $(OBJS)\dynamic.lbc option caseexact - @%append $(OBJS)\dynamic.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\dynamic.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(DYNAMIC_OBJECTS)) do @%append $(OBJS)\dynamic.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dynamic.lbc library %i - @%append $(OBJS)\dynamic.lbc option resource=$(OBJS)\dynamic_dynamic.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\dynamic.lbc library %i + @%append $(OBJS)\dynamic.lbc @for %i in () do @%append $(OBJS)\dynamic.lbc option stack=%i wlink @$(OBJS)\dynamic.lbc $(OBJS)\dynamic_dynamic.obj : .AUTODEPEND .\dynamic.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DYNAMIC_CXXFLAGS) $< - -$(OBJS)\dynamic_dynamic.res : .AUTODEPEND .\dynamic.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(DYNAMIC_CXXFLAGS) $< diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat index 4ffdfdeeaf..e34c0ee872 100644 --- a/samples/erase/makefile.wat +++ b/samples/erase/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ERASE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe + -del $(OBJS)\erase.exe -$(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res +$(OBJS)\erase.exe : $(ERASE_OBJECTS) @%create $(OBJS)\erase.lbc @%append $(OBJS)\erase.lbc option quiet @%append $(OBJS)\erase.lbc name $^@ @%append $(OBJS)\erase.lbc option caseexact - @%append $(OBJS)\erase.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\erase.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\erase.lbc library %i - @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\erase.lbc library %i + @%append $(OBJS)\erase.lbc @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i wlink @$(OBJS)\erase.lbc $(OBJS)\erase_erase.obj : .AUTODEPEND .\erase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $< - -$(OBJS)\erase_erase.res : .AUTODEPEND .\erase.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ERASE_CXXFLAGS) $< diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat index 44112220dc..92d54aee29 100644 --- a/samples/event/makefile.wat +++ b/samples/event/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\event.exe del $(OBJS)\event.exe + -del $(OBJS)\event.exe -$(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res +$(OBJS)\event.exe : $(EVENT_OBJECTS) @%create $(OBJS)\event.lbc @%append $(OBJS)\event.lbc option quiet @%append $(OBJS)\event.lbc name $^@ @%append $(OBJS)\event.lbc option caseexact - @%append $(OBJS)\event.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\event.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\event.lbc library %i - @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\event.lbc library %i + @%append $(OBJS)\event.lbc @for %i in () do @%append $(OBJS)\event.lbc option stack=%i wlink @$(OBJS)\event.lbc $(OBJS)\event_event.obj : .AUTODEPEND .\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $< - -$(OBJS)\event_event.res : .AUTODEPEND .\event.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(EVENT_CXXFLAGS) $< diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat index 656467cd2c..08df3f0a18 100644 --- a/samples/except/makefile.wat +++ b/samples/except/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EXCEPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\except.exe del $(OBJS)\except.exe + -del $(OBJS)\except.exe -$(OBJS)\except.exe : $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res +$(OBJS)\except.exe : $(EXCEPT_OBJECTS) @%create $(OBJS)\except.lbc @%append $(OBJS)\except.lbc option quiet @%append $(OBJS)\except.lbc name $^@ @%append $(OBJS)\except.lbc option caseexact - @%append $(OBJS)\except.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\except.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(EXCEPT_OBJECTS)) do @%append $(OBJS)\except.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\except.lbc library %i - @%append $(OBJS)\except.lbc option resource=$(OBJS)\except_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\except.lbc library %i + @%append $(OBJS)\except.lbc @for %i in () do @%append $(OBJS)\except.lbc option stack=%i wlink @$(OBJS)\except.lbc -$(OBJS)\except_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\except_except.obj : .AUTODEPEND .\except.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EXCEPT_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(EXCEPT_CXXFLAGS) $< diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index 62dddba07e..f790b87611 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EXEC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe + -del $(OBJS)\exec.exe -$(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_exec.res +$(OBJS)\exec.exe : $(EXEC_OBJECTS) @%create $(OBJS)\exec.lbc @%append $(OBJS)\exec.lbc option quiet @%append $(OBJS)\exec.lbc name $^@ @%append $(OBJS)\exec.lbc option caseexact - @%append $(OBJS)\exec.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\exec.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\exec.lbc library %i - @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_exec.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\exec.lbc library %i + @%append $(OBJS)\exec.lbc @for %i in () do @%append $(OBJS)\exec.lbc option stack=%i wlink @$(OBJS)\exec.lbc $(OBJS)\exec_exec.obj : .AUTODEPEND .\exec.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EXEC_CXXFLAGS) $< - -$(OBJS)\exec_exec.res : .AUTODEPEND .\exec.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(EXEC_CXXFLAGS) $< diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat index 889dba795f..2f414c8e71 100644 --- a/samples/font/makefile.wat +++ b/samples/font/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FONT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\font.exe del $(OBJS)\font.exe + -del $(OBJS)\font.exe -$(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res +$(OBJS)\font.exe : $(FONT_OBJECTS) @%create $(OBJS)\font.lbc @%append $(OBJS)\font.lbc option quiet @%append $(OBJS)\font.lbc name $^@ @%append $(OBJS)\font.lbc option caseexact - @%append $(OBJS)\font.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\font.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\font.lbc library %i - @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\font.lbc library %i + @%append $(OBJS)\font.lbc @for %i in () do @%append $(OBJS)\font.lbc option stack=%i wlink @$(OBJS)\font.lbc $(OBJS)\font_font.obj : .AUTODEPEND .\font.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $< - -$(OBJS)\font_font.res : .AUTODEPEND .\font.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(FONT_CXXFLAGS) $< diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat index 0e23986ee1..7acfd83fff 100644 --- a/samples/grid/makefile.wat +++ b/samples/grid/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) GRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = & @@ -275,23 +263,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe + -del $(OBJS)\grid.exe -$(OBJS)\grid.exe : $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res +$(OBJS)\grid.exe : $(GRID_OBJECTS) @%create $(OBJS)\grid.lbc @%append $(OBJS)\grid.lbc option quiet @%append $(OBJS)\grid.lbc name $^@ @%append $(OBJS)\grid.lbc option caseexact - @%append $(OBJS)\grid.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\grid.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\grid.lbc library %i - @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\grid.lbc library %i + @%append $(OBJS)\grid.lbc @for %i in () do @%append $(OBJS)\grid.lbc option stack=%i wlink @$(OBJS)\grid.lbc $(OBJS)\grid_griddemo.obj : .AUTODEPEND .\griddemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $< - -$(OBJS)\grid_griddemo.res : .AUTODEPEND .\griddemo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(GRID_CXXFLAGS) $< diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index 7b7f818b8d..adc0aca0cd 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,55 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -228,14 +179,51 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -246,10 +234,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = & @@ -270,17 +258,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + -del $(OBJS)\help.exe -$(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res +$(OBJS)\help.exe : $(HELP_OBJECTS) @%create $(OBJS)\help.lbc @%append $(OBJS)\help.lbc option quiet @%append $(OBJS)\help.lbc name $^@ @%append $(OBJS)\help.lbc option caseexact - @%append $(OBJS)\help.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\help.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\help.lbc library %i - @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\help.lbc library %i + @%append $(OBJS)\help.lbc @for %i in () do @%append $(OBJS)\help.lbc option stack=%i wlink @$(OBJS)\help.lbc @@ -293,8 +281,5 @@ data_doc : .SYMBOLIC for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc $(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $< - -$(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELP_CXXFLAGS) $< diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat index 0af79b0689..59635d0d4e 100644 --- a/samples/htlbox/makefile.wat +++ b/samples/htlbox/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,10 +229,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HTLBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = & @@ -265,23 +253,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe + -del $(OBJS)\htlbox.exe -$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res +$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) @%create $(OBJS)\htlbox.lbc @%append $(OBJS)\htlbox.lbc option quiet @%append $(OBJS)\htlbox.lbc name $^@ @%append $(OBJS)\htlbox.lbc option caseexact - @%append $(OBJS)\htlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\htlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\htlbox.lbc library %i - @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\htlbox.lbc library %i + @%append $(OBJS)\htlbox.lbc @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i wlink @$(OBJS)\htlbox.lbc $(OBJS)\htlbox_htlbox.obj : .AUTODEPEND .\htlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $< - -$(OBJS)\htlbox_htlbox.res : .AUTODEPEND .\htlbox.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $< diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat index dcc14b2c30..7032d61434 100644 --- a/samples/html/about/makefile.wat +++ b/samples/html/about/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,12 +229,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ABOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = & $(OBJS)\about_about.obj @@ -265,17 +254,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\about.exe del $(OBJS)\about.exe + -del $(OBJS)\about.exe -$(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res +$(OBJS)\about.exe : $(ABOUT_OBJECTS) @%create $(OBJS)\about.lbc @%append $(OBJS)\about.lbc option quiet @%append $(OBJS)\about.lbc name $^@ @%append $(OBJS)\about.lbc option caseexact - @%append $(OBJS)\about.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\about.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\about.lbc library %i - @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\about.lbc library %i + @%append $(OBJS)\about.lbc @for %i in () do @%append $(OBJS)\about.lbc option stack=%i wlink @$(OBJS)\about.lbc @@ -284,8 +273,5 @@ data_files : .SYMBOLIC for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data $(OBJS)\about_about.obj : .AUTODEPEND .\about.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $< - -$(OBJS)\about_about.res : .AUTODEPEND .\about.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ABOUT_CXXFLAGS) $< diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat index f73227c516..930c7a3f35 100644 --- a/samples/html/help/makefile.wat +++ b/samples/html/help/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,12 +229,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HTMLHELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) HTMLHELP_OBJECTS = & $(OBJS)\htmlhelp_help.obj @@ -265,17 +254,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe + -del $(OBJS)\htmlhelp.exe -$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res +$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) @%create $(OBJS)\htmlhelp.lbc @%append $(OBJS)\htmlhelp.lbc option quiet @%append $(OBJS)\htmlhelp.lbc name $^@ @%append $(OBJS)\htmlhelp.lbc option caseexact - @%append $(OBJS)\htmlhelp.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\htmlhelp.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\htmlhelp.lbc library %i - @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\htmlhelp.lbc library %i + @%append $(OBJS)\htmlhelp.lbc @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i wlink @$(OBJS)\htmlhelp.lbc @@ -284,8 +273,5 @@ data : .SYMBOLIC for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles $(OBJS)\htmlhelp_help.obj : .AUTODEPEND .\help.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $< - -$(OBJS)\htmlhelp_help.res : .AUTODEPEND .\help.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $< diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat index fceefa457a..82ee47924d 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,12 +229,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = & $(OBJS)\helpview_helpview.obj @@ -265,17 +254,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + -del $(OBJS)\helpview.exe -$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res +$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) @%create $(OBJS)\helpview.lbc @%append $(OBJS)\helpview.lbc option quiet @%append $(OBJS)\helpview.lbc name $^@ @%append $(OBJS)\helpview.lbc option caseexact - @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\helpview.lbc library %i - @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\helpview.lbc library %i + @%append $(OBJS)\helpview.lbc @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i wlink @$(OBJS)\helpview.lbc @@ -284,8 +273,5 @@ data : .SYMBOLIC for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< - -$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat index 0224b0b6ab..e16c0c5534 100644 --- a/samples/html/makefile.wat +++ b/samples/html/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat index aa2d43cd7e..bdd1acc223 100644 --- a/samples/html/printing/makefile.wat +++ b/samples/html/printing/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,12 +229,12 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) & - $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) & $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) HTMLPRINTING_OBJECTS = & $(OBJS)\htmlprinting_printing.obj @@ -266,17 +254,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe + -del $(OBJS)\htmlprinting.exe -$(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res +$(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) @%create $(OBJS)\htmlprinting.lbc @%append $(OBJS)\htmlprinting.lbc option quiet @%append $(OBJS)\htmlprinting.lbc name $^@ @%append $(OBJS)\htmlprinting.lbc option caseexact - @%append $(OBJS)\htmlprinting.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\htmlprinting.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\htmlprinting.lbc library %i - @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\htmlprinting.lbc library %i + @%append $(OBJS)\htmlprinting.lbc @for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i wlink @$(OBJS)\htmlprinting.lbc @@ -285,8 +273,5 @@ data : .SYMBOLIC for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\htmlprinting_printing.obj : .AUTODEPEND .\printing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $< - -$(OBJS)\htmlprinting_printing.res : .AUTODEPEND .\printing.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $< diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat index ace2a91f3a..b44bc018ac 100644 --- a/samples/html/test/makefile.wat +++ b/samples/html/test/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,55 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -228,14 +179,51 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -246,12 +234,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & $(OBJS)\test_test.obj @@ -270,17 +259,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + -del $(OBJS)\test.exe -$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res +$(OBJS)\test.exe : $(TEST_OBJECTS) @%create $(OBJS)\test.lbc @%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc name $^@ @%append $(OBJS)\test.lbc option caseexact - @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i - @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\test.lbc library %i + @%append $(OBJS)\test.lbc @for %i in () do @%append $(OBJS)\test.lbc option stack=%i wlink @$(OBJS)\test.lbc @@ -289,8 +278,5 @@ data : .SYMBOLIC for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< - -$(OBJS)\test_test.res : .AUTODEPEND .\test.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat index b0c4740e43..69035f2949 100644 --- a/samples/html/virtual/makefile.wat +++ b/samples/html/virtual/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,12 +229,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) VIRTUAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = & $(OBJS)\virtual_virtual.obj @@ -265,17 +254,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe + -del $(OBJS)\virtual.exe -$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res +$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) @%create $(OBJS)\virtual.lbc @%append $(OBJS)\virtual.lbc option quiet @%append $(OBJS)\virtual.lbc name $^@ @%append $(OBJS)\virtual.lbc option caseexact - @%append $(OBJS)\virtual.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\virtual.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\virtual.lbc library %i - @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\virtual.lbc library %i + @%append $(OBJS)\virtual.lbc @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i wlink @$(OBJS)\virtual.lbc @@ -284,8 +273,5 @@ data : .SYMBOLIC for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\virtual_virtual.obj : .AUTODEPEND .\virtual.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $< - -$(OBJS)\virtual_virtual.res : .AUTODEPEND .\virtual.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $< diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat index a982ba5f81..3f0596ae48 100644 --- a/samples/html/widget/makefile.wat +++ b/samples/html/widget/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,12 +229,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WIDGET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = & $(OBJS)\widget_widget.obj @@ -265,17 +254,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe + -del $(OBJS)\widget.exe -$(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res +$(OBJS)\widget.exe : $(WIDGET_OBJECTS) @%create $(OBJS)\widget.lbc @%append $(OBJS)\widget.lbc option quiet @%append $(OBJS)\widget.lbc name $^@ @%append $(OBJS)\widget.lbc option caseexact - @%append $(OBJS)\widget.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\widget.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\widget.lbc library %i - @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\widget.lbc library %i + @%append $(OBJS)\widget.lbc @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i wlink @$(OBJS)\widget.lbc @@ -284,8 +273,5 @@ data : .SYMBOLIC for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\widget_widget.obj : .AUTODEPEND .\widget.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $< - -$(OBJS)\widget_widget.res : .AUTODEPEND .\widget.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGET_CXXFLAGS) $< diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat index b2f500ba56..5a864e91dd 100644 --- a/samples/html/zip/makefile.wat +++ b/samples/html/zip/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,12 +229,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ZIP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = & $(OBJS)\zip_zip.obj @@ -265,17 +254,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe + -del $(OBJS)\zip.exe -$(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res +$(OBJS)\zip.exe : $(ZIP_OBJECTS) @%create $(OBJS)\zip.lbc @%append $(OBJS)\zip.lbc option quiet @%append $(OBJS)\zip.lbc name $^@ @%append $(OBJS)\zip.lbc option caseexact - @%append $(OBJS)\zip.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\zip.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\zip.lbc library %i - @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\zip.lbc library %i + @%append $(OBJS)\zip.lbc @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i wlink @$(OBJS)\zip.lbc @@ -284,8 +273,5 @@ data : .SYMBOLIC for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\zip_zip.obj : .AUTODEPEND .\zip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $< - -$(OBJS)\zip_zip.res : .AUTODEPEND .\zip.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ZIP_CXXFLAGS) $< diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat index e8cc2f61b3..a41fef110e 100644 --- a/samples/image/makefile.wat +++ b/samples/image/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\image.exe del $(OBJS)\image.exe + -del $(OBJS)\image.exe -$(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res +$(OBJS)\image.exe : $(IMAGE_OBJECTS) @%create $(OBJS)\image.lbc @%append $(OBJS)\image.lbc option quiet @%append $(OBJS)\image.lbc name $^@ @%append $(OBJS)\image.lbc option caseexact - @%append $(OBJS)\image.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\image.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\image.lbc library %i - @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\image.lbc library %i + @%append $(OBJS)\image.lbc @for %i in () do @%append $(OBJS)\image.lbc option stack=%i wlink @$(OBJS)\image.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\image_image.obj : .AUTODEPEND .\image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< - -$(OBJS)\image_image.res : .AUTODEPEND .\image.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat index dbb3e379a1..48306896d5 100644 --- a/samples/internat/makefile.wat +++ b/samples/internat/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) INTERNAT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe + -del $(OBJS)\internat.exe -$(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res +$(OBJS)\internat.exe : $(INTERNAT_OBJECTS) @%create $(OBJS)\internat.lbc @%append $(OBJS)\internat.lbc option quiet @%append $(OBJS)\internat.lbc name $^@ @%append $(OBJS)\internat.lbc option caseexact - @%append $(OBJS)\internat.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\internat.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\internat.lbc library %i - @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\internat.lbc library %i + @%append $(OBJS)\internat.lbc @for %i in () do @%append $(OBJS)\internat.lbc option stack=%i wlink @$(OBJS)\internat.lbc @@ -319,8 +307,5 @@ ja_JP.EUC-JP : .SYMBOLIC for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP $(OBJS)\internat_internat.obj : .AUTODEPEND .\internat.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $< - -$(OBJS)\internat_internat.res : .AUTODEPEND .\internat.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $< diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat index 2973e69d66..04c0ba34a5 100644 --- a/samples/ipc/makefile.wat +++ b/samples/ipc/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -231,6 +187,38 @@ __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,7 +229,7 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -250,7 +238,7 @@ IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & IPCCLIENT_OBJECTS = & $(OBJS)\ipcclient_client.obj IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -274,42 +262,36 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe - -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe + -del $(OBJS)\ipcclient.exe + -del $(OBJS)\ipcserver.exe -$(OBJS)\ipcclient.exe : $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res +$(OBJS)\ipcclient.exe : $(IPCCLIENT_OBJECTS) @%create $(OBJS)\ipcclient.lbc @%append $(OBJS)\ipcclient.lbc option quiet @%append $(OBJS)\ipcclient.lbc name $^@ @%append $(OBJS)\ipcclient.lbc option caseexact - @%append $(OBJS)\ipcclient.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\ipcclient.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\ipcclient.lbc library %i - @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\ipcclient.lbc library %i + @%append $(OBJS)\ipcclient.lbc @for %i in () do @%append $(OBJS)\ipcclient.lbc option stack=%i wlink @$(OBJS)\ipcclient.lbc -$(OBJS)\ipcserver.exe : $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res +$(OBJS)\ipcserver.exe : $(IPCSERVER_OBJECTS) @%create $(OBJS)\ipcserver.lbc @%append $(OBJS)\ipcserver.lbc option quiet @%append $(OBJS)\ipcserver.lbc name $^@ @%append $(OBJS)\ipcserver.lbc option caseexact - @%append $(OBJS)\ipcserver.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\ipcserver.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\ipcserver.lbc library %i - @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\ipcserver.lbc library %i + @%append $(OBJS)\ipcserver.lbc @for %i in () do @%append $(OBJS)\ipcserver.lbc option stack=%i wlink @$(OBJS)\ipcserver.lbc -$(OBJS)\ipcclient_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\ipcclient_client.obj : .AUTODEPEND .\client.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $< - -$(OBJS)\ipcserver_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $< $(OBJS)\ipcserver_server.obj : .AUTODEPEND .\server.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $< diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat index 0dfc599765..6c50b21fcf 100644 --- a/samples/joytest/makefile.wat +++ b/samples/joytest/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) JOYTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = & @@ -275,23 +263,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe + -del $(OBJS)\joytest.exe -$(OBJS)\joytest.exe : $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res +$(OBJS)\joytest.exe : $(JOYTEST_OBJECTS) @%create $(OBJS)\joytest.lbc @%append $(OBJS)\joytest.lbc option quiet @%append $(OBJS)\joytest.lbc name $^@ @%append $(OBJS)\joytest.lbc option caseexact - @%append $(OBJS)\joytest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\joytest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(JOYTEST_OBJECTS)) do @%append $(OBJS)\joytest.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\joytest.lbc library %i - @%append $(OBJS)\joytest.lbc option resource=$(OBJS)\joytest_joytest.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\joytest.lbc library %i + @%append $(OBJS)\joytest.lbc @for %i in () do @%append $(OBJS)\joytest.lbc option stack=%i wlink @$(OBJS)\joytest.lbc $(OBJS)\joytest_joytest.obj : .AUTODEPEND .\joytest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(JOYTEST_CXXFLAGS) $< - -$(OBJS)\joytest_joytest.res : .AUTODEPEND .\joytest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(JOYTEST_CXXFLAGS) $< diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat index 0fe6771118..a645e78958 100644 --- a/samples/keyboard/makefile.wat +++ b/samples/keyboard/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) KEYBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe + -del $(OBJS)\keyboard.exe -$(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res +$(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) @%create $(OBJS)\keyboard.lbc @%append $(OBJS)\keyboard.lbc option quiet @%append $(OBJS)\keyboard.lbc name $^@ @%append $(OBJS)\keyboard.lbc option caseexact - @%append $(OBJS)\keyboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\keyboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\keyboard.lbc library %i - @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\keyboard.lbc library %i + @%append $(OBJS)\keyboard.lbc @for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i wlink @$(OBJS)\keyboard.lbc $(OBJS)\keyboard_keyboard.obj : .AUTODEPEND .\keyboard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $< - -$(OBJS)\keyboard_keyboard.res : .AUTODEPEND .\keyboard.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $< diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat index 427d18c05d..28821d2bb2 100644 --- a/samples/layout/makefile.wat +++ b/samples/layout/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LAYOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe + -del $(OBJS)\layout.exe -$(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res +$(OBJS)\layout.exe : $(LAYOUT_OBJECTS) @%create $(OBJS)\layout.lbc @%append $(OBJS)\layout.lbc option quiet @%append $(OBJS)\layout.lbc name $^@ @%append $(OBJS)\layout.lbc option caseexact - @%append $(OBJS)\layout.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\layout.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\layout.lbc library %i - @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\layout.lbc library %i + @%append $(OBJS)\layout.lbc @for %i in () do @%append $(OBJS)\layout.lbc option stack=%i wlink @$(OBJS)\layout.lbc $(OBJS)\layout_layout.obj : .AUTODEPEND .\layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $< - -$(OBJS)\layout_layout.res : .AUTODEPEND .\layout.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $< diff --git a/samples/listbox/makefile.wat b/samples/listbox/makefile.wat index 0f7676b783..c136acb878 100644 --- a/samples/listbox/makefile.wat +++ b/samples/listbox/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LISTBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\listbox.exe del $(OBJS)\listbox.exe + -del $(OBJS)\listbox.exe -$(OBJS)\listbox.exe : $(LISTBOX_OBJECTS) $(OBJS)\listbox_sample.res +$(OBJS)\listbox.exe : $(LISTBOX_OBJECTS) @%create $(OBJS)\listbox.lbc @%append $(OBJS)\listbox.lbc option quiet @%append $(OBJS)\listbox.lbc name $^@ @%append $(OBJS)\listbox.lbc option caseexact - @%append $(OBJS)\listbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\listbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(LISTBOX_OBJECTS)) do @%append $(OBJS)\listbox.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\listbox.lbc library %i - @%append $(OBJS)\listbox.lbc option resource=$(OBJS)\listbox_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\listbox.lbc library %i + @%append $(OBJS)\listbox.lbc @for %i in () do @%append $(OBJS)\listbox.lbc option stack=%i wlink @$(OBJS)\listbox.lbc -$(OBJS)\listbox_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\listbox_lboxtest.obj : .AUTODEPEND .\lboxtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LISTBOX_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LISTBOX_CXXFLAGS) $< diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat index 8d77c9cc2f..bd5495ec71 100644 --- a/samples/listctrl/makefile.wat +++ b/samples/listctrl/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LISTCTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe + -del $(OBJS)\listctrl.exe -$(OBJS)\listctrl.exe : $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res +$(OBJS)\listctrl.exe : $(LISTCTRL_OBJECTS) @%create $(OBJS)\listctrl.lbc @%append $(OBJS)\listctrl.lbc option quiet @%append $(OBJS)\listctrl.lbc name $^@ @%append $(OBJS)\listctrl.lbc option caseexact - @%append $(OBJS)\listctrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\listctrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\listctrl.lbc library %i - @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\listctrl.lbc library %i + @%append $(OBJS)\listctrl.lbc @for %i in () do @%append $(OBJS)\listctrl.lbc option stack=%i wlink @$(OBJS)\listctrl.lbc $(OBJS)\listctrl_listtest.obj : .AUTODEPEND .\listtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LISTCTRL_CXXFLAGS) $< - -$(OBJS)\listctrl_listtest.res : .AUTODEPEND .\listtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(LISTCTRL_CXXFLAGS) $< diff --git a/samples/makefile.wat b/samples/makefile.wat index 3921eaf863..eb93c7dde5 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../build/msw/config.wat +!include ../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat index ac7ad39579..4a7caffe76 100644 --- a/samples/mdi/makefile.wat +++ b/samples/mdi/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe + -del $(OBJS)\mdi.exe -$(OBJS)\mdi.exe : $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res +$(OBJS)\mdi.exe : $(MDI_OBJECTS) @%create $(OBJS)\mdi.lbc @%append $(OBJS)\mdi.lbc option quiet @%append $(OBJS)\mdi.lbc name $^@ @%append $(OBJS)\mdi.lbc option caseexact - @%append $(OBJS)\mdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\mdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MDI_OBJECTS)) do @%append $(OBJS)\mdi.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mdi.lbc library %i - @%append $(OBJS)\mdi.lbc option resource=$(OBJS)\mdi_mdi.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\mdi.lbc library %i + @%append $(OBJS)\mdi.lbc @for %i in () do @%append $(OBJS)\mdi.lbc option stack=%i wlink @$(OBJS)\mdi.lbc $(OBJS)\mdi_mdi.obj : .AUTODEPEND .\mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MDI_CXXFLAGS) $< - -$(OBJS)\mdi_mdi.res : .AUTODEPEND .\mdi.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MDI_CXXFLAGS) $< diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat index cf81dc75cf..f1fad19d4f 100644 --- a/samples/mediaplayer/makefile.wat +++ b/samples/mediaplayer/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,52 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_MEDIA_p = -!ifeq MONOLITHIC 0 -!ifeq USE_MEDIA 1 -__WXLIB_MEDIA_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -225,14 +179,48 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_MEDIA_p = +!ifeq MONOLITHIC 0 +!ifeq USE_MEDIA 1 +__WXLIB_MEDIA_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +!endif +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -243,10 +231,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MEDIAPLAYER_OBJECTS = & @@ -267,23 +255,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe + -del $(OBJS)\mediaplayer.exe -$(OBJS)\mediaplayer.exe : $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res +$(OBJS)\mediaplayer.exe : $(MEDIAPLAYER_OBJECTS) @%create $(OBJS)\mediaplayer.lbc @%append $(OBJS)\mediaplayer.lbc option quiet @%append $(OBJS)\mediaplayer.lbc name $^@ @%append $(OBJS)\mediaplayer.lbc option caseexact - @%append $(OBJS)\mediaplayer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\mediaplayer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MEDIAPLAYER_OBJECTS)) do @%append $(OBJS)\mediaplayer.lbc file %i - @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mediaplayer.lbc library %i - @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res + @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\mediaplayer.lbc library %i + @%append $(OBJS)\mediaplayer.lbc @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i wlink @$(OBJS)\mediaplayer.lbc -$(OBJS)\mediaplayer_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\mediaplayer_mediaplayer.obj : .AUTODEPEND .\mediaplayer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $< diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat index 507c3fca61..a177fc3e89 100644 --- a/samples/memcheck/makefile.wat +++ b/samples/memcheck/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MEMCHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe + -del $(OBJS)\memcheck.exe -$(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res +$(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) @%create $(OBJS)\memcheck.lbc @%append $(OBJS)\memcheck.lbc option quiet @%append $(OBJS)\memcheck.lbc name $^@ @%append $(OBJS)\memcheck.lbc option caseexact - @%append $(OBJS)\memcheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\memcheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\memcheck.lbc library %i - @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\memcheck.lbc library %i + @%append $(OBJS)\memcheck.lbc @for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i wlink @$(OBJS)\memcheck.lbc $(OBJS)\memcheck_memcheck.obj : .AUTODEPEND .\memcheck.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $< - -$(OBJS)\memcheck_memcheck.res : .AUTODEPEND .\memcheck.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $< diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat index 8d5a6f6e30..7c826d173d 100644 --- a/samples/menu/makefile.wat +++ b/samples/menu/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MENU_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe + -del $(OBJS)\menu.exe -$(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_menu.res +$(OBJS)\menu.exe : $(MENU_OBJECTS) @%create $(OBJS)\menu.lbc @%append $(OBJS)\menu.lbc option quiet @%append $(OBJS)\menu.lbc name $^@ @%append $(OBJS)\menu.lbc option caseexact - @%append $(OBJS)\menu.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\menu.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\menu.lbc library %i - @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\menu.lbc library %i + @%append $(OBJS)\menu.lbc @for %i in () do @%append $(OBJS)\menu.lbc option stack=%i wlink @$(OBJS)\menu.lbc $(OBJS)\menu_menu.obj : .AUTODEPEND .\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $< - -$(OBJS)\menu_menu.res : .AUTODEPEND .\menu.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MENU_CXXFLAGS) $< diff --git a/samples/mfc/makefile.wat b/samples/mfc/makefile.wat index 4953a23525..7aad83dded 100644 --- a/samples/mfc/makefile.wat +++ b/samples/mfc/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MFCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe + -del $(OBJS)\mfctest.exe -$(OBJS)\mfctest.exe : $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res +$(OBJS)\mfctest.exe : $(MFCTEST_OBJECTS) @%create $(OBJS)\mfctest.lbc @%append $(OBJS)\mfctest.lbc option quiet @%append $(OBJS)\mfctest.lbc name $^@ @%append $(OBJS)\mfctest.lbc option caseexact - @%append $(OBJS)\mfctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\mfctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MFCTEST_OBJECTS)) do @%append $(OBJS)\mfctest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mfctest.lbc library %i - @%append $(OBJS)\mfctest.lbc option resource=$(OBJS)\mfctest_mfctest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\mfctest.lbc library %i + @%append $(OBJS)\mfctest.lbc @for %i in () do @%append $(OBJS)\mfctest.lbc option stack=%i wlink @$(OBJS)\mfctest.lbc $(OBJS)\mfctest_mfctest.obj : .AUTODEPEND .\mfctest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MFCTEST_CXXFLAGS) $< - -$(OBJS)\mfctest_mfctest.res : .AUTODEPEND .\mfctest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MFCTEST_CXXFLAGS) $< diff --git a/samples/minifram/makefile.wat b/samples/minifram/makefile.wat index 017220bde4..cab95d0ec4 100644 --- a/samples/minifram/makefile.wat +++ b/samples/minifram/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MINIFRAM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MINIFRAM_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\minifram.exe del $(OBJS)\minifram.exe + -del $(OBJS)\minifram.exe -$(OBJS)\minifram.exe : $(MINIFRAM_OBJECTS) $(OBJS)\minifram_minifram.res +$(OBJS)\minifram.exe : $(MINIFRAM_OBJECTS) @%create $(OBJS)\minifram.lbc @%append $(OBJS)\minifram.lbc option quiet @%append $(OBJS)\minifram.lbc name $^@ @%append $(OBJS)\minifram.lbc option caseexact - @%append $(OBJS)\minifram.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\minifram.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MINIFRAM_OBJECTS)) do @%append $(OBJS)\minifram.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\minifram.lbc library %i - @%append $(OBJS)\minifram.lbc option resource=$(OBJS)\minifram_minifram.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\minifram.lbc library %i + @%append $(OBJS)\minifram.lbc @for %i in () do @%append $(OBJS)\minifram.lbc option stack=%i wlink @$(OBJS)\minifram.lbc $(OBJS)\minifram_minifram.obj : .AUTODEPEND .\minifram.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MINIFRAM_CXXFLAGS) $< - -$(OBJS)\minifram_minifram.res : .AUTODEPEND .\minifram.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MINIFRAM_CXXFLAGS) $< diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat index d4c25f1e74..880cb80a7e 100644 --- a/samples/minimal/makefile.wat +++ b/samples/minimal/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe + -del $(OBJS)\minimal.exe -$(OBJS)\minimal.exe : $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res +$(OBJS)\minimal.exe : $(MINIMAL_OBJECTS) @%create $(OBJS)\minimal.lbc @%append $(OBJS)\minimal.lbc option quiet @%append $(OBJS)\minimal.lbc name $^@ @%append $(OBJS)\minimal.lbc option caseexact - @%append $(OBJS)\minimal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\minimal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MINIMAL_OBJECTS)) do @%append $(OBJS)\minimal.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\minimal.lbc library %i - @%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\minimal.lbc library %i + @%append $(OBJS)\minimal.lbc @for %i in () do @%append $(OBJS)\minimal.lbc option stack=%i wlink @$(OBJS)\minimal.lbc -$(OBJS)\minimal_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\minimal_minimal.obj : .AUTODEPEND .\minimal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $< diff --git a/samples/mobile/makefile.wat b/samples/mobile/makefile.wat index 151e57bbc0..26523d07f2 100644 --- a/samples/mobile/makefile.wat +++ b/samples/mobile/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! diff --git a/samples/mobile/styles/makefile.wat b/samples/mobile/styles/makefile.wat index 279e7973ec..82d849abd2 100644 --- a/samples/mobile/styles/makefile.wat +++ b/samples/mobile/styles/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,12 +224,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STYLES_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) STYLES_OBJECTS = & $(OBJS)\styles_styles.obj @@ -260,17 +249,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\styles.exe del $(OBJS)\styles.exe + -del $(OBJS)\styles.exe -$(OBJS)\styles.exe : $(STYLES_OBJECTS) $(OBJS)\styles_sample.res +$(OBJS)\styles.exe : $(STYLES_OBJECTS) @%create $(OBJS)\styles.lbc @%append $(OBJS)\styles.lbc option quiet @%append $(OBJS)\styles.lbc name $^@ @%append $(OBJS)\styles.lbc option caseexact - @%append $(OBJS)\styles.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\styles.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(STYLES_OBJECTS)) do @%append $(OBJS)\styles.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\styles.lbc library %i - @%append $(OBJS)\styles.lbc option resource=$(OBJS)\styles_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\styles.lbc library %i + @%append $(OBJS)\styles.lbc @for %i in () do @%append $(OBJS)\styles.lbc option stack=%i wlink @$(OBJS)\styles.lbc @@ -278,9 +267,6 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (marble.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -$(OBJS)\styles_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - $(OBJS)\styles_styles.obj : .AUTODEPEND .\styles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STYLES_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STYLES_CXXFLAGS) $< diff --git a/samples/mobile/wxedit/makefile.wat b/samples/mobile/wxedit/makefile.wat index f04584894d..1d2d663d45 100644 --- a/samples/mobile/wxedit/makefile.wat +++ b/samples/mobile/wxedit/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,12 +224,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXEDIT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) WXEDIT_OBJECTS = & $(OBJS)\wxedit_wxedit.obj @@ -260,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxedit.exe del $(OBJS)\wxedit.exe + -del $(OBJS)\wxedit.exe -$(OBJS)\wxedit.exe : $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample.res +$(OBJS)\wxedit.exe : $(WXEDIT_OBJECTS) @%create $(OBJS)\wxedit.lbc @%append $(OBJS)\wxedit.lbc option quiet @%append $(OBJS)\wxedit.lbc name $^@ @%append $(OBJS)\wxedit.lbc option caseexact - @%append $(OBJS)\wxedit.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\wxedit.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(WXEDIT_OBJECTS)) do @%append $(OBJS)\wxedit.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\wxedit.lbc library %i - @%append $(OBJS)\wxedit.lbc option resource=$(OBJS)\wxedit_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\wxedit.lbc library %i + @%append $(OBJS)\wxedit.lbc @for %i in () do @%append $(OBJS)\wxedit.lbc option stack=%i wlink @$(OBJS)\wxedit.lbc -$(OBJS)\wxedit_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - $(OBJS)\wxedit_wxedit.obj : .AUTODEPEND .\wxedit.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXEDIT_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WXEDIT_CXXFLAGS) $< diff --git a/samples/multimon/makefile.wat b/samples/multimon/makefile.wat index c9963e0221..b1d6dfabe5 100644 --- a/samples/multimon/makefile.wat +++ b/samples/multimon/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,12 +224,12 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MULTIMON_TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) & - $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) & $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) & $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = & $(OBJS)\multimon_test_multimon_test.obj @@ -261,23 +249,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\multimon_test.exe del $(OBJS)\multimon_test.exe + -del $(OBJS)\multimon_test.exe -$(OBJS)\multimon_test.exe : $(MULTIMON_TEST_OBJECTS) $(OBJS)\multimon_test_sample.res +$(OBJS)\multimon_test.exe : $(MULTIMON_TEST_OBJECTS) @%create $(OBJS)\multimon_test.lbc @%append $(OBJS)\multimon_test.lbc option quiet @%append $(OBJS)\multimon_test.lbc name $^@ @%append $(OBJS)\multimon_test.lbc option caseexact - @%append $(OBJS)\multimon_test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\multimon_test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(MULTIMON_TEST_OBJECTS)) do @%append $(OBJS)\multimon_test.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\multimon_test.lbc library %i - @%append $(OBJS)\multimon_test.lbc option resource=$(OBJS)\multimon_test_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\multimon_test.lbc library %i + @%append $(OBJS)\multimon_test.lbc @for %i in () do @%append $(OBJS)\multimon_test.lbc option stack=%i wlink @$(OBJS)\multimon_test.lbc -$(OBJS)\multimon_test_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\multimon_test_multimon_test.obj : .AUTODEPEND .\multimon_test.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MULTIMON_TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(MULTIMON_TEST_CXXFLAGS) $< diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat index 1eb785dfee..d2482c755f 100644 --- a/samples/nativdlg/makefile.wat +++ b/samples/nativdlg/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NATIVDLG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe + -del $(OBJS)\nativdlg.exe -$(OBJS)\nativdlg.exe : $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res +$(OBJS)\nativdlg.exe : $(NATIVDLG_OBJECTS) @%create $(OBJS)\nativdlg.lbc @%append $(OBJS)\nativdlg.lbc option quiet @%append $(OBJS)\nativdlg.lbc name $^@ @%append $(OBJS)\nativdlg.lbc option caseexact - @%append $(OBJS)\nativdlg.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\nativdlg.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(NATIVDLG_OBJECTS)) do @%append $(OBJS)\nativdlg.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\nativdlg.lbc library %i - @%append $(OBJS)\nativdlg.lbc option resource=$(OBJS)\nativdlg_nativdlg.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\nativdlg.lbc library %i + @%append $(OBJS)\nativdlg.lbc @for %i in () do @%append $(OBJS)\nativdlg.lbc option stack=%i wlink @$(OBJS)\nativdlg.lbc $(OBJS)\nativdlg_nativdlg.obj : .AUTODEPEND .\nativdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NATIVDLG_CXXFLAGS) $< - -$(OBJS)\nativdlg_nativdlg.res : .AUTODEPEND .\nativdlg.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NATIVDLG_CXXFLAGS) $< diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat index 632eb7f432..bffb10504f 100644 --- a/samples/notebook/makefile.wat +++ b/samples/notebook/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NOTEBOOK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe + -del $(OBJS)\notebook.exe -$(OBJS)\notebook.exe : $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res +$(OBJS)\notebook.exe : $(NOTEBOOK_OBJECTS) @%create $(OBJS)\notebook.lbc @%append $(OBJS)\notebook.lbc option quiet @%append $(OBJS)\notebook.lbc name $^@ @%append $(OBJS)\notebook.lbc option caseexact - @%append $(OBJS)\notebook.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\notebook.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\notebook.lbc library %i - @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\notebook.lbc library %i + @%append $(OBJS)\notebook.lbc @for %i in () do @%append $(OBJS)\notebook.lbc option stack=%i wlink @$(OBJS)\notebook.lbc -$(OBJS)\notebook_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\notebook_notebook.obj : .AUTODEPEND .\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $< diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat index 1f8e80bf44..8391b5183f 100644 --- a/samples/oleauto/makefile.wat +++ b/samples/oleauto/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) OLEAUTO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe + -del $(OBJS)\oleauto.exe -$(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res +$(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) @%create $(OBJS)\oleauto.lbc @%append $(OBJS)\oleauto.lbc option quiet @%append $(OBJS)\oleauto.lbc name $^@ @%append $(OBJS)\oleauto.lbc option caseexact - @%append $(OBJS)\oleauto.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\oleauto.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\oleauto.lbc library %i - @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\oleauto.lbc library %i + @%append $(OBJS)\oleauto.lbc @for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i wlink @$(OBJS)\oleauto.lbc $(OBJS)\oleauto_oleauto.obj : .AUTODEPEND .\oleauto.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $< - -$(OBJS)\oleauto_oleauto.res : .AUTODEPEND .\oleauto.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $< diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat index 7717b05547..47f1bf7bb6 100644 --- a/samples/opengl/cube/makefile.wat +++ b/samples/opengl/cube/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -146,45 +146,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -222,14 +183,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -240,12 +228,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = & $(OBJS)\cube_cube.obj @@ -264,25 +253,22 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe + -del $(OBJS)\cube.exe !ifeq USE_OPENGL 1 -$(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res +$(OBJS)\cube.exe : $(CUBE_OBJECTS) @%create $(OBJS)\cube.lbc @%append $(OBJS)\cube.lbc option quiet @%append $(OBJS)\cube.lbc name $^@ @%append $(OBJS)\cube.lbc option caseexact - @%append $(OBJS)\cube.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\cube.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\cube.lbc library %i - @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\cube.lbc library %i + @%append $(OBJS)\cube.lbc @for %i in () do @%append $(OBJS)\cube.lbc option stack=%i wlink @$(OBJS)\cube.lbc !endif $(OBJS)\cube_cube.obj : .AUTODEPEND .\cube.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $< - -$(OBJS)\cube_cube.res : .AUTODEPEND .\cube.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CUBE_CXXFLAGS) $< diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat index 58459bc2d2..0db2fbf828 100644 --- a/samples/opengl/isosurf/makefile.wat +++ b/samples/opengl/isosurf/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -146,45 +146,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -222,14 +183,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -240,12 +228,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ISOSURF_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = & $(OBJS)\isosurf_isosurf.obj @@ -264,18 +253,18 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe + -del $(OBJS)\isosurf.exe !ifeq USE_OPENGL 1 -$(OBJS)\isosurf.exe : $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res +$(OBJS)\isosurf.exe : $(ISOSURF_OBJECTS) @%create $(OBJS)\isosurf.lbc @%append $(OBJS)\isosurf.lbc option quiet @%append $(OBJS)\isosurf.lbc name $^@ @%append $(OBJS)\isosurf.lbc option caseexact - @%append $(OBJS)\isosurf.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\isosurf.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\isosurf.lbc library %i - @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\isosurf.lbc library %i + @%append $(OBJS)\isosurf.lbc @for %i in () do @%append $(OBJS)\isosurf.lbc option stack=%i wlink @$(OBJS)\isosurf.lbc !endif @@ -284,9 +273,6 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -$(OBJS)\isosurf_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - $(OBJS)\isosurf_isosurf.obj : .AUTODEPEND .\isosurf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $< diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat index 171df71d9c..158a771987 100644 --- a/samples/opengl/makefile.wat +++ b/samples/opengl/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat index de497a73df..88e3f449a6 100644 --- a/samples/opengl/penguin/makefile.wat +++ b/samples/opengl/penguin/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -146,45 +146,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -222,14 +183,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -240,19 +228,20 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PENGUIN_CFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(CPPFLAGS) $(CFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(CPPFLAGS) $(CFLAGS) PENGUIN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = & $(OBJS)\penguin_penguin.obj & $(OBJS)\penguin_dxfrenderer.obj & @@ -273,18 +262,18 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe + -del $(OBJS)\penguin.exe !ifeq USE_OPENGL 1 -$(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res +$(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) @%create $(OBJS)\penguin.lbc @%append $(OBJS)\penguin.lbc option quiet @%append $(OBJS)\penguin.lbc name $^@ @%append $(OBJS)\penguin.lbc option caseexact - @%append $(OBJS)\penguin.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\penguin.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\penguin.lbc library %i - @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\penguin.lbc library %i + @%append $(OBJS)\penguin.lbc @for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i wlink @$(OBJS)\penguin.lbc !endif @@ -294,14 +283,11 @@ data : .SYMBOLIC for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\penguin_penguin.obj : .AUTODEPEND .\penguin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< $(OBJS)\penguin_dxfrenderer.obj : .AUTODEPEND .\dxfrenderer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< $(OBJS)\penguin_trackball.obj : .AUTODEPEND .\trackball.c - $(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $< - -$(OBJS)\penguin_penguin.res : .AUTODEPEND .\penguin.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CC) -bt=os2 -zq -fo=$^@ $(PENGUIN_CFLAGS) $< diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat index 3b6cb0dd9d..85b8276879 100644 --- a/samples/ownerdrw/makefile.wat +++ b/samples/ownerdrw/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) OWNERDRW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe + -del $(OBJS)\ownerdrw.exe -$(OBJS)\ownerdrw.exe : $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res +$(OBJS)\ownerdrw.exe : $(OWNERDRW_OBJECTS) @%create $(OBJS)\ownerdrw.lbc @%append $(OBJS)\ownerdrw.lbc option quiet @%append $(OBJS)\ownerdrw.lbc name $^@ @%append $(OBJS)\ownerdrw.lbc option caseexact - @%append $(OBJS)\ownerdrw.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\ownerdrw.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(OWNERDRW_OBJECTS)) do @%append $(OBJS)\ownerdrw.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\ownerdrw.lbc library %i - @%append $(OBJS)\ownerdrw.lbc option resource=$(OBJS)\ownerdrw_ownerdrw.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\ownerdrw.lbc library %i + @%append $(OBJS)\ownerdrw.lbc @for %i in () do @%append $(OBJS)\ownerdrw.lbc option stack=%i wlink @$(OBJS)\ownerdrw.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\ownerdrw_ownerdrw.obj : .AUTODEPEND .\ownerdrw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OWNERDRW_CXXFLAGS) $< - -$(OBJS)\ownerdrw_ownerdrw.res : .AUTODEPEND .\ownerdrw.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(OWNERDRW_CXXFLAGS) $< diff --git a/samples/png/makefile.wat b/samples/png/makefile.wat index 502427a0e3..5197066ff8 100644 --- a/samples/png/makefile.wat +++ b/samples/png/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PNG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) PNG_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\png.exe del $(OBJS)\png.exe + -del $(OBJS)\png.exe -$(OBJS)\png.exe : $(PNG_OBJECTS) $(OBJS)\png_pngdemo.res +$(OBJS)\png.exe : $(PNG_OBJECTS) @%create $(OBJS)\png.lbc @%append $(OBJS)\png.lbc option quiet @%append $(OBJS)\png.lbc name $^@ @%append $(OBJS)\png.lbc option caseexact - @%append $(OBJS)\png.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\png.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(PNG_OBJECTS)) do @%append $(OBJS)\png.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\png.lbc library %i - @%append $(OBJS)\png.lbc option resource=$(OBJS)\png_pngdemo.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\png.lbc library %i + @%append $(OBJS)\png.lbc @for %i in () do @%append $(OBJS)\png.lbc option stack=%i wlink @$(OBJS)\png.lbc $(OBJS)\png_pngdemo.obj : .AUTODEPEND .\pngdemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PNG_CXXFLAGS) $< - -$(OBJS)\png_pngdemo.res : .AUTODEPEND .\pngdemo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PNG_CXXFLAGS) $< diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat index 5bb0b2c106..883b9d72ef 100644 --- a/samples/popup/makefile.wat +++ b/samples/popup/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) POPUP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) POPUP_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe + -del $(OBJS)\popup.exe -$(OBJS)\popup.exe : $(POPUP_OBJECTS) $(OBJS)\popup_sample.res +$(OBJS)\popup.exe : $(POPUP_OBJECTS) @%create $(OBJS)\popup.lbc @%append $(OBJS)\popup.lbc option quiet @%append $(OBJS)\popup.lbc name $^@ @%append $(OBJS)\popup.lbc option caseexact - @%append $(OBJS)\popup.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\popup.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\popup.lbc library %i - @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\popup.lbc library %i + @%append $(OBJS)\popup.lbc @for %i in () do @%append $(OBJS)\popup.lbc option stack=%i wlink @$(OBJS)\popup.lbc $(OBJS)\popup_popup.obj : .AUTODEPEND .\popup.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(POPUP_CXXFLAGS) $< - -$(OBJS)\popup_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(POPUP_CXXFLAGS) $< diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat index d33eb75aa1..7b7f26b9a6 100644 --- a/samples/power/makefile.wat +++ b/samples/power/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) POWER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) POWER_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\power.exe del $(OBJS)\power.exe + -del $(OBJS)\power.exe -$(OBJS)\power.exe : $(POWER_OBJECTS) $(OBJS)\power_sample.res +$(OBJS)\power.exe : $(POWER_OBJECTS) @%create $(OBJS)\power.lbc @%append $(OBJS)\power.lbc option quiet @%append $(OBJS)\power.lbc name $^@ @%append $(OBJS)\power.lbc option caseexact - @%append $(OBJS)\power.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\power.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\power.lbc library %i - @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\power.lbc library %i + @%append $(OBJS)\power.lbc @for %i in () do @%append $(OBJS)\power.lbc option stack=%i wlink @$(OBJS)\power.lbc -$(OBJS)\power_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\power_power.obj : .AUTODEPEND .\power.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(POWER_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(POWER_CXXFLAGS) $< diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat index 23b688151b..44aa4d2dc1 100644 --- a/samples/printing/makefile.wat +++ b/samples/printing/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + -del $(OBJS)\printing.exe -$(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res +$(OBJS)\printing.exe : $(PRINTING_OBJECTS) @%create $(OBJS)\printing.lbc @%append $(OBJS)\printing.lbc option quiet @%append $(OBJS)\printing.lbc name $^@ @%append $(OBJS)\printing.lbc option caseexact - @%append $(OBJS)\printing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\printing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\printing.lbc library %i - @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\printing.lbc library %i + @%append $(OBJS)\printing.lbc @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i wlink @$(OBJS)\printing.lbc $(OBJS)\printing_printing.obj : .AUTODEPEND .\printing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $< - -$(OBJS)\printing_printing.res : .AUTODEPEND .\printing.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PRINTING_CXXFLAGS) $< diff --git a/samples/propsize/makefile.wat b/samples/propsize/makefile.wat index 0dd33e5090..a1e8f0ead2 100644 --- a/samples/propsize/makefile.wat +++ b/samples/propsize/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PROPSIZE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\propsize.exe del $(OBJS)\propsize.exe + -del $(OBJS)\propsize.exe -$(OBJS)\propsize.exe : $(PROPSIZE_OBJECTS) $(OBJS)\propsize_propsize.res +$(OBJS)\propsize.exe : $(PROPSIZE_OBJECTS) @%create $(OBJS)\propsize.lbc @%append $(OBJS)\propsize.lbc option quiet @%append $(OBJS)\propsize.lbc name $^@ @%append $(OBJS)\propsize.lbc option caseexact - @%append $(OBJS)\propsize.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\propsize.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(PROPSIZE_OBJECTS)) do @%append $(OBJS)\propsize.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\propsize.lbc library %i - @%append $(OBJS)\propsize.lbc option resource=$(OBJS)\propsize_propsize.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\propsize.lbc library %i + @%append $(OBJS)\propsize.lbc @for %i in () do @%append $(OBJS)\propsize.lbc option stack=%i wlink @$(OBJS)\propsize.lbc $(OBJS)\propsize_propsize.obj : .AUTODEPEND .\propsize.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPSIZE_CXXFLAGS) $< - -$(OBJS)\propsize_propsize.res : .AUTODEPEND .\propsize.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PROPSIZE_CXXFLAGS) $< diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat index f63de1934c..e754323c77 100644 --- a/samples/regtest/makefile.wat +++ b/samples/regtest/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) REGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe + -del $(OBJS)\regtest.exe -$(OBJS)\regtest.exe : $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res +$(OBJS)\regtest.exe : $(REGTEST_OBJECTS) @%create $(OBJS)\regtest.lbc @%append $(OBJS)\regtest.lbc option quiet @%append $(OBJS)\regtest.lbc name $^@ @%append $(OBJS)\regtest.lbc option caseexact - @%append $(OBJS)\regtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\regtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(REGTEST_OBJECTS)) do @%append $(OBJS)\regtest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\regtest.lbc library %i - @%append $(OBJS)\regtest.lbc option resource=$(OBJS)\regtest_regtest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\regtest.lbc library %i + @%append $(OBJS)\regtest.lbc @for %i in () do @%append $(OBJS)\regtest.lbc option stack=%i wlink @$(OBJS)\regtest.lbc $(OBJS)\regtest_regtest.obj : .AUTODEPEND .\regtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(REGTEST_CXXFLAGS) $< - -$(OBJS)\regtest_regtest.res : .AUTODEPEND .\regtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(REGTEST_CXXFLAGS) $< diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat index aecf1ee7ce..48fd7e2441 100644 --- a/samples/render/makefile.wat +++ b/samples/render/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -94,10 +94,14 @@ PLUGINSUFFIX = PLUGINSUFFIX = u !endif !endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __renddll___depname = !ifeq SHARED 1 __renddll___depname = & - $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_RELEASE_NODOT)_wat.dll + $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_RELEASE_NODOT).dll !endif __DEBUGINFO = !ifeq BUILD debug @@ -209,10 +213,6 @@ ____CAIRO_INCLUDEDIR_FILENAMES = !ifeq USE_CAIRO 1 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo !endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -240,18 +240,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif ### Variables: ### @@ -262,7 +250,7 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -271,7 +259,7 @@ RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & RENDER_OBJECTS = & $(OBJS)\render_render.obj RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -295,41 +283,38 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\render.exe del $(OBJS)\render.exe - -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_RELEASE_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_RELEASE_NODOT)_wat.dll + -del $(OBJS)\render.exe + -del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_RELEASE_NODOT).dll -$(OBJS)\render.exe : $(RENDER_OBJECTS) $(OBJS)\render_sample.res +$(OBJS)\render.exe : $(RENDER_OBJECTS) @%create $(OBJS)\render.lbc @%append $(OBJS)\render.lbc option quiet @%append $(OBJS)\render.lbc name $^@ @%append $(OBJS)\render.lbc option caseexact - @%append $(OBJS)\render.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\render.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\render.lbc library %i - @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\render.lbc library %i + @%append $(OBJS)\render.lbc @for %i in () do @%append $(OBJS)\render.lbc option stack=%i wlink @$(OBJS)\render.lbc !ifeq SHARED 1 -$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_RELEASE_NODOT)_wat.dll : $(RENDDLL_OBJECTS) +$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_RELEASE_NODOT).dll : $(RENDDLL_OBJECTS) @%create $(OBJS)\renddll.lbc @%append $(OBJS)\renddll.lbc option quiet @%append $(OBJS)\renddll.lbc name $^@ @%append $(OBJS)\renddll.lbc option caseexact - @%append $(OBJS)\renddll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\renddll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\renddll.lbc library %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\renddll.lbc library %i @%append $(OBJS)\renddll.lbc @%append $(OBJS)\renddll.lbc system nt_dll wlink @$(OBJS)\renddll.lbc !endif -$(OBJS)\render_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\render_render.obj : .AUTODEPEND .\render.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RENDER_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(RENDER_CXXFLAGS) $< $(OBJS)\renddll_renddll.obj : .AUTODEPEND .\renddll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RENDDLL_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(RENDDLL_CXXFLAGS) $< diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat index 4176e6d2b2..d3190405cc 100644 --- a/samples/richtext/makefile.wat +++ b/samples/richtext/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_RICHTEXT_p = !ifeq MONOLITHIC 0 __WXLIB_RICHTEXT_p = & @@ -189,63 +234,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -256,10 +244,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) RICHTEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) RICHTEXT_OBJECTS = & @@ -280,23 +268,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe + -del $(OBJS)\richtext.exe -$(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res +$(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) @%create $(OBJS)\richtext.lbc @%append $(OBJS)\richtext.lbc option quiet @%append $(OBJS)\richtext.lbc name $^@ @%append $(OBJS)\richtext.lbc option caseexact - @%append $(OBJS)\richtext.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\richtext.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i - @for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\richtext.lbc library %i - @%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res + @for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\richtext.lbc library %i + @%append $(OBJS)\richtext.lbc @for %i in () do @%append $(OBJS)\richtext.lbc option stack=%i wlink @$(OBJS)\richtext.lbc $(OBJS)\richtext_richtext.obj : .AUTODEPEND .\richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXT_CXXFLAGS) $< - -$(OBJS)\richtext_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXT_CXXFLAGS) $< diff --git a/samples/rotate/makefile.wat b/samples/rotate/makefile.wat index bff975243d..1a6d05ab34 100644 --- a/samples/rotate/makefile.wat +++ b/samples/rotate/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ROTATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) ROTATE_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\rotate.exe del $(OBJS)\rotate.exe + -del $(OBJS)\rotate.exe -$(OBJS)\rotate.exe : $(ROTATE_OBJECTS) $(OBJS)\rotate_rotate.res +$(OBJS)\rotate.exe : $(ROTATE_OBJECTS) @%create $(OBJS)\rotate.lbc @%append $(OBJS)\rotate.lbc option quiet @%append $(OBJS)\rotate.lbc name $^@ @%append $(OBJS)\rotate.lbc option caseexact - @%append $(OBJS)\rotate.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\rotate.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(ROTATE_OBJECTS)) do @%append $(OBJS)\rotate.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\rotate.lbc library %i - @%append $(OBJS)\rotate.lbc option resource=$(OBJS)\rotate_rotate.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\rotate.lbc library %i + @%append $(OBJS)\rotate.lbc @for %i in () do @%append $(OBJS)\rotate.lbc option stack=%i wlink @$(OBJS)\rotate.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (duck.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\rotate_rotate.obj : .AUTODEPEND .\rotate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ROTATE_CXXFLAGS) $< - -$(OBJS)\rotate_rotate.res : .AUTODEPEND .\rotate.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(ROTATE_CXXFLAGS) $< diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index 3b27d69244..c309fc84f0 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = & @@ -275,23 +263,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe + -del $(OBJS)\sashtest.exe -$(OBJS)\sashtest.exe : $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res +$(OBJS)\sashtest.exe : $(SASHTEST_OBJECTS) @%create $(OBJS)\sashtest.lbc @%append $(OBJS)\sashtest.lbc option quiet @%append $(OBJS)\sashtest.lbc name $^@ @%append $(OBJS)\sashtest.lbc option caseexact - @%append $(OBJS)\sashtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\sashtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SASHTEST_OBJECTS)) do @%append $(OBJS)\sashtest.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\sashtest.lbc library %i - @%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\sashtest.lbc library %i + @%append $(OBJS)\sashtest.lbc @for %i in () do @%append $(OBJS)\sashtest.lbc option stack=%i wlink @$(OBJS)\sashtest.lbc $(OBJS)\sashtest_sashtest.obj : .AUTODEPEND .\sashtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $< - -$(OBJS)\sashtest_sashtest.res : .AUTODEPEND .\sashtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $< diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat index 962b33b2ef..174e1261c5 100644 --- a/samples/scroll/makefile.wat +++ b/samples/scroll/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SCROLL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe + -del $(OBJS)\scroll.exe -$(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res +$(OBJS)\scroll.exe : $(SCROLL_OBJECTS) @%create $(OBJS)\scroll.lbc @%append $(OBJS)\scroll.lbc option quiet @%append $(OBJS)\scroll.lbc name $^@ @%append $(OBJS)\scroll.lbc option caseexact - @%append $(OBJS)\scroll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\scroll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\scroll.lbc library %i - @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\scroll.lbc library %i + @%append $(OBJS)\scroll.lbc @for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i wlink @$(OBJS)\scroll.lbc $(OBJS)\scroll_scroll.obj : .AUTODEPEND .\scroll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $< - -$(OBJS)\scroll_scroll.res : .AUTODEPEND .\scroll.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SCROLL_CXXFLAGS) $< diff --git a/samples/scrollsub/makefile.wat b/samples/scrollsub/makefile.wat index 026cecd824..d5ea901753 100644 --- a/samples/scrollsub/makefile.wat +++ b/samples/scrollsub/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SCROLLSUB_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SCROLLSUB_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\scrollsub.exe del $(OBJS)\scrollsub.exe + -del $(OBJS)\scrollsub.exe -$(OBJS)\scrollsub.exe : $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub.res +$(OBJS)\scrollsub.exe : $(SCROLLSUB_OBJECTS) @%create $(OBJS)\scrollsub.lbc @%append $(OBJS)\scrollsub.lbc option quiet @%append $(OBJS)\scrollsub.lbc name $^@ @%append $(OBJS)\scrollsub.lbc option caseexact - @%append $(OBJS)\scrollsub.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\scrollsub.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SCROLLSUB_OBJECTS)) do @%append $(OBJS)\scrollsub.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\scrollsub.lbc library %i - @%append $(OBJS)\scrollsub.lbc option resource=$(OBJS)\scrollsub_scrollsub.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\scrollsub.lbc library %i + @%append $(OBJS)\scrollsub.lbc @for %i in () do @%append $(OBJS)\scrollsub.lbc option stack=%i wlink @$(OBJS)\scrollsub.lbc $(OBJS)\scrollsub_scrollsub.obj : .AUTODEPEND .\scrollsub.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCROLLSUB_CXXFLAGS) $< - -$(OBJS)\scrollsub_scrollsub.res : .AUTODEPEND .\scrollsub.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SCROLLSUB_CXXFLAGS) $< diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat index 7bdcb7a722..534f419a3e 100644 --- a/samples/shaped/makefile.wat +++ b/samples/shaped/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SHAPED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = & @@ -260,17 +248,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe + -del $(OBJS)\shaped.exe -$(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res +$(OBJS)\shaped.exe : $(SHAPED_OBJECTS) @%create $(OBJS)\shaped.lbc @%append $(OBJS)\shaped.lbc option quiet @%append $(OBJS)\shaped.lbc name $^@ @%append $(OBJS)\shaped.lbc option caseexact - @%append $(OBJS)\shaped.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\shaped.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\shaped.lbc library %i - @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\shaped.lbc library %i + @%append $(OBJS)\shaped.lbc @for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i wlink @$(OBJS)\shaped.lbc @@ -279,8 +267,5 @@ data : .SYMBOLIC for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\shaped_shaped.obj : .AUTODEPEND .\shaped.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $< - -$(OBJS)\shaped_shaped.res : .AUTODEPEND .\shaped.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SHAPED_CXXFLAGS) $< diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat index 6c1c71d8cc..65adeffd29 100644 --- a/samples/sockets/makefile.wat +++ b/samples/sockets/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -231,6 +187,38 @@ __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,7 +229,7 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -250,7 +238,7 @@ CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & CLIENT_OBJECTS = & $(OBJS)\client_client.obj SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -274,42 +262,36 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\client.exe del $(OBJS)\client.exe - -if exist $(OBJS)\server.exe del $(OBJS)\server.exe + -del $(OBJS)\client.exe + -del $(OBJS)\server.exe -$(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res +$(OBJS)\client.exe : $(CLIENT_OBJECTS) @%create $(OBJS)\client.lbc @%append $(OBJS)\client.lbc option quiet @%append $(OBJS)\client.lbc name $^@ @%append $(OBJS)\client.lbc option caseexact - @%append $(OBJS)\client.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\client.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\client.lbc library %i - @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\client.lbc library %i + @%append $(OBJS)\client.lbc @for %i in () do @%append $(OBJS)\client.lbc option stack=%i wlink @$(OBJS)\client.lbc -$(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res +$(OBJS)\server.exe : $(SERVER_OBJECTS) @%create $(OBJS)\server.lbc @%append $(OBJS)\server.lbc option quiet @%append $(OBJS)\server.lbc name $^@ @%append $(OBJS)\server.lbc option caseexact - @%append $(OBJS)\server.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\server.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\server.lbc library %i - @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\server.lbc library %i + @%append $(OBJS)\server.lbc @for %i in () do @%append $(OBJS)\server.lbc option stack=%i wlink @$(OBJS)\server.lbc $(OBJS)\client_client.obj : .AUTODEPEND .\client.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $< - -$(OBJS)\client_client.res : .AUTODEPEND .\client.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(CLIENT_CXXFLAGS) $< $(OBJS)\server_server.obj : .AUTODEPEND .\server.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $< - -$(OBJS)\server_server.res : .AUTODEPEND .\server.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SERVER_CXXFLAGS) $< diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat index 5d13d0210e..78dfc00d64 100644 --- a/samples/sound/makefile.wat +++ b/samples/sound/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SOUND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SOUND_OBJECTS = & @@ -275,17 +263,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe + -del $(OBJS)\sound.exe -$(OBJS)\sound.exe : $(SOUND_OBJECTS) $(OBJS)\sound_sound.res +$(OBJS)\sound.exe : $(SOUND_OBJECTS) @%create $(OBJS)\sound.lbc @%append $(OBJS)\sound.lbc option quiet @%append $(OBJS)\sound.lbc name $^@ @%append $(OBJS)\sound.lbc option caseexact - @%append $(OBJS)\sound.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\sound.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SOUND_OBJECTS)) do @%append $(OBJS)\sound.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\sound.lbc library %i - @%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\sound.lbc library %i + @%append $(OBJS)\sound.lbc @for %i in () do @%append $(OBJS)\sound.lbc option stack=%i wlink @$(OBJS)\sound.lbc @@ -294,8 +282,5 @@ data : .SYMBOLIC for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\sound_sound.obj : .AUTODEPEND .\sound.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SOUND_CXXFLAGS) $< - -$(OBJS)\sound_sound.res : .AUTODEPEND .\sound.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SOUND_CXXFLAGS) $< diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat index 526e73e857..4dd43a8cc5 100644 --- a/samples/splash/makefile.wat +++ b/samples/splash/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_MEDIA_p = !ifeq MONOLITHIC 0 !ifeq USE_MEDIA 1 @@ -191,63 +236,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -258,10 +246,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SPLASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SPLASH_OBJECTS = & @@ -282,17 +270,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe + -del $(OBJS)\splash.exe -$(OBJS)\splash.exe : $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res +$(OBJS)\splash.exe : $(SPLASH_OBJECTS) @%create $(OBJS)\splash.lbc @%append $(OBJS)\splash.lbc option quiet @%append $(OBJS)\splash.lbc name $^@ @%append $(OBJS)\splash.lbc option caseexact - @%append $(OBJS)\splash.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\splash.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SPLASH_OBJECTS)) do @%append $(OBJS)\splash.lbc file %i - @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\splash.lbc library %i - @%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res + @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\splash.lbc library %i + @%append $(OBJS)\splash.lbc @for %i in () do @%append $(OBJS)\splash.lbc option stack=%i wlink @$(OBJS)\splash.lbc @@ -301,8 +289,5 @@ data : .SYMBOLIC for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\splash_splash.obj : .AUTODEPEND .\splash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SPLASH_CXXFLAGS) $< - -$(OBJS)\splash_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SPLASH_CXXFLAGS) $< diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat index d0cfb453f0..acf947d687 100644 --- a/samples/splitter/makefile.wat +++ b/samples/splitter/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SPLITTER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe + -del $(OBJS)\splitter.exe -$(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res +$(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) @%create $(OBJS)\splitter.lbc @%append $(OBJS)\splitter.lbc option quiet @%append $(OBJS)\splitter.lbc name $^@ @%append $(OBJS)\splitter.lbc option caseexact - @%append $(OBJS)\splitter.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\splitter.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\splitter.lbc library %i - @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\splitter.lbc library %i + @%append $(OBJS)\splitter.lbc @for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i wlink @$(OBJS)\splitter.lbc $(OBJS)\splitter_splitter.obj : .AUTODEPEND .\splitter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $< - -$(OBJS)\splitter_splitter.res : .AUTODEPEND .\splitter.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $< diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat index 0e1ca71e3b..d0175c576b 100644 --- a/samples/statbar/makefile.wat +++ b/samples/statbar/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STATBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe + -del $(OBJS)\statbar.exe -$(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res +$(OBJS)\statbar.exe : $(STATBAR_OBJECTS) @%create $(OBJS)\statbar.lbc @%append $(OBJS)\statbar.lbc option quiet @%append $(OBJS)\statbar.lbc name $^@ @%append $(OBJS)\statbar.lbc option caseexact - @%append $(OBJS)\statbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\statbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\statbar.lbc library %i - @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\statbar.lbc library %i + @%append $(OBJS)\statbar.lbc @for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i wlink @$(OBJS)\statbar.lbc $(OBJS)\statbar_statbar.obj : .AUTODEPEND .\statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $< - -$(OBJS)\statbar_statbar.res : .AUTODEPEND .\statbar.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(STATBAR_CXXFLAGS) $< diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index 8c5e46a0f6..194d9504db 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TASKBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = & @@ -275,23 +263,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe + -del $(OBJS)\taskbar.exe -$(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res +$(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) @%create $(OBJS)\taskbar.lbc @%append $(OBJS)\taskbar.lbc option quiet @%append $(OBJS)\taskbar.lbc name $^@ @%append $(OBJS)\taskbar.lbc option caseexact - @%append $(OBJS)\taskbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\taskbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\taskbar.lbc library %i - @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\taskbar.lbc library %i + @%append $(OBJS)\taskbar.lbc @for %i in () do @%append $(OBJS)\taskbar.lbc option stack=%i wlink @$(OBJS)\taskbar.lbc -$(OBJS)\taskbar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\taskbar_tbtest.obj : .AUTODEPEND .\tbtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $< diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat index c462f5005d..16bfbd4bdf 100644 --- a/samples/text/makefile.wat +++ b/samples/text/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\text.exe del $(OBJS)\text.exe + -del $(OBJS)\text.exe -$(OBJS)\text.exe : $(TEXT_OBJECTS) $(OBJS)\text_text.res +$(OBJS)\text.exe : $(TEXT_OBJECTS) @%create $(OBJS)\text.lbc @%append $(OBJS)\text.lbc option quiet @%append $(OBJS)\text.lbc name $^@ @%append $(OBJS)\text.lbc option caseexact - @%append $(OBJS)\text.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\text.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\text.lbc library %i - @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\text.lbc library %i + @%append $(OBJS)\text.lbc @for %i in () do @%append $(OBJS)\text.lbc option stack=%i wlink @$(OBJS)\text.lbc $(OBJS)\text_text.obj : .AUTODEPEND .\text.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $< - -$(OBJS)\text_text.res : .AUTODEPEND .\text.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEXT_CXXFLAGS) $< diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat index 98014780e2..10ddb2dc3a 100644 --- a/samples/thread/makefile.wat +++ b/samples/thread/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) THREAD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe + -del $(OBJS)\thread.exe -$(OBJS)\thread.exe : $(THREAD_OBJECTS) $(OBJS)\thread_thread.res +$(OBJS)\thread.exe : $(THREAD_OBJECTS) @%create $(OBJS)\thread.lbc @%append $(OBJS)\thread.lbc option quiet @%append $(OBJS)\thread.lbc name $^@ @%append $(OBJS)\thread.lbc option caseexact - @%append $(OBJS)\thread.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\thread.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\thread.lbc library %i - @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\thread.lbc library %i + @%append $(OBJS)\thread.lbc @for %i in () do @%append $(OBJS)\thread.lbc option stack=%i wlink @$(OBJS)\thread.lbc $(OBJS)\thread_thread.obj : .AUTODEPEND .\thread.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $< - -$(OBJS)\thread_thread.res : .AUTODEPEND .\thread.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(THREAD_CXXFLAGS) $< diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat index e80b109712..a9693dfc35 100644 --- a/samples/toolbar/makefile.wat +++ b/samples/toolbar/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TOOLBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe + -del $(OBJS)\toolbar.exe -$(OBJS)\toolbar.exe : $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res +$(OBJS)\toolbar.exe : $(TOOLBAR_OBJECTS) @%create $(OBJS)\toolbar.lbc @%append $(OBJS)\toolbar.lbc option quiet @%append $(OBJS)\toolbar.lbc name $^@ @%append $(OBJS)\toolbar.lbc option caseexact - @%append $(OBJS)\toolbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\toolbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TOOLBAR_OBJECTS)) do @%append $(OBJS)\toolbar.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\toolbar.lbc library %i - @%append $(OBJS)\toolbar.lbc option resource=$(OBJS)\toolbar_toolbar.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\toolbar.lbc library %i + @%append $(OBJS)\toolbar.lbc @for %i in () do @%append $(OBJS)\toolbar.lbc option stack=%i wlink @$(OBJS)\toolbar.lbc $(OBJS)\toolbar_toolbar.obj : .AUTODEPEND .\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TOOLBAR_CXXFLAGS) $< - -$(OBJS)\toolbar_toolbar.res : .AUTODEPEND .\toolbar.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TOOLBAR_CXXFLAGS) $< diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat index 8c5cea8ed9..d7d6fb03dd 100644 --- a/samples/treectrl/makefile.wat +++ b/samples/treectrl/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TREECTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe + -del $(OBJS)\treectrl.exe -$(OBJS)\treectrl.exe : $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res +$(OBJS)\treectrl.exe : $(TREECTRL_OBJECTS) @%create $(OBJS)\treectrl.lbc @%append $(OBJS)\treectrl.lbc option quiet @%append $(OBJS)\treectrl.lbc name $^@ @%append $(OBJS)\treectrl.lbc option caseexact - @%append $(OBJS)\treectrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\treectrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TREECTRL_OBJECTS)) do @%append $(OBJS)\treectrl.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\treectrl.lbc library %i - @%append $(OBJS)\treectrl.lbc option resource=$(OBJS)\treectrl_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\treectrl.lbc library %i + @%append $(OBJS)\treectrl.lbc @for %i in () do @%append $(OBJS)\treectrl.lbc option stack=%i wlink @$(OBJS)\treectrl.lbc $(OBJS)\treectrl_treetest.obj : .AUTODEPEND .\treetest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TREECTRL_CXXFLAGS) $< - -$(OBJS)\treectrl_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TREECTRL_CXXFLAGS) $< diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index 479f97cb13..62fbd9fd1d 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TYPETEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe + -del $(OBJS)\typetest.exe -$(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res +$(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) @%create $(OBJS)\typetest.lbc @%append $(OBJS)\typetest.lbc option quiet @%append $(OBJS)\typetest.lbc name $^@ @%append $(OBJS)\typetest.lbc option caseexact - @%append $(OBJS)\typetest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\typetest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\typetest.lbc library %i - @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\typetest.lbc library %i + @%append $(OBJS)\typetest.lbc @for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i wlink @$(OBJS)\typetest.lbc $(OBJS)\typetest_typetest.obj : .AUTODEPEND .\typetest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $< - -$(OBJS)\typetest_typetest.res : .AUTODEPEND .\typetest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $< diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat index 210f9d79dd..5e69d60be4 100644 --- a/samples/validate/makefile.wat +++ b/samples/validate/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) VALIDATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe + -del $(OBJS)\validate.exe -$(OBJS)\validate.exe : $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res +$(OBJS)\validate.exe : $(VALIDATE_OBJECTS) @%create $(OBJS)\validate.lbc @%append $(OBJS)\validate.lbc option quiet @%append $(OBJS)\validate.lbc name $^@ @%append $(OBJS)\validate.lbc option caseexact - @%append $(OBJS)\validate.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\validate.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(VALIDATE_OBJECTS)) do @%append $(OBJS)\validate.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\validate.lbc library %i - @%append $(OBJS)\validate.lbc option resource=$(OBJS)\validate_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\validate.lbc library %i + @%append $(OBJS)\validate.lbc @for %i in () do @%append $(OBJS)\validate.lbc option stack=%i wlink @$(OBJS)\validate.lbc $(OBJS)\validate_validate.obj : .AUTODEPEND .\validate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $< - -$(OBJS)\validate_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $< diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat index 1a93a1a0a1..c3e6d1240b 100644 --- a/samples/vscroll/makefile.wat +++ b/samples/vscroll/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,10 +224,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) VSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = & @@ -260,23 +248,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe + -del $(OBJS)\vstest.exe -$(OBJS)\vstest.exe : $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res +$(OBJS)\vstest.exe : $(VSTEST_OBJECTS) @%create $(OBJS)\vstest.lbc @%append $(OBJS)\vstest.lbc option quiet @%append $(OBJS)\vstest.lbc name $^@ @%append $(OBJS)\vstest.lbc option caseexact - @%append $(OBJS)\vstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\vstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(VSTEST_OBJECTS)) do @%append $(OBJS)\vstest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\vstest.lbc library %i - @%append $(OBJS)\vstest.lbc option resource=$(OBJS)\vstest_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\vstest.lbc library %i + @%append $(OBJS)\vstest.lbc @for %i in () do @%append $(OBJS)\vstest.lbc option stack=%i wlink @$(OBJS)\vstest.lbc -$(OBJS)\vstest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - $(OBJS)\vstest_vstest.obj : .AUTODEPEND .\vstest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(VSTEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(VSTEST_CXXFLAGS) $< diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat index 93dc95aa45..1107a1b405 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_XML_p = !ifeq MONOLITHIC 0 __WXLIB_XML_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = & @@ -297,89 +285,86 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe + -del $(OBJS)\widgets.exe -$(OBJS)\widgets.exe : $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res +$(OBJS)\widgets.exe : $(WIDGETS_OBJECTS) @%create $(OBJS)\widgets.lbc @%append $(OBJS)\widgets.lbc option quiet @%append $(OBJS)\widgets.lbc name $^@ @%append $(OBJS)\widgets.lbc option caseexact - @%append $(OBJS)\widgets.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\widgets.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\widgets.lbc library %i - @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\widgets.lbc library %i + @%append $(OBJS)\widgets.lbc @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i wlink @$(OBJS)\widgets.lbc $(OBJS)\widgets_bmpcombobox.obj : .AUTODEPEND .\bmpcombobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_button.obj : .AUTODEPEND .\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_checkbox.obj : .AUTODEPEND .\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_clrpicker.obj : .AUTODEPEND .\clrpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_combobox.obj : .AUTODEPEND .\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_datepick.obj : .AUTODEPEND .\datepick.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_dirctrl.obj : .AUTODEPEND .\dirctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_dirpicker.obj : .AUTODEPEND .\dirpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_filepicker.obj : .AUTODEPEND .\filepicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_fontpicker.obj : .AUTODEPEND .\fontpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_gauge.obj : .AUTODEPEND .\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_hyperlnk.obj : .AUTODEPEND .\hyperlnk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_listbox.obj : .AUTODEPEND .\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_notebook.obj : .AUTODEPEND .\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_odcombobox.obj : .AUTODEPEND .\odcombobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_radiobox.obj : .AUTODEPEND .\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_searchctrl.obj : .AUTODEPEND .\searchctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_slider.obj : .AUTODEPEND .\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_spinbtn.obj : .AUTODEPEND .\spinbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_static.obj : .AUTODEPEND .\static.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_textctrl.obj : .AUTODEPEND .\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_toggle.obj : .AUTODEPEND .\toggle.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< $(OBJS)\widgets_widgets.obj : .AUTODEPEND .\widgets.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat index b980900238..2e12ea9042 100644 --- a/samples/wizard/makefile.wat +++ b/samples/wizard/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_ADV_p = !ifeq MONOLITHIC 0 __WXLIB_ADV_p = & @@ -184,63 +229,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -251,10 +239,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WIZARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = & @@ -275,23 +263,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe + -del $(OBJS)\wizard.exe -$(OBJS)\wizard.exe : $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res +$(OBJS)\wizard.exe : $(WIZARD_OBJECTS) @%create $(OBJS)\wizard.lbc @%append $(OBJS)\wizard.lbc option quiet @%append $(OBJS)\wizard.lbc name $^@ @%append $(OBJS)\wizard.lbc option caseexact - @%append $(OBJS)\wizard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\wizard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\wizard.lbc library %i - @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\wizard.lbc library %i + @%append $(OBJS)\wizard.lbc @for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i wlink @$(OBJS)\wizard.lbc $(OBJS)\wizard_wizard.obj : .AUTODEPEND .\wizard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $< - -$(OBJS)\wizard_wizard.res : .AUTODEPEND .\wizard.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WIZARD_CXXFLAGS) $< diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index 724065abc4..68d65f86db 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,6 +142,51 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__NDEBUG_DEFINE_p = +!ifeq BUILD release +__NDEBUG_DEFINE_p = -dNDEBUG +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +____CAIRO_INCLUDEDIR_FILENAMES_p = +!ifeq USE_CAIRO 1 +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif __WXLIB_XRC_p = !ifeq MONOLITHIC 0 __WXLIB_XRC_p = & @@ -189,63 +234,6 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif ### Variables: ### @@ -256,10 +244,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = & @@ -283,17 +271,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + -del $(OBJS)\xrcdemo.exe -$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res +$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) @%create $(OBJS)\xrcdemo.lbc @%append $(OBJS)\xrcdemo.lbc option quiet @%append $(OBJS)\xrcdemo.lbc name $^@ @%append $(OBJS)\xrcdemo.lbc option caseexact - @%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i - @for %i in ( $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\xrcdemo.lbc library %i - @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res + @for %i in ( $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\xrcdemo.lbc library %i + @%append $(OBJS)\xrcdemo.lbc @for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i wlink @$(OBJS)\xrcdemo.lbc @@ -302,17 +290,14 @@ data : .SYMBOLIC for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< $(OBJS)\xrcdemo_myframe.obj : .AUTODEPEND .\myframe.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< $(OBJS)\xrcdemo_derivdlg.obj : .AUTODEPEND .\derivdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< $(OBJS)\xrcdemo_custclas.obj : .AUTODEPEND .\custclas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< - -$(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< diff --git a/tests/makefile.wat b/tests/makefile.wat index fed3e3002f..5c94b1ee9a 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../build/msw/config.wat +!include ../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -223,18 +223,6 @@ __WXLIB_MONO_p = __WXLIB_MONO_p = & wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif ### Variables: ### @@ -245,7 +233,7 @@ LIBDIRNAME = .\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -253,7 +241,6 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & - $(OBJS)\test_dummy.obj & $(OBJS)\test_test.obj & $(OBJS)\test_archivetest.obj & $(OBJS)\test_ziptest.obj & @@ -294,7 +281,7 @@ TEST_OBJECTS = & $(OBJS)\test_textfiletest.obj & $(OBJS)\test_uris.obj TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -302,13 +289,12 @@ TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) TEST_GUI_OBJECTS = & - $(OBJS)\test_gui_dummy.obj & $(OBJS)\test_gui_test.obj & $(OBJS)\test_gui_rect.obj & $(OBJS)\test_gui_size.obj & $(OBJS)\test_gui_point.obj PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -316,7 +302,6 @@ PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_printfbench.pch $(__RTTIFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) PRINTFBENCH_OBJECTS = & - $(OBJS)\printfbench_dummy.obj & $(OBJS)\printfbench_printfbench.obj @@ -334,32 +319,32 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\test.exe del $(OBJS)\test.exe - -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe - -if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe + -del $(OBJS)\test.exe + -del $(OBJS)\test_gui.exe + -del $(OBJS)\printfbench.exe $(OBJS)\test.exe : $(TEST_OBJECTS) @%create $(OBJS)\test.lbc @%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc name $^@ @%append $(OBJS)\test.lbc option caseexact - @%append $(OBJS)\test.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\test.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system os2v2 $(CPPUNIT_LIBS) $(LDFLAGS) @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\test.lbc library %i @%append $(OBJS)\test.lbc @for %i in () do @%append $(OBJS)\test.lbc option stack=%i wlink @$(OBJS)\test.lbc !ifeq USE_GUI 1 -$(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res +$(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) @%create $(OBJS)\test_gui.lbc @%append $(OBJS)\test_gui.lbc option quiet @%append $(OBJS)\test_gui.lbc name $^@ @%append $(OBJS)\test_gui.lbc option caseexact - @%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system os2v2 $(LDFLAGS) @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test_gui.lbc library %i - @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\test_gui.lbc library %i + @%append $(OBJS)\test_gui.lbc @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i wlink @$(OBJS)\test_gui.lbc !endif @@ -373,154 +358,142 @@ $(OBJS)\printfbench.exe : $(PRINTFBENCH_OBJECTS) @%append $(OBJS)\printfbench.lbc option quiet @%append $(OBJS)\printfbench.lbc name $^@ @%append $(OBJS)\printfbench.lbc option caseexact - @%append $(OBJS)\printfbench.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\printfbench.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system os2v2 $(CPPUNIT_LIBS) $(LDFLAGS) @for %i in ($(PRINTFBENCH_OBJECTS)) do @%append $(OBJS)\printfbench.lbc file %i - @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\printfbench.lbc library %i + @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\printfbench.lbc library %i @%append $(OBJS)\printfbench.lbc @for %i in () do @%append $(OBJS)\printfbench.lbc option stack=%i wlink @$(OBJS)\printfbench.lbc -$(OBJS)\test_dummy.obj : .AUTODEPEND .\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< - $(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_archivetest.obj : .AUTODEPEND .\archive\archivetest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_ziptest.obj : .AUTODEPEND .\archive\ziptest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_tartest.obj : .AUTODEPEND .\archive\tartest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_arrays.obj : .AUTODEPEND .\arrays\arrays.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_fileconftest.obj : .AUTODEPEND .\fileconf\fileconftest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_filekind.obj : .AUTODEPEND .\filekind\filekind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_filenametest.obj : .AUTODEPEND .\filename\filenametest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_filesystest.obj : .AUTODEPEND .\filesys\filesystest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_fontmaptest.obj : .AUTODEPEND .\fontmap\fontmaptest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_formatconvertertest.obj : .AUTODEPEND .\formatconverter\formatconvertertest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_hashes.obj : .AUTODEPEND .\hashes\hashes.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_lists.obj : .AUTODEPEND .\lists\lists.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_longlongtest.obj : .AUTODEPEND .\longlong\longlongtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_convautotest.obj : .AUTODEPEND .\mbconv\convautotest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_mbconvtest.obj : .AUTODEPEND .\mbconv\mbconvtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_regextest.obj : .AUTODEPEND .\regex\regextest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_wxregextest.obj : .AUTODEPEND .\regex\wxregextest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_scopeguardtest.obj : .AUTODEPEND .\scopeguard\scopeguardtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_strings.obj : .AUTODEPEND .\strings\strings.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_stdstrings.obj : .AUTODEPEND .\strings\stdstrings.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_tokenizer.obj : .AUTODEPEND .\strings\tokenizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_unicode.obj : .AUTODEPEND .\strings\unicode.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_crt.obj : .AUTODEPEND .\strings\crt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_vsnprintf.obj : .AUTODEPEND .\strings\vsnprintf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_bstream.obj : .AUTODEPEND .\streams\bstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_datastreamtest.obj : .AUTODEPEND .\streams\datastreamtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_ffilestream.obj : .AUTODEPEND .\streams\ffilestream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_fileback.obj : .AUTODEPEND .\streams\fileback.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_filestream.obj : .AUTODEPEND .\streams\filestream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_largefile.obj : .AUTODEPEND .\streams\largefile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_memstream.obj : .AUTODEPEND .\streams\memstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_sstream.obj : .AUTODEPEND .\streams\sstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_tempfile.obj : .AUTODEPEND .\streams\tempfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_textstreamtest.obj : .AUTODEPEND .\streams\textstreamtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_zlibstream.obj : .AUTODEPEND .\streams\zlibstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_textfiletest.obj : .AUTODEPEND .\textfile\textfiletest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_uris.obj : .AUTODEPEND .\uris\uris.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< - -$(OBJS)\test_gui_sample.res : .AUTODEPEND .\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $< - -$(OBJS)\test_gui_dummy.obj : .AUTODEPEND .\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_gui_test.obj : .AUTODEPEND .\test.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(OBJS)\test_gui_rect.obj : .AUTODEPEND .\geometry\rect.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(OBJS)\test_gui_size.obj : .AUTODEPEND .\geometry\size.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(OBJS)\test_gui_point.obj : .AUTODEPEND .\geometry\point.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< - -$(OBJS)\printfbench_dummy.obj : .AUTODEPEND .\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PRINTFBENCH_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(OBJS)\printfbench_printfbench.obj : .AUTODEPEND .\benchmarks\printfbench.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PRINTFBENCH_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(PRINTFBENCH_CXXFLAGS) $< diff --git a/utils/HelpGen/src/makefile.wat b/utils/HelpGen/src/makefile.wat index fb6d61f6ac..b2b1f2d1e1 100644 --- a/utils/HelpGen/src/makefile.wat +++ b/utils/HelpGen/src/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -197,18 +197,6 @@ __WXLIB_MONO_p = __WXLIB_MONO_p = & wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif ### Variables: ### @@ -219,7 +207,7 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HELPGEN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & @@ -250,41 +238,41 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\HelpGen.exe del $(OBJS)\HelpGen.exe + -del $(OBJS)\HelpGen.exe $(OBJS)\HelpGen.exe : $(HELPGEN_OBJECTS) @%create $(OBJS)\HelpGen.lbc @%append $(OBJS)\HelpGen.lbc option quiet @%append $(OBJS)\HelpGen.lbc name $^@ @%append $(OBJS)\HelpGen.lbc option caseexact - @%append $(OBJS)\HelpGen.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\HelpGen.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2 $(LDFLAGS) @for %i in ($(HELPGEN_OBJECTS)) do @%append $(OBJS)\HelpGen.lbc file %i - @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\HelpGen.lbc library %i + @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\HelpGen.lbc library %i @%append $(OBJS)\HelpGen.lbc @for %i in () do @%append $(OBJS)\HelpGen.lbc option stack=%i wlink @$(OBJS)\HelpGen.lbc $(OBJS)\HelpGen_HelpGen.obj : .AUTODEPEND .\HelpGen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< $(OBJS)\HelpGen_cjparser.obj : .AUTODEPEND .\cjparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< $(OBJS)\HelpGen_docripper.obj : .AUTODEPEND .\docripper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< $(OBJS)\HelpGen_ifcontext.obj : .AUTODEPEND .\ifcontext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< $(OBJS)\HelpGen_markup.obj : .AUTODEPEND .\markup.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< $(OBJS)\HelpGen_scriptbinder.obj : .AUTODEPEND .\scriptbinder.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< $(OBJS)\HelpGen_sourcepainter.obj : .AUTODEPEND .\sourcepainter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< $(OBJS)\HelpGen_srcparser.obj : .AUTODEPEND .\srcparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $< diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat index fe7989e784..749ad0a2cc 100644 --- a/utils/emulator/src/makefile.wat +++ b/utils/emulator/src/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,45 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -218,14 +179,41 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -236,12 +224,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) WXEMULATOR_OBJECTS = & $(OBJS)\wxemulator_emulator.obj @@ -260,17 +249,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe + -del $(OBJS)\wxemulator.exe -$(OBJS)\wxemulator.exe : $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res +$(OBJS)\wxemulator.exe : $(WXEMULATOR_OBJECTS) @%create $(OBJS)\wxemulator.lbc @%append $(OBJS)\wxemulator.lbc option quiet @%append $(OBJS)\wxemulator.lbc name $^@ @%append $(OBJS)\wxemulator.lbc option caseexact - @%append $(OBJS)\wxemulator.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\wxemulator.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\wxemulator.lbc library %i - @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\wxemulator.lbc library %i + @%append $(OBJS)\wxemulator.lbc @for %i in () do @%append $(OBJS)\wxemulator.lbc option stack=%i wlink @$(OBJS)\wxemulator.lbc @@ -278,9 +267,6 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -$(OBJS)\wxemulator_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - $(OBJS)\wxemulator_emulator.obj : .AUTODEPEND .\emulator.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $< diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat index 0e795212d8..2372bcef42 100644 --- a/utils/helpview/src/makefile.wat +++ b/utils/helpview/src/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,55 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -228,14 +179,51 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -246,12 +234,13 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & - -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples & - -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) + -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) & + -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = & $(OBJS)\helpview_helpview.obj @@ -270,17 +259,17 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + -del $(OBJS)\helpview.exe -$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res +$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) @%create $(OBJS)\helpview.lbc @%append $(OBJS)\helpview.lbc option quiet @%append $(OBJS)\helpview.lbc name $^@ @%append $(OBJS)\helpview.lbc option caseexact - @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\helpview.lbc library %i - @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\helpview.lbc library %i + @%append $(OBJS)\helpview.lbc @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i wlink @$(OBJS)\helpview.lbc @@ -289,8 +278,5 @@ data : .SYMBOLIC for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< - -$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat index 605a873101..60ae9cbec3 100644 --- a/utils/hhp2cached/makefile.wat +++ b/utils/hhp2cached/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -142,50 +142,6 @@ __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs !endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -223,14 +179,46 @@ __GFXCTX_DEFINE_p = !ifeq USE_GDIPLUS 1 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 !endif -____CAIRO_INCLUDEDIR_FILENAMES = +____CAIRO_INCLUDEDIR_FILENAMES_p = !ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif ### Variables: ### @@ -241,10 +229,10 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HHP2CACHED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples & -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = & @@ -265,23 +253,20 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe + -del $(OBJS)\hhp2cached.exe -$(OBJS)\hhp2cached.exe : $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res +$(OBJS)\hhp2cached.exe : $(HHP2CACHED_OBJECTS) @%create $(OBJS)\hhp2cached.lbc @%append $(OBJS)\hhp2cached.lbc option quiet @%append $(OBJS)\hhp2cached.lbc name $^@ @%append $(OBJS)\hhp2cached.lbc option caseexact - @%append $(OBJS)\hhp2cached.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\hhp2cached.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\hhp2cached.lbc library %i - @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\hhp2cached.lbc library %i + @%append $(OBJS)\hhp2cached.lbc @for %i in () do @%append $(OBJS)\hhp2cached.lbc option stack=%i wlink @$(OBJS)\hhp2cached.lbc $(OBJS)\hhp2cached_hhp2cached.obj : .AUTODEPEND .\hhp2cached.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HHP2CACHED_CXXFLAGS) $< - -$(OBJS)\hhp2cached_hhp2cached.res : .AUTODEPEND .\hhp2cached.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(HHP2CACHED_CXXFLAGS) $< diff --git a/utils/makefile.wat b/utils/makefile.wat index ce02b9f2f4..f9b7831fe1 100644 --- a/utils/makefile.wat +++ b/utils/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../build/msw/config.wat +!include ../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! diff --git a/utils/tex2rtf/src/makefile.wat b/utils/tex2rtf/src/makefile.wat index 672feee1a5..47909d0451 100644 --- a/utils/tex2rtf/src/makefile.wat +++ b/utils/tex2rtf/src/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../../build/msw/config.wat +!include ../../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -168,28 +168,6 @@ __EXCEPTIONSFLAG = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG = -xs !endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ @@ -235,6 +213,16 @@ __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif ### Variables: ### @@ -245,7 +233,7 @@ LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEX2RTF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -261,7 +249,7 @@ TEX2RTF_OBJECTS = & $(OBJS)\tex2rtf_readshg.obj & $(OBJS)\tex2rtf_table.obj TEX2RTF_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & @@ -292,83 +280,80 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\tex2rtf.exe del $(OBJS)\tex2rtf.exe - -if exist $(OBJS)\tex2rtf_gui.exe del $(OBJS)\tex2rtf_gui.exe + -del $(OBJS)\tex2rtf.exe + -del $(OBJS)\tex2rtf_gui.exe $(OBJS)\tex2rtf.exe : $(TEX2RTF_OBJECTS) @%create $(OBJS)\tex2rtf.lbc @%append $(OBJS)\tex2rtf.lbc option quiet @%append $(OBJS)\tex2rtf.lbc name $^@ @%append $(OBJS)\tex2rtf.lbc option caseexact - @%append $(OBJS)\tex2rtf.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\tex2rtf.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2 $(LDFLAGS) @for %i in ($(TEX2RTF_OBJECTS)) do @%append $(OBJS)\tex2rtf.lbc file %i - @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\tex2rtf.lbc library %i + @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\tex2rtf.lbc library %i @%append $(OBJS)\tex2rtf.lbc @for %i in () do @%append $(OBJS)\tex2rtf.lbc option stack=%i wlink @$(OBJS)\tex2rtf.lbc !ifeq USE_GUI 1 -$(OBJS)\tex2rtf_gui.exe : $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample.res +$(OBJS)\tex2rtf_gui.exe : $(TEX2RTF_GUI_OBJECTS) @%create $(OBJS)\tex2rtf_gui.lbc @%append $(OBJS)\tex2rtf_gui.lbc option quiet @%append $(OBJS)\tex2rtf_gui.lbc name $^@ @%append $(OBJS)\tex2rtf_gui.lbc option caseexact - @%append $(OBJS)\tex2rtf_gui.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\tex2rtf_gui.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2_pm $(LDFLAGS) @for %i in ($(TEX2RTF_GUI_OBJECTS)) do @%append $(OBJS)\tex2rtf_gui.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\tex2rtf_gui.lbc library %i - @%append $(OBJS)\tex2rtf_gui.lbc option resource=$(OBJS)\tex2rtf_gui_sample.res + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\tex2rtf_gui.lbc library %i + @%append $(OBJS)\tex2rtf_gui.lbc @for %i in () do @%append $(OBJS)\tex2rtf_gui.lbc option stack=%i wlink @$(OBJS)\tex2rtf_gui.lbc !endif $(OBJS)\tex2rtf_tex2rtf.obj : .AUTODEPEND .\tex2rtf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_tex2any.obj : .AUTODEPEND .\tex2any.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_texutils.obj : .AUTODEPEND .\texutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_rtfutils.obj : .AUTODEPEND .\rtfutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_xlputils.obj : .AUTODEPEND .\xlputils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_htmlutil.obj : .AUTODEPEND .\htmlutil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_readshg.obj : .AUTODEPEND .\readshg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_table.obj : .AUTODEPEND .\table.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< - -$(OBJS)\tex2rtf_gui_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_tex2rtf.obj : .AUTODEPEND .\tex2rtf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_tex2any.obj : .AUTODEPEND .\tex2any.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_texutils.obj : .AUTODEPEND .\texutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_rtfutils.obj : .AUTODEPEND .\rtfutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_xlputils.obj : .AUTODEPEND .\xlputils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_htmlutil.obj : .AUTODEPEND .\htmlutil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_readshg.obj : .AUTODEPEND .\readshg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< $(OBJS)\tex2rtf_gui_table.obj : .AUTODEPEND .\table.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $< diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index 1103228d16..496df3f84a 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -!include ../../build/msw/config.wat +!include ../../build/os2/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -36,7 +36,7 @@ PORTNAME = PORTNAME = base !endif !ifeq USE_GUI 1 -PORTNAME = msw +PORTNAME = pm !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -61,10 +61,10 @@ WXDLLFLAG = dll !endif LIBTYPE_SUFFIX = !ifeq SHARED 0 -LIBTYPE_SUFFIX = lib +LIBTYPE_SUFFIX = pm_lib !endif !ifeq SHARED 1 -LIBTYPE_SUFFIX = dll +LIBTYPE_SUFFIX = pm_dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 @@ -206,18 +206,6 @@ __WXLIB_MONO_p = __WXLIB_MONO_p = & wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES_p = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib -!endif ### Variables: ### @@ -228,7 +216,7 @@ LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__RUNTIME_LIBS_6) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx & @@ -252,7 +240,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe + -del $(OBJS)\wxrc.exe !ifeq USE_XRC 1 $(OBJS)\wxrc.exe : $(WXRC_OBJECTS) @@ -260,14 +248,14 @@ $(OBJS)\wxrc.exe : $(WXRC_OBJECTS) @%append $(OBJS)\wxrc.lbc option quiet @%append $(OBJS)\wxrc.lbc name $^@ @%append $(OBJS)\wxrc.lbc option caseexact - @%append $(OBJS)\wxrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) + @%append $(OBJS)\wxrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system os2v2 $(LDFLAGS) @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\wxrc.lbc library %i + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\wxrc.lbc library %i @%append $(OBJS)\wxrc.lbc @for %i in () do @%append $(OBJS)\wxrc.lbc option stack=%i wlink @$(OBJS)\wxrc.lbc !endif $(OBJS)\wxrc_wxrc.obj : .AUTODEPEND .\wxrc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXRC_CXXFLAGS) $< + $(CXX) -bt=os2 -zq -fo=$^@ $(WXRC_CXXFLAGS) $<