Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AUI under wxOS2 build fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-06 21:07:42 +00:00
parent 092f0ed782
commit 3a7458677b
5 changed files with 235 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/os2/config.wat
View File

@@ -74,6 +74,9 @@ USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1] # Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1 USE_XRC = 1
# Build wxAUI library (USE_GUI must be 1)? [0,1]
USE_AUI = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0 USE_OPENGL = 0

305
build/os2/makefile.wat
View File

@@ -171,19 +171,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_xh_unkwn.obj & $(OBJS)\monodll_xh_unkwn.obj &
$(OBJS)\monodll_xh_wizrd.obj & $(OBJS)\monodll_xh_wizrd.obj &
$(OBJS)\monodll_xmlres.obj & $(OBJS)\monodll_xmlres.obj &
$(OBJS)\monodll_xmlrsall.obj $(OBJS)\monodll_xmlrsall.obj &
$(OBJS)\monodll_framemanager.obj &
$(OBJS)\monodll_dockart.obj &
$(OBJS)\monodll_floatpane.obj
!endif !endif
____CORE_SRC_FILENAMES_OBJECTS = ____CORE_SRC_FILENAMES_OBJECTS =
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____CORE_SRC_FILENAMES_OBJECTS = & ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_caret.obj & $(OBJS)\monodll_caret.obj &
$(OBJS)\monodll_clrpickerg.obj &
$(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_colrdlgg.obj &
$(OBJS)\monodll_dirdlgg.obj & $(OBJS)\monodll_dirdlgg.obj &
$(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_fdrepdlg.obj &
$(OBJS)\monodll_filepickerg.obj &
$(OBJS)\monodll_fontpickerg.obj &
$(OBJS)\monodll_imaglist.obj & $(OBJS)\monodll_imaglist.obj &
$(OBJS)\monodll_listctrl.obj & $(OBJS)\monodll_listctrl.obj &
$(OBJS)\monodll_mdig.obj & $(OBJS)\monodll_mdig.obj &
@@ -346,10 +346,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_buttonbar.obj & $(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_choicdgg.obj & $(OBJS)\monodll_choicdgg.obj &
$(OBJS)\monodll_choicbkg.obj & $(OBJS)\monodll_choicbkg.obj &
$(OBJS)\monodll_clrpickerg.obj &
$(OBJS)\monodll_combog.obj & $(OBJS)\monodll_combog.obj &
$(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dcpsg.obj &
$(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dirctrlg.obj &
$(OBJS)\monodll_dragimgg.obj & $(OBJS)\monodll_dragimgg.obj &
$(OBJS)\monodll_filepickerg.obj &
$(OBJS)\monodll_fontpickerg.obj &
$(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj & $(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_numdlgg.obj &
@@ -374,14 +377,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____CORE_SRC_FILENAMES_OBJECTS = & ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_accel.obj & $(OBJS)\monodll_accel.obj &
$(OBJS)\monodll_clrpickerg.obj &
$(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_colrdlgg.obj &
$(OBJS)\monodll_dirdlgg.obj & $(OBJS)\monodll_dirdlgg.obj &
$(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_fdrepdlg.obj &
$(OBJS)\monodll_filedlgg.obj & $(OBJS)\monodll_filedlgg.obj &
$(OBJS)\monodll_filepickerg.obj &
$(OBJS)\monodll_fontdlgg.obj & $(OBJS)\monodll_fontdlgg.obj &
$(OBJS)\monodll_fontpickerg.obj &
$(OBJS)\monodll_imaglist.obj & $(OBJS)\monodll_imaglist.obj &
$(OBJS)\monodll_listctrl.obj & $(OBJS)\monodll_listctrl.obj &
$(OBJS)\monodll_mdig.obj & $(OBJS)\monodll_mdig.obj &
@@ -512,10 +512,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_buttonbar.obj & $(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_choicdgg.obj & $(OBJS)\monodll_choicdgg.obj &
$(OBJS)\monodll_choicbkg.obj & $(OBJS)\monodll_choicbkg.obj &
$(OBJS)\monodll_clrpickerg.obj &
$(OBJS)\monodll_combog.obj & $(OBJS)\monodll_combog.obj &
$(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dcpsg.obj &
$(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dirctrlg.obj &
$(OBJS)\monodll_dragimgg.obj & $(OBJS)\monodll_dragimgg.obj &
$(OBJS)\monodll_filepickerg.obj &
$(OBJS)\monodll_fontpickerg.obj &
$(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj & $(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_numdlgg.obj &
@@ -679,19 +682,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_xh_unkwn.obj & $(OBJS)\monolib_xh_unkwn.obj &
$(OBJS)\monolib_xh_wizrd.obj & $(OBJS)\monolib_xh_wizrd.obj &
$(OBJS)\monolib_xmlres.obj & $(OBJS)\monolib_xmlres.obj &
$(OBJS)\monolib_xmlrsall.obj $(OBJS)\monolib_xmlrsall.obj &
$(OBJS)\monolib_framemanager.obj &
$(OBJS)\monolib_dockart.obj &
$(OBJS)\monolib_floatpane.obj
!endif !endif
____CORE_SRC_FILENAMES_1_OBJECTS = ____CORE_SRC_FILENAMES_1_OBJECTS =
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____CORE_SRC_FILENAMES_1_OBJECTS = & ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_caret.obj & $(OBJS)\monolib_caret.obj &
$(OBJS)\monolib_clrpickerg.obj &
$(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_colrdlgg.obj &
$(OBJS)\monolib_dirdlgg.obj & $(OBJS)\monolib_dirdlgg.obj &
$(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_fdrepdlg.obj &
$(OBJS)\monolib_filepickerg.obj &
$(OBJS)\monolib_fontpickerg.obj &
$(OBJS)\monolib_imaglist.obj & $(OBJS)\monolib_imaglist.obj &
$(OBJS)\monolib_listctrl.obj & $(OBJS)\monolib_listctrl.obj &
$(OBJS)\monolib_mdig.obj & $(OBJS)\monolib_mdig.obj &
@@ -854,10 +857,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_buttonbar.obj & $(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_choicdgg.obj & $(OBJS)\monolib_choicdgg.obj &
$(OBJS)\monolib_choicbkg.obj & $(OBJS)\monolib_choicbkg.obj &
$(OBJS)\monolib_clrpickerg.obj &
$(OBJS)\monolib_combog.obj & $(OBJS)\monolib_combog.obj &
$(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dcpsg.obj &
$(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dirctrlg.obj &
$(OBJS)\monolib_dragimgg.obj & $(OBJS)\monolib_dragimgg.obj &
$(OBJS)\monolib_filepickerg.obj &
$(OBJS)\monolib_fontpickerg.obj &
$(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj & $(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_numdlgg.obj &
@@ -882,14 +888,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____CORE_SRC_FILENAMES_1_OBJECTS = & ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_accel.obj & $(OBJS)\monolib_accel.obj &
$(OBJS)\monolib_clrpickerg.obj &
$(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_colrdlgg.obj &
$(OBJS)\monolib_dirdlgg.obj & $(OBJS)\monolib_dirdlgg.obj &
$(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_fdrepdlg.obj &
$(OBJS)\monolib_filedlgg.obj & $(OBJS)\monolib_filedlgg.obj &
$(OBJS)\monolib_filepickerg.obj &
$(OBJS)\monolib_fontdlgg.obj & $(OBJS)\monolib_fontdlgg.obj &
$(OBJS)\monolib_fontpickerg.obj &
$(OBJS)\monolib_imaglist.obj & $(OBJS)\monolib_imaglist.obj &
$(OBJS)\monolib_listctrl.obj & $(OBJS)\monolib_listctrl.obj &
$(OBJS)\monolib_mdig.obj & $(OBJS)\monolib_mdig.obj &
@@ -1020,10 +1023,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_buttonbar.obj & $(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_choicdgg.obj & $(OBJS)\monolib_choicdgg.obj &
$(OBJS)\monolib_choicbkg.obj & $(OBJS)\monolib_choicbkg.obj &
$(OBJS)\monolib_clrpickerg.obj &
$(OBJS)\monolib_combog.obj & $(OBJS)\monolib_combog.obj &
$(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dcpsg.obj &
$(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dirctrlg.obj &
$(OBJS)\monolib_dragimgg.obj & $(OBJS)\monolib_dragimgg.obj &
$(OBJS)\monolib_filepickerg.obj &
$(OBJS)\monolib_fontpickerg.obj &
$(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj & $(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_numdlgg.obj &
@@ -1139,12 +1145,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____CORE_SRC_FILENAMES_2_OBJECTS = & ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_caret.obj & $(OBJS)\coredll_caret.obj &
$(OBJS)\coredll_clrpickerg.obj &
$(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_colrdlgg.obj &
$(OBJS)\coredll_dirdlgg.obj & $(OBJS)\coredll_dirdlgg.obj &
$(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_fdrepdlg.obj &
$(OBJS)\coredll_filepickerg.obj &
$(OBJS)\coredll_fontpickerg.obj &
$(OBJS)\coredll_imaglist.obj & $(OBJS)\coredll_imaglist.obj &
$(OBJS)\coredll_listctrl.obj & $(OBJS)\coredll_listctrl.obj &
$(OBJS)\coredll_mdig.obj & $(OBJS)\coredll_mdig.obj &
@@ -1307,10 +1310,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_buttonbar.obj & $(OBJS)\coredll_buttonbar.obj &
$(OBJS)\coredll_choicdgg.obj & $(OBJS)\coredll_choicdgg.obj &
$(OBJS)\coredll_choicbkg.obj & $(OBJS)\coredll_choicbkg.obj &
$(OBJS)\coredll_clrpickerg.obj &
$(OBJS)\coredll_combog.obj & $(OBJS)\coredll_combog.obj &
$(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dcpsg.obj &
$(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dirctrlg.obj &
$(OBJS)\coredll_dragimgg.obj & $(OBJS)\coredll_dragimgg.obj &
$(OBJS)\coredll_filepickerg.obj &
$(OBJS)\coredll_fontpickerg.obj &
$(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj & $(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_numdlgg.obj &
@@ -1335,14 +1341,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____CORE_SRC_FILENAMES_2_OBJECTS = & ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_accel.obj & $(OBJS)\coredll_accel.obj &
$(OBJS)\coredll_clrpickerg.obj &
$(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_colrdlgg.obj &
$(OBJS)\coredll_dirdlgg.obj & $(OBJS)\coredll_dirdlgg.obj &
$(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_fdrepdlg.obj &
$(OBJS)\coredll_filedlgg.obj & $(OBJS)\coredll_filedlgg.obj &
$(OBJS)\coredll_filepickerg.obj &
$(OBJS)\coredll_fontdlgg.obj & $(OBJS)\coredll_fontdlgg.obj &
$(OBJS)\coredll_fontpickerg.obj &
$(OBJS)\coredll_imaglist.obj & $(OBJS)\coredll_imaglist.obj &
$(OBJS)\coredll_listctrl.obj & $(OBJS)\coredll_listctrl.obj &
$(OBJS)\coredll_mdig.obj & $(OBJS)\coredll_mdig.obj &
@@ -1473,10 +1476,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_buttonbar.obj & $(OBJS)\coredll_buttonbar.obj &
$(OBJS)\coredll_choicdgg.obj & $(OBJS)\coredll_choicdgg.obj &
$(OBJS)\coredll_choicbkg.obj & $(OBJS)\coredll_choicbkg.obj &
$(OBJS)\coredll_clrpickerg.obj &
$(OBJS)\coredll_combog.obj & $(OBJS)\coredll_combog.obj &
$(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dcpsg.obj &
$(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dirctrlg.obj &
$(OBJS)\coredll_dragimgg.obj & $(OBJS)\coredll_dragimgg.obj &
$(OBJS)\coredll_filepickerg.obj &
$(OBJS)\coredll_fontpickerg.obj &
$(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj & $(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_numdlgg.obj &
@@ -1511,12 +1517,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____CORE_SRC_FILENAMES_3_OBJECTS = & ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_caret.obj & $(OBJS)\corelib_caret.obj &
$(OBJS)\corelib_clrpickerg.obj &
$(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_colrdlgg.obj &
$(OBJS)\corelib_dirdlgg.obj & $(OBJS)\corelib_dirdlgg.obj &
$(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_fdrepdlg.obj &
$(OBJS)\corelib_filepickerg.obj &
$(OBJS)\corelib_fontpickerg.obj &
$(OBJS)\corelib_imaglist.obj & $(OBJS)\corelib_imaglist.obj &
$(OBJS)\corelib_listctrl.obj & $(OBJS)\corelib_listctrl.obj &
$(OBJS)\corelib_mdig.obj & $(OBJS)\corelib_mdig.obj &
@@ -1679,10 +1682,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_buttonbar.obj & $(OBJS)\corelib_buttonbar.obj &
$(OBJS)\corelib_choicdgg.obj & $(OBJS)\corelib_choicdgg.obj &
$(OBJS)\corelib_choicbkg.obj & $(OBJS)\corelib_choicbkg.obj &
$(OBJS)\corelib_clrpickerg.obj &
$(OBJS)\corelib_combog.obj & $(OBJS)\corelib_combog.obj &
$(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dcpsg.obj &
$(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dirctrlg.obj &
$(OBJS)\corelib_dragimgg.obj & $(OBJS)\corelib_dragimgg.obj &
$(OBJS)\corelib_filepickerg.obj &
$(OBJS)\corelib_fontpickerg.obj &
$(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj & $(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_numdlgg.obj &
@@ -1707,14 +1713,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____CORE_SRC_FILENAMES_3_OBJECTS = & ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_accel.obj & $(OBJS)\corelib_accel.obj &
$(OBJS)\corelib_clrpickerg.obj &
$(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_colrdlgg.obj &
$(OBJS)\corelib_dirdlgg.obj & $(OBJS)\corelib_dirdlgg.obj &
$(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_fdrepdlg.obj &
$(OBJS)\corelib_filedlgg.obj & $(OBJS)\corelib_filedlgg.obj &
$(OBJS)\corelib_filepickerg.obj &
$(OBJS)\corelib_fontdlgg.obj & $(OBJS)\corelib_fontdlgg.obj &
$(OBJS)\corelib_fontpickerg.obj &
$(OBJS)\corelib_imaglist.obj & $(OBJS)\corelib_imaglist.obj &
$(OBJS)\corelib_listctrl.obj & $(OBJS)\corelib_listctrl.obj &
$(OBJS)\corelib_mdig.obj & $(OBJS)\corelib_mdig.obj &
@@ -1845,10 +1848,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_buttonbar.obj & $(OBJS)\corelib_buttonbar.obj &
$(OBJS)\corelib_choicdgg.obj & $(OBJS)\corelib_choicdgg.obj &
$(OBJS)\corelib_choicbkg.obj & $(OBJS)\corelib_choicbkg.obj &
$(OBJS)\corelib_clrpickerg.obj &
$(OBJS)\corelib_combog.obj & $(OBJS)\corelib_combog.obj &
$(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dcpsg.obj &
$(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dirctrlg.obj &
$(OBJS)\corelib_dragimgg.obj & $(OBJS)\corelib_dragimgg.obj &
$(OBJS)\corelib_filepickerg.obj &
$(OBJS)\corelib_fontpickerg.obj &
$(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj & $(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_numdlgg.obj &
@@ -2131,6 +2137,24 @@ __xrclib___depname = &
!endif !endif
!endif !endif
!endif !endif
__auidll___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 1
!ifeq USE_AUI 1
__auidll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll
!endif
!endif
!endif
__auilib___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 0
!ifeq USE_AUI 1
__auilib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
!endif
!endif
!endif
__gldll___depname = __gldll___depname =
!ifeq SHARED 1 !ifeq SHARED 1
!ifeq USE_GUI 1 !ifeq USE_GUI 1
@@ -2289,8 +2313,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" & USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" & USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" & USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" & VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
@@ -3200,6 +3224,32 @@ XRCLIB_OBJECTS = &
$(OBJS)\xrclib_xh_wizrd.obj & $(OBJS)\xrclib_xh_wizrd.obj &
$(OBJS)\xrclib_xmlres.obj & $(OBJS)\xrclib_xmlres.obj &
$(OBJS)\xrclib_xmlrsall.obj $(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) -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 -i=..\..\src\expat\lib -dWXUSINGDLL &
-dWXMAKINGDLL_AUI /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) &
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
AUIDLL_OBJECTS = &
$(OBJS)\auidll_dummy.obj &
$(OBJS)\auidll_framemanager.obj &
$(OBJS)\auidll_dockart.obj &
$(OBJS)\auidll_floatpane.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) -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 -i=..\..\src\expat\lib &
/fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
$(CXXFLAGS)
AUILIB_OBJECTS = &
$(OBJS)\auilib_dummy.obj &
$(OBJS)\auilib_framemanager.obj &
$(OBJS)\auilib_dockart.obj &
$(OBJS)\auilib_floatpane.obj
GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -3231,7 +3281,7 @@ $(OBJS) :
### Targets: ### ### Targets: ###
all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
clean : .SYMBOLIC clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -3281,6 +3331,9 @@ clean : .SYMBOLIC
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
@@ -3348,7 +3401,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib : $(MONOLIB_OBJECTS) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib : $(MONOLIB_OBJECTS)
@%create $(OBJS)\monolib.lbc @%create $(OBJS)\monolib.lbc
@for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i @for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i
wlib -q -p4096 -n -b $^@ @$(OBJS)\monolib.lbc wlib -q -p8192 -n -b $^@ @$(OBJS)\monolib.lbc
!endif !endif
!endif !endif
@@ -3686,6 +3739,36 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif !endif
!endif !endif
!ifeq MONOLITHIC 0
!ifeq SHARED 1
!ifeq USE_AUI 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll : $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
@%create $(OBJS)\auidll.lbc
@%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)
@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
@%append $(OBJS)\auidll.lbc system os2v2 dll
wlink @$(OBJS)\auidll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +$^@
!endif
!endif
!endif
!ifeq MONOLITHIC 0
!ifeq SHARED 0
!ifeq USE_AUI 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib : $(AUILIB_OBJECTS)
@%create $(OBJS)\auilib.lbc
@for %i in ($(AUILIB_OBJECTS)) do @%append $(OBJS)\auilib.lbc +%i
wlib -q -p4096 -n -b $^@ @$(OBJS)\auilib.lbc
!endif
!endif
!endif
!ifeq SHARED 1 !ifeq SHARED 1
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq USE_OPENGL 1 !ifeq USE_OPENGL 1
@@ -4785,17 +4868,21 @@ $(OBJS)\monodll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp $(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp $(OBJS)\monodll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!ifeq USE_GUI 1
$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -4811,16 +4898,6 @@ $(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(OBJS)\monodll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5635,6 +5712,11 @@ $(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp $(OBJS)\monodll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5655,6 +5737,16 @@ $(OBJS)\monodll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6526,17 +6618,21 @@ $(OBJS)\monolib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp $(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp $(OBJS)\monolib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!ifeq USE_GUI 1
$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -6552,16 +6648,6 @@ $(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(OBJS)\monolib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7376,6 +7462,11 @@ $(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp $(OBJS)\monolib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7396,6 +7487,16 @@ $(OBJS)\monolib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8288,11 +8389,6 @@ $(OBJS)\coredll_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp
$(OBJS)\coredll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp $(OBJS)\coredll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!ifeq USE_GUI 1
$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -8308,16 +8404,6 @@ $(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\coredll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(OBJS)\coredll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9132,6 +9218,11 @@ $(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\coredll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp $(OBJS)\coredll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9152,6 +9243,16 @@ $(OBJS)\coredll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9449,11 +9550,6 @@ $(OBJS)\corelib_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp
$(OBJS)\corelib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp $(OBJS)\corelib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!ifeq USE_GUI 1
$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp $(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -9469,16 +9565,6 @@ $(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\corelib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp $(OBJS)\corelib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10293,6 +10379,11 @@ $(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\corelib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp $(OBJS)\corelib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10313,6 +10404,16 @@ $(OBJS)\corelib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -11075,6 +11176,30 @@ $(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp $(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\auidll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auidll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auidll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auidll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\auilib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\auilib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<

7
include/wx/os2/setup0.h
View File

@@ -532,6 +532,13 @@
# define wxUSE_XML 0 # define wxUSE_XML 0
#endif #endif
// Use wxWidget's AUI docking system
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_AUI 1
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Individual GUI controls // Individual GUI controls
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

1
samples/aui/auidemo.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/image.h" #include "wx/image.h"
#include "wx/colordlg.h" #include "wx/colordlg.h"
#include "wx/wxhtml.h" #include "wx/wxhtml.h"
#include "wx/imaglist.h"
#include "wx/aui/aui.h" #include "wx/aui/aui.h"
#include "../sample.xpm" #include "../sample.xpm"

8
src/os2/window.cpp
View File

@@ -5047,6 +5047,14 @@ wxPoint wxGetMousePosition()
return wxPoint(vPt.x, vPt.y); return wxPoint(vPt.x, vPt.y);
} }
wxMouseState wxGetMouseState()
{
wxMouseState ms;
// TODO
return ms;
}
wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin, wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin,
short* WXUNUSED(pnX), short* WXUNUSED(pnX),
short* WXUNUSED(pnY) ) short* WXUNUSED(pnY) )