diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index f2cef3f424..4c06776f32 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -265,4 +265,27 @@
xrc=xrclib+xrcdll
+
+
+
+
+
+ WXUSINGDLL
+ WXMAKINGDLL_AUI
+ $(AUI_SRC)
+ advdll
+ coredll
+ basedll
+ $(AUI_HDR)
+
+
+
+ $(AUI_SRC)
+ $(AUI_HDR)
+
+
+ aui=auilib+auidll
+
diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 0da8fe7cca..1d92d10887 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -40,10 +40,10 @@ def mk_wxid(id):
# All libs that are part of the main library (i.e. non-contrib):
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
- 'media', 'odbc', 'qa', 'dbgrid', 'xrc']
+ 'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui']
# List of library names/ids for categories with different names:
LIBS_NOGUI = ['xml', 'net', 'odbc']
-LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media']
+LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media', 'aui']
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',
diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index 499851f1fe..5f4e4e89d0 100644
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -108,6 +108,11 @@ USE_MEDIA = 1
USE_XRC = 1
!endif
+# Build wxAUI library (USE_GUI must be 1)? [0,1]
+!ifndef USE_AUI
+USE_AUI = 1
+!endif
+
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
!ifndef USE_OPENGL
USE_OPENGL = 0
diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index debf0f0692..65678a6d63 100644
--- a/build/msw/config.gcc
+++ b/build/msw/config.gcc
@@ -70,6 +70,9 @@ USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,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]
USE_OPENGL = 0
diff --git a/build/msw/config.vc b/build/msw/config.vc
index a18b147958..3da28a91c1 100644
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -83,6 +83,9 @@ USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,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]
USE_OPENGL = 0
diff --git a/build/msw/config.wat b/build/msw/config.wat
index f11223b4d0..68514b52e1 100644
--- a/build/msw/config.wat
+++ b/build/msw/config.wat
@@ -74,6 +74,9 @@ USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,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]
USE_OPENGL = 0
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index c7849e1afa..1de10ace89 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -28,7 +28,8 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
-DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
-DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
- -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
+ -DUSE_AUI="$(USE_AUI)" -DUSE_OPENGL="$(USE_OPENGL)" \
+ -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
-DUSE_THREADS="$(USE_THREADS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-DVENDOR="$(VENDOR)" -DWX_FLAVOUR="$(WX_FLAVOUR)" \
@@ -1003,6 +1004,31 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_wizrd.obj \
$(OBJS)\xrclib_xmlres.obj \
$(OBJS)\xrclib_xmlrsall.obj
+AUIDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+ -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \
+ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \
+ -DWXUSINGDLL -DWXMAKINGDLL_AUI -Hu -H=$(OBJS)\wxprec_auidll.csm $(CPPFLAGS) \
+ $(CXXFLAGS)
+AUIDLL_OBJECTS = \
+ $(OBJS)\auidll_dummy.obj \
+ $(OBJS)\auidll_framemanager.obj \
+ $(OBJS)\auidll_dockart.obj \
+ $(OBJS)\auidll_floatpane.obj
+AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+ -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \
+ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \
+ -H=$(OBJS)\wxprec_auilib.csm $(CPPFLAGS) $(CXXFLAGS)
+AUILIB_OBJECTS = \
+ $(OBJS)\auilib_dummy.obj \
+ $(OBJS)\auilib_framemanager.obj \
+ $(OBJS)\auilib_dockart.obj \
+ $(OBJS)\auilib_floatpane.obj
GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1166,7 +1192,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_unkwn.obj \
$(OBJS)\monodll_xh_wizrd.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
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -1218,9 +1247,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_helpwin.obj \
$(OBJS)\monodll_automtn.obj \
$(OBJS)\monodll_uuid.obj \
- $(OBJS)\monodll_clrpickerg.obj \
- $(OBJS)\monodll_fontpickerg.obj \
- $(OBJS)\monodll_filepickerg.obj \
$(OBJS)\monodll_statusbr.obj \
$(OBJS)\monodll_prntdlgg.obj \
$(OBJS)\monodll_accel.obj \
@@ -1356,10 +1382,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
+ $(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
+ $(OBJS)\monodll_filepickerg.obj \
+ $(OBJS)\monodll_fontpickerg.obj \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \
@@ -1430,14 +1459,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_automtn.obj \
$(OBJS)\monodll_uuid.obj \
$(OBJS)\monodll_accel.obj \
- $(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_dirdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_filedlgg.obj \
- $(OBJS)\monodll_filepickerg.obj \
$(OBJS)\monodll_fontdlgg.obj \
- $(OBJS)\monodll_fontpickerg.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_listctrl.obj \
$(OBJS)\monodll_mdig.obj \
@@ -1568,10 +1594,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
+ $(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
+ $(OBJS)\monodll_filepickerg.obj \
+ $(OBJS)\monodll_fontpickerg.obj \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \
@@ -1738,7 +1767,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_unkwn.obj \
$(OBJS)\monolib_xh_wizrd.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
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -1790,9 +1822,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_helpwin.obj \
$(OBJS)\monolib_automtn.obj \
$(OBJS)\monolib_uuid.obj \
- $(OBJS)\monolib_clrpickerg.obj \
- $(OBJS)\monolib_fontpickerg.obj \
- $(OBJS)\monolib_filepickerg.obj \
$(OBJS)\monolib_statusbr.obj \
$(OBJS)\monolib_prntdlgg.obj \
$(OBJS)\monolib_accel.obj \
@@ -1928,10 +1957,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
+ $(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
+ $(OBJS)\monolib_filepickerg.obj \
+ $(OBJS)\monolib_fontpickerg.obj \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \
@@ -2002,14 +2034,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_automtn.obj \
$(OBJS)\monolib_uuid.obj \
$(OBJS)\monolib_accel.obj \
- $(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_dirdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_filedlgg.obj \
- $(OBJS)\monolib_filepickerg.obj \
$(OBJS)\monolib_fontdlgg.obj \
- $(OBJS)\monolib_fontpickerg.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_listctrl.obj \
$(OBJS)\monolib_mdig.obj \
@@ -2140,10 +2169,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
+ $(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
+ $(OBJS)\monolib_filepickerg.obj \
+ $(OBJS)\monolib_fontpickerg.obj \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \
@@ -2290,9 +2322,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_helpwin.obj \
$(OBJS)\coredll_automtn.obj \
$(OBJS)\coredll_uuid.obj \
- $(OBJS)\coredll_clrpickerg.obj \
- $(OBJS)\coredll_fontpickerg.obj \
- $(OBJS)\coredll_filepickerg.obj \
$(OBJS)\coredll_statusbr.obj \
$(OBJS)\coredll_prntdlgg.obj \
$(OBJS)\coredll_accel.obj \
@@ -2428,10 +2457,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
+ $(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
+ $(OBJS)\coredll_filepickerg.obj \
+ $(OBJS)\coredll_fontpickerg.obj \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \
@@ -2502,14 +2534,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_automtn.obj \
$(OBJS)\coredll_uuid.obj \
$(OBJS)\coredll_accel.obj \
- $(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_dirdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_filedlgg.obj \
- $(OBJS)\coredll_filepickerg.obj \
$(OBJS)\coredll_fontdlgg.obj \
- $(OBJS)\coredll_fontpickerg.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_listctrl.obj \
$(OBJS)\coredll_mdig.obj \
@@ -2640,10 +2669,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
+ $(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
+ $(OBJS)\coredll_filepickerg.obj \
+ $(OBJS)\coredll_fontpickerg.obj \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \
@@ -2717,9 +2749,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_helpwin.obj \
$(OBJS)\corelib_automtn.obj \
$(OBJS)\corelib_uuid.obj \
- $(OBJS)\corelib_clrpickerg.obj \
- $(OBJS)\corelib_fontpickerg.obj \
- $(OBJS)\corelib_filepickerg.obj \
$(OBJS)\corelib_statusbr.obj \
$(OBJS)\corelib_prntdlgg.obj \
$(OBJS)\corelib_accel.obj \
@@ -2855,10 +2884,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
+ $(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
+ $(OBJS)\corelib_filepickerg.obj \
+ $(OBJS)\corelib_fontpickerg.obj \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \
@@ -2929,14 +2961,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_automtn.obj \
$(OBJS)\corelib_uuid.obj \
$(OBJS)\corelib_accel.obj \
- $(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_dirdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_filedlgg.obj \
- $(OBJS)\corelib_filepickerg.obj \
$(OBJS)\corelib_fontdlgg.obj \
- $(OBJS)\corelib_fontpickerg.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_listctrl.obj \
$(OBJS)\corelib_mdig.obj \
@@ -3067,10 +3096,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
+ $(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
+ $(OBJS)\corelib_filepickerg.obj \
+ $(OBJS)\corelib_fontpickerg.obj \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \
@@ -3268,6 +3300,14 @@ __xrcdll___depname = \
__xrclib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
+__auidll___depname = \
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
+__auilib___depname = \
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
__gldll___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll
@@ -3289,10 +3329,10 @@ __gllib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
!endif
!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_10 =
+__THREADSFLAG_11 =
!endif
!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_10 = mt
+__THREADSFLAG_11 = mt
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_4 = i
@@ -3301,28 +3341,28 @@ __RUNTIME_LIBS_4 = i
__RUNTIME_LIBS_4 =
!endif
!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_49 = -d__WXUNIVERSAL__
+__WXUNIV_DEFINE_p_53 = -d__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_49 = -d__WXDEBUG__
+__DEBUG_DEFINE_p_53 = -d__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_49 = -d__WXDEBUG__
+__DEBUG_DEFINE_p_53 = -d__WXDEBUG__
!endif
!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_49 = -dwxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_53 = -dwxNO_EXCEPTIONS
!endif
!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_49 = -dwxNO_RTTI
+__RTTI_DEFINE_p_53 = -dwxNO_RTTI
!endif
!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_49 = -dwxNO_THREADS
+__THREAD_DEFINE_p_53 = -dwxNO_THREADS
!endif
!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_50 = -d_UNICODE
+__UNICODE_DEFINE_p_54 = -d_UNICODE
!endif
!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_49 = -dwxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_53 = -dwxUSE_UNICODE_MSLU=1
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -3404,7 +3444,7 @@ $(OBJS):
### Targets: ###
-all: 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: 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:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -3512,6 +3552,14 @@ clean:
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ils
-if exist $(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
-if exist $(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
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).tds
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilc
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ild
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilf
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ils
+ -if exist $(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
+ -if exist $(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
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).tds
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ilc
@@ -3572,7 +3620,7 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(OBJS)\monodll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res
+ c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
!endif
@@ -3588,7 +3636,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(OBJS)\basedll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res
+ c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res
|
implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
!endif
@@ -3604,7 +3652,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(OBJS)\netdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res
+ c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res
|
implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@
!endif
@@ -3620,7 +3668,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(OBJS)\coredll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res
+ c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@
!endif
@@ -3636,7 +3684,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res
+ c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@
!endif
@@ -3652,7 +3700,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res
+ c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@
!endif
@@ -3668,7 +3716,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(ODBCDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\odbcdll_version.res
+ c0d32.obj $(ODBCDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\odbcdll_version.res
|
implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc $@
!endif
@@ -3684,7 +3732,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\dbgriddll_version.res
+ c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\dbgriddll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid $@
!endif
@@ -3700,7 +3748,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res
+ c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@
!endif
@@ -3716,7 +3764,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res
+ c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@
!endif
@@ -3732,7 +3780,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res
+ c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res
|
implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@
!endif
@@ -3748,7 +3796,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res
+ c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@
!endif
@@ -3761,10 +3809,26 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(OBJS)\auidll_version.res $(__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)
+ ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
+ c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.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 import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\auidll_version.res
+|
+ implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib: $(OBJS)\auilib_dummy.obj $(AUILIB_OBJECTS)
+ if exist $@ del $@
+ tlib /a /p4096 $@ @&&|
+ $(AUILIB_OBJECTS)
+|
+!endif
+
!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
- c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res
+ c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@
!endif
@@ -4191,7 +4255,7 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) -H $**
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $**
$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4856,6 +4920,15 @@ $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5102,21 +5175,6 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5812,6 +5870,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5832,6 +5895,16 @@ $(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6713,6 +6786,15 @@ $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
$(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6959,21 +7041,6 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7669,6 +7736,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7689,6 +7761,16 @@ $(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7908,7 +7990,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H $**
$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $**
$(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
@@ -8397,7 +8479,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H $**
$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG) $**
$(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
@@ -8478,7 +8560,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H $**
$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG) $**
$(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8876,21 +8958,6 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9586,6 +9653,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9606,6 +9678,16 @@ $(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -10095,21 +10177,6 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10805,6 +10872,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10825,6 +10897,16 @@ $(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10919,7 +11001,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $**
$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG) $**
$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
@@ -11084,7 +11166,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H $**
$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG) $**
$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
@@ -11117,7 +11199,7 @@ $(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $**
$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG) $**
$(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
$(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
@@ -11138,7 +11220,7 @@ $(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) -H $**
$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG) $**
$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
$(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) $**
@@ -11153,7 +11235,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H $**
$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG) $**
$(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $**
@@ -11306,7 +11388,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H $**
$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG) $**
$(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) $**
@@ -11327,7 +11409,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H $**
$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG) $**
$(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $**
@@ -11348,7 +11430,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H $**
$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) $**
$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
@@ -11653,11 +11735,38 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
+$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) -H $**
+
+$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG) $**
+
+$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
+ $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H $**
+
+$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) $**
+
$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**
$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG) $**
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG) $**
$(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) $**
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 92c1d64707..e1e4b214be 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -17,8 +17,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
- USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" \
- USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+ USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
@@ -1005,6 +1005,32 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_wizrd.o \
$(OBJS)\xrclib_xmlres.o \
$(OBJS)\xrclib_xmlrsall.o
+AUIDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W \
+ -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
+ -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_AUI \
+ $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+ $(CXXFLAGS)
+AUIDLL_OBJECTS = \
+ $(OBJS)\auidll_dummy.o \
+ $(OBJS)\auidll_version_rc.o \
+ $(OBJS)\auidll_framemanager.o \
+ $(OBJS)\auidll_dockart.o \
+ $(OBJS)\auidll_floatpane.o
+AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W \
+ -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
+ -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+AUILIB_OBJECTS = \
+ $(OBJS)\auilib_dummy.o \
+ $(OBJS)\auilib_framemanager.o \
+ $(OBJS)\auilib_dockart.o \
+ $(OBJS)\auilib_floatpane.o
GLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -1176,7 +1202,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_unkwn.o \
$(OBJS)\monodll_xh_wizrd.o \
$(OBJS)\monodll_xmlres.o \
- $(OBJS)\monodll_xmlrsall.o
+ $(OBJS)\monodll_xmlrsall.o \
+ $(OBJS)\monodll_framemanager.o \
+ $(OBJS)\monodll_dockart.o \
+ $(OBJS)\monodll_floatpane.o
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
@@ -1229,9 +1258,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_helpwin.o \
$(OBJS)\monodll_automtn.o \
$(OBJS)\monodll_uuid.o \
- $(OBJS)\monodll_clrpickerg.o \
- $(OBJS)\monodll_fontpickerg.o \
- $(OBJS)\monodll_filepickerg.o \
$(OBJS)\monodll_statusbr.o \
$(OBJS)\monodll_prntdlgg.o \
$(OBJS)\monodll_accel.o \
@@ -1367,10 +1393,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_buttonbar.o \
$(OBJS)\monodll_choicdgg.o \
$(OBJS)\monodll_choicbkg.o \
+ $(OBJS)\monodll_clrpickerg.o \
$(OBJS)\monodll_combog.o \
$(OBJS)\monodll_dcpsg.o \
$(OBJS)\monodll_dirctrlg.o \
$(OBJS)\monodll_dragimgg.o \
+ $(OBJS)\monodll_filepickerg.o \
+ $(OBJS)\monodll_fontpickerg.o \
$(OBJS)\monodll_listbkg.o \
$(OBJS)\monodll_logg.o \
$(OBJS)\monodll_numdlgg.o \
@@ -1443,14 +1472,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_automtn.o \
$(OBJS)\monodll_uuid.o \
$(OBJS)\monodll_accel.o \
- $(OBJS)\monodll_clrpickerg.o \
$(OBJS)\monodll_colrdlgg.o \
$(OBJS)\monodll_dirdlgg.o \
$(OBJS)\monodll_fdrepdlg.o \
$(OBJS)\monodll_filedlgg.o \
- $(OBJS)\monodll_filepickerg.o \
$(OBJS)\monodll_fontdlgg.o \
- $(OBJS)\monodll_fontpickerg.o \
$(OBJS)\monodll_imaglist.o \
$(OBJS)\monodll_listctrl.o \
$(OBJS)\monodll_mdig.o \
@@ -1581,10 +1607,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_buttonbar.o \
$(OBJS)\monodll_choicdgg.o \
$(OBJS)\monodll_choicbkg.o \
+ $(OBJS)\monodll_clrpickerg.o \
$(OBJS)\monodll_combog.o \
$(OBJS)\monodll_dcpsg.o \
$(OBJS)\monodll_dirctrlg.o \
$(OBJS)\monodll_dragimgg.o \
+ $(OBJS)\monodll_filepickerg.o \
+ $(OBJS)\monodll_fontpickerg.o \
$(OBJS)\monodll_listbkg.o \
$(OBJS)\monodll_logg.o \
$(OBJS)\monodll_numdlgg.o \
@@ -1754,7 +1783,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_unkwn.o \
$(OBJS)\monolib_xh_wizrd.o \
$(OBJS)\monolib_xmlres.o \
- $(OBJS)\monolib_xmlrsall.o
+ $(OBJS)\monolib_xmlrsall.o \
+ $(OBJS)\monolib_framemanager.o \
+ $(OBJS)\monolib_dockart.o \
+ $(OBJS)\monolib_floatpane.o
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
@@ -1807,9 +1839,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_helpwin.o \
$(OBJS)\monolib_automtn.o \
$(OBJS)\monolib_uuid.o \
- $(OBJS)\monolib_clrpickerg.o \
- $(OBJS)\monolib_fontpickerg.o \
- $(OBJS)\monolib_filepickerg.o \
$(OBJS)\monolib_statusbr.o \
$(OBJS)\monolib_prntdlgg.o \
$(OBJS)\monolib_accel.o \
@@ -1945,10 +1974,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_buttonbar.o \
$(OBJS)\monolib_choicdgg.o \
$(OBJS)\monolib_choicbkg.o \
+ $(OBJS)\monolib_clrpickerg.o \
$(OBJS)\monolib_combog.o \
$(OBJS)\monolib_dcpsg.o \
$(OBJS)\monolib_dirctrlg.o \
$(OBJS)\monolib_dragimgg.o \
+ $(OBJS)\monolib_filepickerg.o \
+ $(OBJS)\monolib_fontpickerg.o \
$(OBJS)\monolib_listbkg.o \
$(OBJS)\monolib_logg.o \
$(OBJS)\monolib_numdlgg.o \
@@ -2021,14 +2053,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_automtn.o \
$(OBJS)\monolib_uuid.o \
$(OBJS)\monolib_accel.o \
- $(OBJS)\monolib_clrpickerg.o \
$(OBJS)\monolib_colrdlgg.o \
$(OBJS)\monolib_dirdlgg.o \
$(OBJS)\monolib_fdrepdlg.o \
$(OBJS)\monolib_filedlgg.o \
- $(OBJS)\monolib_filepickerg.o \
$(OBJS)\monolib_fontdlgg.o \
- $(OBJS)\monolib_fontpickerg.o \
$(OBJS)\monolib_imaglist.o \
$(OBJS)\monolib_listctrl.o \
$(OBJS)\monolib_mdig.o \
@@ -2159,10 +2188,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_buttonbar.o \
$(OBJS)\monolib_choicdgg.o \
$(OBJS)\monolib_choicbkg.o \
+ $(OBJS)\monolib_clrpickerg.o \
$(OBJS)\monolib_combog.o \
$(OBJS)\monolib_dcpsg.o \
$(OBJS)\monolib_dirctrlg.o \
$(OBJS)\monolib_dragimgg.o \
+ $(OBJS)\monolib_filepickerg.o \
+ $(OBJS)\monolib_fontpickerg.o \
$(OBJS)\monolib_listbkg.o \
$(OBJS)\monolib_logg.o \
$(OBJS)\monolib_numdlgg.o \
@@ -2323,9 +2355,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_helpwin.o \
$(OBJS)\coredll_automtn.o \
$(OBJS)\coredll_uuid.o \
- $(OBJS)\coredll_clrpickerg.o \
- $(OBJS)\coredll_fontpickerg.o \
- $(OBJS)\coredll_filepickerg.o \
$(OBJS)\coredll_statusbr.o \
$(OBJS)\coredll_prntdlgg.o \
$(OBJS)\coredll_accel.o \
@@ -2461,10 +2490,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.o \
$(OBJS)\coredll_choicdgg.o \
$(OBJS)\coredll_choicbkg.o \
+ $(OBJS)\coredll_clrpickerg.o \
$(OBJS)\coredll_combog.o \
$(OBJS)\coredll_dcpsg.o \
$(OBJS)\coredll_dirctrlg.o \
$(OBJS)\coredll_dragimgg.o \
+ $(OBJS)\coredll_filepickerg.o \
+ $(OBJS)\coredll_fontpickerg.o \
$(OBJS)\coredll_listbkg.o \
$(OBJS)\coredll_logg.o \
$(OBJS)\coredll_numdlgg.o \
@@ -2537,14 +2569,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_automtn.o \
$(OBJS)\coredll_uuid.o \
$(OBJS)\coredll_accel.o \
- $(OBJS)\coredll_clrpickerg.o \
$(OBJS)\coredll_colrdlgg.o \
$(OBJS)\coredll_dirdlgg.o \
$(OBJS)\coredll_fdrepdlg.o \
$(OBJS)\coredll_filedlgg.o \
- $(OBJS)\coredll_filepickerg.o \
$(OBJS)\coredll_fontdlgg.o \
- $(OBJS)\coredll_fontpickerg.o \
$(OBJS)\coredll_imaglist.o \
$(OBJS)\coredll_listctrl.o \
$(OBJS)\coredll_mdig.o \
@@ -2675,10 +2704,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.o \
$(OBJS)\coredll_choicdgg.o \
$(OBJS)\coredll_choicbkg.o \
+ $(OBJS)\coredll_clrpickerg.o \
$(OBJS)\coredll_combog.o \
$(OBJS)\coredll_dcpsg.o \
$(OBJS)\coredll_dirctrlg.o \
$(OBJS)\coredll_dragimgg.o \
+ $(OBJS)\coredll_filepickerg.o \
+ $(OBJS)\coredll_fontpickerg.o \
$(OBJS)\coredll_listbkg.o \
$(OBJS)\coredll_logg.o \
$(OBJS)\coredll_numdlgg.o \
@@ -2758,9 +2790,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_helpwin.o \
$(OBJS)\corelib_automtn.o \
$(OBJS)\corelib_uuid.o \
- $(OBJS)\corelib_clrpickerg.o \
- $(OBJS)\corelib_fontpickerg.o \
- $(OBJS)\corelib_filepickerg.o \
$(OBJS)\corelib_statusbr.o \
$(OBJS)\corelib_prntdlgg.o \
$(OBJS)\corelib_accel.o \
@@ -2896,10 +2925,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.o \
$(OBJS)\corelib_choicdgg.o \
$(OBJS)\corelib_choicbkg.o \
+ $(OBJS)\corelib_clrpickerg.o \
$(OBJS)\corelib_combog.o \
$(OBJS)\corelib_dcpsg.o \
$(OBJS)\corelib_dirctrlg.o \
$(OBJS)\corelib_dragimgg.o \
+ $(OBJS)\corelib_filepickerg.o \
+ $(OBJS)\corelib_fontpickerg.o \
$(OBJS)\corelib_listbkg.o \
$(OBJS)\corelib_logg.o \
$(OBJS)\corelib_numdlgg.o \
@@ -2972,14 +3004,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_automtn.o \
$(OBJS)\corelib_uuid.o \
$(OBJS)\corelib_accel.o \
- $(OBJS)\corelib_clrpickerg.o \
$(OBJS)\corelib_colrdlgg.o \
$(OBJS)\corelib_dirdlgg.o \
$(OBJS)\corelib_fdrepdlg.o \
$(OBJS)\corelib_filedlgg.o \
- $(OBJS)\corelib_filepickerg.o \
$(OBJS)\corelib_fontdlgg.o \
- $(OBJS)\corelib_fontpickerg.o \
$(OBJS)\corelib_imaglist.o \
$(OBJS)\corelib_listctrl.o \
$(OBJS)\corelib_mdig.o \
@@ -3110,10 +3139,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.o \
$(OBJS)\corelib_choicdgg.o \
$(OBJS)\corelib_choicbkg.o \
+ $(OBJS)\corelib_clrpickerg.o \
$(OBJS)\corelib_combog.o \
$(OBJS)\corelib_dcpsg.o \
$(OBJS)\corelib_dirctrlg.o \
$(OBJS)\corelib_dragimgg.o \
+ $(OBJS)\corelib_filepickerg.o \
+ $(OBJS)\corelib_fontpickerg.o \
$(OBJS)\corelib_listbkg.o \
$(OBJS)\corelib_logg.o \
$(OBJS)\corelib_numdlgg.o \
@@ -3388,6 +3420,22 @@ __xrclib___depname = \
endif
endif
endif
+ifeq ($(MONOLITHIC),0)
+ifeq ($(SHARED),1)
+ifeq ($(USE_AUI),1)
+__auidll___depname = \
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll
+endif
+endif
+endif
+ifeq ($(MONOLITHIC),0)
+ifeq ($(SHARED),0)
+ifeq ($(USE_AUI),1)
+__auilib___depname = \
+ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a
+endif
+endif
+endif
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_OPENGL),1)
@@ -3417,30 +3465,30 @@ endif
endif
endif
ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_49 = --define __WXUNIVERSAL__
+__WXUNIV_DEFINE_p_53 = --define __WXUNIVERSAL__
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_49 = --define __WXDEBUG__
+__DEBUG_DEFINE_p_53 = --define __WXDEBUG__
endif
endif
ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_49 = --define __WXDEBUG__
+__DEBUG_DEFINE_p_53 = --define __WXDEBUG__
endif
ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_49 = --define wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_53 = --define wxNO_EXCEPTIONS
endif
ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_49 = --define wxNO_RTTI
+__RTTI_DEFINE_p_53 = --define wxNO_RTTI
endif
ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_49 = --define wxNO_THREADS
+__THREAD_DEFINE_p_53 = --define wxNO_THREADS
endif
ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_50 = --define _UNICODE
+__UNICODE_DEFINE_p_54 = --define _UNICODE
endif
ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_49 = --define wxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_53 = --define wxUSE_UNICODE_MSLU=1
endif
ifeq ($(USE_GUI),1)
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -3534,7 +3582,7 @@ $(OBJS):
### Targets: ###
-all: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__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: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__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:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -3581,6 +3629,9 @@ clean:
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll
+ -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a
+ -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a
-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a
@@ -3864,6 +3915,26 @@ endif
endif
endif
+ifeq ($(MONOLITHIC),0)
+ifeq ($(SHARED),1)
+ifeq ($(USE_AUI),1)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(OBJS)\auidll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+ $(CXX) -shared -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+endif
+endif
+endif
+
+ifeq ($(MONOLITHIC),0)
+ifeq ($(SHARED),0)
+ifeq ($(USE_AUI),1)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a: $(AUILIB_OBJECTS)
+ if exist $@ del $@
+ ar rcu $@ $(AUILIB_OBJECTS)
+ ranlib $@
+endif
+endif
+endif
+
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
ifeq ($(USE_OPENGL),1)
@@ -4295,7 +4366,7 @@ $(OBJS)\monodll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)
$(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -4960,6 +5031,15 @@ $(OBJS)\monodll_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\monodll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\monodll_framemanager.o: ../../src/aui/framemanager.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_dockart.o: ../../src/aui/dockart.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_floatpane.o: ../../src/aui/floatpane.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5206,21 +5286,6 @@ $(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_fontpickerg.o: ../../src/generic/fontpickerg.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_filepickerg.o: ../../src/generic/filepickerg.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monodll_statusbr.o: ../../src/generic/statusbr.cpp
@@ -6020,6 +6085,11 @@ $(OBJS)\monodll_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6040,6 +6110,16 @@ $(OBJS)\monodll_dragimgg.o: ../../src/generic/dragimgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_filepickerg.o: ../../src/generic/filepickerg.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_fontpickerg.o: ../../src/generic/fontpickerg.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6921,6 +7001,15 @@ $(OBJS)\monolib_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\monolib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\monolib_framemanager.o: ../../src/aui/framemanager.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_dockart.o: ../../src/aui/dockart.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_floatpane.o: ../../src/aui/floatpane.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\monolib_xml.o: ../../src/xml/xml.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7167,21 +7256,6 @@ $(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_fontpickerg.o: ../../src/generic/fontpickerg.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_filepickerg.o: ../../src/generic/filepickerg.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monolib_statusbr.o: ../../src/generic/statusbr.cpp
@@ -7981,6 +8055,11 @@ $(OBJS)\monolib_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8001,6 +8080,16 @@ $(OBJS)\monolib_dragimgg.o: ../../src/generic/dragimgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_filepickerg.o: ../../src/generic/filepickerg.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_fontpickerg.o: ../../src/generic/fontpickerg.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8220,7 +8309,7 @@ $(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)
$(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8709,7 +8798,7 @@ $(OBJS)\netdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG)
$(OBJS)\netdll_fs_inet.o: ../../src/common/fs_inet.cpp
$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8790,7 +8879,7 @@ $(OBJS)\coredll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG)
$(OBJS)\coredll_event.o: ../../src/common/event.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9188,21 +9277,6 @@ $(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_fontpickerg.o: ../../src/generic/fontpickerg.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_filepickerg.o: ../../src/generic/filepickerg.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\coredll_statusbr.o: ../../src/generic/statusbr.cpp
@@ -10002,6 +10076,11 @@ $(OBJS)\coredll_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10022,6 +10101,16 @@ $(OBJS)\coredll_dragimgg.o: ../../src/generic/dragimgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_filepickerg.o: ../../src/generic/filepickerg.cpp
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_fontpickerg.o: ../../src/generic/fontpickerg.cpp
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10511,21 +10600,6 @@ $(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_fontpickerg.o: ../../src/generic/fontpickerg.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_filepickerg.o: ../../src/generic/filepickerg.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\corelib_statusbr.o: ../../src/generic/statusbr.cpp
@@ -11325,6 +11399,11 @@ $(OBJS)\corelib_choicbkg.o: ../../src/generic/choicbkg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_combog.o: ../../src/generic/combog.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11345,6 +11424,16 @@ $(OBJS)\corelib_dragimgg.o: ../../src/generic/dragimgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_filepickerg.o: ../../src/generic/filepickerg.cpp
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_fontpickerg.o: ../../src/generic/fontpickerg.cpp
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11439,7 +11528,7 @@ $(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG)
$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11604,7 +11693,7 @@ $(OBJS)\mediadll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG)
$(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11637,7 +11726,7 @@ $(OBJS)\odbcdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\odbcdll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG)
$(OBJS)\odbcdll_db.o: ../../src/common/db.cpp
$(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11658,7 +11747,7 @@ $(OBJS)\dbgriddll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\dbgriddll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG)
$(OBJS)\dbgriddll_dbgrid.o: ../../src/common/dbgrid.cpp
$(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11673,7 +11762,7 @@ $(OBJS)\htmldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG)
$(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11826,7 +11915,7 @@ $(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\qadll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG)
$(OBJS)\qadll_debugrpt.o: ../../src/common/debugrpt.cpp
$(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11847,7 +11936,7 @@ $(OBJS)\xmldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG)
$(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp
$(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11868,7 +11957,7 @@ $(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG)
$(OBJS)\xrcdll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12173,11 +12262,38 @@ $(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\auidll_dummy.o: ../../src/common/dummy.cpp
+ $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\auidll_version_rc.o: ../../src/msw/version.rc
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG)
+
+$(OBJS)\auidll_framemanager.o: ../../src/aui/framemanager.cpp
+ $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\auidll_dockart.o: ../../src/aui/dockart.cpp
+ $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\auidll_floatpane.o: ../../src/aui/floatpane.cpp
+ $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\auilib_dummy.o: ../../src/common/dummy.cpp
+ $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\auilib_framemanager.o: ../../src/aui/framemanager.cpp
+ $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\auilib_dockart.o: ../../src/aui/dockart.cpp
+ $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\auilib_floatpane.o: ../../src/aui/floatpane.cpp
+ $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG)
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG)
$(OBJS)\gldll_glcanvas.o: ../../src/msw/glcanvas.cpp
$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index e34be5971d..c455537901 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -18,8 +18,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
- USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" \
- USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+ USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
@@ -1089,7 +1089,39 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_wizrd.obj \
$(OBJS)\xrclib_xmlres.obj \
$(OBJS)\xrclib_xmlrsall.obj
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME) /DWIN32 \
+AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME) /DWIN32 \
+ $(__DEBUGINFO) \
+ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
+ $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 /I..\..\src\tiff \
+ /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+ /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_AUI $(__RTTIFLAG) \
+ $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auidll.pch" \
+ $(CPPFLAGS) $(CXXFLAGS)
+AUIDLL_OBJECTS = \
+ $(OBJS)\auidll_dummy.obj \
+ $(OBJS)\auidll_version.res \
+ $(OBJS)\auidll_framemanager.obj \
+ $(OBJS)\auidll_dockart.obj \
+ $(OBJS)\auidll_floatpane.obj
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+ $(__DEBUGINFO) \
+ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
+ $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 /I..\..\src\tiff \
+ /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+ /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+ /Fp"$(OBJS)\wxprec_auilib.pch" $(CPPFLAGS) $(CXXFLAGS)
+AUILIB_OBJECTS = \
+ $(OBJS)\auilib_dummy.obj \
+ $(OBJS)\auilib_framemanager.obj \
+ $(OBJS)\auilib_dockart.obj \
+ $(OBJS)\auilib_floatpane.obj
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_438)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1104,7 +1136,7 @@ GLDLL_OBJECTS = \
$(OBJS)\gldll_dummy.obj \
$(OBJS)\gldll_version.res \
$(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1325,7 +1357,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_unkwn.obj \
$(OBJS)\monodll_xh_wizrd.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
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -1377,9 +1412,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_helpwin.obj \
$(OBJS)\monodll_automtn.obj \
$(OBJS)\monodll_uuid.obj \
- $(OBJS)\monodll_clrpickerg.obj \
- $(OBJS)\monodll_fontpickerg.obj \
- $(OBJS)\monodll_filepickerg.obj \
$(OBJS)\monodll_statusbr.obj \
$(OBJS)\monodll_prntdlgg.obj \
$(OBJS)\monodll_accel.obj \
@@ -1515,10 +1547,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
+ $(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
+ $(OBJS)\monodll_filepickerg.obj \
+ $(OBJS)\monodll_fontpickerg.obj \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \
@@ -1589,14 +1624,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_automtn.obj \
$(OBJS)\monodll_uuid.obj \
$(OBJS)\monodll_accel.obj \
- $(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_dirdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_filedlgg.obj \
- $(OBJS)\monodll_filepickerg.obj \
$(OBJS)\monodll_fontdlgg.obj \
- $(OBJS)\monodll_fontpickerg.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_listctrl.obj \
$(OBJS)\monodll_mdig.obj \
@@ -1727,10 +1759,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
+ $(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
$(OBJS)\monodll_dragimgg.obj \
+ $(OBJS)\monodll_filepickerg.obj \
+ $(OBJS)\monodll_fontpickerg.obj \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \
@@ -1903,7 +1938,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_unkwn.obj \
$(OBJS)\monolib_xh_wizrd.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
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -1955,9 +1993,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_helpwin.obj \
$(OBJS)\monolib_automtn.obj \
$(OBJS)\monolib_uuid.obj \
- $(OBJS)\monolib_clrpickerg.obj \
- $(OBJS)\monolib_fontpickerg.obj \
- $(OBJS)\monolib_filepickerg.obj \
$(OBJS)\monolib_statusbr.obj \
$(OBJS)\monolib_prntdlgg.obj \
$(OBJS)\monolib_accel.obj \
@@ -2093,10 +2128,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
+ $(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
+ $(OBJS)\monolib_filepickerg.obj \
+ $(OBJS)\monolib_fontpickerg.obj \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \
@@ -2167,14 +2205,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_automtn.obj \
$(OBJS)\monolib_uuid.obj \
$(OBJS)\monolib_accel.obj \
- $(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_dirdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_filedlgg.obj \
- $(OBJS)\monolib_filepickerg.obj \
$(OBJS)\monolib_fontdlgg.obj \
- $(OBJS)\monolib_fontpickerg.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_listctrl.obj \
$(OBJS)\monolib_mdig.obj \
@@ -2305,10 +2340,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
+ $(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
$(OBJS)\monolib_dragimgg.obj \
+ $(OBJS)\monolib_filepickerg.obj \
+ $(OBJS)\monolib_fontpickerg.obj \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \
@@ -2485,9 +2523,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_helpwin.obj \
$(OBJS)\coredll_automtn.obj \
$(OBJS)\coredll_uuid.obj \
- $(OBJS)\coredll_clrpickerg.obj \
- $(OBJS)\coredll_fontpickerg.obj \
- $(OBJS)\coredll_filepickerg.obj \
$(OBJS)\coredll_statusbr.obj \
$(OBJS)\coredll_prntdlgg.obj \
$(OBJS)\coredll_accel.obj \
@@ -2623,10 +2658,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
+ $(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
+ $(OBJS)\coredll_filepickerg.obj \
+ $(OBJS)\coredll_fontpickerg.obj \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \
@@ -2697,14 +2735,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_automtn.obj \
$(OBJS)\coredll_uuid.obj \
$(OBJS)\coredll_accel.obj \
- $(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_dirdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_filedlgg.obj \
- $(OBJS)\coredll_filepickerg.obj \
$(OBJS)\coredll_fontdlgg.obj \
- $(OBJS)\coredll_fontpickerg.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_listctrl.obj \
$(OBJS)\coredll_mdig.obj \
@@ -2835,10 +2870,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
+ $(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
$(OBJS)\coredll_dragimgg.obj \
+ $(OBJS)\coredll_filepickerg.obj \
+ $(OBJS)\coredll_fontpickerg.obj \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \
@@ -2918,9 +2956,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_helpwin.obj \
$(OBJS)\corelib_automtn.obj \
$(OBJS)\corelib_uuid.obj \
- $(OBJS)\corelib_clrpickerg.obj \
- $(OBJS)\corelib_fontpickerg.obj \
- $(OBJS)\corelib_filepickerg.obj \
$(OBJS)\corelib_statusbr.obj \
$(OBJS)\corelib_prntdlgg.obj \
$(OBJS)\corelib_accel.obj \
@@ -3056,10 +3091,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
+ $(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
+ $(OBJS)\corelib_filepickerg.obj \
+ $(OBJS)\corelib_fontpickerg.obj \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \
@@ -3130,14 +3168,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_automtn.obj \
$(OBJS)\corelib_uuid.obj \
$(OBJS)\corelib_accel.obj \
- $(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_dirdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_filedlgg.obj \
- $(OBJS)\corelib_filepickerg.obj \
$(OBJS)\corelib_fontdlgg.obj \
- $(OBJS)\corelib_fontpickerg.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_listctrl.obj \
$(OBJS)\corelib_mdig.obj \
@@ -3268,10 +3303,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
+ $(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
$(OBJS)\corelib_dragimgg.obj \
+ $(OBJS)\corelib_filepickerg.obj \
+ $(OBJS)\corelib_fontpickerg.obj \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \
@@ -3565,9 +3603,9 @@ __RUNTIME_LIBS_397 = D
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_397 = $(__THREADSFLAG)
!endif
-!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-__gldll___depname = \
- $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
+__auidll___depname = \
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_411 = D
@@ -3575,6 +3613,26 @@ __RUNTIME_LIBS_411 = D
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_411 = $(__THREADSFLAG)
!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
+__auilib___depname = \
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_424 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
+__gldll___depname = \
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_438 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_438 = $(__THREADSFLAG)
+!endif
!if "$(MONOLITHIC)" == "0"
__WXLIBGLDEP_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
@@ -3592,10 +3650,10 @@ __gllib___depname = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_424 = D
+__RUNTIME_LIBS_451 = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+__RUNTIME_LIBS_451 = $(__THREADSFLAG)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_4 = /DEBUG
@@ -3622,34 +3680,34 @@ ____DEBUGRUNTIME_4 =
____DEBUGRUNTIME_4 = /d _DEBUG
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_55 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_59 = /d __NO_VC_CRTDBG__
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_55 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_59 = /d __NO_VC_CRTDBG__
!endif
!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_49 = /d __WXUNIVERSAL__
+__WXUNIV_DEFINE_p_53 = /d __WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_49 = /d __WXDEBUG__
+__DEBUG_DEFINE_p_53 = /d __WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_49 = /d __WXDEBUG__
+__DEBUG_DEFINE_p_53 = /d __WXDEBUG__
!endif
!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_49 = /d wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_53 = /d wxNO_EXCEPTIONS
!endif
!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_49 = /d wxNO_RTTI
+__RTTI_DEFINE_p_53 = /d wxNO_RTTI
!endif
!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_49 = /d wxNO_THREADS
+__THREAD_DEFINE_p_53 = /d wxNO_THREADS
!endif
!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_50 = /d _UNICODE
+__UNICODE_DEFINE_p_54 = /d _UNICODE
!endif
!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_49 = /d wxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_53 = /d wxUSE_UNICODE_MSLU=1
!endif
!if "$(USE_GUI)" == "1"
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -3767,7 +3825,7 @@ $(OBJS):
### Targets: ###
-all: 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: 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:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -3839,6 +3897,11 @@ clean:
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb
-if exist $(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
-if exist $(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
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb
+ -if exist $(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
+ -if exist $(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
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb
@@ -4072,6 +4135,21 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(OBJS)\auidll_version.res $(__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)
+ link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+ $(AUIDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_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)_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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib: $(OBJS)\auilib_dummy.obj $(AUILIB_OBJECTS)
+ if exist $@ del $@
+ link /LIB /NOLOGO /OUT:$@ @<<
+ $(AUILIB_OBJECTS)
+<<
+!endif
+
!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
@@ -4500,7 +4578,7 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5165,6 +5243,15 @@ $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5411,21 +5498,6 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6121,6 +6193,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6141,6 +6218,16 @@ $(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7022,6 +7109,15 @@ $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
$(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7268,21 +7364,6 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7978,6 +8059,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7998,6 +8084,16 @@ $(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8217,7 +8313,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
$(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
@@ -8706,7 +8802,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) $**
$(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
@@ -8787,7 +8883,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) $**
$(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9185,21 +9281,6 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9895,6 +9976,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9915,6 +10001,16 @@ $(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -10404,21 +10500,6 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11114,6 +11195,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11134,6 +11220,16 @@ $(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11228,7 +11324,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) $**
$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
@@ -11393,7 +11489,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) $**
$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
@@ -11426,7 +11522,7 @@ $(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) $**
$(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
@@ -11447,7 +11543,7 @@ $(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) $**
$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
@@ -11462,7 +11558,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) $**
$(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
@@ -11615,7 +11711,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) $**
$(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
@@ -11636,7 +11732,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) $**
$(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
@@ -11657,7 +11753,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) $**
$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
@@ -11962,11 +12058,38 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG) $**
+
+$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55) /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) $**
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_59) /d __WXMSW__ $(__WXUNIV_DEFINE_p_53) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) $**
$(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index a39cab9d32..841eac5056 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -182,7 +182,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_xh_unkwn.obj &
$(OBJS)\monodll_xh_wizrd.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
____CORE_SRC_FILENAMES_OBJECTS =
!ifeq USE_GUI 1
@@ -236,9 +239,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_helpwin.obj &
$(OBJS)\monodll_automtn.obj &
$(OBJS)\monodll_uuid.obj &
- $(OBJS)\monodll_clrpickerg.obj &
- $(OBJS)\monodll_fontpickerg.obj &
- $(OBJS)\monodll_filepickerg.obj &
$(OBJS)\monodll_statusbr.obj &
$(OBJS)\monodll_prntdlgg.obj &
$(OBJS)\monodll_accel.obj &
@@ -374,10 +374,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_choicdgg.obj &
$(OBJS)\monodll_choicbkg.obj &
+ $(OBJS)\monodll_clrpickerg.obj &
$(OBJS)\monodll_combog.obj &
$(OBJS)\monodll_dcpsg.obj &
$(OBJS)\monodll_dirctrlg.obj &
$(OBJS)\monodll_dragimgg.obj &
+ $(OBJS)\monodll_filepickerg.obj &
+ $(OBJS)\monodll_fontpickerg.obj &
$(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_numdlgg.obj &
@@ -450,14 +453,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_automtn.obj &
$(OBJS)\monodll_uuid.obj &
$(OBJS)\monodll_accel.obj &
- $(OBJS)\monodll_clrpickerg.obj &
$(OBJS)\monodll_colrdlgg.obj &
$(OBJS)\monodll_dirdlgg.obj &
$(OBJS)\monodll_fdrepdlg.obj &
$(OBJS)\monodll_filedlgg.obj &
- $(OBJS)\monodll_filepickerg.obj &
$(OBJS)\monodll_fontdlgg.obj &
- $(OBJS)\monodll_fontpickerg.obj &
$(OBJS)\monodll_imaglist.obj &
$(OBJS)\monodll_listctrl.obj &
$(OBJS)\monodll_mdig.obj &
@@ -588,10 +588,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_choicdgg.obj &
$(OBJS)\monodll_choicbkg.obj &
+ $(OBJS)\monodll_clrpickerg.obj &
$(OBJS)\monodll_combog.obj &
$(OBJS)\monodll_dcpsg.obj &
$(OBJS)\monodll_dirctrlg.obj &
$(OBJS)\monodll_dragimgg.obj &
+ $(OBJS)\monodll_filepickerg.obj &
+ $(OBJS)\monodll_fontpickerg.obj &
$(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_numdlgg.obj &
@@ -764,7 +767,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_xh_unkwn.obj &
$(OBJS)\monolib_xh_wizrd.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
____CORE_SRC_FILENAMES_1_OBJECTS =
!ifeq USE_GUI 1
@@ -818,9 +824,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_helpwin.obj &
$(OBJS)\monolib_automtn.obj &
$(OBJS)\monolib_uuid.obj &
- $(OBJS)\monolib_clrpickerg.obj &
- $(OBJS)\monolib_fontpickerg.obj &
- $(OBJS)\monolib_filepickerg.obj &
$(OBJS)\monolib_statusbr.obj &
$(OBJS)\monolib_prntdlgg.obj &
$(OBJS)\monolib_accel.obj &
@@ -956,10 +959,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_choicdgg.obj &
$(OBJS)\monolib_choicbkg.obj &
+ $(OBJS)\monolib_clrpickerg.obj &
$(OBJS)\monolib_combog.obj &
$(OBJS)\monolib_dcpsg.obj &
$(OBJS)\monolib_dirctrlg.obj &
$(OBJS)\monolib_dragimgg.obj &
+ $(OBJS)\monolib_filepickerg.obj &
+ $(OBJS)\monolib_fontpickerg.obj &
$(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_numdlgg.obj &
@@ -1032,14 +1038,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_automtn.obj &
$(OBJS)\monolib_uuid.obj &
$(OBJS)\monolib_accel.obj &
- $(OBJS)\monolib_clrpickerg.obj &
$(OBJS)\monolib_colrdlgg.obj &
$(OBJS)\monolib_dirdlgg.obj &
$(OBJS)\monolib_fdrepdlg.obj &
$(OBJS)\monolib_filedlgg.obj &
- $(OBJS)\monolib_filepickerg.obj &
$(OBJS)\monolib_fontdlgg.obj &
- $(OBJS)\monolib_fontpickerg.obj &
$(OBJS)\monolib_imaglist.obj &
$(OBJS)\monolib_listctrl.obj &
$(OBJS)\monolib_mdig.obj &
@@ -1170,10 +1173,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_choicdgg.obj &
$(OBJS)\monolib_choicbkg.obj &
+ $(OBJS)\monolib_clrpickerg.obj &
$(OBJS)\monolib_combog.obj &
$(OBJS)\monolib_dcpsg.obj &
$(OBJS)\monolib_dirctrlg.obj &
$(OBJS)\monolib_dragimgg.obj &
+ $(OBJS)\monolib_filepickerg.obj &
+ $(OBJS)\monolib_fontpickerg.obj &
$(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_numdlgg.obj &
@@ -1341,9 +1347,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_helpwin.obj &
$(OBJS)\coredll_automtn.obj &
$(OBJS)\coredll_uuid.obj &
- $(OBJS)\coredll_clrpickerg.obj &
- $(OBJS)\coredll_fontpickerg.obj &
- $(OBJS)\coredll_filepickerg.obj &
$(OBJS)\coredll_statusbr.obj &
$(OBJS)\coredll_prntdlgg.obj &
$(OBJS)\coredll_accel.obj &
@@ -1479,10 +1482,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_buttonbar.obj &
$(OBJS)\coredll_choicdgg.obj &
$(OBJS)\coredll_choicbkg.obj &
+ $(OBJS)\coredll_clrpickerg.obj &
$(OBJS)\coredll_combog.obj &
$(OBJS)\coredll_dcpsg.obj &
$(OBJS)\coredll_dirctrlg.obj &
$(OBJS)\coredll_dragimgg.obj &
+ $(OBJS)\coredll_filepickerg.obj &
+ $(OBJS)\coredll_fontpickerg.obj &
$(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_numdlgg.obj &
@@ -1555,14 +1561,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_automtn.obj &
$(OBJS)\coredll_uuid.obj &
$(OBJS)\coredll_accel.obj &
- $(OBJS)\coredll_clrpickerg.obj &
$(OBJS)\coredll_colrdlgg.obj &
$(OBJS)\coredll_dirdlgg.obj &
$(OBJS)\coredll_fdrepdlg.obj &
$(OBJS)\coredll_filedlgg.obj &
- $(OBJS)\coredll_filepickerg.obj &
$(OBJS)\coredll_fontdlgg.obj &
- $(OBJS)\coredll_fontpickerg.obj &
$(OBJS)\coredll_imaglist.obj &
$(OBJS)\coredll_listctrl.obj &
$(OBJS)\coredll_mdig.obj &
@@ -1693,10 +1696,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_buttonbar.obj &
$(OBJS)\coredll_choicdgg.obj &
$(OBJS)\coredll_choicbkg.obj &
+ $(OBJS)\coredll_clrpickerg.obj &
$(OBJS)\coredll_combog.obj &
$(OBJS)\coredll_dcpsg.obj &
$(OBJS)\coredll_dirctrlg.obj &
$(OBJS)\coredll_dragimgg.obj &
+ $(OBJS)\coredll_filepickerg.obj &
+ $(OBJS)\coredll_fontpickerg.obj &
$(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_numdlgg.obj &
@@ -1778,9 +1784,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_helpwin.obj &
$(OBJS)\corelib_automtn.obj &
$(OBJS)\corelib_uuid.obj &
- $(OBJS)\corelib_clrpickerg.obj &
- $(OBJS)\corelib_fontpickerg.obj &
- $(OBJS)\corelib_filepickerg.obj &
$(OBJS)\corelib_statusbr.obj &
$(OBJS)\corelib_prntdlgg.obj &
$(OBJS)\corelib_accel.obj &
@@ -1916,10 +1919,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_buttonbar.obj &
$(OBJS)\corelib_choicdgg.obj &
$(OBJS)\corelib_choicbkg.obj &
+ $(OBJS)\corelib_clrpickerg.obj &
$(OBJS)\corelib_combog.obj &
$(OBJS)\corelib_dcpsg.obj &
$(OBJS)\corelib_dirctrlg.obj &
$(OBJS)\corelib_dragimgg.obj &
+ $(OBJS)\corelib_filepickerg.obj &
+ $(OBJS)\corelib_fontpickerg.obj &
$(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_numdlgg.obj &
@@ -1992,14 +1998,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_automtn.obj &
$(OBJS)\corelib_uuid.obj &
$(OBJS)\corelib_accel.obj &
- $(OBJS)\corelib_clrpickerg.obj &
$(OBJS)\corelib_colrdlgg.obj &
$(OBJS)\corelib_dirdlgg.obj &
$(OBJS)\corelib_fdrepdlg.obj &
$(OBJS)\corelib_filedlgg.obj &
- $(OBJS)\corelib_filepickerg.obj &
$(OBJS)\corelib_fontdlgg.obj &
- $(OBJS)\corelib_fontpickerg.obj &
$(OBJS)\corelib_imaglist.obj &
$(OBJS)\corelib_listctrl.obj &
$(OBJS)\corelib_mdig.obj &
@@ -2130,10 +2133,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_buttonbar.obj &
$(OBJS)\corelib_choicdgg.obj &
$(OBJS)\corelib_choicbkg.obj &
+ $(OBJS)\corelib_clrpickerg.obj &
$(OBJS)\corelib_combog.obj &
$(OBJS)\corelib_dcpsg.obj &
$(OBJS)\corelib_dirctrlg.obj &
$(OBJS)\corelib_dragimgg.obj &
+ $(OBJS)\corelib_filepickerg.obj &
+ $(OBJS)\corelib_fontpickerg.obj &
$(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_numdlgg.obj &
@@ -2426,6 +2432,24 @@ __xrclib___depname = &
!endif
!endif
!endif
+__auidll___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_AUI 1
+__auidll___depname = &
+ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).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 =
!ifeq SHARED 1
!ifeq USE_GUI 1
@@ -2584,8 +2608,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
- USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" &
- USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
+ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
+ USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
@@ -3566,6 +3590,32 @@ XRCLIB_OBJECTS = &
$(OBJS)\xrclib_xh_wizrd.obj &
$(OBJS)\xrclib_xmlres.obj &
$(OBJS)\xrclib_xmlrsall.obj
+AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+ $(__RUNTIME_LIBS) -d__WXMSW__ $(__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__WXMSW__ $(__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) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -3597,7 +3647,7 @@ $(OBJS) :
### 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
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -3647,6 +3697,9 @@ clean : .SYMBOLIC
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG).dll
-if exist $(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
-if exist $(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
+ -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).dll
+ -if exist $(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
+ -if exist $(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
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll
-if exist $(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
-if exist $(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
@@ -3714,7 +3767,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib : $(MONOLIB_OBJECTS)
@%create $(OBJS)\monolib.lbc
@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
@@ -4052,6 +4105,36 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
!endif
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_AUI 1
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG).dll : $(AUIDLL_OBJECTS) $(OBJS)\auidll_version.res $(__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) 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)_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 option resource=$(OBJS)\auidll_version.res
+ @%append $(OBJS)\auidll.lbc system nt_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 USE_GUI 1
!ifeq USE_OPENGL 1
@@ -5160,6 +5243,15 @@ $(OBJS)\monodll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+$(OBJS)\monodll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
$(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5406,21 +5498,6 @@ $(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -6220,6 +6297,11 @@ $(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\monodll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6240,6 +6322,16 @@ $(OBJS)\monodll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7121,6 +7213,15 @@ $(OBJS)\monolib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+$(OBJS)\monolib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
$(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7367,21 +7468,6 @@ $(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -8181,6 +8267,11 @@ $(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\monolib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8201,6 +8292,16 @@ $(OBJS)\monolib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -9388,21 +9489,6 @@ $(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -10202,6 +10288,11 @@ $(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\coredll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -10222,6 +10313,16 @@ $(OBJS)\coredll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -10711,21 +10812,6 @@ $(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -11525,6 +11611,11 @@ $(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\corelib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -11545,6 +11636,16 @@ $(OBJS)\corelib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
+!ifeq USE_GUI 1
+$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
!ifeq USE_GUI 1
$(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -12373,6 +12474,33 @@ $(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+$(OBJS)\auidll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
+
+$(OBJS)\auidll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG) $<
+
+$(OBJS)\auidll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
+
+$(OBJS)\auidll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
+
+$(OBJS)\auidll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
+
+$(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
+
+$(OBJS)\auilib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
+
+$(OBJS)\auilib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
+
+$(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
+
$(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
diff --git a/build/msw/wx.dsw b/build/msw/wx.dsw
index 0b5c65c0e4..968729ab5b 100644
--- a/build/msw/wx.dsw
+++ b/build/msw/wx.dsw
@@ -206,6 +206,18 @@ Package=<4>
###############################################################################
+Project: "aui"=wx_aui.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "gl"=wx_gl.dsp - Package Owner=<4>
Package=<5>
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 035f26028f..ccd50dbfaa 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=adv - Win32 Debug
+CFG=adv - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=adv - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_adv.mak" CFG="adv - Win32 Debug"
+!MESSAGE NMAKE /f "wx_adv.mak" CFG="adv - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "adv - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=adv - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_adv_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
-!ELSEIF "$(CFG)" == "adv - Win32 Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\adv"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\adv"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_adv.lib"
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "adv - Win32 DLL Universal Unicode Release"
-# Name "adv - Win32 DLL Universal Unicode Debug"
-# Name "adv - Win32 DLL Universal Release"
-# Name "adv - Win32 DLL Universal Debug"
-# Name "adv - Win32 DLL Unicode Release"
-# Name "adv - Win32 DLL Unicode Debug"
-# Name "adv - Win32 DLL Release"
-# Name "adv - Win32 DLL Debug"
-# Name "adv - Win32 Universal Unicode Release"
-# Name "adv - Win32 Universal Unicode Debug"
-# Name "adv - Win32 Universal Release"
-# Name "adv - Win32 Universal Debug"
-# Name "adv - Win32 Unicode Release"
-# Name "adv - Win32 Unicode Debug"
-# Name "adv - Win32 Release"
-# Name "adv - Win32 Debug"
+# Name "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "adv - Win32 DLL Universal Release USE_AUI_1"
+# Name "adv - Win32 DLL Universal Release USE_AUI_0"
+# Name "adv - Win32 DLL Universal Debug USE_AUI_1"
+# Name "adv - Win32 DLL Universal Debug USE_AUI_0"
+# Name "adv - Win32 DLL Unicode Release USE_AUI_1"
+# Name "adv - Win32 DLL Unicode Release USE_AUI_0"
+# Name "adv - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "adv - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "adv - Win32 DLL Release USE_AUI_1"
+# Name "adv - Win32 DLL Release USE_AUI_0"
+# Name "adv - Win32 DLL Debug USE_AUI_1"
+# Name "adv - Win32 DLL Debug USE_AUI_0"
+# Name "adv - Win32 Universal Unicode Release USE_AUI_1"
+# Name "adv - Win32 Universal Unicode Release USE_AUI_0"
+# Name "adv - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "adv - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "adv - Win32 Universal Release USE_AUI_1"
+# Name "adv - Win32 Universal Release USE_AUI_0"
+# Name "adv - Win32 Universal Debug USE_AUI_1"
+# Name "adv - Win32 Universal Debug USE_AUI_0"
+# Name "adv - Win32 Unicode Release USE_AUI_1"
+# Name "adv - Win32 Unicode Release USE_AUI_0"
+# Name "adv - Win32 Unicode Debug USE_AUI_1"
+# Name "adv - Win32 Unicode Debug USE_AUI_0"
+# Name "adv - Win32 Release USE_AUI_1"
+# Name "adv - Win32 Release USE_AUI_0"
+# Name "adv - Win32 Debug USE_AUI_1"
+# Name "adv - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -472,60 +888,116 @@ SOURCE=..\..\src\common\taskbarcmn.cpp
SOURCE=..\..\src\msw\datectrl.cpp
-!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "adv - Win32 Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "adv - Win32 Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
!ENDIF
@@ -547,59 +1019,115 @@ SOURCE=..\..\src\msw\taskbar.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "adv - Win32 Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -678,7 +1206,7 @@ SOURCE=..\..\src\generic\wizard.cpp
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -688,7 +1216,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -698,7 +1236,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -708,7 +1256,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -718,31 +1276,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -752,7 +1344,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -762,7 +1364,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -772,7 +1384,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -782,25 +1404,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -813,31 +1469,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -847,7 +1527,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -857,7 +1547,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -867,7 +1567,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -877,31 +1587,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -911,7 +1655,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -921,7 +1675,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -931,7 +1695,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -956,7 +1740,7 @@ SOURCE=..\..\include\wx\msw\datectrl.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -965,7 +1749,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -974,7 +1767,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -983,7 +1785,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -992,7 +1803,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -1001,7 +1821,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -1010,7 +1839,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -1019,7 +1857,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -1028,7 +1875,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -1037,7 +1893,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -1046,7 +1911,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -1055,7 +1929,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -1064,7 +1947,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -1073,7 +1965,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -1082,7 +1983,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Release"
+!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -1091,7 +2001,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "adv - Win32 Debug"
+!ELSEIF "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index daa5a2287c..69745ac529 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=base - Win32 Debug
+CFG=base - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=base - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_base.mak" CFG="base - Win32 Debug"
+!MESSAGE NMAKE /f "wx_base.mak" CFG="base - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "base - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=base - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-!ELSEIF "$(CFG)" == "base - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
-!ELSEIF "$(CFG)" == "base - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
-!ELSEIF "$(CFG)" == "base - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
-!ELSEIF "$(CFG)" == "base - Win32 Release"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
-!ELSEIF "$(CFG)" == "base - Win32 Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\base"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\base"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "base - Win32 DLL Universal Unicode Release"
-# Name "base - Win32 DLL Universal Unicode Debug"
-# Name "base - Win32 DLL Universal Release"
-# Name "base - Win32 DLL Universal Debug"
-# Name "base - Win32 DLL Unicode Release"
-# Name "base - Win32 DLL Unicode Debug"
-# Name "base - Win32 DLL Release"
-# Name "base - Win32 DLL Debug"
-# Name "base - Win32 Universal Unicode Release"
-# Name "base - Win32 Universal Unicode Debug"
-# Name "base - Win32 Universal Release"
-# Name "base - Win32 Universal Debug"
-# Name "base - Win32 Unicode Release"
-# Name "base - Win32 Unicode Debug"
-# Name "base - Win32 Release"
-# Name "base - Win32 Debug"
+# Name "base - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "base - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "base - Win32 DLL Universal Release USE_AUI_1"
+# Name "base - Win32 DLL Universal Release USE_AUI_0"
+# Name "base - Win32 DLL Universal Debug USE_AUI_1"
+# Name "base - Win32 DLL Universal Debug USE_AUI_0"
+# Name "base - Win32 DLL Unicode Release USE_AUI_1"
+# Name "base - Win32 DLL Unicode Release USE_AUI_0"
+# Name "base - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "base - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "base - Win32 DLL Release USE_AUI_1"
+# Name "base - Win32 DLL Release USE_AUI_0"
+# Name "base - Win32 DLL Debug USE_AUI_1"
+# Name "base - Win32 DLL Debug USE_AUI_0"
+# Name "base - Win32 Universal Unicode Release USE_AUI_1"
+# Name "base - Win32 Universal Unicode Release USE_AUI_0"
+# Name "base - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "base - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "base - Win32 Universal Release USE_AUI_1"
+# Name "base - Win32 Universal Release USE_AUI_0"
+# Name "base - Win32 Universal Debug USE_AUI_1"
+# Name "base - Win32 Universal Debug USE_AUI_0"
+# Name "base - Win32 Unicode Release USE_AUI_1"
+# Name "base - Win32 Unicode Release USE_AUI_0"
+# Name "base - Win32 Unicode Debug USE_AUI_1"
+# Name "base - Win32 Unicode Debug USE_AUI_0"
+# Name "base - Win32 Release USE_AUI_1"
+# Name "base - Win32 Release USE_AUI_0"
+# Name "base - Win32 Debug USE_AUI_1"
+# Name "base - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -781,59 +1197,115 @@ SOURCE=..\..\src\msw\utilsexc.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "base - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "base - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "base - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "base - Win32 Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "base - Win32 Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -852,31 +1324,55 @@ SOURCE=..\..\src\msw\volume.cpp
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -886,7 +1382,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -896,7 +1402,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -906,7 +1422,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -916,31 +1442,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -950,7 +1510,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -960,7 +1530,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Release"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -970,7 +1550,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -987,7 +1587,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -997,7 +1597,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -1007,7 +1617,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -1017,7 +1637,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -1027,31 +1657,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -1061,7 +1725,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -1071,7 +1745,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -1081,7 +1765,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -1091,25 +1785,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Release"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -1154,7 +1882,7 @@ SOURCE=..\..\include\wx\msw\gccpriv.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -1163,7 +1891,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -1172,7 +1909,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -1181,7 +1927,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -1190,7 +1945,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -1199,7 +1963,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -1208,7 +1981,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -1217,7 +1999,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -1226,7 +2017,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -1235,7 +2035,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -1244,7 +2053,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -1253,7 +2071,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -1262,7 +2089,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -1271,7 +2107,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -1280,7 +2125,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Release"
+!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -1289,7 +2143,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "base - Win32 Debug"
+!ELSEIF "$(CFG)" == "base - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "base - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 6111fc2c82..168712f0ff 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=core - Win32 Debug
+CFG=core - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=core - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug"
+!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "core - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=core - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib"
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "core - Win32 DLL Universal Unicode Release"
-# Name "core - Win32 DLL Universal Unicode Debug"
-# Name "core - Win32 DLL Universal Release"
-# Name "core - Win32 DLL Universal Debug"
-# Name "core - Win32 DLL Unicode Release"
-# Name "core - Win32 DLL Unicode Debug"
-# Name "core - Win32 DLL Release"
-# Name "core - Win32 DLL Debug"
-# Name "core - Win32 Universal Unicode Release"
-# Name "core - Win32 Universal Unicode Debug"
-# Name "core - Win32 Universal Release"
-# Name "core - Win32 Universal Debug"
-# Name "core - Win32 Unicode Release"
-# Name "core - Win32 Unicode Debug"
-# Name "core - Win32 Release"
-# Name "core - Win32 Debug"
+# Name "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "core - Win32 DLL Universal Release USE_AUI_1"
+# Name "core - Win32 DLL Universal Release USE_AUI_0"
+# Name "core - Win32 DLL Universal Debug USE_AUI_1"
+# Name "core - Win32 DLL Universal Debug USE_AUI_0"
+# Name "core - Win32 DLL Unicode Release USE_AUI_1"
+# Name "core - Win32 DLL Unicode Release USE_AUI_0"
+# Name "core - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "core - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "core - Win32 DLL Release USE_AUI_1"
+# Name "core - Win32 DLL Release USE_AUI_0"
+# Name "core - Win32 DLL Debug USE_AUI_1"
+# Name "core - Win32 DLL Debug USE_AUI_0"
+# Name "core - Win32 Universal Unicode Release USE_AUI_1"
+# Name "core - Win32 Universal Unicode Release USE_AUI_0"
+# Name "core - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "core - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "core - Win32 Universal Release USE_AUI_1"
+# Name "core - Win32 Universal Release USE_AUI_0"
+# Name "core - Win32 Universal Debug USE_AUI_1"
+# Name "core - Win32 Universal Debug USE_AUI_0"
+# Name "core - Win32 Unicode Release USE_AUI_1"
+# Name "core - Win32 Unicode Release USE_AUI_0"
+# Name "core - Win32 Unicode Debug USE_AUI_1"
+# Name "core - Win32 Unicode Debug USE_AUI_0"
+# Name "core - Win32 Release USE_AUI_1"
+# Name "core - Win32 Release USE_AUI_0"
+# Name "core - Win32 Debug USE_AUI_1"
+# Name "core - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -808,60 +1224,116 @@ SOURCE=..\..\src\common\xpmdecod.cpp
SOURCE=..\..\src\msw\accel.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -871,60 +1343,116 @@ SOURCE=..\..\src\msw\accel.cpp
SOURCE=..\..\src\msw\ole\access.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -946,60 +1474,116 @@ SOURCE=..\..\src\msw\bitmap.cpp
SOURCE=..\..\src\msw\bmpbuttn.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1013,60 +1597,116 @@ SOURCE=..\..\src\msw\brush.cpp
SOURCE=..\..\src\msw\button.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1080,60 +1720,116 @@ SOURCE=..\..\src\msw\caret.cpp
SOURCE=..\..\src\msw\checkbox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1143,60 +1839,116 @@ SOURCE=..\..\src\msw\checkbox.cpp
SOURCE=..\..\src\msw\checklst.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1206,60 +1958,116 @@ SOURCE=..\..\src\msw\checklst.cpp
SOURCE=..\..\src\msw\choice.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1273,60 +2081,116 @@ SOURCE=..\..\src\msw\clipbrd.cpp
SOURCE=..\..\src\msw\colordlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1340,60 +2204,116 @@ SOURCE=..\..\src\msw\colour.cpp
SOURCE=..\..\src\msw\combo.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1403,60 +2323,116 @@ SOURCE=..\..\src\msw\combo.cpp
SOURCE=..\..\src\msw\combobox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1466,60 +2442,116 @@ SOURCE=..\..\src\msw\combobox.cpp
SOURCE=..\..\src\msw\control.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1561,60 +2593,116 @@ SOURCE=..\..\src\msw\dcscreen.cpp
SOURCE=..\..\src\msw\dialog.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1632,60 +2720,116 @@ SOURCE=..\..\src\msw\dib.cpp
SOURCE=..\..\src\msw\dirdlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1699,60 +2843,116 @@ SOURCE=..\..\src\msw\display.cpp
SOURCE=..\..\src\msw\dragimag.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1778,60 +2978,116 @@ SOURCE=..\..\src\msw\evtloop.cpp
SOURCE=..\..\src\msw\fdrepdlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1841,60 +3097,116 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp
SOURCE=..\..\src\msw\filedlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1908,60 +3220,116 @@ SOURCE=..\..\src\msw\font.cpp
SOURCE=..\..\src\msw\fontdlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -1979,60 +3347,116 @@ SOURCE=..\..\src\msw\fontutil.cpp
SOURCE=..\..\src\msw\frame.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2042,60 +3466,116 @@ SOURCE=..\..\src\msw\frame.cpp
SOURCE=..\..\src\msw\gauge95.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2129,60 +3609,116 @@ SOURCE=..\..\src\msw\icon.cpp
SOURCE=..\..\src\msw\imaglist.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2192,60 +3728,116 @@ SOURCE=..\..\src\msw\imaglist.cpp
SOURCE=..\..\src\msw\iniconf.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2255,60 +3847,116 @@ SOURCE=..\..\src\msw\iniconf.cpp
SOURCE=..\..\src\msw\listbox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2318,60 +3966,116 @@ SOURCE=..\..\src\msw\listbox.cpp
SOURCE=..\..\src\msw\listctrl.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2385,60 +4089,116 @@ SOURCE=..\..\src\msw\main.cpp
SOURCE=..\..\src\msw\mdi.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2448,60 +4208,116 @@ SOURCE=..\..\src\msw\mdi.cpp
SOURCE=..\..\src\msw\menu.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2511,60 +4327,116 @@ SOURCE=..\..\src\msw\menu.cpp
SOURCE=..\..\src\msw\menuitem.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2574,60 +4446,116 @@ SOURCE=..\..\src\msw\menuitem.cpp
SOURCE=..\..\src\msw\metafile.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2641,60 +4569,116 @@ SOURCE=..\..\src\msw\minifram.cpp
SOURCE=..\..\src\msw\msgdlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2708,60 +4692,116 @@ SOURCE=..\..\src\msw\mslu.cpp
SOURCE=..\..\src\msw\nativdlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2771,60 +4811,116 @@ SOURCE=..\..\src\msw\nativdlg.cpp
SOURCE=..\..\src\msw\notebook.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2838,60 +4934,116 @@ SOURCE=..\..\src\msw\ole\oleutils.cpp
SOURCE=..\..\src\msw\ownerdrw.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2921,60 +5073,116 @@ SOURCE=..\..\src\msw\printwin.cpp
SOURCE=..\..\src\msw\radiobox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -2984,60 +5192,116 @@ SOURCE=..\..\src\msw\radiobox.cpp
SOURCE=..\..\src\msw\radiobut.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3055,60 +5319,116 @@ SOURCE=..\..\src\msw\renderer.cpp
SOURCE=..\..\src\msw\scrolbar.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3122,60 +5442,116 @@ SOURCE=..\..\src\msw\settings.cpp
SOURCE=..\..\src\msw\slider95.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3185,60 +5561,116 @@ SOURCE=..\..\src\msw\slider95.cpp
SOURCE=..\..\src\msw\spinbutt.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3248,60 +5680,116 @@ SOURCE=..\..\src\msw\spinbutt.cpp
SOURCE=..\..\src\msw\spinctrl.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3311,60 +5799,116 @@ SOURCE=..\..\src\msw\spinctrl.cpp
SOURCE=..\..\src\msw\statbmp.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3374,60 +5918,116 @@ SOURCE=..\..\src\msw\statbmp.cpp
SOURCE=..\..\src\msw\statbox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3437,60 +6037,116 @@ SOURCE=..\..\src\msw\statbox.cpp
SOURCE=..\..\src\msw\statbr95.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3500,60 +6156,116 @@ SOURCE=..\..\src\msw\statbr95.cpp
SOURCE=..\..\src\msw\statline.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3563,60 +6275,116 @@ SOURCE=..\..\src\msw\statline.cpp
SOURCE=..\..\src\msw\stattext.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3626,60 +6394,116 @@ SOURCE=..\..\src\msw\stattext.cpp
SOURCE=..\..\src\msw\tabctrl.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3689,60 +6513,116 @@ SOURCE=..\..\src\msw\tabctrl.cpp
SOURCE=..\..\src\msw\tbar95.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3752,60 +6632,116 @@ SOURCE=..\..\src\msw\tbar95.cpp
SOURCE=..\..\src\msw\textctrl.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3815,60 +6751,116 @@ SOURCE=..\..\src\msw\textctrl.cpp
SOURCE=..\..\src\msw\tglbtn.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3890,60 +6882,116 @@ SOURCE=..\..\src\msw\toplevel.cpp
SOURCE=..\..\src\msw\treectrl.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -3965,59 +7013,115 @@ SOURCE=..\..\src\msw\uxtheme.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4040,59 +7144,115 @@ SOURCE=..\..\src\msw\window.cpp
SOURCE=..\..\src\generic\accel.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4123,59 +7283,115 @@ SOURCE=..\..\src\generic\clrpickerg.cpp
SOURCE=..\..\src\generic\colrdlgg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4198,59 +7414,115 @@ SOURCE=..\..\src\generic\dirctrlg.cpp
SOURCE=..\..\src\generic\dirdlgg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4265,59 +7537,115 @@ SOURCE=..\..\src\generic\dragimgg.cpp
SOURCE=..\..\src\generic\fdrepdlg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4328,59 +7656,115 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp
SOURCE=..\..\src\generic\filedlgg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4395,59 +7779,115 @@ SOURCE=..\..\src\generic\filepickerg.cpp
SOURCE=..\..\src\generic\fontdlgg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4462,59 +7902,115 @@ SOURCE=..\..\src\generic\fontpickerg.cpp
SOURCE=..\..\src\generic\imaglist.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4529,59 +8025,115 @@ SOURCE=..\..\src\generic\listbkg.cpp
SOURCE=..\..\src\generic\listctrl.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4596,59 +8148,115 @@ SOURCE=..\..\src\generic\logg.cpp
SOURCE=..\..\src\generic\mdig.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4659,59 +8267,115 @@ SOURCE=..\..\src\generic\mdig.cpp
SOURCE=..\..\src\generic\msgdlgg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4762,60 +8426,116 @@ SOURCE=..\..\src\generic\splitter.cpp
SOURCE=..\..\src\generic\statusbr.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
!ENDIF
@@ -4825,59 +8545,115 @@ SOURCE=..\..\src\generic\statusbr.cpp
SOURCE=..\..\src\generic\tabg.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4920,59 +8696,115 @@ SOURCE=..\..\src\generic\vscroll.cpp
SOURCE=..\..\src\univ\bmpbuttn.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -4983,59 +8815,115 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp
SOURCE=..\..\src\univ\button.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5046,59 +8934,115 @@ SOURCE=..\..\src\univ\button.cpp
SOURCE=..\..\src\univ\checkbox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5109,59 +9053,115 @@ SOURCE=..\..\src\univ\checkbox.cpp
SOURCE=..\..\src\univ\checklst.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5172,59 +9172,115 @@ SOURCE=..\..\src\univ\checklst.cpp
SOURCE=..\..\src\univ\choice.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5235,59 +9291,115 @@ SOURCE=..\..\src\univ\choice.cpp
SOURCE=..\..\src\univ\colschem.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5298,59 +9410,115 @@ SOURCE=..\..\src\univ\colschem.cpp
SOURCE=..\..\src\univ\combobox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5361,59 +9529,115 @@ SOURCE=..\..\src\univ\combobox.cpp
SOURCE=..\..\src\univ\control.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5424,59 +9648,115 @@ SOURCE=..\..\src\univ\control.cpp
SOURCE=..\..\src\univ\ctrlrend.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5487,59 +9767,115 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
SOURCE=..\..\src\univ\dialog.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5550,59 +9886,115 @@ SOURCE=..\..\src\univ\dialog.cpp
SOURCE=..\..\src\univ\framuniv.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5613,59 +10005,115 @@ SOURCE=..\..\src\univ\framuniv.cpp
SOURCE=..\..\src\univ\gauge.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5676,59 +10124,115 @@ SOURCE=..\..\src\univ\gauge.cpp
SOURCE=..\..\src\univ\themes\gtk.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5739,59 +10243,115 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
SOURCE=..\..\src\univ\inpcons.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5802,59 +10362,115 @@ SOURCE=..\..\src\univ\inpcons.cpp
SOURCE=..\..\src\univ\inphand.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5865,59 +10481,115 @@ SOURCE=..\..\src\univ\inphand.cpp
SOURCE=..\..\src\univ\listbox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5928,59 +10600,115 @@ SOURCE=..\..\src\univ\listbox.cpp
SOURCE=..\..\src\univ\menu.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -5991,59 +10719,115 @@ SOURCE=..\..\src\univ\menu.cpp
SOURCE=..\..\src\univ\themes\metal.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6054,59 +10838,115 @@ SOURCE=..\..\src\univ\themes\metal.cpp
SOURCE=..\..\src\univ\notebook.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6117,59 +10957,115 @@ SOURCE=..\..\src\univ\notebook.cpp
SOURCE=..\..\src\univ\radiobox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6180,59 +11076,115 @@ SOURCE=..\..\src\univ\radiobox.cpp
SOURCE=..\..\src\univ\radiobut.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6243,59 +11195,115 @@ SOURCE=..\..\src\univ\radiobut.cpp
SOURCE=..\..\src\univ\scrarrow.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6306,59 +11314,115 @@ SOURCE=..\..\src\univ\scrarrow.cpp
SOURCE=..\..\src\univ\scrolbar.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6369,59 +11433,115 @@ SOURCE=..\..\src\univ\scrolbar.cpp
SOURCE=..\..\src\univ\scrthumb.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6432,59 +11552,115 @@ SOURCE=..\..\src\univ\scrthumb.cpp
SOURCE=..\..\src\univ\slider.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6495,59 +11671,115 @@ SOURCE=..\..\src\univ\slider.cpp
SOURCE=..\..\src\univ\spinbutt.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6558,59 +11790,115 @@ SOURCE=..\..\src\univ\spinbutt.cpp
SOURCE=..\..\src\univ\statbmp.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6621,59 +11909,115 @@ SOURCE=..\..\src\univ\statbmp.cpp
SOURCE=..\..\src\univ\statbox.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6684,59 +12028,115 @@ SOURCE=..\..\src\univ\statbox.cpp
SOURCE=..\..\src\univ\statline.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6747,59 +12147,115 @@ SOURCE=..\..\src\univ\statline.cpp
SOURCE=..\..\src\univ\stattext.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6810,59 +12266,115 @@ SOURCE=..\..\src\univ\stattext.cpp
SOURCE=..\..\src\univ\statusbr.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6873,59 +12385,115 @@ SOURCE=..\..\src\univ\statusbr.cpp
SOURCE=..\..\src\univ\textctrl.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6936,59 +12504,115 @@ SOURCE=..\..\src\univ\textctrl.cpp
SOURCE=..\..\src\univ\tglbtn.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -6999,59 +12623,115 @@ SOURCE=..\..\src\univ\tglbtn.cpp
SOURCE=..\..\src\univ\theme.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -7062,59 +12742,115 @@ SOURCE=..\..\src\univ\theme.cpp
SOURCE=..\..\src\univ\toolbar.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -7125,59 +12861,115 @@ SOURCE=..\..\src\univ\toolbar.cpp
SOURCE=..\..\src\univ\topluniv.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -7188,59 +12980,115 @@ SOURCE=..\..\src\univ\topluniv.cpp
SOURCE=..\..\src\univ\themes\win32.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -7251,59 +13099,115 @@ SOURCE=..\..\src\univ\themes\win32.cpp
SOURCE=..\..\src\univ\winuniv.cpp
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -7318,31 +13222,55 @@ SOURCE=..\..\src\univ\winuniv.cpp
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7352,7 +13280,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7362,7 +13300,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7372,7 +13320,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7382,31 +13340,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7416,7 +13408,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7426,7 +13428,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7436,7 +13448,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -7453,7 +13485,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7463,7 +13495,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7473,7 +13515,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7483,7 +13535,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7493,31 +13555,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7527,7 +13623,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7537,7 +13643,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7547,7 +13663,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -7557,25 +13683,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -7768,7 +13928,7 @@ SOURCE=..\..\include\wx\msw\gdiimage.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -7777,7 +13937,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -7786,7 +13955,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -7795,7 +13973,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -7804,7 +13991,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -7813,7 +14009,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -7822,7 +14027,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -7831,7 +14045,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -7840,7 +14063,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -7849,7 +14081,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -7858,7 +14099,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -7867,7 +14117,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -7876,7 +14135,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -7885,7 +14153,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -7894,7 +14171,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Release"
+!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -7903,7 +14189,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "core - Win32 Debug"
+!ELSEIF "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "core - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
@@ -8569,6 +14873,10 @@ SOURCE=..\..\include\wx\artprov.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\wx\aui\aui.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\wx\bitmap.h
# End Source File
# Begin Source File
@@ -8753,6 +15061,10 @@ SOURCE=..\..\include\wx\dnd.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\wx\aui\dockart.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\wx\docmdi.h
# End Source File
# Begin Source File
@@ -8789,6 +15101,10 @@ SOURCE=..\..\include\wx\filepicker.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\wx\aui\floatpane.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\wx\fmappriv.h
# End Source File
# Begin Source File
@@ -8817,6 +15133,10 @@ SOURCE=..\..\include\wx\frame.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\wx\aui\framemanager.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\wx\gauge.h
# End Source File
# Begin Source File
diff --git a/build/msw/wx_dbgrid.dsp b/build/msw/wx_dbgrid.dsp
index 1a76540df7..cfc165e4b5 100644
--- a/build/msw/wx_dbgrid.dsp
+++ b/build/msw/wx_dbgrid.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=dbgrid - Win32 Debug
+CFG=dbgrid - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=dbgrid - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_dbgrid.mak" CFG="dbgrid - Win32 Debug"
+!MESSAGE NMAKE /f "wx_dbgrid.mak" CFG="dbgrid - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=dbgrid - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.lib" /debug
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.lib" /debug
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.lib" /debug
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.lib" /debug
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.lib" /debug
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.lib" /debug
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.lib" /debug
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_dbgrid_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.lib" /debug
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\dbgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\dbgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_dbgrid.lib"
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "dbgrid - Win32 DLL Universal Unicode Release"
-# Name "dbgrid - Win32 DLL Universal Unicode Debug"
-# Name "dbgrid - Win32 DLL Universal Release"
-# Name "dbgrid - Win32 DLL Universal Debug"
-# Name "dbgrid - Win32 DLL Unicode Release"
-# Name "dbgrid - Win32 DLL Unicode Debug"
-# Name "dbgrid - Win32 DLL Release"
-# Name "dbgrid - Win32 DLL Debug"
-# Name "dbgrid - Win32 Universal Unicode Release"
-# Name "dbgrid - Win32 Universal Unicode Debug"
-# Name "dbgrid - Win32 Universal Release"
-# Name "dbgrid - Win32 Universal Debug"
-# Name "dbgrid - Win32 Unicode Release"
-# Name "dbgrid - Win32 Unicode Debug"
-# Name "dbgrid - Win32 Release"
-# Name "dbgrid - Win32 Debug"
+# Name "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "dbgrid - Win32 DLL Universal Release USE_AUI_1"
+# Name "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+# Name "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
+# Name "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+# Name "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
+# Name "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+# Name "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "dbgrid - Win32 DLL Release USE_AUI_1"
+# Name "dbgrid - Win32 DLL Release USE_AUI_0"
+# Name "dbgrid - Win32 DLL Debug USE_AUI_1"
+# Name "dbgrid - Win32 DLL Debug USE_AUI_0"
+# Name "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
+# Name "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
+# Name "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "dbgrid - Win32 Universal Release USE_AUI_1"
+# Name "dbgrid - Win32 Universal Release USE_AUI_0"
+# Name "dbgrid - Win32 Universal Debug USE_AUI_1"
+# Name "dbgrid - Win32 Universal Debug USE_AUI_0"
+# Name "dbgrid - Win32 Unicode Release USE_AUI_1"
+# Name "dbgrid - Win32 Unicode Release USE_AUI_0"
+# Name "dbgrid - Win32 Unicode Debug USE_AUI_1"
+# Name "dbgrid - Win32 Unicode Debug USE_AUI_0"
+# Name "dbgrid - Win32 Release USE_AUI_1"
+# Name "dbgrid - Win32 Release USE_AUI_0"
+# Name "dbgrid - Win32 Debug USE_AUI_1"
+# Name "dbgrid - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -468,59 +884,115 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -535,7 +1007,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -545,7 +1017,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -555,7 +1037,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -565,7 +1057,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -575,31 +1077,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -609,7 +1145,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -619,7 +1165,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -629,7 +1185,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -639,25 +1205,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -670,31 +1270,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -704,7 +1328,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -714,7 +1348,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -724,7 +1368,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -734,31 +1388,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -768,7 +1456,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -778,7 +1476,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -788,7 +1496,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -809,7 +1537,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -818,7 +1546,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -827,7 +1564,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -836,7 +1582,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -845,7 +1600,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -854,7 +1618,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -863,7 +1636,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -872,7 +1654,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -881,7 +1672,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -890,7 +1690,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -899,7 +1708,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -908,7 +1726,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -917,7 +1744,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -926,7 +1762,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -935,7 +1780,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Release"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -944,7 +1798,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug"
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp
index 28449f5450..57a9b85324 100644
--- a/build/msw/wx_gl.dsp
+++ b/build/msw/wx_gl.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=gl - Win32 Debug
+CFG=gl - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=gl - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_gl.mak" CFG="gl - Win32 Debug"
+!MESSAGE NMAKE /f "wx_gl.mak" CFG="gl - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "gl - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=gl - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.lib" /debug
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.lib" /debug
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.lib" /debug
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.lib" /debug
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.lib" /debug
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.lib" /debug
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.lib" /debug
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_gl_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.lib" /debug
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
-!ELSEIF "$(CFG)" == "gl - Win32 Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\gl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\gl"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_gl.lib"
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "gl - Win32 DLL Universal Unicode Release"
-# Name "gl - Win32 DLL Universal Unicode Debug"
-# Name "gl - Win32 DLL Universal Release"
-# Name "gl - Win32 DLL Universal Debug"
-# Name "gl - Win32 DLL Unicode Release"
-# Name "gl - Win32 DLL Unicode Debug"
-# Name "gl - Win32 DLL Release"
-# Name "gl - Win32 DLL Debug"
-# Name "gl - Win32 Universal Unicode Release"
-# Name "gl - Win32 Universal Unicode Debug"
-# Name "gl - Win32 Universal Release"
-# Name "gl - Win32 Universal Debug"
-# Name "gl - Win32 Unicode Release"
-# Name "gl - Win32 Unicode Debug"
-# Name "gl - Win32 Release"
-# Name "gl - Win32 Debug"
+# Name "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "gl - Win32 DLL Universal Release USE_AUI_1"
+# Name "gl - Win32 DLL Universal Release USE_AUI_0"
+# Name "gl - Win32 DLL Universal Debug USE_AUI_1"
+# Name "gl - Win32 DLL Universal Debug USE_AUI_0"
+# Name "gl - Win32 DLL Unicode Release USE_AUI_1"
+# Name "gl - Win32 DLL Unicode Release USE_AUI_0"
+# Name "gl - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "gl - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "gl - Win32 DLL Release USE_AUI_1"
+# Name "gl - Win32 DLL Release USE_AUI_0"
+# Name "gl - Win32 DLL Debug USE_AUI_1"
+# Name "gl - Win32 DLL Debug USE_AUI_0"
+# Name "gl - Win32 Universal Unicode Release USE_AUI_1"
+# Name "gl - Win32 Universal Unicode Release USE_AUI_0"
+# Name "gl - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "gl - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "gl - Win32 Universal Release USE_AUI_1"
+# Name "gl - Win32 Universal Release USE_AUI_0"
+# Name "gl - Win32 Universal Debug USE_AUI_1"
+# Name "gl - Win32 Universal Debug USE_AUI_0"
+# Name "gl - Win32 Unicode Release USE_AUI_1"
+# Name "gl - Win32 Unicode Release USE_AUI_0"
+# Name "gl - Win32 Unicode Debug USE_AUI_1"
+# Name "gl - Win32 Unicode Debug USE_AUI_0"
+# Name "gl - Win32 Release USE_AUI_1"
+# Name "gl - Win32 Release USE_AUI_0"
+# Name "gl - Win32 Debug USE_AUI_1"
+# Name "gl - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -468,59 +884,115 @@ SOURCE=..\..\src\msw\glcanvas.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "gl - Win32 Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "gl - Win32 Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -535,7 +1007,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -545,7 +1017,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -555,7 +1037,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -565,7 +1057,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -575,31 +1077,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -609,7 +1145,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -619,7 +1165,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -629,7 +1185,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -639,25 +1205,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -670,31 +1270,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -704,7 +1328,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -714,7 +1348,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -724,7 +1368,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -734,31 +1388,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -768,7 +1456,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -778,7 +1476,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -788,7 +1496,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -809,7 +1537,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -818,7 +1546,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -827,7 +1564,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -836,7 +1582,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -845,7 +1600,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -854,7 +1618,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -863,7 +1636,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -872,7 +1654,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -881,7 +1672,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -890,7 +1690,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -899,7 +1708,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -908,7 +1726,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -917,7 +1744,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -926,7 +1762,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -935,7 +1780,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Release"
+!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -944,7 +1798,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "gl - Win32 Debug"
+!ELSEIF "$(CFG)" == "gl - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp
index c7bf6fa194..913e5da52b 100644
--- a/build/msw/wx_html.dsp
+++ b/build/msw/wx_html.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=html - Win32 Debug
+CFG=html - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=html - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_html.mak" CFG="html - Win32 Debug"
+!MESSAGE NMAKE /f "wx_html.mak" CFG="html - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "html - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=html - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.lib" /debug
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.lib" /debug
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.lib" /debug
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.lib" /debug
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.lib" /debug
-!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.lib" /debug
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.lib" /debug
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_html_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_html_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.lib" /debug
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 Release"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
-!ELSEIF "$(CFG)" == "html - Win32 Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\html"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\html"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_html.lib"
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "html - Win32 DLL Universal Unicode Release"
-# Name "html - Win32 DLL Universal Unicode Debug"
-# Name "html - Win32 DLL Universal Release"
-# Name "html - Win32 DLL Universal Debug"
-# Name "html - Win32 DLL Unicode Release"
-# Name "html - Win32 DLL Unicode Debug"
-# Name "html - Win32 DLL Release"
-# Name "html - Win32 DLL Debug"
-# Name "html - Win32 Universal Unicode Release"
-# Name "html - Win32 Universal Unicode Debug"
-# Name "html - Win32 Universal Release"
-# Name "html - Win32 Universal Debug"
-# Name "html - Win32 Unicode Release"
-# Name "html - Win32 Unicode Debug"
-# Name "html - Win32 Release"
-# Name "html - Win32 Debug"
+# Name "html - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "html - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "html - Win32 DLL Universal Release USE_AUI_1"
+# Name "html - Win32 DLL Universal Release USE_AUI_0"
+# Name "html - Win32 DLL Universal Debug USE_AUI_1"
+# Name "html - Win32 DLL Universal Debug USE_AUI_0"
+# Name "html - Win32 DLL Unicode Release USE_AUI_1"
+# Name "html - Win32 DLL Unicode Release USE_AUI_0"
+# Name "html - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "html - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "html - Win32 DLL Release USE_AUI_1"
+# Name "html - Win32 DLL Release USE_AUI_0"
+# Name "html - Win32 DLL Debug USE_AUI_1"
+# Name "html - Win32 DLL Debug USE_AUI_0"
+# Name "html - Win32 Universal Unicode Release USE_AUI_1"
+# Name "html - Win32 Universal Unicode Release USE_AUI_0"
+# Name "html - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "html - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "html - Win32 Universal Release USE_AUI_1"
+# Name "html - Win32 Universal Release USE_AUI_0"
+# Name "html - Win32 Universal Debug USE_AUI_1"
+# Name "html - Win32 Universal Debug USE_AUI_0"
+# Name "html - Win32 Unicode Release USE_AUI_1"
+# Name "html - Win32 Unicode Release USE_AUI_0"
+# Name "html - Win32 Unicode Debug USE_AUI_1"
+# Name "html - Win32 Unicode Debug USE_AUI_0"
+# Name "html - Win32 Release USE_AUI_1"
+# Name "html - Win32 Release USE_AUI_0"
+# Name "html - Win32 Debug USE_AUI_1"
+# Name "html - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -468,59 +884,115 @@ SOURCE=..\..\src\msw\helpbest.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "html - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "html - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "html - Win32 Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "html - Win32 Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -635,31 +1107,55 @@ SOURCE=..\..\src\html\winpars.cpp
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -669,7 +1165,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -679,7 +1185,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -689,7 +1205,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -699,31 +1225,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -733,7 +1293,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -743,7 +1313,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Release"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -753,7 +1333,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -770,7 +1370,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -780,7 +1380,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -790,7 +1400,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -800,7 +1420,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -810,31 +1440,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -844,7 +1508,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -854,7 +1528,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -864,7 +1548,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -874,25 +1568,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Release"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -909,7 +1637,7 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -918,7 +1646,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -927,7 +1664,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -936,7 +1682,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -945,7 +1700,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -954,7 +1718,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -963,7 +1736,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -972,7 +1754,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -981,7 +1772,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -990,7 +1790,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -999,7 +1808,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -1008,7 +1826,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -1017,7 +1844,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -1026,7 +1862,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -1035,7 +1880,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Release"
+!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -1044,7 +1898,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "html - Win32 Debug"
+!ELSEIF "$(CFG)" == "html - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "html - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_media.dsp b/build/msw/wx_media.dsp
index 62e8ff6dfc..55be59359e 100644
--- a/build/msw/wx_media.dsp
+++ b/build/msw/wx_media.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=media - Win32 Debug
+CFG=media - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=media - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_media.mak" CFG="media - Win32 Debug"
+!MESSAGE NMAKE /f "wx_media.mak" CFG="media - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "media - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=media - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.lib" /debug
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.lib" /debug
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.lib" /debug
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.lib" /debug
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.lib" /debug
-!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.lib" /debug
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.lib" /debug
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_media_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_media_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.lib" /debug
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 Release"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
-!ELSEIF "$(CFG)" == "media - Win32 Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\media"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\media"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_medialib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_media.lib"
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "media - Win32 DLL Universal Unicode Release"
-# Name "media - Win32 DLL Universal Unicode Debug"
-# Name "media - Win32 DLL Universal Release"
-# Name "media - Win32 DLL Universal Debug"
-# Name "media - Win32 DLL Unicode Release"
-# Name "media - Win32 DLL Unicode Debug"
-# Name "media - Win32 DLL Release"
-# Name "media - Win32 DLL Debug"
-# Name "media - Win32 Universal Unicode Release"
-# Name "media - Win32 Universal Unicode Debug"
-# Name "media - Win32 Universal Release"
-# Name "media - Win32 Universal Debug"
-# Name "media - Win32 Unicode Release"
-# Name "media - Win32 Unicode Debug"
-# Name "media - Win32 Release"
-# Name "media - Win32 Debug"
+# Name "media - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "media - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "media - Win32 DLL Universal Release USE_AUI_1"
+# Name "media - Win32 DLL Universal Release USE_AUI_0"
+# Name "media - Win32 DLL Universal Debug USE_AUI_1"
+# Name "media - Win32 DLL Universal Debug USE_AUI_0"
+# Name "media - Win32 DLL Unicode Release USE_AUI_1"
+# Name "media - Win32 DLL Unicode Release USE_AUI_0"
+# Name "media - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "media - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "media - Win32 DLL Release USE_AUI_1"
+# Name "media - Win32 DLL Release USE_AUI_0"
+# Name "media - Win32 DLL Debug USE_AUI_1"
+# Name "media - Win32 DLL Debug USE_AUI_0"
+# Name "media - Win32 Universal Unicode Release USE_AUI_1"
+# Name "media - Win32 Universal Unicode Release USE_AUI_0"
+# Name "media - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "media - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "media - Win32 Universal Release USE_AUI_1"
+# Name "media - Win32 Universal Release USE_AUI_0"
+# Name "media - Win32 Universal Debug USE_AUI_1"
+# Name "media - Win32 Universal Debug USE_AUI_0"
+# Name "media - Win32 Unicode Release USE_AUI_1"
+# Name "media - Win32 Unicode Release USE_AUI_0"
+# Name "media - Win32 Unicode Debug USE_AUI_1"
+# Name "media - Win32 Unicode Debug USE_AUI_0"
+# Name "media - Win32 Release USE_AUI_1"
+# Name "media - Win32 Release USE_AUI_0"
+# Name "media - Win32 Debug USE_AUI_1"
+# Name "media - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -480,59 +896,115 @@ SOURCE=..\..\src\msw\mediactrl_wmp10.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "media - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "media - Win32 Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "media - Win32 Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -547,7 +1019,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -557,7 +1029,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -567,7 +1049,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -577,7 +1069,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -587,31 +1089,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -621,7 +1157,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -631,7 +1177,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -641,7 +1197,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -651,25 +1217,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Release"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -682,31 +1282,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -716,7 +1340,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -726,7 +1360,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -736,7 +1380,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -746,31 +1400,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -780,7 +1468,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -790,7 +1488,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Release"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -800,7 +1508,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -825,7 +1553,7 @@ SOURCE=..\..\include\wx\msw\ole\activex.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -834,7 +1562,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -843,7 +1580,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -852,7 +1598,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -861,7 +1616,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -870,7 +1634,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -879,7 +1652,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -888,7 +1670,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -897,7 +1688,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -906,7 +1706,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -915,7 +1724,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -924,7 +1742,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -933,7 +1760,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -942,7 +1778,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -951,7 +1796,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Release"
+!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -960,7 +1814,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "media - Win32 Debug"
+!ELSEIF "$(CFG)" == "media - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "media - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp
index dd3b69a757..57c80be128 100644
--- a/build/msw/wx_net.dsp
+++ b/build/msw/wx_net.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=net - Win32 Debug
+CFG=net - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=net - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_net.mak" CFG="net - Win32 Debug"
+!MESSAGE NMAKE /f "wx_net.mak" CFG="net - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "net - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=net - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 Release"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
-!ELSEIF "$(CFG)" == "net - Win32 Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\net"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\net"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "net - Win32 DLL Universal Unicode Release"
-# Name "net - Win32 DLL Universal Unicode Debug"
-# Name "net - Win32 DLL Universal Release"
-# Name "net - Win32 DLL Universal Debug"
-# Name "net - Win32 DLL Unicode Release"
-# Name "net - Win32 DLL Unicode Debug"
-# Name "net - Win32 DLL Release"
-# Name "net - Win32 DLL Debug"
-# Name "net - Win32 Universal Unicode Release"
-# Name "net - Win32 Universal Unicode Debug"
-# Name "net - Win32 Universal Release"
-# Name "net - Win32 Universal Debug"
-# Name "net - Win32 Unicode Release"
-# Name "net - Win32 Unicode Debug"
-# Name "net - Win32 Release"
-# Name "net - Win32 Debug"
+# Name "net - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "net - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "net - Win32 DLL Universal Release USE_AUI_1"
+# Name "net - Win32 DLL Universal Release USE_AUI_0"
+# Name "net - Win32 DLL Universal Debug USE_AUI_1"
+# Name "net - Win32 DLL Universal Debug USE_AUI_0"
+# Name "net - Win32 DLL Unicode Release USE_AUI_1"
+# Name "net - Win32 DLL Unicode Release USE_AUI_0"
+# Name "net - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "net - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "net - Win32 DLL Release USE_AUI_1"
+# Name "net - Win32 DLL Release USE_AUI_0"
+# Name "net - Win32 DLL Debug USE_AUI_1"
+# Name "net - Win32 DLL Debug USE_AUI_0"
+# Name "net - Win32 Universal Unicode Release USE_AUI_1"
+# Name "net - Win32 Universal Unicode Release USE_AUI_0"
+# Name "net - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "net - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "net - Win32 Universal Release USE_AUI_1"
+# Name "net - Win32 Universal Release USE_AUI_0"
+# Name "net - Win32 Universal Debug USE_AUI_1"
+# Name "net - Win32 Universal Debug USE_AUI_0"
+# Name "net - Win32 Unicode Release USE_AUI_1"
+# Name "net - Win32 Unicode Release USE_AUI_0"
+# Name "net - Win32 Unicode Debug USE_AUI_1"
+# Name "net - Win32 Unicode Debug USE_AUI_0"
+# Name "net - Win32 Release USE_AUI_1"
+# Name "net - Win32 Release USE_AUI_0"
+# Name "net - Win32 Debug USE_AUI_1"
+# Name "net - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -512,59 +928,115 @@ SOURCE=..\..\src\msw\urlmsw.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "net - Win32 Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "net - Win32 Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -579,7 +1051,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -589,7 +1061,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -599,7 +1081,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -609,7 +1101,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -619,31 +1121,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -653,7 +1189,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -663,7 +1209,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -673,7 +1229,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -683,25 +1249,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Release"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -714,31 +1314,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -748,7 +1372,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -758,7 +1392,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -768,7 +1412,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -778,31 +1432,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -812,7 +1500,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -822,7 +1520,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Release"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -832,7 +1540,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -853,7 +1581,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -862,7 +1590,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -871,7 +1608,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -880,7 +1626,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -889,7 +1644,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -898,7 +1662,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -907,7 +1680,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -916,7 +1698,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -925,7 +1716,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -934,7 +1734,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -943,7 +1752,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -952,7 +1770,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -961,7 +1788,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -970,7 +1806,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -979,7 +1824,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Release"
+!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -988,7 +1842,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "net - Win32 Debug"
+!ELSEIF "$(CFG)" == "net - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "net - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_odbc.dsp b/build/msw/wx_odbc.dsp
index 11896f2911..9e11b93a4d 100644
--- a/build/msw/wx_odbc.dsp
+++ b/build/msw/wx_odbc.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=odbc - Win32 Debug
+CFG=odbc - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=odbc - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_odbc.mak" CFG="odbc - Win32 Debug"
+!MESSAGE NMAKE /f "wx_odbc.mak" CFG="odbc - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "odbc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=odbc - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
-!ELSEIF "$(CFG)" == "odbc - Win32 Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\odbc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\odbc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "odbc - Win32 DLL Universal Unicode Release"
-# Name "odbc - Win32 DLL Universal Unicode Debug"
-# Name "odbc - Win32 DLL Universal Release"
-# Name "odbc - Win32 DLL Universal Debug"
-# Name "odbc - Win32 DLL Unicode Release"
-# Name "odbc - Win32 DLL Unicode Debug"
-# Name "odbc - Win32 DLL Release"
-# Name "odbc - Win32 DLL Debug"
-# Name "odbc - Win32 Universal Unicode Release"
-# Name "odbc - Win32 Universal Unicode Debug"
-# Name "odbc - Win32 Universal Release"
-# Name "odbc - Win32 Universal Debug"
-# Name "odbc - Win32 Unicode Release"
-# Name "odbc - Win32 Unicode Debug"
-# Name "odbc - Win32 Release"
-# Name "odbc - Win32 Debug"
+# Name "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "odbc - Win32 DLL Universal Release USE_AUI_1"
+# Name "odbc - Win32 DLL Universal Release USE_AUI_0"
+# Name "odbc - Win32 DLL Universal Debug USE_AUI_1"
+# Name "odbc - Win32 DLL Universal Debug USE_AUI_0"
+# Name "odbc - Win32 DLL Unicode Release USE_AUI_1"
+# Name "odbc - Win32 DLL Unicode Release USE_AUI_0"
+# Name "odbc - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "odbc - Win32 DLL Release USE_AUI_1"
+# Name "odbc - Win32 DLL Release USE_AUI_0"
+# Name "odbc - Win32 DLL Debug USE_AUI_1"
+# Name "odbc - Win32 DLL Debug USE_AUI_0"
+# Name "odbc - Win32 Universal Unicode Release USE_AUI_1"
+# Name "odbc - Win32 Universal Unicode Release USE_AUI_0"
+# Name "odbc - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "odbc - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "odbc - Win32 Universal Release USE_AUI_1"
+# Name "odbc - Win32 Universal Release USE_AUI_0"
+# Name "odbc - Win32 Universal Debug USE_AUI_1"
+# Name "odbc - Win32 Universal Debug USE_AUI_0"
+# Name "odbc - Win32 Unicode Release USE_AUI_1"
+# Name "odbc - Win32 Unicode Release USE_AUI_0"
+# Name "odbc - Win32 Unicode Debug USE_AUI_1"
+# Name "odbc - Win32 Unicode Debug USE_AUI_0"
+# Name "odbc - Win32 Release USE_AUI_1"
+# Name "odbc - Win32 Release USE_AUI_0"
+# Name "odbc - Win32 Debug USE_AUI_1"
+# Name "odbc - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -472,59 +888,115 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "odbc - Win32 Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "odbc - Win32 Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -539,7 +1011,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -549,7 +1021,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -559,7 +1041,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -569,7 +1061,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -579,31 +1081,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -613,7 +1149,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -623,7 +1169,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -633,7 +1189,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -643,25 +1209,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -674,31 +1274,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -708,7 +1332,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -718,7 +1352,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -728,7 +1372,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -738,31 +1392,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -772,7 +1460,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -782,7 +1480,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -792,7 +1500,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -813,7 +1541,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -822,7 +1550,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -831,7 +1568,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -840,7 +1586,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -849,7 +1604,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -858,7 +1622,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -867,7 +1640,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -876,7 +1658,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -885,7 +1676,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -894,7 +1694,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -903,7 +1712,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -912,7 +1730,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -921,7 +1748,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -930,7 +1766,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -939,7 +1784,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Release"
+!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -948,7 +1802,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "odbc - Win32 Debug"
+!ELSEIF "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_qa.dsp b/build/msw/wx_qa.dsp
index 3da377b4dc..611fd8cdac 100644
--- a/build/msw/wx_qa.dsp
+++ b/build/msw/wx_qa.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=qa - Win32 Debug
+CFG=qa - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=qa - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_qa.mak" CFG="qa - Win32 Debug"
+!MESSAGE NMAKE /f "wx_qa.mak" CFG="qa - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "qa - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=qa - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.lib" /debug
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.lib" /debug
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.lib" /debug
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.lib" /debug
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.lib" /debug
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.lib" /debug
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.lib" /debug
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_qa_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.lib" /debug
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
-!ELSEIF "$(CFG)" == "qa - Win32 Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\qa"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\qa"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_qalib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_qa.lib"
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "qa - Win32 DLL Universal Unicode Release"
-# Name "qa - Win32 DLL Universal Unicode Debug"
-# Name "qa - Win32 DLL Universal Release"
-# Name "qa - Win32 DLL Universal Debug"
-# Name "qa - Win32 DLL Unicode Release"
-# Name "qa - Win32 DLL Unicode Debug"
-# Name "qa - Win32 DLL Release"
-# Name "qa - Win32 DLL Debug"
-# Name "qa - Win32 Universal Unicode Release"
-# Name "qa - Win32 Universal Unicode Debug"
-# Name "qa - Win32 Universal Release"
-# Name "qa - Win32 Universal Debug"
-# Name "qa - Win32 Unicode Release"
-# Name "qa - Win32 Unicode Debug"
-# Name "qa - Win32 Release"
-# Name "qa - Win32 Debug"
+# Name "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "qa - Win32 DLL Universal Release USE_AUI_1"
+# Name "qa - Win32 DLL Universal Release USE_AUI_0"
+# Name "qa - Win32 DLL Universal Debug USE_AUI_1"
+# Name "qa - Win32 DLL Universal Debug USE_AUI_0"
+# Name "qa - Win32 DLL Unicode Release USE_AUI_1"
+# Name "qa - Win32 DLL Unicode Release USE_AUI_0"
+# Name "qa - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "qa - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "qa - Win32 DLL Release USE_AUI_1"
+# Name "qa - Win32 DLL Release USE_AUI_0"
+# Name "qa - Win32 DLL Debug USE_AUI_1"
+# Name "qa - Win32 DLL Debug USE_AUI_0"
+# Name "qa - Win32 Universal Unicode Release USE_AUI_1"
+# Name "qa - Win32 Universal Unicode Release USE_AUI_0"
+# Name "qa - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "qa - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "qa - Win32 Universal Release USE_AUI_1"
+# Name "qa - Win32 Universal Release USE_AUI_0"
+# Name "qa - Win32 Universal Debug USE_AUI_1"
+# Name "qa - Win32 Universal Debug USE_AUI_0"
+# Name "qa - Win32 Unicode Release USE_AUI_1"
+# Name "qa - Win32 Unicode Release USE_AUI_0"
+# Name "qa - Win32 Unicode Debug USE_AUI_1"
+# Name "qa - Win32 Unicode Debug USE_AUI_0"
+# Name "qa - Win32 Release USE_AUI_1"
+# Name "qa - Win32 Release USE_AUI_0"
+# Name "qa - Win32 Debug USE_AUI_1"
+# Name "qa - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -468,59 +884,115 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "qa - Win32 Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "qa - Win32 Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -543,7 +1015,7 @@ SOURCE=..\..\src\generic\dbgrptg.cpp
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -553,7 +1025,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -563,7 +1045,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -573,7 +1065,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -583,31 +1085,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -617,7 +1153,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -627,7 +1173,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -637,7 +1193,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -647,25 +1213,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -678,31 +1278,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -712,7 +1336,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -722,7 +1356,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -732,7 +1376,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -742,31 +1396,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -776,7 +1464,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -786,7 +1484,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -796,7 +1504,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -817,7 +1545,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -826,7 +1554,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -835,7 +1572,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -844,7 +1590,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -853,7 +1608,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -862,7 +1626,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -871,7 +1644,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -880,7 +1662,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -889,7 +1680,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -898,7 +1698,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -907,7 +1716,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -916,7 +1734,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -925,7 +1752,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -934,7 +1770,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -943,7 +1788,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Release"
+!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -952,7 +1806,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "qa - Win32 Debug"
+!ELSEIF "$(CFG)" == "qa - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_wxexpat.dsp b/build/msw/wx_wxexpat.dsp
index 27c623f922..62c004378e 100644
--- a/build/msw/wx_wxexpat.dsp
+++ b/build/msw/wx_wxexpat.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=wxexpat - Win32 Debug
+CFG=wxexpat - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,26 +13,42 @@ CFG=wxexpat - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 Debug"
+!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -42,7 +58,7 @@ CFG=wxexpat - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -65,7 +81,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -88,7 +127,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -111,7 +173,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -134,7 +219,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -157,7 +265,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -180,7 +311,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -203,7 +357,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -226,7 +403,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -249,7 +449,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -272,7 +495,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -295,7 +541,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -318,7 +587,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -341,7 +633,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -364,7 +679,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Release"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -387,7 +725,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-!ELSEIF "$(CFG)" == "wxexpat - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxexpat"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxexpat"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
+
+!ELSEIF "$(CFG)" == "wxexpat - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -414,22 +798,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "wxexpat - Win32 DLL Universal Unicode Release"
-# Name "wxexpat - Win32 DLL Universal Unicode Debug"
-# Name "wxexpat - Win32 DLL Universal Release"
-# Name "wxexpat - Win32 DLL Universal Debug"
-# Name "wxexpat - Win32 DLL Unicode Release"
-# Name "wxexpat - Win32 DLL Unicode Debug"
-# Name "wxexpat - Win32 DLL Release"
-# Name "wxexpat - Win32 DLL Debug"
-# Name "wxexpat - Win32 Universal Unicode Release"
-# Name "wxexpat - Win32 Universal Unicode Debug"
-# Name "wxexpat - Win32 Universal Release"
-# Name "wxexpat - Win32 Universal Debug"
-# Name "wxexpat - Win32 Unicode Release"
-# Name "wxexpat - Win32 Unicode Debug"
-# Name "wxexpat - Win32 Release"
-# Name "wxexpat - Win32 Debug"
+# Name "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "wxexpat - Win32 DLL Universal Release USE_AUI_1"
+# Name "wxexpat - Win32 DLL Universal Release USE_AUI_0"
+# Name "wxexpat - Win32 DLL Universal Debug USE_AUI_1"
+# Name "wxexpat - Win32 DLL Universal Debug USE_AUI_0"
+# Name "wxexpat - Win32 DLL Unicode Release USE_AUI_1"
+# Name "wxexpat - Win32 DLL Unicode Release USE_AUI_0"
+# Name "wxexpat - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "wxexpat - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "wxexpat - Win32 DLL Release USE_AUI_1"
+# Name "wxexpat - Win32 DLL Release USE_AUI_0"
+# Name "wxexpat - Win32 DLL Debug USE_AUI_1"
+# Name "wxexpat - Win32 DLL Debug USE_AUI_0"
+# Name "wxexpat - Win32 Universal Unicode Release USE_AUI_1"
+# Name "wxexpat - Win32 Universal Unicode Release USE_AUI_0"
+# Name "wxexpat - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "wxexpat - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "wxexpat - Win32 Universal Release USE_AUI_1"
+# Name "wxexpat - Win32 Universal Release USE_AUI_0"
+# Name "wxexpat - Win32 Universal Debug USE_AUI_1"
+# Name "wxexpat - Win32 Universal Debug USE_AUI_0"
+# Name "wxexpat - Win32 Unicode Release USE_AUI_1"
+# Name "wxexpat - Win32 Unicode Release USE_AUI_0"
+# Name "wxexpat - Win32 Unicode Debug USE_AUI_1"
+# Name "wxexpat - Win32 Unicode Debug USE_AUI_0"
+# Name "wxexpat - Win32 Release USE_AUI_1"
+# Name "wxexpat - Win32 Release USE_AUI_0"
+# Name "wxexpat - Win32 Debug USE_AUI_1"
+# Name "wxexpat - Win32 Debug USE_AUI_0"
# Begin Group "Source Files"
# PROP Default_Filter ""
diff --git a/build/msw/wx_wxjpeg.dsp b/build/msw/wx_wxjpeg.dsp
index 8d776b2396..20474d0598 100644
--- a/build/msw/wx_wxjpeg.dsp
+++ b/build/msw/wx_wxjpeg.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=wxjpeg - Win32 Debug
+CFG=wxjpeg - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,26 +13,42 @@ CFG=wxjpeg - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 Debug"
+!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -42,7 +58,7 @@ CFG=wxjpeg - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -65,7 +81,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -88,7 +127,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -111,7 +173,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswuniv" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswuniv" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -134,7 +219,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -157,7 +265,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -180,7 +311,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -203,7 +357,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\msw" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\msw" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -226,7 +403,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -249,7 +449,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -272,7 +495,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -295,7 +541,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswuniv" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswuniv" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -318,7 +587,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -341,7 +633,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -364,7 +679,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Release"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -387,7 +725,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-!ELSEIF "$(CFG)" == "wxjpeg - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\msw" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\msw" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
+
+!ELSEIF "$(CFG)" == "wxjpeg - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -414,22 +798,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "wxjpeg - Win32 DLL Universal Unicode Release"
-# Name "wxjpeg - Win32 DLL Universal Unicode Debug"
-# Name "wxjpeg - Win32 DLL Universal Release"
-# Name "wxjpeg - Win32 DLL Universal Debug"
-# Name "wxjpeg - Win32 DLL Unicode Release"
-# Name "wxjpeg - Win32 DLL Unicode Debug"
-# Name "wxjpeg - Win32 DLL Release"
-# Name "wxjpeg - Win32 DLL Debug"
-# Name "wxjpeg - Win32 Universal Unicode Release"
-# Name "wxjpeg - Win32 Universal Unicode Debug"
-# Name "wxjpeg - Win32 Universal Release"
-# Name "wxjpeg - Win32 Universal Debug"
-# Name "wxjpeg - Win32 Unicode Release"
-# Name "wxjpeg - Win32 Unicode Debug"
-# Name "wxjpeg - Win32 Release"
-# Name "wxjpeg - Win32 Debug"
+# Name "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Universal Release USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Universal Release USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Universal Debug USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Universal Debug USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Unicode Release USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Unicode Release USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Release USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Release USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Debug USE_AUI_1"
+# Name "wxjpeg - Win32 DLL Debug USE_AUI_0"
+# Name "wxjpeg - Win32 Universal Unicode Release USE_AUI_1"
+# Name "wxjpeg - Win32 Universal Unicode Release USE_AUI_0"
+# Name "wxjpeg - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "wxjpeg - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "wxjpeg - Win32 Universal Release USE_AUI_1"
+# Name "wxjpeg - Win32 Universal Release USE_AUI_0"
+# Name "wxjpeg - Win32 Universal Debug USE_AUI_1"
+# Name "wxjpeg - Win32 Universal Debug USE_AUI_0"
+# Name "wxjpeg - Win32 Unicode Release USE_AUI_1"
+# Name "wxjpeg - Win32 Unicode Release USE_AUI_0"
+# Name "wxjpeg - Win32 Unicode Debug USE_AUI_1"
+# Name "wxjpeg - Win32 Unicode Debug USE_AUI_0"
+# Name "wxjpeg - Win32 Release USE_AUI_1"
+# Name "wxjpeg - Win32 Release USE_AUI_0"
+# Name "wxjpeg - Win32 Debug USE_AUI_1"
+# Name "wxjpeg - Win32 Debug USE_AUI_0"
# Begin Group "Source Files"
# PROP Default_Filter ""
diff --git a/build/msw/wx_wxpng.dsp b/build/msw/wx_wxpng.dsp
index 0530292c01..c092a20c68 100644
--- a/build/msw/wx_wxpng.dsp
+++ b/build/msw/wx_wxpng.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=wxpng - Win32 Debug
+CFG=wxpng - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,26 +13,42 @@ CFG=wxpng - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_wxpng.mak" CFG="wxpng - Win32 Debug"
+!MESSAGE NMAKE /f "wx_wxpng.mak" CFG="wxpng - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "wxpng - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -42,7 +58,7 @@ CFG=wxpng - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -65,7 +81,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -88,7 +127,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -111,7 +173,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -134,7 +219,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -157,7 +265,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -180,7 +311,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -203,7 +357,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -226,7 +403,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxpng - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -249,7 +449,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -272,7 +495,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -295,7 +541,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -318,7 +587,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxpng - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -341,7 +633,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -364,7 +679,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Release"
+!ELSEIF "$(CFG)" == "wxpng - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -387,7 +725,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-!ELSEIF "$(CFG)" == "wxpng - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxpng - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxpng"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxpng"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
+
+!ELSEIF "$(CFG)" == "wxpng - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -414,22 +798,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "wxpng - Win32 DLL Universal Unicode Release"
-# Name "wxpng - Win32 DLL Universal Unicode Debug"
-# Name "wxpng - Win32 DLL Universal Release"
-# Name "wxpng - Win32 DLL Universal Debug"
-# Name "wxpng - Win32 DLL Unicode Release"
-# Name "wxpng - Win32 DLL Unicode Debug"
-# Name "wxpng - Win32 DLL Release"
-# Name "wxpng - Win32 DLL Debug"
-# Name "wxpng - Win32 Universal Unicode Release"
-# Name "wxpng - Win32 Universal Unicode Debug"
-# Name "wxpng - Win32 Universal Release"
-# Name "wxpng - Win32 Universal Debug"
-# Name "wxpng - Win32 Unicode Release"
-# Name "wxpng - Win32 Unicode Debug"
-# Name "wxpng - Win32 Release"
-# Name "wxpng - Win32 Debug"
+# Name "wxpng - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "wxpng - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "wxpng - Win32 DLL Universal Release USE_AUI_1"
+# Name "wxpng - Win32 DLL Universal Release USE_AUI_0"
+# Name "wxpng - Win32 DLL Universal Debug USE_AUI_1"
+# Name "wxpng - Win32 DLL Universal Debug USE_AUI_0"
+# Name "wxpng - Win32 DLL Unicode Release USE_AUI_1"
+# Name "wxpng - Win32 DLL Unicode Release USE_AUI_0"
+# Name "wxpng - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "wxpng - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "wxpng - Win32 DLL Release USE_AUI_1"
+# Name "wxpng - Win32 DLL Release USE_AUI_0"
+# Name "wxpng - Win32 DLL Debug USE_AUI_1"
+# Name "wxpng - Win32 DLL Debug USE_AUI_0"
+# Name "wxpng - Win32 Universal Unicode Release USE_AUI_1"
+# Name "wxpng - Win32 Universal Unicode Release USE_AUI_0"
+# Name "wxpng - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "wxpng - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "wxpng - Win32 Universal Release USE_AUI_1"
+# Name "wxpng - Win32 Universal Release USE_AUI_0"
+# Name "wxpng - Win32 Universal Debug USE_AUI_1"
+# Name "wxpng - Win32 Universal Debug USE_AUI_0"
+# Name "wxpng - Win32 Unicode Release USE_AUI_1"
+# Name "wxpng - Win32 Unicode Release USE_AUI_0"
+# Name "wxpng - Win32 Unicode Debug USE_AUI_1"
+# Name "wxpng - Win32 Unicode Debug USE_AUI_0"
+# Name "wxpng - Win32 Release USE_AUI_1"
+# Name "wxpng - Win32 Release USE_AUI_0"
+# Name "wxpng - Win32 Debug USE_AUI_1"
+# Name "wxpng - Win32 Debug USE_AUI_0"
# Begin Group "Source Files"
# PROP Default_Filter ""
diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp
index d8e904bd7b..92c62ae13c 100644
--- a/build/msw/wx_wxregex.dsp
+++ b/build/msw/wx_wxregex.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=wxregex - Win32 Debug
+CFG=wxregex - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,26 +13,42 @@ CFG=wxregex - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 Debug"
+!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -42,7 +58,7 @@ CFG=wxregex - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -65,7 +81,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -88,7 +127,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -111,7 +173,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -134,7 +219,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -157,7 +265,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -180,7 +311,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -203,7 +357,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -226,7 +403,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -249,7 +449,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -272,7 +495,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -295,7 +541,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -318,7 +587,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -341,7 +633,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -364,7 +679,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -387,7 +725,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-!ELSEIF "$(CFG)" == "wxregex - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxregex"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxregex"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -414,22 +798,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "wxregex - Win32 DLL Universal Unicode Release"
-# Name "wxregex - Win32 DLL Universal Unicode Debug"
-# Name "wxregex - Win32 DLL Universal Release"
-# Name "wxregex - Win32 DLL Universal Debug"
-# Name "wxregex - Win32 DLL Unicode Release"
-# Name "wxregex - Win32 DLL Unicode Debug"
-# Name "wxregex - Win32 DLL Release"
-# Name "wxregex - Win32 DLL Debug"
-# Name "wxregex - Win32 Universal Unicode Release"
-# Name "wxregex - Win32 Universal Unicode Debug"
-# Name "wxregex - Win32 Universal Release"
-# Name "wxregex - Win32 Universal Debug"
-# Name "wxregex - Win32 Unicode Release"
-# Name "wxregex - Win32 Unicode Debug"
-# Name "wxregex - Win32 Release"
-# Name "wxregex - Win32 Debug"
+# Name "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "wxregex - Win32 DLL Universal Release USE_AUI_1"
+# Name "wxregex - Win32 DLL Universal Release USE_AUI_0"
+# Name "wxregex - Win32 DLL Universal Debug USE_AUI_1"
+# Name "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+# Name "wxregex - Win32 DLL Unicode Release USE_AUI_1"
+# Name "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+# Name "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "wxregex - Win32 DLL Release USE_AUI_1"
+# Name "wxregex - Win32 DLL Release USE_AUI_0"
+# Name "wxregex - Win32 DLL Debug USE_AUI_1"
+# Name "wxregex - Win32 DLL Debug USE_AUI_0"
+# Name "wxregex - Win32 Universal Unicode Release USE_AUI_1"
+# Name "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+# Name "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "wxregex - Win32 Universal Release USE_AUI_1"
+# Name "wxregex - Win32 Universal Release USE_AUI_0"
+# Name "wxregex - Win32 Universal Debug USE_AUI_1"
+# Name "wxregex - Win32 Universal Debug USE_AUI_0"
+# Name "wxregex - Win32 Unicode Release USE_AUI_1"
+# Name "wxregex - Win32 Unicode Release USE_AUI_0"
+# Name "wxregex - Win32 Unicode Debug USE_AUI_1"
+# Name "wxregex - Win32 Unicode Debug USE_AUI_0"
+# Name "wxregex - Win32 Release USE_AUI_1"
+# Name "wxregex - Win32 Release USE_AUI_0"
+# Name "wxregex - Win32 Debug USE_AUI_1"
+# Name "wxregex - Win32 Debug USE_AUI_0"
# Begin Group "Source Files"
# PROP Default_Filter ""
@@ -457,7 +857,7 @@ SOURCE=..\..\src\regex\regfree.c
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -466,7 +866,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -475,7 +884,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -484,7 +902,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -493,7 +920,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -502,7 +938,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -511,7 +956,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -520,7 +974,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -529,7 +992,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -538,7 +1010,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -547,7 +1028,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -556,7 +1046,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -565,7 +1064,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -574,7 +1082,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -583,7 +1100,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -592,7 +1118,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
@@ -608,7 +1152,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -618,7 +1162,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -628,7 +1182,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -638,7 +1202,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -648,31 +1222,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -682,7 +1290,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -692,7 +1310,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -702,7 +1330,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -712,25 +1350,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -743,31 +1415,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -777,7 +1473,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -787,7 +1493,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -797,7 +1513,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -807,31 +1533,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -841,7 +1601,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -851,7 +1621,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Release"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -861,7 +1641,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "wxregex - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
diff --git a/build/msw/wx_wxtiff.dsp b/build/msw/wx_wxtiff.dsp
index 4ba9593859..efd3a5165b 100644
--- a/build/msw/wx_wxtiff.dsp
+++ b/build/msw/wx_wxtiff.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=wxtiff - Win32 Debug
+CFG=wxtiff - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,26 +13,42 @@ CFG=wxtiff - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_wxtiff.mak" CFG="wxtiff - Win32 Debug"
+!MESSAGE NMAKE /f "wx_wxtiff.mak" CFG="wxtiff - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -42,7 +58,7 @@ CFG=wxtiff - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -65,7 +81,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -88,7 +127,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -111,7 +173,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -134,7 +219,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -157,7 +265,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -180,7 +311,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -203,7 +357,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -226,7 +403,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -249,7 +449,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -272,7 +495,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -295,7 +541,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -318,7 +587,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -341,7 +633,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -364,7 +679,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Release"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -387,7 +725,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-!ELSEIF "$(CFG)" == "wxtiff - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxtiff"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxtiff"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
+
+!ELSEIF "$(CFG)" == "wxtiff - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -414,22 +798,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "wxtiff - Win32 DLL Universal Unicode Release"
-# Name "wxtiff - Win32 DLL Universal Unicode Debug"
-# Name "wxtiff - Win32 DLL Universal Release"
-# Name "wxtiff - Win32 DLL Universal Debug"
-# Name "wxtiff - Win32 DLL Unicode Release"
-# Name "wxtiff - Win32 DLL Unicode Debug"
-# Name "wxtiff - Win32 DLL Release"
-# Name "wxtiff - Win32 DLL Debug"
-# Name "wxtiff - Win32 Universal Unicode Release"
-# Name "wxtiff - Win32 Universal Unicode Debug"
-# Name "wxtiff - Win32 Universal Release"
-# Name "wxtiff - Win32 Universal Debug"
-# Name "wxtiff - Win32 Unicode Release"
-# Name "wxtiff - Win32 Unicode Debug"
-# Name "wxtiff - Win32 Release"
-# Name "wxtiff - Win32 Debug"
+# Name "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "wxtiff - Win32 DLL Universal Release USE_AUI_1"
+# Name "wxtiff - Win32 DLL Universal Release USE_AUI_0"
+# Name "wxtiff - Win32 DLL Universal Debug USE_AUI_1"
+# Name "wxtiff - Win32 DLL Universal Debug USE_AUI_0"
+# Name "wxtiff - Win32 DLL Unicode Release USE_AUI_1"
+# Name "wxtiff - Win32 DLL Unicode Release USE_AUI_0"
+# Name "wxtiff - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "wxtiff - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "wxtiff - Win32 DLL Release USE_AUI_1"
+# Name "wxtiff - Win32 DLL Release USE_AUI_0"
+# Name "wxtiff - Win32 DLL Debug USE_AUI_1"
+# Name "wxtiff - Win32 DLL Debug USE_AUI_0"
+# Name "wxtiff - Win32 Universal Unicode Release USE_AUI_1"
+# Name "wxtiff - Win32 Universal Unicode Release USE_AUI_0"
+# Name "wxtiff - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "wxtiff - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "wxtiff - Win32 Universal Release USE_AUI_1"
+# Name "wxtiff - Win32 Universal Release USE_AUI_0"
+# Name "wxtiff - Win32 Universal Debug USE_AUI_1"
+# Name "wxtiff - Win32 Universal Debug USE_AUI_0"
+# Name "wxtiff - Win32 Unicode Release USE_AUI_1"
+# Name "wxtiff - Win32 Unicode Release USE_AUI_0"
+# Name "wxtiff - Win32 Unicode Debug USE_AUI_1"
+# Name "wxtiff - Win32 Unicode Debug USE_AUI_0"
+# Name "wxtiff - Win32 Release USE_AUI_1"
+# Name "wxtiff - Win32 Release USE_AUI_0"
+# Name "wxtiff - Win32 Debug USE_AUI_1"
+# Name "wxtiff - Win32 Debug USE_AUI_0"
# Begin Group "Source Files"
# PROP Default_Filter ""
diff --git a/build/msw/wx_wxzlib.dsp b/build/msw/wx_wxzlib.dsp
index 795819e0b6..60203927bc 100644
--- a/build/msw/wx_wxzlib.dsp
+++ b/build/msw/wx_wxzlib.dsp
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=wxzlib - Win32 Debug
+CFG=wxzlib - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,26 +13,42 @@ CFG=wxzlib - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 Debug"
+!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -42,7 +58,7 @@ CFG=wxzlib - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -65,7 +81,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -88,7 +127,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -111,7 +173,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -134,7 +219,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -157,7 +265,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -180,7 +311,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -203,7 +357,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -226,7 +403,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -249,7 +449,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -272,7 +495,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -295,7 +541,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -318,7 +587,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -341,7 +633,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -364,7 +679,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Release"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -387,7 +725,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-!ELSEIF "$(CFG)" == "wxzlib - Win32 Debug"
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\wxzlib"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\wxzlib"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
+
+!ELSEIF "$(CFG)" == "wxzlib - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -414,22 +798,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "wxzlib - Win32 DLL Universal Unicode Release"
-# Name "wxzlib - Win32 DLL Universal Unicode Debug"
-# Name "wxzlib - Win32 DLL Universal Release"
-# Name "wxzlib - Win32 DLL Universal Debug"
-# Name "wxzlib - Win32 DLL Unicode Release"
-# Name "wxzlib - Win32 DLL Unicode Debug"
-# Name "wxzlib - Win32 DLL Release"
-# Name "wxzlib - Win32 DLL Debug"
-# Name "wxzlib - Win32 Universal Unicode Release"
-# Name "wxzlib - Win32 Universal Unicode Debug"
-# Name "wxzlib - Win32 Universal Release"
-# Name "wxzlib - Win32 Universal Debug"
-# Name "wxzlib - Win32 Unicode Release"
-# Name "wxzlib - Win32 Unicode Debug"
-# Name "wxzlib - Win32 Release"
-# Name "wxzlib - Win32 Debug"
+# Name "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "wxzlib - Win32 DLL Universal Release USE_AUI_1"
+# Name "wxzlib - Win32 DLL Universal Release USE_AUI_0"
+# Name "wxzlib - Win32 DLL Universal Debug USE_AUI_1"
+# Name "wxzlib - Win32 DLL Universal Debug USE_AUI_0"
+# Name "wxzlib - Win32 DLL Unicode Release USE_AUI_1"
+# Name "wxzlib - Win32 DLL Unicode Release USE_AUI_0"
+# Name "wxzlib - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "wxzlib - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "wxzlib - Win32 DLL Release USE_AUI_1"
+# Name "wxzlib - Win32 DLL Release USE_AUI_0"
+# Name "wxzlib - Win32 DLL Debug USE_AUI_1"
+# Name "wxzlib - Win32 DLL Debug USE_AUI_0"
+# Name "wxzlib - Win32 Universal Unicode Release USE_AUI_1"
+# Name "wxzlib - Win32 Universal Unicode Release USE_AUI_0"
+# Name "wxzlib - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "wxzlib - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "wxzlib - Win32 Universal Release USE_AUI_1"
+# Name "wxzlib - Win32 Universal Release USE_AUI_0"
+# Name "wxzlib - Win32 Universal Debug USE_AUI_1"
+# Name "wxzlib - Win32 Universal Debug USE_AUI_0"
+# Name "wxzlib - Win32 Unicode Release USE_AUI_1"
+# Name "wxzlib - Win32 Unicode Release USE_AUI_0"
+# Name "wxzlib - Win32 Unicode Debug USE_AUI_1"
+# Name "wxzlib - Win32 Unicode Debug USE_AUI_0"
+# Name "wxzlib - Win32 Release USE_AUI_1"
+# Name "wxzlib - Win32 Release USE_AUI_0"
+# Name "wxzlib - Win32 Debug USE_AUI_1"
+# Name "wxzlib - Win32 Debug USE_AUI_0"
# Begin Group "Source Files"
# PROP Default_Filter ""
diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp
index fbd46ad0cf..b4931de950 100644
--- a/build/msw/wx_xml.dsp
+++ b/build/msw/wx_xml.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=xml - Win32 Debug
+CFG=xml - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=xml - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_xml.mak" CFG="xml - Win32 Debug"
+!MESSAGE NMAKE /f "wx_xml.mak" CFG="xml - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "xml - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=xml - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+# ADD LINK32 wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+# ADD LINK32 wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\xml"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\xml"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "xml - Win32 DLL Universal Unicode Release"
-# Name "xml - Win32 DLL Universal Unicode Debug"
-# Name "xml - Win32 DLL Universal Release"
-# Name "xml - Win32 DLL Universal Debug"
-# Name "xml - Win32 DLL Unicode Release"
-# Name "xml - Win32 DLL Unicode Debug"
-# Name "xml - Win32 DLL Release"
-# Name "xml - Win32 DLL Debug"
-# Name "xml - Win32 Universal Unicode Release"
-# Name "xml - Win32 Universal Unicode Debug"
-# Name "xml - Win32 Universal Release"
-# Name "xml - Win32 Universal Debug"
-# Name "xml - Win32 Unicode Release"
-# Name "xml - Win32 Unicode Debug"
-# Name "xml - Win32 Release"
-# Name "xml - Win32 Debug"
+# Name "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "xml - Win32 DLL Universal Release USE_AUI_1"
+# Name "xml - Win32 DLL Universal Release USE_AUI_0"
+# Name "xml - Win32 DLL Universal Debug USE_AUI_1"
+# Name "xml - Win32 DLL Universal Debug USE_AUI_0"
+# Name "xml - Win32 DLL Unicode Release USE_AUI_1"
+# Name "xml - Win32 DLL Unicode Release USE_AUI_0"
+# Name "xml - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "xml - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "xml - Win32 DLL Release USE_AUI_1"
+# Name "xml - Win32 DLL Release USE_AUI_0"
+# Name "xml - Win32 DLL Debug USE_AUI_1"
+# Name "xml - Win32 DLL Debug USE_AUI_0"
+# Name "xml - Win32 Universal Unicode Release USE_AUI_1"
+# Name "xml - Win32 Universal Unicode Release USE_AUI_0"
+# Name "xml - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "xml - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "xml - Win32 Universal Release USE_AUI_1"
+# Name "xml - Win32 Universal Release USE_AUI_0"
+# Name "xml - Win32 Universal Debug USE_AUI_1"
+# Name "xml - Win32 Universal Debug USE_AUI_0"
+# Name "xml - Win32 Unicode Release USE_AUI_1"
+# Name "xml - Win32 Unicode Release USE_AUI_0"
+# Name "xml - Win32 Unicode Debug USE_AUI_1"
+# Name "xml - Win32 Unicode Debug USE_AUI_0"
+# Name "xml - Win32 Release USE_AUI_1"
+# Name "xml - Win32 Release USE_AUI_0"
+# Name "xml - Win32 Debug USE_AUI_1"
+# Name "xml - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -468,59 +884,115 @@ SOURCE=..\..\src\common\xtixml.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xml - Win32 Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -535,7 +1007,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -545,7 +1017,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -555,7 +1037,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -565,7 +1057,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -575,31 +1077,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -609,7 +1145,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -619,7 +1165,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -629,7 +1185,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -639,25 +1205,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -670,31 +1270,55 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -704,7 +1328,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -714,7 +1348,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -724,7 +1368,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -734,31 +1388,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -768,7 +1456,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -778,7 +1476,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -788,7 +1496,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -809,7 +1537,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -818,7 +1546,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -827,7 +1564,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -836,7 +1582,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -845,7 +1600,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -854,7 +1618,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -863,7 +1636,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -872,7 +1654,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -881,7 +1672,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -890,7 +1690,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -899,7 +1708,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -908,7 +1726,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -917,7 +1744,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -926,7 +1762,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -935,7 +1780,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Release"
+!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -944,7 +1798,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+!ELSEIF "$(CFG)" == "xml - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp
index 0c46997f55..f83a99da0a 100644
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -2,10 +2,10 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=xrc - Win32 Debug
+CFG=xrc - Win32 Debug USE_AUI_0
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,26 +14,42 @@ CFG=xrc - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "wx_xrc.mak" CFG="xrc - Win32 Debug"
+!MESSAGE NMAKE /f "wx_xrc.mak" CFG="xrc - Win32 Debug USE_AUI_0"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "xrc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -43,7 +59,7 @@ CFG=xrc - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,7 +84,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,7 +134,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.lib" /debug
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.lib" /debug
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -118,7 +184,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -143,7 +234,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.lib" /debug
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.lib" /debug
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -168,7 +284,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -193,7 +334,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.lib" /debug
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.lib" /debug
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -218,7 +384,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -243,7 +434,32 @@ LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.lib" /debug
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswddll\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswddll\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_xrc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.lib" /debug
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -266,7 +482,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -289,7 +528,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -312,7 +574,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -335,7 +620,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -358,7 +666,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -381,7 +712,30 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -404,7 +758,53 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
-!ELSEIF "$(CFG)" == "xrc - Win32 Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\xrc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\xrc"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xrclib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_xrc.lib"
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -431,22 +831,38 @@ LIB32=link.exe -lib
# Begin Target
-# Name "xrc - Win32 DLL Universal Unicode Release"
-# Name "xrc - Win32 DLL Universal Unicode Debug"
-# Name "xrc - Win32 DLL Universal Release"
-# Name "xrc - Win32 DLL Universal Debug"
-# Name "xrc - Win32 DLL Unicode Release"
-# Name "xrc - Win32 DLL Unicode Debug"
-# Name "xrc - Win32 DLL Release"
-# Name "xrc - Win32 DLL Debug"
-# Name "xrc - Win32 Universal Unicode Release"
-# Name "xrc - Win32 Universal Unicode Debug"
-# Name "xrc - Win32 Universal Release"
-# Name "xrc - Win32 Universal Debug"
-# Name "xrc - Win32 Unicode Release"
-# Name "xrc - Win32 Unicode Debug"
-# Name "xrc - Win32 Release"
-# Name "xrc - Win32 Debug"
+# Name "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
+# Name "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
+# Name "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
+# Name "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# Name "xrc - Win32 DLL Universal Release USE_AUI_1"
+# Name "xrc - Win32 DLL Universal Release USE_AUI_0"
+# Name "xrc - Win32 DLL Universal Debug USE_AUI_1"
+# Name "xrc - Win32 DLL Universal Debug USE_AUI_0"
+# Name "xrc - Win32 DLL Unicode Release USE_AUI_1"
+# Name "xrc - Win32 DLL Unicode Release USE_AUI_0"
+# Name "xrc - Win32 DLL Unicode Debug USE_AUI_1"
+# Name "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+# Name "xrc - Win32 DLL Release USE_AUI_1"
+# Name "xrc - Win32 DLL Release USE_AUI_0"
+# Name "xrc - Win32 DLL Debug USE_AUI_1"
+# Name "xrc - Win32 DLL Debug USE_AUI_0"
+# Name "xrc - Win32 Universal Unicode Release USE_AUI_1"
+# Name "xrc - Win32 Universal Unicode Release USE_AUI_0"
+# Name "xrc - Win32 Universal Unicode Debug USE_AUI_1"
+# Name "xrc - Win32 Universal Unicode Debug USE_AUI_0"
+# Name "xrc - Win32 Universal Release USE_AUI_1"
+# Name "xrc - Win32 Universal Release USE_AUI_0"
+# Name "xrc - Win32 Universal Debug USE_AUI_1"
+# Name "xrc - Win32 Universal Debug USE_AUI_0"
+# Name "xrc - Win32 Unicode Release USE_AUI_1"
+# Name "xrc - Win32 Unicode Release USE_AUI_0"
+# Name "xrc - Win32 Unicode Debug USE_AUI_1"
+# Name "xrc - Win32 Unicode Debug USE_AUI_0"
+# Name "xrc - Win32 Release USE_AUI_1"
+# Name "xrc - Win32 Release USE_AUI_0"
+# Name "xrc - Win32 Debug USE_AUI_1"
+# Name "xrc - Win32 Debug USE_AUI_0"
# Begin Group "Common Sources"
# PROP Default_Filter ""
@@ -464,59 +880,115 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
-!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_1"
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xrc - Win32 Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_1"
# PROP Exclude_From_Build 1
-!ELSEIF "$(CFG)" == "xrc - Win32 Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
# PROP Exclude_From_Build 1
@@ -531,31 +1003,55 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
-!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -565,7 +1061,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -575,7 +1081,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -585,7 +1101,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -595,31 +1121,65 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -629,7 +1189,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -639,7 +1209,17 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -649,7 +1229,27 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
@@ -666,7 +1266,7 @@ InputPath=..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
-!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -676,7 +1276,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -686,7 +1296,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -696,7 +1316,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -706,31 +1336,65 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -740,7 +1404,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -750,7 +1424,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -760,7 +1444,17 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
InputPath=..\include\wx\univ\setup.h
@@ -770,25 +1464,59 @@ InputPath=..\include\wx\univ\setup.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build -
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build -
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
# Begin Custom Build -
@@ -805,7 +1533,7 @@ InputPath=..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
-!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
+!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
@@ -814,7 +1542,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
@@ -823,7 +1560,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
@@ -832,7 +1578,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
@@ -841,7 +1596,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
@@ -850,7 +1614,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
@@ -859,7 +1632,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
@@ -868,7 +1650,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
@@ -877,7 +1668,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
@@ -886,7 +1686,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
@@ -895,7 +1704,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
@@ -904,7 +1722,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
@@ -913,7 +1740,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
@@ -922,7 +1758,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
@@ -931,7 +1776,16 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Release"
+!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
@@ -940,7 +1794,25 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
# End Custom Build
-!ELSEIF "$(CFG)" == "xrc - Win32 Debug"
+!ELSEIF "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+ cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
diff --git a/configure.in b/configure.in
index bff76dc4e9..c062c92a70 100644
--- a/configure.in
+++ b/configure.in
@@ -490,6 +490,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_HTML=no
DEFAULT_wxUSE_RICHTEXT=no
DEFAULT_wxUSE_XRC=no
+ DEFAULT_wxUSE_AUI=no
DEFAULT_wxUSE_WEBKIT=no
DEFAULT_wxUSE_FILESYSTEM=no
DEFAULT_wxUSE_FS_INET=no
@@ -701,6 +702,7 @@ else
DEFAULT_wxUSE_HTML=yes
DEFAULT_wxUSE_RICHTEXT=yes
DEFAULT_wxUSE_XRC=yes
+ DEFAULT_wxUSE_AUI=yes
DEFAULT_wxUSE_WEBKIT=yes
DEFAULT_wxUSE_FILESYSTEM=yes
DEFAULT_wxUSE_FS_INET=yes
@@ -983,6 +985,7 @@ WX_ARG_ENABLE(mshtmlhelp, [ --enable-mshtmlhelp use MS HTML Help (win32)],
WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], wxUSE_HTML)
WX_ARG_ENABLE(htmlhelp, [ --enable-htmlhelp use wxHTML-based help], wxUSE_WXHTML_HELP)
WX_ARG_ENABLE(xrc, [ --enable-xrc use XRC resources sub-library], wxUSE_XRC)
+WX_ARG_ENABLE(aui, [ --enable-aui use AUI docking library], wxUSE_AUI)
WX_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS)
WX_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI)
@@ -6708,6 +6711,13 @@ if test "$wxUSE_XRC" = "yes"; then
fi
fi
+USE_AUI=0
+if test "$wxUSE_AUI" = "yes"; then
+ AC_DEFINE(wxUSE_AUI)
+ USE_AUI=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
+fi
+
if test "$wxUSE_MENUS" = "yes"; then
AC_DEFINE(wxUSE_MENUS)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
@@ -6978,6 +6988,9 @@ fi
if test "$wxUSE_XRC" = "yes" ; then
CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
fi
+if test "$wxUSE_AUI" = "yes" ; then
+ CORE_GUI_LIBS="aui $CORE_GUI_LIBS"
+fi
if test "$wxUSE_GUI" != "yes"; then
CORE_GUI_LIBS=""
diff --git a/include/wx/aui/aui.h b/include/wx/aui/aui.h
new file mode 100644
index 0000000000..967949ab1e
--- /dev/null
+++ b/include/wx/aui/aui.h
@@ -0,0 +1,21 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: aui.h
+// Purpose: wxaui: wx advanced user interface - docking window manager
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-05-17
+// RCS-ID:
+// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_AUI_H_
+#define _WX_AUI_H_
+
+#include "wx/aui/framemanager.h"
+#include "wx/aui/dockart.h"
+#include "wx/aui/floatpane.h"
+
+#endif
+ // _WX_AUI_H_
+
diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h
new file mode 100644
index 0000000000..8bafde4ffc
--- /dev/null
+++ b/include/wx/aui/dockart.h
@@ -0,0 +1,152 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: dockart.h
+// Purpose: wxaui: wx advanced user interface - docking window manager
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-05-17
+// RCS-ID:
+// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DOCKART_H_
+#define _WX_DOCKART_H_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
+#if wxUSE_AUI
+
+
+// dock art provider code - a dock provider provides all drawing
+// functionality to the wxAui dock manager. This allows the dock
+// manager to have plugable look-and-feels
+
+class WXDLLIMPEXP_AUI wxDockArt
+{
+public:
+
+ wxDockArt() { }
+ virtual ~wxDockArt() { }
+
+ virtual int GetMetric(int id) = 0;
+ virtual void SetMetric(int id, int new_val) = 0;
+ virtual void SetFont(int id, const wxFont& font) = 0;
+ virtual wxFont GetFont(int id) = 0;
+ virtual wxColour GetColour(int id) = 0;
+ virtual void SetColour(int id, const wxColor& colour) = 0;
+ wxColor GetColor(int id) { return GetColour(id); }
+ void SetColor(int id, const wxColor& color) { SetColour(id, color); }
+
+ virtual void DrawSash(wxDC& dc,
+ int orientation,
+ const wxRect& rect) = 0;
+
+ virtual void DrawBackground(wxDC& dc,
+ int orientation,
+ const wxRect& rect) = 0;
+
+ virtual void DrawCaption(wxDC& dc,
+ const wxString& text,
+ const wxRect& rect,
+ wxPaneInfo& pane) = 0;
+
+ virtual void DrawGripper(wxDC& dc,
+ const wxRect& rect,
+ wxPaneInfo& pane) = 0;
+
+ virtual void DrawBorder(wxDC& dc,
+ const wxRect& rect,
+ wxPaneInfo& pane) = 0;
+
+ virtual void DrawPaneButton(wxDC& dc,
+ int button,
+ int button_state,
+ const wxRect& rect,
+ wxPaneInfo& pane) = 0;
+};
+
+
+// this is the default art provider for wxFrameManager. Dock art
+// can be customized by creating a class derived from this one,
+// or replacing this class entirely
+
+class WXDLLIMPEXP_AUI wxDefaultDockArt : public wxDockArt
+{
+public:
+
+ wxDefaultDockArt();
+
+ int GetMetric(int metric_id);
+ void SetMetric(int metric_id, int new_val);
+ wxColour GetColour(int id);
+ void SetColour(int id, const wxColor& colour);
+ void SetFont(int id, const wxFont& font);
+ wxFont GetFont(int id);
+
+ void DrawSash(wxDC& dc,
+ int orientation,
+ const wxRect& rect);
+
+ void DrawBackground(wxDC& dc,
+ int orientation,
+ const wxRect& rect);
+
+ void DrawCaption(wxDC& dc,
+ const wxString& text,
+ const wxRect& rect,
+ wxPaneInfo& pane);
+
+ void DrawGripper(wxDC& dc,
+ const wxRect& rect,
+ wxPaneInfo& pane);
+
+ void DrawBorder(wxDC& dc,
+ const wxRect& rect,
+ wxPaneInfo& pane);
+
+ void DrawPaneButton(wxDC& dc,
+ int button,
+ int button_state,
+ const wxRect& rect,
+ wxPaneInfo& pane);
+
+protected:
+
+ void DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active);
+
+protected:
+
+ wxPen m_border_pen;
+ wxBrush m_sash_brush;
+ wxBrush m_background_brush;
+ wxBrush m_gripper_brush;
+ wxFont m_caption_font;
+ wxBitmap m_inactive_close_bitmap;
+ wxBitmap m_inactive_pin_bitmap;
+ wxBitmap m_active_close_bitmap;
+ wxBitmap m_active_pin_bitmap;
+ wxPen m_gripper_pen1;
+ wxPen m_gripper_pen2;
+ wxPen m_gripper_pen3;
+ wxColour m_active_caption_colour;
+ wxColour m_active_caption_gradient_colour;
+ wxColour m_active_caption_text_colour;
+ wxColour m_inactive_caption_colour;
+ wxColour m_inactive_caption_gradient_colour;
+ wxColour m_inactive_caption_text_colour;
+ int m_border_size;
+ int m_caption_size;
+ int m_sash_size;
+ int m_button_size;
+ int m_gripper_size;
+ int m_gradient_type;
+};
+
+
+
+#endif // wxUSE_AUI
+#endif //_WX_DOCKART_H_
diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
new file mode 100644
index 0000000000..afe170be5a
--- /dev/null
+++ b/include/wx/aui/floatpane.h
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: floatpane.h
+// Purpose: wxaui: wx advanced user interface - docking window manager
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-05-17
+// RCS-ID:
+// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_FLOATPANE_H_
+#define _WX_FLOATPANE_H_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
+#if wxUSE_AUI
+
+#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+#include "wx/minifram.h"
+#define wxFloatingPaneBaseClass wxMiniFrame
+#else
+#define wxFloatingPaneBaseClass wxFrame
+#endif
+
+class WXDLLIMPEXP_AUI wxFloatingPane : public wxFloatingPaneBaseClass
+{
+public:
+ wxFloatingPane(wxWindow* parent,
+ wxFrameManager* owner_mgr,
+ wxWindowID id = -1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize);
+ ~wxFloatingPane();
+ void SetPaneWindow(const wxPaneInfo& pane);
+private:
+ void OnSize(wxSizeEvent& event);
+ void OnClose(wxCloseEvent& event);
+ void OnMoveEvent(wxMoveEvent& event);
+ void OnIdle(wxIdleEvent& event);
+ void OnMoveStart();
+ void OnMoving(const wxRect& window_rect);
+ void OnMoveFinished();
+ void OnActivate(wxActivateEvent& event);
+ static bool isMouseDown();
+private:
+ wxWindow* m_pane_window; // pane window being managed
+ bool m_moving;
+ wxRect m_last_rect;
+ wxSize m_last_size;
+
+ wxFrameManager* m_owner_mgr;
+ wxFrameManager m_mgr;
+
+ DECLARE_EVENT_TABLE()
+};
+
+#endif // wxUSE_AUI
+#endif //_WX_FLOATPANE_H_
+
diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
new file mode 100644
index 0000000000..f1f5016377
--- /dev/null
+++ b/include/wx/aui/framemanager.h
@@ -0,0 +1,654 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: framemanager.h
+// Purpose: wxaui: wx advanced user interface - docking window manager
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-05-17
+// RCS-ID:
+// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_FRAMEMANAGER_H_
+#define _WX_FRAMEMANAGER_H_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
+#if wxUSE_AUI
+
+enum WXDLLIMPEXP_AUI wxFrameManagerDock
+{
+ wxAUI_DOCK_NONE = 0,
+ wxAUI_DOCK_TOP = 1,
+ wxAUI_DOCK_RIGHT = 2,
+ wxAUI_DOCK_BOTTOM = 3,
+ wxAUI_DOCK_LEFT = 4,
+ wxAUI_DOCK_CENTER = 5,
+ wxAUI_DOCK_CENTRE = wxAUI_DOCK_CENTER
+};
+
+enum WXDLLIMPEXP_AUI wxFrameManagerOption
+{
+ wxAUI_MGR_ALLOW_FLOATING = 1 << 0,
+ wxAUI_MGR_ALLOW_ACTIVE_PANE = 1 << 1,
+ wxAUI_MGR_TRANSPARENT_DRAG = 1 << 2,
+ wxAUI_MGR_TRANSPARENT_HINT = 1 << 3,
+ wxAUI_MGR_TRANSPARENT_HINT_FADE = 1 << 4,
+
+ wxAUI_MGR_DEFAULT = wxAUI_MGR_ALLOW_FLOATING |
+ wxAUI_MGR_TRANSPARENT_HINT |
+ wxAUI_MGR_TRANSPARENT_HINT_FADE
+};
+
+enum WXDLLIMPEXP_AUI wxPaneDockArtSetting
+{
+ wxAUI_ART_SASH_SIZE = 0,
+ wxAUI_ART_CAPTION_SIZE = 1,
+ wxAUI_ART_GRIPPER_SIZE = 2,
+ wxAUI_ART_PANE_BORDER_SIZE = 3,
+ wxAUI_ART_PANE_BUTTON_SIZE = 4,
+ wxAUI_ART_BACKGROUND_COLOUR = 5,
+ wxAUI_ART_SASH_COLOUR = 6,
+ wxAUI_ART_ACTIVE_CAPTION_COLOUR = 7,
+ wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8,
+ wxAUI_ART_INACTIVE_CAPTION_COLOUR = 9,
+ wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10,
+ wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR = 11,
+ wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR = 12,
+ wxAUI_ART_BORDER_COLOUR = 13,
+ wxAUI_ART_GRIPPER_COLOUR = 14,
+ wxAUI_ART_CAPTION_FONT = 15,
+ wxAUI_ART_GRADIENT_TYPE = 16
+};
+
+enum WXDLLIMPEXP_AUI wxPaneDockArtGradients
+{
+ wxAUI_GRADIENT_NONE = 0,
+ wxAUI_GRADIENT_VERTICAL = 1,
+ wxAUI_GRADIENT_HORIZONTAL = 2
+};
+
+enum WXDLLIMPEXP_AUI wxPaneButtonState
+{
+ wxAUI_BUTTON_STATE_NORMAL = 0,
+ wxAUI_BUTTON_STATE_HOVER = 1,
+ wxAUI_BUTTON_STATE_PRESSED = 2
+};
+
+enum WXDLLIMPEXP_AUI wxPaneInsertLevel
+{
+ wxAUI_INSERT_PANE = 0,
+ wxAUI_INSERT_ROW = 1,
+ wxAUI_INSERT_DOCK = 2
+};
+
+
+
+// forwards and array declarations
+class wxDockUIPart;
+class wxPaneButton;
+class wxPaneInfo;
+class wxDockInfo;
+class wxDockArt;
+class wxFrameManagerEvent;
+
+WX_DECLARE_OBJARRAY(wxDockInfo, wxDockInfoArray);
+WX_DECLARE_OBJARRAY(wxDockUIPart, wxDockUIPartArray);
+WX_DECLARE_OBJARRAY(wxPaneButton, wxPaneButtonArray);
+WX_DECLARE_OBJARRAY(wxPaneInfo, wxPaneInfoArray);
+WX_DEFINE_ARRAY_PTR(wxPaneInfo*, wxPaneInfoPtrArray);
+WX_DEFINE_ARRAY_PTR(wxDockInfo*, wxDockInfoPtrArray);
+
+extern wxDockInfo wxNullDockInfo;
+extern wxPaneInfo wxNullPaneInfo;
+
+
+
+
+class WXDLLIMPEXP_AUI wxPaneInfo
+{
+public:
+
+ wxPaneInfo()
+ {
+ window = NULL;
+ frame = NULL;
+ state = 0;
+ dock_direction = wxAUI_DOCK_LEFT;
+ dock_layer = 0;
+ dock_row = 0;
+ dock_pos = 0;
+ floating_pos = wxDefaultPosition;
+ floating_size = wxDefaultSize;
+ best_size = wxDefaultSize;
+ min_size = wxDefaultSize;
+ max_size = wxDefaultSize;
+ dock_proportion = 0;
+
+ DefaultPane();
+ }
+
+ wxPaneInfo(const wxPaneInfo& c)
+ {
+ name = c.name;
+ caption = c.caption;
+ window = c.window;
+ frame = c.frame;
+ state = c.state;
+ dock_direction = c.dock_direction;
+ dock_layer = c.dock_layer;
+ dock_row = c.dock_row;
+ dock_pos = c.dock_pos;
+ best_size = c.best_size;
+ min_size = c.min_size;
+ max_size = c.max_size;
+ floating_pos = c.floating_pos;
+ floating_size = c.floating_size;
+ dock_proportion = c.dock_proportion;
+ buttons = c.buttons;
+ rect = c.rect;
+ }
+
+ wxPaneInfo& operator=(const wxPaneInfo& c)
+ {
+ name = c.name;
+ caption = c.caption;
+ window = c.window;
+ frame = c.frame;
+ state = c.state;
+ dock_direction = c.dock_direction;
+ dock_layer = c.dock_layer;
+ dock_row = c.dock_row;
+ dock_pos = c.dock_pos;
+ best_size = c.best_size;
+ min_size = c.min_size;
+ max_size = c.max_size;
+ floating_pos = c.floating_pos;
+ floating_size = c.floating_size;
+ dock_proportion = c.dock_proportion;
+ buttons = c.buttons;
+ rect = c.rect;
+ return *this;
+ }
+
+ bool IsOk() const { return (window != NULL) ? true : false; }
+ bool IsFixed() const { return !HasFlag(optionResizable); }
+ bool IsResizable() const { return HasFlag(optionResizable); }
+ bool IsShown() const { return !HasFlag(optionHidden); }
+ bool IsFloating() const { return HasFlag(optionFloating); }
+ bool IsDocked() const { return !HasFlag(optionFloating); }
+ bool IsToolbar() const { return HasFlag(optionToolbar); }
+ bool IsTopDockable() const { return HasFlag(optionTopDockable); }
+ bool IsBottomDockable() const { return HasFlag(optionBottomDockable); }
+ bool IsLeftDockable() const { return HasFlag(optionLeftDockable); }
+ bool IsRightDockable() const { return HasFlag(optionRightDockable); }
+ bool IsFloatable() const { return HasFlag(optionFloatable); }
+ bool IsMovable() const { return HasFlag(optionMovable); }
+ bool HasCaption() const { return HasFlag(optionCaption); }
+ bool HasGripper() const { return HasFlag(optionGripper); }
+ bool HasBorder() const { return HasFlag(optionPaneBorder); }
+ bool HasCloseButton() const { return HasFlag(buttonClose); }
+ bool HasMaximizeButton() const { return HasFlag(buttonMaximize); }
+ bool HasMinimizeButton() const { return HasFlag(buttonMinimize); }
+ bool HasPinButton() const { return HasFlag(buttonPin); }
+ bool HasGripperTop() const { return HasFlag(optionGripperTop); }
+
+ wxPaneInfo& Window(wxWindow* w) { window = w; return *this; }
+ wxPaneInfo& Name(const wxString& n) { name = n; return *this; }
+ wxPaneInfo& Caption(const wxString& c) { caption = c; return *this; }
+ wxPaneInfo& Left() { dock_direction = wxAUI_DOCK_LEFT; return *this; }
+ wxPaneInfo& Right() { dock_direction = wxAUI_DOCK_RIGHT; return *this; }
+ wxPaneInfo& Top() { dock_direction = wxAUI_DOCK_TOP; return *this; }
+ wxPaneInfo& Bottom() { dock_direction = wxAUI_DOCK_BOTTOM; return *this; }
+ wxPaneInfo& Center() { dock_direction = wxAUI_DOCK_CENTER; return *this; }
+ wxPaneInfo& Centre() { dock_direction = wxAUI_DOCK_CENTRE; return *this; }
+ wxPaneInfo& Direction(int direction) { dock_direction = direction; return *this; }
+ wxPaneInfo& Layer(int layer) { dock_layer = layer; return *this; }
+ wxPaneInfo& Row(int row) { dock_row = row; return *this; }
+ wxPaneInfo& Position(int pos) { dock_pos = pos; return *this; }
+ wxPaneInfo& BestSize(const wxSize& size) { best_size = size; return *this; }
+ wxPaneInfo& MinSize(const wxSize& size) { min_size = size; return *this; }
+ wxPaneInfo& MaxSize(const wxSize& size) { max_size = size; return *this; }
+ wxPaneInfo& BestSize(int x, int y) { best_size.Set(x,y); return *this; }
+ wxPaneInfo& MinSize(int x, int y) { min_size.Set(x,y); return *this; }
+ wxPaneInfo& MaxSize(int x, int y) { max_size.Set(x,y); return *this; }
+ wxPaneInfo& FloatingPosition(const wxPoint& pos) { floating_pos = pos; return *this; }
+ wxPaneInfo& FloatingPosition(int x, int y) { floating_pos.x = x; floating_pos.y = y; return *this; }
+ wxPaneInfo& FloatingSize(const wxSize& size) { floating_size = size; return *this; }
+ wxPaneInfo& FloatingSize(int x, int y) { floating_size.Set(x,y); return *this; }
+ wxPaneInfo& Fixed() { return SetFlag(optionResizable, false); }
+ wxPaneInfo& Resizable(bool resizable = true) { return SetFlag(optionResizable, resizable); }
+ wxPaneInfo& Dock() { return SetFlag(optionFloating, false); }
+ wxPaneInfo& Float() { return SetFlag(optionFloating, true); }
+ wxPaneInfo& Hide() { return SetFlag(optionHidden, true); }
+ wxPaneInfo& Show(bool show = true) { return SetFlag(optionHidden, !show); }
+ wxPaneInfo& CaptionVisible(bool visible = true) { return SetFlag(optionCaption, visible); }
+ wxPaneInfo& PaneBorder(bool visible = true) { return SetFlag(optionPaneBorder, visible); }
+ wxPaneInfo& Gripper(bool visible = true) { return SetFlag(optionGripper, visible); }
+ wxPaneInfo& GripperTop(bool attop = true) { return SetFlag(optionGripperTop, attop); }
+ wxPaneInfo& CloseButton(bool visible = true) { return SetFlag(buttonClose, visible); }
+ wxPaneInfo& MaximizeButton(bool visible = true) { return SetFlag(buttonMaximize, visible); }
+ wxPaneInfo& MinimizeButton(bool visible = true) { return SetFlag(buttonMinimize, visible); }
+ wxPaneInfo& PinButton(bool visible = true) { return SetFlag(buttonPin, visible); }
+ wxPaneInfo& DestroyOnClose(bool b = true) { return SetFlag(optionDestroyOnClose, b); }
+ wxPaneInfo& TopDockable(bool b = true) { return SetFlag(optionTopDockable, b); }
+ wxPaneInfo& BottomDockable(bool b = true) { return SetFlag(optionBottomDockable, b); }
+ wxPaneInfo& LeftDockable(bool b = true) { return SetFlag(optionLeftDockable, b); }
+ wxPaneInfo& RightDockable(bool b = true) { return SetFlag(optionRightDockable, b); }
+ wxPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); }
+ wxPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); }
+ wxPaneInfo& Dockable(bool b = true)
+ {
+ return TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b);
+ }
+
+ wxPaneInfo& DefaultPane()
+ {
+ state |= optionTopDockable | optionBottomDockable |
+ optionLeftDockable | optionRightDockable |
+ optionFloatable | optionMovable | optionResizable |
+ optionCaption | optionPaneBorder | buttonClose;
+ return *this;
+ }
+
+ wxPaneInfo& CentrePane() { return CenterPane(); }
+ wxPaneInfo& CenterPane()
+ {
+ state = 0;
+ return Center().PaneBorder().Resizable();
+ }
+
+ wxPaneInfo& ToolbarPane()
+ {
+ DefaultPane();
+ state |= (optionToolbar | optionGripper);
+ state &= ~(optionResizable | optionCaption);
+ if (dock_layer == 0)
+ dock_layer = 10;
+ return *this;
+ }
+
+ wxPaneInfo& SetFlag(unsigned int flag, bool option_state)
+ {
+ if (option_state)
+ state |= flag;
+ else
+ state &= ~flag;
+ return *this;
+ }
+
+ bool HasFlag(unsigned int flag) const
+ {
+ return (state & flag) ? true:false;
+ }
+
+public:
+
+ enum wxPaneState
+ {
+ optionFloating = 1 << 0,
+ optionHidden = 1 << 1,
+ optionLeftDockable = 1 << 2,
+ optionRightDockable = 1 << 3,
+ optionTopDockable = 1 << 4,
+ optionBottomDockable = 1 << 5,
+ optionFloatable = 1 << 6,
+ optionMovable = 1 << 7,
+ optionResizable = 1 << 8,
+ optionPaneBorder = 1 << 9,
+ optionCaption = 1 << 10,
+ optionGripper = 1 << 11,
+ optionDestroyOnClose = 1 << 12,
+ optionToolbar = 1 << 13,
+ optionActive = 1 << 14,
+ optionGripperTop = 1 << 15,
+
+ buttonClose = 1 << 24,
+ buttonMaximize = 1 << 25,
+ buttonMinimize = 1 << 26,
+ buttonPin = 1 << 27,
+ buttonCustom1 = 1 << 28,
+ buttonCustom2 = 1 << 29,
+ buttonCustom3 = 1 << 30,
+ actionPane = 1 << 31 // used internally
+ };
+
+public:
+ wxString name; // name of the pane
+ wxString caption; // caption displayed on the window
+
+ wxWindow* window; // window that is in this pane
+ wxWindow* frame; // floating frame window that holds the pane
+ unsigned int state; // a combination of wxPaneState values
+
+ int dock_direction; // dock direction (top, bottom, left, right, center)
+ int dock_layer; // layer number (0 = innermost layer)
+ int dock_row; // row number on the docking bar (0 = first row)
+ int dock_pos; // position inside the row (0 = first position)
+
+ wxSize best_size; // size that the layout engine will prefer
+ wxSize min_size; // minimum size the pane window can tolerate
+ wxSize max_size; // maximum size the pane window can tolerate
+
+ wxPoint floating_pos; // position while floating
+ wxSize floating_size; // size while floating
+ int dock_proportion; // proportion while docked
+
+ wxPaneButtonArray buttons; // buttons on the pane
+
+ wxRect rect; // current rectangle (populated by wxAUI)
+};
+
+
+
+
+
+class WXDLLIMPEXP_AUI wxFrameManager : public wxEvtHandler
+{
+friend class wxFloatingPane;
+
+public:
+
+ wxFrameManager(wxFrame* frame = NULL,
+ unsigned int flags = wxAUI_MGR_DEFAULT);
+ virtual ~wxFrameManager();
+ void UnInit();
+
+ void SetFlags(unsigned int flags);
+ unsigned int GetFlags() const;
+
+ void SetFrame(wxFrame* frame);
+ wxFrame* GetFrame() const;
+
+ void SetArtProvider(wxDockArt* art_provider);
+ wxDockArt* GetArtProvider() const;
+
+ wxPaneInfo& GetPane(wxWindow* window);
+ wxPaneInfo& GetPane(const wxString& name);
+ wxPaneInfoArray& GetAllPanes();
+
+ bool AddPane(wxWindow* window,
+ const wxPaneInfo& pane_info);
+
+ bool AddPane(wxWindow* window,
+ int direction = wxLEFT,
+ const wxString& caption = wxEmptyString);
+
+ bool InsertPane(wxWindow* window,
+ const wxPaneInfo& pane_info,
+ int insert_level = wxAUI_INSERT_PANE);
+
+ bool DetachPane(wxWindow* window);
+
+ wxString SavePerspective();
+
+ bool LoadPerspective(const wxString& perspective,
+ bool update = true);
+
+ void Update();
+
+private:
+
+ void DrawHintRect(wxWindow* pane_window,
+ const wxPoint& pt,
+ const wxPoint& offset);
+
+ void DoFrameLayout();
+
+ void LayoutAddPane(wxSizer* container,
+ wxDockInfo& dock,
+ wxPaneInfo& pane,
+ wxDockUIPartArray& uiparts,
+ bool spacer_only);
+
+ void LayoutAddDock(wxSizer* container,
+ wxDockInfo& dock,
+ wxDockUIPartArray& uiparts,
+ bool spacer_only);
+
+ wxSizer* LayoutAll(wxPaneInfoArray& panes,
+ wxDockInfoArray& docks,
+ wxDockUIPartArray& uiparts,
+ bool spacer_only = false);
+
+ bool DoDrop(wxDockInfoArray& docks,
+ wxPaneInfoArray& panes,
+ wxPaneInfo& drop,
+ const wxPoint& pt,
+ const wxPoint& action_offset = wxPoint(0,0));
+
+ wxPaneInfo& LookupPane(wxWindow* window);
+ wxPaneInfo& LookupPane(const wxString& name);
+ wxDockUIPart* HitTest(int x, int y);
+ wxDockUIPart* GetPanePart(wxWindow* pane);
+ int GetDockPixelOffset(wxPaneInfo& test);
+ void OnFloatingPaneMoveStart(wxWindow* window);
+ void OnFloatingPaneMoving(wxWindow* window);
+ void OnFloatingPaneMoved(wxWindow* window);
+ void OnFloatingPaneActivated(wxWindow* window);
+ void OnFloatingPaneClosed(wxWindow* window);
+ void OnFloatingPaneResized(wxWindow* window, const wxSize& size);
+ void Render(wxDC* dc);
+ void Repaint(wxDC* dc = NULL);
+ void ProcessMgrEvent(wxFrameManagerEvent& event);
+ void UpdateButtonOnScreen(wxDockUIPart* button_ui_part,
+ const wxMouseEvent& event);
+ void GetPanePositionsAndSizes(wxDockInfo& dock,
+ wxArrayInt& positions,
+ wxArrayInt& sizes);
+ void ShowHint(const wxRect& rect);
+ void HideHint();
+ void RemoveHint();
+
+private:
+
+ // events
+ void OnPaint(wxPaintEvent& event);
+ void OnEraseBackground(wxEraseEvent& event);
+ void OnSize(wxSizeEvent& event);
+ void OnSetCursor(wxSetCursorEvent& event);
+ void OnLeftDown(wxMouseEvent& event);
+ void OnLeftUp(wxMouseEvent& event);
+ void OnMotion(wxMouseEvent& event);
+ void OnLeaveWindow(wxMouseEvent& event);
+ void OnPaneButton(wxFrameManagerEvent& event);
+ void OnChildFocus(wxChildFocusEvent& event);
+ void OnHintFadeTimer(wxTimerEvent& event);
+
+private:
+
+ enum
+ {
+ actionNone = 0,
+ actionResize,
+ actionClickButton,
+ actionClickCaption,
+ actionDragToolbarPane,
+ actionDragFloatingPane
+ };
+
+private:
+
+ wxFrame* m_frame; // the frame being managed
+ wxDockArt* m_art; // dock art object which does all drawing
+ unsigned int m_flags; // manager flags wxAUI_MGR_*
+
+ wxPaneInfoArray m_panes; // array of panes structures
+ wxDockInfoArray m_docks; // array of docks structures
+ wxDockUIPartArray m_uiparts; // array of UI parts (captions, buttons, etc)
+
+ int m_action; // current mouse action
+ wxPoint m_action_start; // position where the action click started
+ wxPoint m_action_offset; // offset from upper left of the item clicked
+ wxDockUIPart* m_action_part; // ptr to the part the action happened to
+ wxWindow* m_action_window; // action frame or window (NULL if none)
+ wxRect m_action_hintrect; // hint rectangle for the action
+ wxDockUIPart* m_hover_button;// button uipart being hovered over
+ wxRect m_last_hint; // last hint rectangle
+ wxPoint m_last_mouse_move; // last mouse move position (see OnMotion)
+
+ wxWindow* m_hint_wnd; // transparent hint window (for now, only msw)
+ wxTimer m_hint_fadetimer; // transparent fade timer (for now, only msw)
+ int m_hint_fadeamt; // transparent fade amount (for now, only msw)
+
+ DECLARE_EVENT_TABLE()
+};
+
+
+
+// event declarations/classes
+
+class WXDLLIMPEXP_AUI wxFrameManagerEvent : public wxEvent
+{
+public:
+ wxFrameManagerEvent(wxEventType type) : wxEvent(0, type)
+ {
+ pane = NULL;
+ button = 0;
+ }
+
+ wxFrameManagerEvent(const wxFrameManagerEvent& c) : wxEvent(c)
+ {
+ pane = c.pane;
+ button = c.button;
+ }
+
+ wxEvent *Clone() const { return new wxFrameManagerEvent(*this); }
+
+ void SetPane(wxPaneInfo* p) { pane = p; }
+ void SetButton(int b) { button = b; }
+ wxPaneInfo* GetPane() { return pane; }
+ int GetButton() { return button; }
+
+public:
+ wxPaneInfo* pane;
+ int button;
+};
+
+
+class WXDLLIMPEXP_AUI wxDockInfo
+{
+public:
+ wxDockInfo()
+ {
+ dock_direction = 0;
+ dock_layer = 0;
+ dock_row = 0;
+ size = 0;
+ min_size = 0;
+ resizable = true;
+ fixed = false;
+ toolbar = false;
+ }
+
+ wxDockInfo(const wxDockInfo& c)
+ {
+ dock_direction = c.dock_direction;
+ dock_layer = c.dock_layer;
+ dock_row = c.dock_row;
+ size = c.size;
+ min_size = c.min_size;
+ resizable = c.resizable;
+ fixed = c.fixed;
+ toolbar = c.toolbar;
+ panes = c.panes;
+ rect = c.rect;
+ }
+
+ wxDockInfo& operator=(const wxDockInfo& c)
+ {
+ dock_direction = c.dock_direction;
+ dock_layer = c.dock_layer;
+ dock_row = c.dock_row;
+ size = c.size;
+ min_size = c.min_size;
+ resizable = c.resizable;
+ fixed = c.fixed;
+ toolbar = c.toolbar;
+ panes = c.panes;
+ rect = c.rect;
+ return *this;
+ }
+
+ bool IsOk() const { return (dock_direction != 0) ? true : false; }
+ bool IsHorizontal() const { return (dock_direction == wxAUI_DOCK_TOP ||
+ dock_direction == wxAUI_DOCK_BOTTOM) ? true:false; }
+ bool IsVertical() const { return (dock_direction == wxAUI_DOCK_LEFT ||
+ dock_direction == wxAUI_DOCK_RIGHT ||
+ dock_direction == wxAUI_DOCK_CENTER) ? true:false; }
+public:
+ wxPaneInfoPtrArray panes; // array of panes
+ wxRect rect; // current rectangle
+ int dock_direction; // dock direction (top, bottom, left, right, center)
+ int dock_layer; // layer number (0 = innermost layer)
+ int dock_row; // row number on the docking bar (0 = first row)
+ int size; // size of the dock
+ int min_size; // minimum size of a dock (0 if there is no min)
+ bool resizable; // flag indicating whether the dock is resizable
+ bool toolbar; // flag indicating dock contains only toolbars
+ bool fixed; // flag indicating that the dock operates on
+ // absolute coordinates as opposed to proportional
+};
+
+
+class WXDLLIMPEXP_AUI wxDockUIPart
+{
+public:
+ enum
+ {
+ typeCaption,
+ typeGripper,
+ typeDock,
+ typeDockSizer,
+ typePane,
+ typePaneSizer,
+ typeBackground,
+ typePaneBorder,
+ typePaneButton,
+ };
+
+ int type; // ui part type (see enum above)
+ int orientation; // orientation (either wxHORIZONTAL or wxVERTICAL)
+ wxDockInfo* dock; // which dock the item is associated with
+ wxPaneInfo* pane; // which pane the item is associated with
+ wxPaneButton* button; // which pane button the item is associated with
+ wxSizer* cont_sizer; // the part's containing sizer
+ wxSizerItem* sizer_item; // the sizer item of the part
+ wxRect rect; // client coord rectangle of the part itself
+};
+
+
+class WXDLLIMPEXP_AUI wxPaneButton
+{
+public:
+ int button_id; // id of the button (e.g. buttonClose)
+};
+
+
+
+
+// wx event machinery
+
+
+// right now the only event that works is wxEVT_AUI_PANEBUTTON. A full
+// spectrum of events will be implemented in the next incremental version
+
+BEGIN_DECLARE_EVENT_TYPES()
+ DECLARE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON, 0)
+END_DECLARE_EVENT_TYPES()
+
+typedef void (wxEvtHandler::*wxFrameManagerEventFunction)(wxFrameManagerEvent&);
+
+#define wxFrameManagerEventHandler(func) \
+ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFrameManagerEventFunction, &func)
+
+#define EVT_AUI_PANEBUTTON(func) \
+ wx__DECLARE_EVT0(wxEVT_AUI_PANEBUTTON, wxFrameManagerEventHandler(func))
+
+#endif // wxUSE_AUI
+#endif //_WX_FRAMEMANAGER_H_
+
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
new file mode 100644
index 0000000000..9da0b609f0
--- /dev/null
+++ b/samples/aui/Makefile.in
@@ -0,0 +1,207 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+@MAKE_SET@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+WINDRES = @WINDRES@
+REZ = @REZ@
+SETFILE = @SETFILE@
+NM = @NM@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+LDFLAGS_GUI = @LDFLAGS_GUI@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_XML = @EXTRALIBS_XML@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_SDL = @EXTRALIBS_SDL@
+HOST_SUFFIX = @HOST_SUFFIX@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+
+### Variables: ###
+
+DESTDIR =
+WX_RELEASE = 2.7
+WX_VERSION = $(WX_RELEASE).0
+LIBDIRNAME = $(top_builddir)lib
+AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS = \
+ $(__auidemo___win32rc) \
+ $(__auidemo_os2_lib_res) \
+ auidemo_auidemo.o
+
+### Conditionally set variables: ###
+
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
+@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
+@COND_PLATFORM_MAC_1@__auidemo___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@ $(SETFILE) -a C auidemo$(EXEEXT)
+@COND_PLATFORM_MAC_1@__auidemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
+ grep -q pmwin.763 ; then emxbind -ep auidemo$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__auidemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__auidemo___win32rc = auidemo_sample_rc.o
+@COND_PLATFORM_OS2_1@__auidemo_os2_lib_res = \
+@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__auidemo_bundle___depname = auidemo_bundle
+@COND_TOOLKIT_COCOA@____auidemo_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@ auidemo.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____auidemo_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@ auidemo.app/Contents/PkgInfo
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_ADV_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
+ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
+ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+ $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+ auidemo$(EXEEXT) Carbon.r sample.r
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
+
+### Targets: ###
+
+all: auidemo$(EXEEXT) $(__auidemo_bundle___depname)
+
+install: all
+
+uninstall:
+
+install-strip: install
+
+clean:
+ rm -rf ./.deps ./.pch
+ rm -f ./*.o
+ rm -f auidemo$(EXEEXT)
+ rm -rf auidemo.app
+
+distclean: clean
+ rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
+ $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+ $(__auidemo___mac_rezcmd)
+ $(__auidemo___mac_setfilecmd)
+ $(__auidemo___os2_emxbindcmd)
+ $(SAMPLES_RPATH_POSTLINK)
+
+auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+ mkdir -p auidemo.app/Contents
+ mkdir -p auidemo.app/Contents/MacOS
+ mkdir -p auidemo.app/Contents/Resources
+
+
+ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+ -e "s/EXECUTABLE/auidemo/" \
+ -e "s/VERSION/$(WX_VERSION)/" \
+ $(top_srcdir)/src/mac/carbon/Info.plist.in >auidemo.app/Contents/Info.plist
+
+
+ echo -n "APPL????" >auidemo.app/Contents/PkgInfo
+
+
+ ln -f auidemo$(EXEEXT) auidemo.app/Contents/MacOS/auidemo
+
+
+ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns auidemo.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@auidemo_bundle: $(____auidemo_BUNDLE_TGT_REF_DEP)
+
+auidemo_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+
+auidemo_auidemo.o: $(srcdir)/auidemo.cpp
+ $(CXXC) -c -o $@ $(AUIDEMO_CXXFLAGS) $(srcdir)/auidemo.cpp
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include .deps/*.d
+
+.PHONY: all install uninstall clean distclean auidemo_bundle
diff --git a/samples/aui/auidemo.bkl b/samples/aui/auidemo.bkl
new file mode 100644
index 0000000000..b4a2fff4fd
--- /dev/null
+++ b/samples/aui/auidemo.bkl
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+ auidemo.cpp
+
+ aui
+ html
+ adv
+ core
+ xml
+ base
+
+
diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
new file mode 100644
index 0000000000..73916eff41
--- /dev/null
+++ b/samples/aui/auidemo.cpp
@@ -0,0 +1,1199 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: auidemo.cpp
+// Purpose: wxaui: wx advanced user interface - sample/test program
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-10-03
+// RCS-ID:
+// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #include "wx/log.h"
+#endif
+
+#include "wx/wx.h"
+#include "wx/grid.h"
+#include "wx/treectrl.h"
+#include "wx/spinctrl.h"
+#include "wx/artprov.h"
+#include "wx/clipbrd.h"
+#include "wx/image.h"
+#include "wx/colordlg.h"
+#include "wx/wxhtml.h"
+
+#include "wx/aui/aui.h"
+#include "../sample.xpm"
+
+// -- application --
+
+class MyApp : public wxApp
+{
+public:
+ bool OnInit();
+};
+
+DECLARE_APP(MyApp);
+IMPLEMENT_APP(MyApp);
+
+
+class wxSizeReportCtrl;
+
+// -- frame --
+
+class MyFrame : public wxFrame
+{
+ enum
+ {
+ ID_CreateTree = wxID_HIGHEST+1,
+ ID_CreateGrid,
+ ID_CreateText,
+ ID_CreateHTML,
+ ID_CreateSizeReport,
+ ID_GridContent,
+ ID_TextContent,
+ ID_TreeContent,
+ ID_HTMLContent,
+ ID_SizeReportContent,
+ ID_CreatePerspective,
+ ID_CopyPerspectiveCode,
+ ID_AllowFloating,
+ ID_AllowActivePane,
+ ID_TransparentHint,
+ ID_TransparentHintFade,
+ ID_TransparentDrag,
+ ID_NoGradient,
+ ID_VerticalGradient,
+ ID_HorizontalGradient,
+ ID_Settings,
+ ID_FirstPerspective = ID_CreatePerspective+1000
+ };
+
+public:
+ MyFrame(wxWindow* parent,
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER);
+
+ ~MyFrame();
+
+ wxDockArt* GetDockArt();
+ void DoUpdate();
+
+private:
+ wxTextCtrl* CreateTextCtrl();
+ wxGrid* CreateGrid();
+ wxTreeCtrl* CreateTreeCtrl();
+ wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
+ wxPoint GetStartPosition();
+ wxHtmlWindow* CreateHTMLCtrl();
+
+ wxString GetIntroText();
+
+private:
+
+ void OnEraseBackground(wxEraseEvent& event);
+ void OnSize(wxSizeEvent& event);
+
+ void OnCreateTree(wxCommandEvent& event);
+ void OnCreateGrid(wxCommandEvent& event);
+ void OnCreateHTML(wxCommandEvent& event);
+ void OnCreateText(wxCommandEvent& event);
+ void OnCreateSizeReport(wxCommandEvent& event);
+ void OnChangeContentPane(wxCommandEvent& event);
+ void OnCreatePerspective(wxCommandEvent& event);
+ void OnCopyPerspectiveCode(wxCommandEvent& event);
+ void OnRestorePerspective(wxCommandEvent& event);
+ void OnSettings(wxCommandEvent& event);
+ void OnExit(wxCommandEvent& event);
+ void OnAbout(wxCommandEvent& event);
+
+ void OnGradient(wxCommandEvent& event);
+ void OnManagerFlag(wxCommandEvent& event);
+ void OnUpdateUI(wxUpdateUIEvent& event);
+
+private:
+
+ wxFrameManager m_mgr;
+ wxArrayString m_perspectives;
+ wxMenu* m_perspectives_menu;
+
+ DECLARE_EVENT_TABLE();
+};
+
+
+
+// -- wxSizeReportCtrl --
+// (a utility control that always reports it's client size)
+
+class wxSizeReportCtrl : public wxControl
+{
+public:
+
+ wxSizeReportCtrl(wxWindow* parent, wxWindowID id = -1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ wxFrameManager* mgr = NULL)
+ : wxControl(parent, id, pos, size, wxNO_BORDER)
+ {
+ m_mgr = mgr;
+ }
+
+private:
+
+ void OnPaint(wxPaintEvent& evt)
+ {
+ wxPaintDC dc(this);
+ wxSize size = GetClientSize();
+ wxString s;
+ int h, w, height;
+
+ s.Printf(wxT("Size: %d x %d"), size.x, size.y);
+
+ dc.SetFont(*wxNORMAL_FONT);
+ dc.GetTextExtent(s, &w, &height);
+ height += 3;
+ dc.SetBrush(*wxWHITE_BRUSH);
+ dc.SetPen(*wxWHITE_PEN);
+ dc.DrawRectangle(0, 0, size.x, size.y);
+ dc.SetPen(*wxLIGHT_GREY_PEN);
+ dc.DrawLine(0, 0, size.x, size.y);
+ dc.DrawLine(0, size.y, size.x, 0);
+ dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2));
+
+ if (m_mgr)
+ {
+ wxPaneInfo pi = m_mgr->GetPane(this);
+
+ s.Printf(wxT("Layer: %d"), pi.dock_layer);
+ dc.GetTextExtent(s, &w, &h);
+ dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*1));
+
+ s.Printf(wxT("Dock: %d Row: %d"), pi.dock_direction, pi.dock_row);
+ dc.GetTextExtent(s, &w, &h);
+ dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*2));
+
+ s.Printf(wxT("Position: %d"), pi.dock_pos);
+ dc.GetTextExtent(s, &w, &h);
+ dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*3));
+
+ s.Printf(wxT("Proportion: %d"), pi.dock_proportion);
+ dc.GetTextExtent(s, &w, &h);
+ dc.DrawText(s, (size.x-w)/2, ((size.y-(height*5))/2)+(height*4));
+ }
+ }
+
+ void OnEraseBackground(wxEraseEvent& evt)
+ {
+ // intentionally empty
+ }
+
+ void OnSize(wxSizeEvent& evt)
+ {
+ Refresh();
+ }
+private:
+
+ wxFrameManager* m_mgr;
+
+ DECLARE_EVENT_TABLE();
+};
+
+BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)
+ EVT_PAINT(wxSizeReportCtrl::OnPaint)
+ EVT_SIZE(wxSizeReportCtrl::OnSize)
+ EVT_ERASE_BACKGROUND(wxSizeReportCtrl::OnEraseBackground)
+END_EVENT_TABLE()
+
+
+
+
+
+
+class SettingsPanel : public wxPanel
+{
+ enum
+ {
+ ID_PaneBorderSize = wxID_HIGHEST+1,
+ ID_SashSize,
+ ID_CaptionSize,
+ ID_BackgroundColor,
+ ID_SashColor,
+ ID_InactiveCaptionColor,
+ ID_InactiveCaptionGradientColor,
+ ID_InactiveCaptionTextColor,
+ ID_ActiveCaptionColor,
+ ID_ActiveCaptionGradientColor,
+ ID_ActiveCaptionTextColor,
+ ID_BorderColor,
+ ID_GripperColor
+ };
+
+public:
+
+ SettingsPanel(wxWindow* parent, MyFrame* frame)
+ : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
+ {
+ //wxBoxSizer* vert = new wxBoxSizer(wxVERTICAL);
+
+ //vert->Add(1, 1, 1, wxEXPAND);
+
+ wxBoxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
+ m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+ s1->Add(1, 1, 1, wxEXPAND);
+ s1->Add(new wxStaticText(this, -1, wxT("Pane Border Size:")));
+ s1->Add(m_border_size);
+ s1->Add(1, 1, 1, wxEXPAND);
+ s1->SetItemMinSize((size_t)1, 180, 20);
+ //vert->Add(s1, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
+
+ wxBoxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
+ m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+ s2->Add(1, 1, 1, wxEXPAND);
+ s2->Add(new wxStaticText(this, -1, wxT("Sash Size:")));
+ s2->Add(m_sash_size);
+ s2->Add(1, 1, 1, wxEXPAND);
+ s2->SetItemMinSize((size_t)1, 180, 20);
+ //vert->Add(s2, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
+
+ wxBoxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
+ m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+ s3->Add(1, 1, 1, wxEXPAND);
+ s3->Add(new wxStaticText(this, -1, wxT("Caption Size:")));
+ s3->Add(m_caption_size);
+ s3->Add(1, 1, 1, wxEXPAND);
+ s3->SetItemMinSize((size_t)1, 180, 20);
+ //vert->Add(s3, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
+
+ //vert->Add(1, 1, 1, wxEXPAND);
+
+
+ wxBitmap b = CreateColorBitmap(*wxBLACK);
+
+ wxBoxSizer* s4 = new wxBoxSizer(wxHORIZONTAL);
+ m_background_color = new wxBitmapButton(this, ID_BackgroundColor, b, wxDefaultPosition, wxSize(50,25));
+ s4->Add(1, 1, 1, wxEXPAND);
+ s4->Add(new wxStaticText(this, -1, wxT("Background Color:")));
+ s4->Add(m_background_color);
+ s4->Add(1, 1, 1, wxEXPAND);
+ s4->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s5 = new wxBoxSizer(wxHORIZONTAL);
+ m_sash_color = new wxBitmapButton(this, ID_SashColor, b, wxDefaultPosition, wxSize(50,25));
+ s5->Add(1, 1, 1, wxEXPAND);
+ s5->Add(new wxStaticText(this, -1, wxT("Sash Color:")));
+ s5->Add(m_sash_color);
+ s5->Add(1, 1, 1, wxEXPAND);
+ s5->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s6 = new wxBoxSizer(wxHORIZONTAL);
+ m_inactive_caption_color = new wxBitmapButton(this, ID_InactiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
+ s6->Add(1, 1, 1, wxEXPAND);
+ s6->Add(new wxStaticText(this, -1, wxT("Normal Caption:")));
+ s6->Add(m_inactive_caption_color);
+ s6->Add(1, 1, 1, wxEXPAND);
+ s6->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s7 = new wxBoxSizer(wxHORIZONTAL);
+ m_inactive_caption_gradient_color = new wxBitmapButton(this, ID_InactiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
+ s7->Add(1, 1, 1, wxEXPAND);
+ s7->Add(new wxStaticText(this, -1, wxT("Normal Caption Gradient:")));
+ s7->Add(m_inactive_caption_gradient_color);
+ s7->Add(1, 1, 1, wxEXPAND);
+ s7->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s8 = new wxBoxSizer(wxHORIZONTAL);
+ m_inactive_caption_text_color = new wxBitmapButton(this, ID_InactiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
+ s8->Add(1, 1, 1, wxEXPAND);
+ s8->Add(new wxStaticText(this, -1, wxT("Normal Caption Text:")));
+ s8->Add(m_inactive_caption_text_color);
+ s8->Add(1, 1, 1, wxEXPAND);
+ s8->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s9 = new wxBoxSizer(wxHORIZONTAL);
+ m_active_caption_color = new wxBitmapButton(this, ID_ActiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
+ s9->Add(1, 1, 1, wxEXPAND);
+ s9->Add(new wxStaticText(this, -1, wxT("Active Caption:")));
+ s9->Add(m_active_caption_color);
+ s9->Add(1, 1, 1, wxEXPAND);
+ s9->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s10 = new wxBoxSizer(wxHORIZONTAL);
+ m_active_caption_gradient_color = new wxBitmapButton(this, ID_ActiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
+ s10->Add(1, 1, 1, wxEXPAND);
+ s10->Add(new wxStaticText(this, -1, wxT("Active Caption Gradient:")));
+ s10->Add(m_active_caption_gradient_color);
+ s10->Add(1, 1, 1, wxEXPAND);
+ s10->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s11 = new wxBoxSizer(wxHORIZONTAL);
+ m_active_caption_text_color = new wxBitmapButton(this, ID_ActiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
+ s11->Add(1, 1, 1, wxEXPAND);
+ s11->Add(new wxStaticText(this, -1, wxT("Active Caption Text:")));
+ s11->Add(m_active_caption_text_color);
+ s11->Add(1, 1, 1, wxEXPAND);
+ s11->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s12 = new wxBoxSizer(wxHORIZONTAL);
+ m_border_color = new wxBitmapButton(this, ID_BorderColor, b, wxDefaultPosition, wxSize(50,25));
+ s12->Add(1, 1, 1, wxEXPAND);
+ s12->Add(new wxStaticText(this, -1, wxT("Border Color:")));
+ s12->Add(m_border_color);
+ s12->Add(1, 1, 1, wxEXPAND);
+ s12->SetItemMinSize((size_t)1, 180, 20);
+
+ wxBoxSizer* s13 = new wxBoxSizer(wxHORIZONTAL);
+ m_gripper_color = new wxBitmapButton(this, ID_GripperColor, b, wxDefaultPosition, wxSize(50,25));
+ s13->Add(1, 1, 1, wxEXPAND);
+ s13->Add(new wxStaticText(this, -1, wxT("Gripper Color:")));
+ s13->Add(m_gripper_color);
+ s13->Add(1, 1, 1, wxEXPAND);
+ s13->SetItemMinSize((size_t)1, 180, 20);
+
+ wxGridSizer* grid_sizer = new wxGridSizer(2);
+ grid_sizer->SetHGap(5);
+ grid_sizer->Add(s1); grid_sizer->Add(s4);
+ grid_sizer->Add(s2); grid_sizer->Add(s5);
+ grid_sizer->Add(s3); grid_sizer->Add(s13);
+ grid_sizer->Add(1,1); grid_sizer->Add(s12);
+ grid_sizer->Add(s6); grid_sizer->Add(s9);
+ grid_sizer->Add(s7); grid_sizer->Add(s10);
+ grid_sizer->Add(s8); grid_sizer->Add(s11);
+
+ wxBoxSizer* cont_sizer = new wxBoxSizer(wxVERTICAL);
+ cont_sizer->Add(grid_sizer, 1, wxEXPAND | wxALL, 5);
+ SetSizer(cont_sizer);
+ GetSizer()->SetSizeHints(this);
+
+ m_frame = frame;
+ m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_PANE_BORDER_SIZE));
+ m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_SASH_SIZE));
+ m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_CAPTION_SIZE));
+
+ UpdateColors();
+ }
+
+private:
+
+ wxBitmap CreateColorBitmap(const wxColour& c)
+ {
+ wxImage image;
+ image.Create(25,14);
+ for (int x = 0; x < 25; ++x)
+ for (int y = 0; y < 14; ++y)
+ {
+ wxColour pixcol = c;
+ if (x == 0 || x == 24 || y == 0 || y == 13)
+ pixcol = *wxBLACK;
+ image.SetRGB(x, y, pixcol.Red(), pixcol.Green(), pixcol.Blue());
+ }
+ return wxBitmap(image);
+ }
+
+ void UpdateColors()
+ {
+ wxColour bk = m_frame->GetDockArt()->GetColor(wxAUI_ART_BACKGROUND_COLOUR);
+ m_background_color->SetBitmapLabel(CreateColorBitmap(bk));
+
+ wxColour cap = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_COLOUR);
+ m_inactive_caption_color->SetBitmapLabel(CreateColorBitmap(cap));
+
+ wxColour capgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR);
+ m_inactive_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(capgrad));
+
+ wxColour captxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR);
+ m_inactive_caption_text_color->SetBitmapLabel(CreateColorBitmap(captxt));
+
+ wxColour acap = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_COLOUR);
+ m_active_caption_color->SetBitmapLabel(CreateColorBitmap(acap));
+
+ wxColour acapgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR);
+ m_active_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(acapgrad));
+
+ wxColour acaptxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR);
+ m_active_caption_text_color->SetBitmapLabel(CreateColorBitmap(acaptxt));
+
+ wxColour sash = m_frame->GetDockArt()->GetColor(wxAUI_ART_SASH_COLOUR);
+ m_sash_color->SetBitmapLabel(CreateColorBitmap(sash));
+
+ wxColour border = m_frame->GetDockArt()->GetColor(wxAUI_ART_BORDER_COLOUR);
+ m_border_color->SetBitmapLabel(CreateColorBitmap(border));
+
+ wxColour gripper = m_frame->GetDockArt()->GetColor(wxAUI_ART_GRIPPER_COLOUR);
+ m_gripper_color->SetBitmapLabel(CreateColorBitmap(gripper));
+ }
+
+ void OnPaneBorderSize(wxSpinEvent& event)
+ {
+ m_frame->GetDockArt()->SetMetric(wxAUI_ART_PANE_BORDER_SIZE,
+ event.GetPosition());
+ m_frame->DoUpdate();
+ }
+
+ void OnSashSize(wxSpinEvent& event)
+ {
+ m_frame->GetDockArt()->SetMetric(wxAUI_ART_SASH_SIZE,
+ event.GetPosition());
+ m_frame->DoUpdate();
+ }
+
+ void OnCaptionSize(wxSpinEvent& event)
+ {
+ m_frame->GetDockArt()->SetMetric(wxAUI_ART_CAPTION_SIZE,
+ event.GetPosition());
+ m_frame->DoUpdate();
+ }
+
+ void OnSetColor(wxCommandEvent& event)
+ {
+ wxColourDialog dlg(m_frame);
+ dlg.SetTitle(_("Color Picker"));
+ if (dlg.ShowModal() != wxID_OK)
+ return;
+
+ int var = 0;
+ switch (event.GetId())
+ {
+ case ID_BackgroundColor: var = wxAUI_ART_BACKGROUND_COLOUR; break;
+ case ID_SashColor: var = wxAUI_ART_SASH_COLOUR; break;
+ case ID_InactiveCaptionColor: var = wxAUI_ART_INACTIVE_CAPTION_COLOUR; break;
+ case ID_InactiveCaptionGradientColor: var = wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR; break;
+ case ID_InactiveCaptionTextColor: var = wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR; break;
+ case ID_ActiveCaptionColor: var = wxAUI_ART_ACTIVE_CAPTION_COLOUR; break;
+ case ID_ActiveCaptionGradientColor: var = wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR; break;
+ case ID_ActiveCaptionTextColor: var = wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR; break;
+ case ID_BorderColor: var = wxAUI_ART_BORDER_COLOUR; break;
+ case ID_GripperColor: var = wxAUI_ART_GRIPPER_COLOUR; break;
+ default: return;
+ }
+
+ m_frame->GetDockArt()->SetColor(var, dlg.GetColourData().GetColour());
+ m_frame->DoUpdate();
+ UpdateColors();
+ }
+
+private:
+
+ MyFrame* m_frame;
+ wxSpinCtrl* m_border_size;
+ wxSpinCtrl* m_sash_size;
+ wxSpinCtrl* m_caption_size;
+ wxBitmapButton* m_inactive_caption_text_color;
+ wxBitmapButton* m_inactive_caption_gradient_color;
+ wxBitmapButton* m_inactive_caption_color;
+ wxBitmapButton* m_active_caption_text_color;
+ wxBitmapButton* m_active_caption_gradient_color;
+ wxBitmapButton* m_active_caption_color;
+ wxBitmapButton* m_sash_color;
+ wxBitmapButton* m_background_color;
+ wxBitmapButton* m_border_color;
+ wxBitmapButton* m_gripper_color;
+
+ DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(SettingsPanel, wxPanel)
+ EVT_SPINCTRL(ID_PaneBorderSize, SettingsPanel::OnPaneBorderSize)
+ EVT_SPINCTRL(ID_SashSize, SettingsPanel::OnSashSize)
+ EVT_SPINCTRL(ID_CaptionSize, SettingsPanel::OnCaptionSize)
+ EVT_BUTTON(ID_BackgroundColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_SashColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_InactiveCaptionColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_InactiveCaptionGradientColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_InactiveCaptionTextColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_ActiveCaptionColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_ActiveCaptionGradientColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_ActiveCaptionTextColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_BorderColor, SettingsPanel::OnSetColor)
+ EVT_BUTTON(ID_GripperColor, SettingsPanel::OnSetColor)
+END_EVENT_TABLE()
+
+
+
+
+
+
+
+bool MyApp::OnInit()
+{
+ wxFrame* frame = new MyFrame(NULL,
+ wxID_ANY,
+ wxT("wxAUI 0.9.2 Test Application"),
+ wxDefaultPosition,
+ wxSize(800, 600));
+ SetTopWindow(frame);
+ frame->Show();
+
+ return true;
+}
+
+
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+ EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground)
+ EVT_SIZE(MyFrame::OnSize)
+ EVT_MENU(MyFrame::ID_CreateTree, MyFrame::OnCreateTree)
+ EVT_MENU(MyFrame::ID_CreateGrid, MyFrame::OnCreateGrid)
+ EVT_MENU(MyFrame::ID_CreateText, MyFrame::OnCreateText)
+ EVT_MENU(MyFrame::ID_CreateHTML, MyFrame::OnCreateHTML)
+ EVT_MENU(MyFrame::ID_CreateSizeReport, MyFrame::OnCreateSizeReport)
+ EVT_MENU(MyFrame::ID_CreatePerspective, MyFrame::OnCreatePerspective)
+ EVT_MENU(MyFrame::ID_CopyPerspectiveCode, MyFrame::OnCopyPerspectiveCode)
+ EVT_MENU(ID_AllowFloating, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_TransparentHint, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_TransparentHintFade, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_NoGradient, MyFrame::OnGradient)
+ EVT_MENU(ID_VerticalGradient, MyFrame::OnGradient)
+ EVT_MENU(ID_HorizontalGradient, MyFrame::OnGradient)
+ EVT_MENU(ID_Settings, MyFrame::OnSettings)
+ EVT_MENU(ID_GridContent, MyFrame::OnChangeContentPane)
+ EVT_MENU(ID_TreeContent, MyFrame::OnChangeContentPane)
+ EVT_MENU(ID_TextContent, MyFrame::OnChangeContentPane)
+ EVT_MENU(ID_SizeReportContent, MyFrame::OnChangeContentPane)
+ EVT_MENU(ID_HTMLContent, MyFrame::OnChangeContentPane)
+ EVT_MENU(wxID_EXIT, MyFrame::OnExit)
+ EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
+ EVT_UPDATE_UI(ID_AllowFloating, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_TransparentHint, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_TransparentHintFade, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_TransparentDrag, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
+ EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
+ MyFrame::OnRestorePerspective)
+END_EVENT_TABLE()
+
+
+
+MyFrame::MyFrame(wxWindow* parent,
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style)
+ : wxFrame(parent, id, title, pos, size, style)
+{
+ // tell wxFrameManager to manage this frame
+ m_mgr.SetFrame(this);
+
+ // set frame icon
+ SetIcon(wxIcon(sample_xpm));
+
+ // create menu
+ wxMenuBar* mb = new wxMenuBar;
+
+ wxMenu* file_menu = new wxMenu;
+ file_menu->Append(wxID_EXIT, _("Exit"));
+
+ wxMenu* view_menu = new wxMenu;
+ view_menu->Append(ID_CreateText, _("Create Text Control"));
+ view_menu->Append(ID_CreateHTML, _("Create HTML Control"));
+ view_menu->Append(ID_CreateTree, _("Create Tree"));
+ view_menu->Append(ID_CreateGrid, _("Create Grid"));
+ view_menu->Append(ID_CreateSizeReport, _("Create Size Reporter"));
+ view_menu->AppendSeparator();
+ view_menu->Append(ID_GridContent, _("Use a Grid for the Content Pane"));
+ view_menu->Append(ID_TextContent, _("Use a Text Control for the Content Pane"));
+ view_menu->Append(ID_HTMLContent, _("Use an HTML Control for the Content Pane"));
+ view_menu->Append(ID_TreeContent, _("Use a Tree Control for the Content Pane"));
+ view_menu->Append(ID_SizeReportContent, _("Use a Size Reporter for the Content Pane"));
+
+ wxMenu* options_menu = new wxMenu;
+ options_menu->AppendCheckItem(ID_AllowFloating, _("Allow Floating"));
+ options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));
+ options_menu->AppendCheckItem(ID_TransparentHintFade, _("Transparent Hint Fade-in"));
+ options_menu->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag"));
+ options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane"));
+ options_menu->AppendSeparator();
+ options_menu->AppendRadioItem(ID_NoGradient, _("No Caption Gradient"));
+ options_menu->AppendRadioItem(ID_VerticalGradient, _("Vertical Caption Gradient"));
+ options_menu->AppendRadioItem(ID_HorizontalGradient, _("Horizontal Caption Gradient"));
+ options_menu->AppendSeparator();
+ options_menu->Append(ID_Settings, _("Settings Pane"));
+
+ m_perspectives_menu = new wxMenu;
+ m_perspectives_menu->Append(ID_CreatePerspective, _("Create Perspective"));
+ m_perspectives_menu->Append(ID_CopyPerspectiveCode, _("Copy Perspective Data To Clipboard"));
+ m_perspectives_menu->AppendSeparator();
+ m_perspectives_menu->Append(ID_FirstPerspective+0, _("Default Startup"));
+ m_perspectives_menu->Append(ID_FirstPerspective+1, _("All Panes"));
+
+ wxMenu* help_menu = new wxMenu;
+ help_menu->Append(wxID_ABOUT, _("About..."));
+
+ mb->Append(file_menu, _("File"));
+ mb->Append(view_menu, _("View"));
+ mb->Append(m_perspectives_menu, _("Perspectives"));
+ mb->Append(options_menu, _("Options"));
+ mb->Append(help_menu, _("Help"));
+
+ SetMenuBar(mb);
+
+ CreateStatusBar();
+ GetStatusBar()->SetStatusText(_("Ready"));
+
+
+ // min size for the frame itself isn't completely done.
+ // see the end up wxFrameManager::Update() for the test
+ // code. For now, just hard code a frame minimum size
+ SetMinSize(wxSize(400,300));
+
+ // create some toolbars
+ wxToolBar* tb1 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+ wxTB_FLAT | wxTB_NODIVIDER);
+ tb1->SetToolBitmapSize(wxSize(48,48));
+ tb1->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
+ tb1->AddSeparator();
+ tb1->AddTool(102, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION));
+ tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION));
+ tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING));
+ tb1->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
+ tb1->Realize();
+
+
+
+ wxToolBar* tb2 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+ wxTB_FLAT | wxTB_NODIVIDER);
+ tb2->SetToolBitmapSize(wxSize(16,16));
+
+ wxBitmap tb2_bmp1 = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16));
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddSeparator();
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddSeparator();
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->AddTool(101, wxT("Test"), tb2_bmp1);
+ tb2->Realize();
+
+
+ wxToolBar* tb3 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+ wxTB_FLAT | wxTB_NODIVIDER);
+ tb3->SetToolBitmapSize(wxSize(16,16));
+ wxBitmap tb3_bmp1 = wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16));
+ tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+ tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+ tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+ tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+ tb3->AddSeparator();
+ tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+ tb3->AddTool(101, wxT("Test"), tb3_bmp1);
+ tb3->Realize();
+
+
+
+ wxToolBar* tb4 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+ wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT);
+ tb4->SetToolBitmapSize(wxSize(16,16));
+ wxBitmap tb4_bmp1 = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16));
+ tb4->AddTool(101, wxT("Item 1"), tb4_bmp1);
+ tb4->AddTool(101, wxT("Item 2"), tb4_bmp1);
+ tb4->AddTool(101, wxT("Item 3"), tb4_bmp1);
+ tb4->AddTool(101, wxT("Item 4"), tb4_bmp1);
+ tb4->AddSeparator();
+ tb4->AddTool(101, wxT("Item 5"), tb4_bmp1);
+ tb4->AddTool(101, wxT("Item 6"), tb4_bmp1);
+ tb4->AddTool(101, wxT("Item 7"), tb4_bmp1);
+ tb4->AddTool(101, wxT("Item 8"), tb4_bmp1);
+ tb4->Realize();
+
+ // create some toolbars
+ wxToolBar* tb5 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
+ wxTB_FLAT | wxTB_NODIVIDER | wxTB_VERTICAL);
+ tb5->SetToolBitmapSize(wxSize(48,48));
+ tb5->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
+ tb5->AddSeparator();
+ tb5->AddTool(102, wxT("Test"), wxArtProvider::GetBitmap(wxART_QUESTION));
+ tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_INFORMATION));
+ tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_WARNING));
+ tb5->AddTool(103, wxT("Test"), wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
+ tb5->Realize();
+
+
+ // add a bunch of panes
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test1")).Caption(wxT("Pane Caption")).
+ Top());
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test2")).Caption(wxT("Client Size Reporter")).
+ Bottom().Position(1));
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test3")).Caption(wxT("Client Size Reporter")).
+ Bottom());
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test4")).Caption(wxT("Pane Caption")).
+ Left());
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test5")).Caption(wxT("Pane Caption")).
+ Right());
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test6")).Caption(wxT("Client Size Reporter")).
+ Right().Row(1));
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test7")).Caption(wxT("Client Size Reporter")).
+ Left().Layer(1));
+
+ m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
+ Name(wxT("test8")).Caption(wxT("Tree Pane")).
+ Left().Layer(1).Position(1));
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test9")).Caption(wxT("Min Size 200x100")).
+ BestSize(wxSize(200,100)).MinSize(wxSize(200,100)).
+ Bottom().Layer(1));
+
+ m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
+ Name(wxT("test10")).Caption(wxT("Text Pane")).
+ Bottom().Layer(1).Position(1));
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("test11")).Caption(wxT("Fixed Pane")).
+ Bottom().Layer(1).Position(2).Fixed());
+
+
+ m_mgr.AddPane(new SettingsPanel(this,this), wxPaneInfo().
+ Name(wxT("settings")).Caption(wxT("Dock Manager Settings")).
+ Dockable(false).Float().Hide());
+
+ // create some center panes
+
+ m_mgr.AddPane(CreateGrid(), wxPaneInfo().Name(wxT("grid_content")).
+ CenterPane().Hide());
+
+ m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().Name(wxT("tree_content")).
+ CenterPane().Hide());
+
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().Name(wxT("sizereport_content")).
+ CenterPane().Hide());
+
+ m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().Name(wxT("text_content")).
+ CenterPane().Hide());
+
+ m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().Name(wxT("html_content")).
+ CenterPane());
+
+ // add the toolbars to the manager
+
+ m_mgr.AddPane(tb1, wxPaneInfo().
+ Name(wxT("tb1")).Caption(wxT("Big Toolbar")).
+ ToolbarPane().Top().
+ LeftDockable(false).RightDockable(false));
+
+ m_mgr.AddPane(tb2, wxPaneInfo().
+ Name(wxT("tb2")).Caption(wxT("Toolbar 2")).
+ ToolbarPane().Top().Row(1).
+ LeftDockable(false).RightDockable(false));
+
+ m_mgr.AddPane(tb3, wxPaneInfo().
+ Name(wxT("tb3")).Caption(wxT("Toolbar 3")).
+ ToolbarPane().Top().Row(1).Position(1).
+ LeftDockable(false).RightDockable(false));
+
+ m_mgr.AddPane(tb4, wxPaneInfo().
+ Name(wxT("tb4")).Caption(wxT("Sample Bookmark Toolbar")).
+ ToolbarPane().Top().Row(2).
+ LeftDockable(false).RightDockable(false));
+
+ m_mgr.AddPane(tb5, wxPaneInfo().
+ Name(wxT("tb4")).Caption(wxT("Sample Vertical Toolbar")).
+ ToolbarPane().Left().
+ GripperTop().
+ TopDockable(false).BottomDockable(false));
+
+ m_mgr.AddPane(new wxButton(this, -1, _("Test Button")),
+ wxPaneInfo().Name(wxT("tb5")).
+ ToolbarPane().Top().Row(2).Position(1).
+ LeftDockable(false).RightDockable(false));
+
+
+
+ // make some default perspectives
+
+ wxString perspective_all = m_mgr.SavePerspective();
+
+ int i, count;
+ wxPaneInfoArray& all_panes = m_mgr.GetAllPanes();
+ for (i = 0, count = all_panes.GetCount(); i < count; ++i)
+ if (!all_panes.Item(i).IsToolbar())
+ all_panes.Item(i).Hide();
+ m_mgr.GetPane(wxT("tb1")).Hide();
+ m_mgr.GetPane(wxT("tb5")).Hide();
+ m_mgr.GetPane(wxT("test8")).Show().Left().Layer(0).Row(0).Position(0);
+ m_mgr.GetPane(wxT("test10")).Show().Bottom().Layer(0).Row(0).Position(0);
+ m_mgr.GetPane(wxT("html_content")).Show();
+ wxString perspective_default = m_mgr.SavePerspective();
+
+ m_perspectives.Add(perspective_default);
+ m_perspectives.Add(perspective_all);
+
+ // "commit" all changes made to wxFrameManager
+ m_mgr.Update();
+}
+
+MyFrame::~MyFrame()
+{
+ m_mgr.UnInit();
+}
+
+wxDockArt* MyFrame::GetDockArt()
+{
+ return m_mgr.GetArtProvider();
+}
+
+void MyFrame::DoUpdate()
+{
+ m_mgr.Update();
+}
+
+
+void MyFrame::OnEraseBackground(wxEraseEvent& event)
+{
+ event.Skip();
+}
+
+void MyFrame::OnSize(wxSizeEvent& event)
+{
+ event.Skip();
+}
+
+void MyFrame::OnSettings(wxCommandEvent& event)
+{
+ // show the settings pane, and float it
+ wxPaneInfo& floating_pane = m_mgr.GetPane(wxT("settings")).Float().Show();
+
+ if (floating_pane.floating_pos == wxDefaultPosition)
+ floating_pane.FloatingPosition(GetStartPosition());
+
+ m_mgr.Update();
+}
+
+
+void MyFrame::OnGradient(wxCommandEvent& event)
+{
+ int gradient = 0;
+
+ switch (event.GetId())
+ {
+ case ID_NoGradient: gradient = wxAUI_GRADIENT_NONE; break;
+ case ID_VerticalGradient: gradient = wxAUI_GRADIENT_VERTICAL; break;
+ case ID_HorizontalGradient: gradient = wxAUI_GRADIENT_HORIZONTAL; break;
+ }
+
+ m_mgr.GetArtProvider()->SetMetric(wxAUI_ART_GRADIENT_TYPE, gradient);
+ m_mgr.Update();
+}
+
+void MyFrame::OnManagerFlag(wxCommandEvent& event)
+{
+ unsigned int flag = 0;
+
+ #ifndef __WXMSW__
+ if (event.GetId() == ID_TransparentDrag ||
+ event.GetId() == ID_TransparentHint ||
+ event.GetId() == ID_TransparentHintFade)
+ {
+ wxMessageBox(wxT("This option is presently only available on wxMSW"));
+ return;
+ }
+ #endif
+
+ switch (event.GetId())
+ {
+ case ID_AllowFloating: flag = wxAUI_MGR_ALLOW_FLOATING; break;
+ case ID_TransparentDrag: flag = wxAUI_MGR_TRANSPARENT_DRAG; break;
+ case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break;
+ case ID_TransparentHintFade: flag = wxAUI_MGR_TRANSPARENT_HINT_FADE; break;
+ case ID_AllowActivePane: flag = wxAUI_MGR_ALLOW_ACTIVE_PANE; break;
+ }
+ m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);
+ m_mgr.Update();
+}
+
+void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
+{
+ unsigned int flags = m_mgr.GetFlags();
+
+ switch (event.GetId())
+ {
+ case ID_NoGradient:
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE ? true : false);
+ break;
+ case ID_VerticalGradient:
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL ? true : false);
+ break;
+ case ID_HorizontalGradient:
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL ? true : false);
+ break;
+ case ID_AllowFloating:
+ event.Check(flags & wxAUI_MGR_ALLOW_FLOATING ? true : false);
+ break;
+ case ID_TransparentDrag:
+ event.Check(flags & wxAUI_MGR_TRANSPARENT_DRAG ? true : false);
+ break;
+ case ID_TransparentHint:
+ event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT ? true : false);
+ break;
+ case ID_TransparentHintFade:
+ event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT_FADE ? true : false);
+ break;
+ }
+}
+
+void MyFrame::OnCreatePerspective(wxCommandEvent& event)
+{
+ wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
+ wxT("wxAUI Test"));
+
+ dlg.SetValue(wxString::Format(wxT("Perspective %d"), m_perspectives.GetCount()+1));
+ if (dlg.ShowModal() != wxID_OK)
+ return;
+
+ if (m_perspectives.GetCount() == 0)
+ {
+ m_perspectives_menu->AppendSeparator();
+ }
+
+ m_perspectives_menu->Append(ID_FirstPerspective + m_perspectives.GetCount(), dlg.GetValue());
+ m_perspectives.Add(m_mgr.SavePerspective());
+}
+
+void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& event)
+{
+ wxString s = m_mgr.SavePerspective();
+
+ if (wxTheClipboard->Open())
+ {
+ wxTheClipboard->SetData(new wxTextDataObject(s));
+ wxTheClipboard->Close();
+ }
+}
+
+void MyFrame::OnRestorePerspective(wxCommandEvent& event)
+{
+ m_mgr.LoadPerspective(m_perspectives.Item(event.GetId() - ID_FirstPerspective));
+}
+
+
+wxPoint MyFrame::GetStartPosition()
+{
+ static int x = 0;
+ x += 20;
+ wxPoint pt = ClientToScreen(wxPoint(0,0));
+ return wxPoint(pt.x + x, pt.y + x);
+}
+
+void MyFrame::OnCreateTree(wxCommandEvent& event)
+{
+ m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
+ Name(wxT("Test")).Caption(wxT("Tree Control")).
+ Float().FloatingPosition(GetStartPosition()).
+ FloatingSize(wxSize(150,300)));
+ m_mgr.Update();
+}
+
+void MyFrame::OnCreateGrid(wxCommandEvent& event)
+{
+ m_mgr.AddPane(CreateGrid(), wxPaneInfo().
+ Name(wxT("Test")).Caption(wxT("Grid")).
+ Float().FloatingPosition(GetStartPosition()).
+ FloatingSize(wxSize(300,200)));
+ m_mgr.Update();
+}
+
+void MyFrame::OnCreateHTML(wxCommandEvent& event)
+{
+ m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
+ Name(wxT("Test")).Caption(wxT("Grid")).
+ Float().FloatingPosition(GetStartPosition()).
+ FloatingSize(wxSize(300,200)));
+ m_mgr.Update();
+}
+
+void MyFrame::OnCreateText(wxCommandEvent& event)
+{
+ m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
+ Name(wxT("Test")).Caption(wxT("Text Control")).
+ Float().FloatingPosition(GetStartPosition()));
+ m_mgr.Update();
+}
+
+void MyFrame::OnCreateSizeReport(wxCommandEvent& event)
+{
+ m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
+ Name(wxT("Test")).Caption(wxT("Client Size Reporter")).
+ Float().FloatingPosition(GetStartPosition()));
+ m_mgr.Update();
+}
+
+void MyFrame::OnChangeContentPane(wxCommandEvent& event)
+{
+ m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent ? true:false);
+ m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent ? true:false);
+ m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent ? true:false);
+ m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent ? true:false);
+ m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent ? true:false);
+ m_mgr.Update();
+}
+
+void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+ Close(true);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+ wxMessageBox(_("wxAUI Demo\nAn advanced window management library for wxWidgets\n(c) Copyright 2005-2006, Kirix Corporation"), _("About wxAUI Demo"), wxOK, this);
+}
+
+wxTextCtrl* MyFrame::CreateTextCtrl()
+{
+ wxString text;
+ static int n = 0;
+
+ text.Printf(wxT("This is text box %d"), ++n);
+
+ return new wxTextCtrl(this,-1, text,
+ wxPoint(0,0), wxSize(150,90),
+ wxNO_BORDER | wxTE_MULTILINE);
+}
+
+
+wxGrid* MyFrame::CreateGrid()
+{
+ wxGrid* grid = new wxGrid(this, -1,
+ wxPoint(0,0),
+ wxSize(150,250),
+ wxNO_BORDER | wxWANTS_CHARS);
+ grid->CreateGrid(50, 20);
+ return grid;
+}
+
+wxTreeCtrl* MyFrame::CreateTreeCtrl()
+{
+ wxTreeCtrl* tree = new wxTreeCtrl(this, -1,
+ wxPoint(0,0), wxSize(160,250),
+ wxTR_DEFAULT_STYLE | wxNO_BORDER);
+
+ wxTreeItemId root = tree->AddRoot(wxT("wxAUI Project"));
+ wxArrayTreeItemIds items;
+
+
+ wxImageList* imglist = new wxImageList(16, 16, true, 2);
+ imglist->Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16)));
+ imglist->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16)));
+ tree->AssignImageList(imglist);
+
+ items.Add(tree->AppendItem(root, wxT("Item 1"), 0));
+ items.Add(tree->AppendItem(root, wxT("Item 2"), 0));
+ items.Add(tree->AppendItem(root, wxT("Item 3"), 0));
+ items.Add(tree->AppendItem(root, wxT("Item 4"), 0));
+ items.Add(tree->AppendItem(root, wxT("Item 5"), 0));
+
+
+ int i, count;
+ for (i = 0, count = items.Count(); i < count; ++i)
+ {
+ wxTreeItemId id = items.Item(i);
+ tree->AppendItem(id, wxT("Subitem 1"), 1);
+ tree->AppendItem(id, wxT("Subitem 2"), 1);
+ tree->AppendItem(id, wxT("Subitem 3"), 1);
+ tree->AppendItem(id, wxT("Subitem 4"), 1);
+ tree->AppendItem(id, wxT("Subitem 5"), 1);
+ }
+
+
+ tree->Expand(root);
+
+ return tree;
+}
+
+wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
+{
+ wxSizeReportCtrl* ctrl = new wxSizeReportCtrl(this, -1,
+ wxDefaultPosition,
+ wxSize(width, height), &m_mgr);
+ return ctrl;
+}
+
+wxHtmlWindow* MyFrame::CreateHTMLCtrl()
+{
+ wxHtmlWindow* ctrl = new wxHtmlWindow(this, -1,
+ wxDefaultPosition,
+ wxSize(400,300));
+ ctrl->SetPage(GetIntroText());
+ return ctrl;
+}
+
+
+wxString MyFrame::GetIntroText()
+{
+ const char* text =
+ ""
+ "Welcome to wxAUI 0.9.2
"
+ "
Overview
"
+ "wxAUI is an Advanced User Interface library for the wxWidgets toolkit "
+ "that allows developers to create high-quality, cross-platform user "
+ "interfaces quickly and easily.
"
+ "Features
"
+ "With wxAUI version 0.9.2, developers can create application frameworks with:
"
+ ""
+ "- Native, dockable floating frames
"
+ "- Perspective saving and loading
"
+ "- Native toolbars incorporating real-time, "spring-loaded" dragging
"
+ "- Customizable floating/docking behavior
"
+ "- Completely customizable look-and-feel
"
+ "- Optional transparent window effects (while dragging or docking)
"
+ "
"
+ "What's new in 0.9.2?
"
+ "The following features/fixes have been added since the last version of wxAUI:
"
+ ""
+ "- Support for wxMac
"
+ "- Updates for wxWidgets 2.6.3
"
+ "- Fix to pass more unused events through
"
+ "- Fix to allow floating windows to receive idle events
"
+ "- Fix for minimizing/maximizing problem with transparent hint pane
"
+ "- Fix to not paint empty hint rectangles
"
+ "- Fix for 64-bit compilation
"
+ "
"
+ "What changed in 0.9.1?
"
+ "The following features/fixes were added in wxAUI 0.9.1:
"
+ ""
+ "- Support for MDI frames
"
+ "- Gradient captions option
"
+ "- Active/Inactive panes option
"
+ "- Fix for screen artifacts/paint problems
"
+ "- Fix for hiding/showing floated window problem
"
+ "- Fix for floating pane sizing problem
"
+ "- Fix for drop position problem when dragging around center pane margins
"
+ "- LF-only text file formatting for source code
"
+ "
"
+ "See README.txt for more information.
"
+ "";
+
+ return wxString::FromAscii(text);
+}
diff --git a/samples/aui/auidemo.dsp b/samples/aui/auidemo.dsp
new file mode 100644
index 0000000000..8656f6d4d0
--- /dev/null
+++ b/samples/aui/auidemo.dsp
@@ -0,0 +1,480 @@
+# Microsoft Developer Studio Project File - Name="auidemo" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=auidemo - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "auidemo.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "auidemo.mak" CFG="auidemo - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "auidemo - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 DLL Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 DLL Debug" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Unicode Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Unicode Debug" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "auidemo - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "auidemo - Win32 DLL Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswunivudll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswunivudll"
+# PROP Intermediate_Dir "vc_mswunivudll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27u_aui.lib wxmswuniv27u_html.lib wxmswuniv27u_adv.lib wxmswuniv27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27u_aui.lib wxmswuniv27u_html.lib wxmswuniv27u_adv.lib wxmswuniv27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 DLL Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivuddll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivuddll"
+# PROP Intermediate_Dir "vc_mswunivuddll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27ud_aui.lib wxmswuniv27ud_html.lib wxmswuniv27ud_adv.lib wxmswuniv27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27ud_aui.lib wxmswuniv27ud_html.lib wxmswuniv27ud_adv.lib wxmswuniv27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 DLL Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswunivdll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswunivdll"
+# PROP Intermediate_Dir "vc_mswunivdll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27_aui.lib wxmswuniv27_html.lib wxmswuniv27_adv.lib wxmswuniv27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27_aui.lib wxmswuniv27_html.lib wxmswuniv27_adv.lib wxmswuniv27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 DLL Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivddll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivddll"
+# PROP Intermediate_Dir "vc_mswunivddll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27d_aui.lib wxmswuniv27d_html.lib wxmswuniv27d_adv.lib wxmswuniv27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv27d_aui.lib wxmswuniv27d_html.lib wxmswuniv27d_adv.lib wxmswuniv27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 DLL Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswudll"
+# PROP BASE Intermediate_Dir "vc_mswudll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswudll"
+# PROP Intermediate_Dir "vc_mswudll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27u_aui.lib wxmsw27u_html.lib wxmsw27u_adv.lib wxmsw27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27u_aui.lib wxmsw27u_html.lib wxmsw27u_adv.lib wxmsw27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 DLL Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswuddll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswuddll"
+# PROP Intermediate_Dir "vc_mswuddll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27ud_aui.lib wxmsw27ud_html.lib wxmsw27ud_adv.lib wxmsw27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27ud_aui.lib wxmsw27ud_html.lib wxmsw27ud_adv.lib wxmsw27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswdll"
+# PROP BASE Intermediate_Dir "vc_mswdll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswdll"
+# PROP Intermediate_Dir "vc_mswdll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27_aui.lib wxmsw27_html.lib wxmsw27_adv.lib wxmsw27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27_aui.lib wxmsw27_html.lib wxmsw27_adv.lib wxmsw27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswddll"
+# PROP BASE Intermediate_Dir "vc_mswddll\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswddll"
+# PROP Intermediate_Dir "vc_mswddll\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27d_aui.lib wxmsw27d_html.lib wxmsw27d_adv.lib wxmsw27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw27d_aui.lib wxmsw27d_html.lib wxmsw27d_adv.lib wxmsw27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Universal Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswunivu"
+# PROP BASE Intermediate_Dir "vc_mswunivu\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswunivu"
+# PROP Intermediate_Dir "vc_mswunivu\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27u_aui.lib wxmswuniv27u_html.lib wxmswuniv27u_adv.lib wxmswuniv27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27u_aui.lib wxmswuniv27u_html.lib wxmswuniv27u_adv.lib wxmswuniv27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Universal Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivud"
+# PROP BASE Intermediate_Dir "vc_mswunivud\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivud"
+# PROP Intermediate_Dir "vc_mswunivud\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27ud_aui.lib wxmswuniv27ud_html.lib wxmswuniv27ud_adv.lib wxmswuniv27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27ud_aui.lib wxmswuniv27ud_html.lib wxmswuniv27ud_adv.lib wxmswuniv27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswuniv"
+# PROP BASE Intermediate_Dir "vc_mswuniv\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswuniv"
+# PROP Intermediate_Dir "vc_mswuniv\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27_aui.lib wxmswuniv27_html.lib wxmswuniv27_adv.lib wxmswuniv27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswuniv\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27_aui.lib wxmswuniv27_html.lib wxmswuniv27_adv.lib wxmswuniv27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswuniv\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivd"
+# PROP BASE Intermediate_Dir "vc_mswunivd\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivd"
+# PROP Intermediate_Dir "vc_mswunivd\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv27d_aui.lib wxmswuniv27d_html.lib wxmswuniv27d_adv.lib wxmswuniv27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv27d_aui.lib wxmswuniv27d_html.lib wxmswuniv27d_adv.lib wxmswuniv27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Unicode Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_mswu"
+# PROP BASE Intermediate_Dir "vc_mswu\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_mswu"
+# PROP Intermediate_Dir "vc_mswu\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27u_aui.lib wxmsw27u_html.lib wxmsw27u_adv.lib wxmsw27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27u_aui.lib wxmsw27u_html.lib wxmsw27u_adv.lib wxmsw27u_core.lib wxbase27u_xml.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Unicode Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswud"
+# PROP BASE Intermediate_Dir "vc_mswud\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswud"
+# PROP Intermediate_Dir "vc_mswud\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27ud_aui.lib wxmsw27ud_html.lib wxmsw27ud_adv.lib wxmsw27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27ud_aui.lib wxmsw27ud_html.lib wxmsw27ud_adv.lib wxmsw27ud_core.lib wxbase27ud_xml.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "vc_msw"
+# PROP BASE Intermediate_Dir "vc_msw\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "vc_msw"
+# PROP Intermediate_Dir "vc_msw\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Fdvc_msw\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27_aui.lib wxmsw27_html.lib wxmsw27_adv.lib wxmsw27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_msw\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27_aui.lib wxmsw27_html.lib wxmsw27_adv.lib wxmsw27_core.lib wxbase27_xml.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_msw\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "auidemo - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswd"
+# PROP BASE Intermediate_Dir "vc_mswd\auidemo"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswd"
+# PROP Intermediate_Dir "vc_mswd\auidemo"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw27d_aui.lib wxmsw27d_html.lib wxmsw27d_adv.lib wxmsw27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw27d_aui.lib wxmsw27d_html.lib wxmsw27d_adv.lib wxmsw27d_core.lib wxbase27d_xml.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ENDIF
+
+# Begin Target
+
+# Name "auidemo - Win32 DLL Universal Unicode Release"
+# Name "auidemo - Win32 DLL Universal Unicode Debug"
+# Name "auidemo - Win32 DLL Universal Release"
+# Name "auidemo - Win32 DLL Universal Debug"
+# Name "auidemo - Win32 DLL Unicode Release"
+# Name "auidemo - Win32 DLL Unicode Debug"
+# Name "auidemo - Win32 DLL Release"
+# Name "auidemo - Win32 DLL Debug"
+# Name "auidemo - Win32 Universal Unicode Release"
+# Name "auidemo - Win32 Universal Unicode Debug"
+# Name "auidemo - Win32 Universal Release"
+# Name "auidemo - Win32 Universal Debug"
+# Name "auidemo - Win32 Unicode Release"
+# Name "auidemo - Win32 Unicode Debug"
+# Name "auidemo - Win32 Release"
+# Name "auidemo - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\auidemo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\..\..\samples\sample.rc
+# End Source File
+# End Group
+# End Target
+# End Project
+
diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc
new file mode 100644
index 0000000000..e57d91723f
--- /dev/null
+++ b/samples/aui/makefile.bcc
@@ -0,0 +1,241 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 27
+OBJS = \
+ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+AUIDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH \
+ $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS = \
+ $(OBJS)\auidemo_auidemo.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\auidemo.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
+ -if exist $(OBJS)\auidemo.tds del $(OBJS)\auidemo.tds
+ -if exist $(OBJS)\auidemo.ilc del $(OBJS)\auidemo.ilc
+ -if exist $(OBJS)\auidemo.ild del $(OBJS)\auidemo.ild
+ -if exist $(OBJS)\auidemo.ilf del $(OBJS)\auidemo.ilf
+ -if exist $(OBJS)\auidemo.ils del $(OBJS)\auidemo.ils
+
+$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
+ ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
+ c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res
+|
+
+$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
+
+$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp
+ $(CXX) -q -c -P -o$@ $(AUIDEMO_CXXFLAGS) $**
+
diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc
new file mode 100644
index 0000000000..f424b22353
--- /dev/null
+++ b/samples/aui/makefile.gcc
@@ -0,0 +1,239 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 27
+OBJS = \
+ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+AUIDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+ -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+ -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+ $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS = \
+ $(OBJS)\auidemo_sample_rc.o \
+ $(OBJS)\auidemo_auidemo.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+WXDEBUGFLAG = d
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_AUI_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\auidemo.exe
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
+
+$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o
+ $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+
+$(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
+
+$(OBJS)\auidemo_auidemo.o: ./auidemo.cpp
+ $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc
new file mode 100644
index 0000000000..a2a4bae946
--- /dev/null
+++ b/samples/aui/makefile.vc
@@ -0,0 +1,316 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 27
+OBJS = \
+ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = .\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(____DEBUGRUNTIME_2_p) \
+ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+ /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
+ /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
+ $(CXXFLAGS)
+AUIDEMO_OBJECTS = \
+ $(OBJS)\auidemo_sample.res \
+ $(OBJS)\auidemo_auidemo.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_3 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_4 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_4 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_7 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_7 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_9 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_9 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_10 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_10 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\auidemo.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
+ -if exist $(OBJS)\auidemo.ilk del $(OBJS)\auidemo.ilk
+ -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb
+
+$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
+ link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+ $(AUIDEMO_OBJECTS) $(__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) $(__UNICOWS_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
+<<
+
+$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
+
+$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) $**
+
diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat
new file mode 100644
index 0000000000..c5f7a0af4c
--- /dev/null
+++ b/samples/aui/makefile.wat
@@ -0,0 +1,273 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+! loaddll wcc wccd
+! loaddll wccaxp wccdaxp
+! loaddll wcc386 wccd386
+! loaddll wpp wppdi86
+! loaddll wppaxp wppdaxp
+! loaddll wpp386 wppd386
+! loaddll wlink wlink
+! loaddll wlib wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+WXDEBUGFLAG = d
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE =
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 =
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 =
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 =
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 =
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 =
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 =
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_AUI_p =
+!ifeq MONOLITHIC 0
+__WXLIB_AUI_p = &
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!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_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
+__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
+__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
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 27
+OBJS = &
+ wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+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) &
+ $(__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=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
+ $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS = &
+ $(OBJS)\auidemo_auidemo.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\auidemo.exe
+
+clean : .SYMBOLIC
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -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
+
+$(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
+ @%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 $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+ @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) 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 () 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) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+
+$(OBJS)\auidemo_auidemo.obj : .AUTODEPEND .\auidemo.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $<
+
diff --git a/setup.h.in b/setup.h.in
index e5187bf6cd..a87a6ddc1e 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -289,6 +289,7 @@
# define wxUSE_XML 0
#endif
+#define wxUSE_AUI 0
#define wxUSE_CONTROLS 0
diff --git a/setup.h_vms b/setup.h_vms
index 74fad9693f..29e6c67e8b 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -304,6 +304,7 @@ typedef pid_t GPid;
# define wxUSE_XML 1
#endif
+#define wxUSE_AUI 0
#define wxUSE_CONTROLS 1
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
new file mode 100644
index 0000000000..2890dbd432
--- /dev/null
+++ b/src/aui/dockart.cpp
@@ -0,0 +1,548 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: dockart.cpp
+// Purpose: wxaui: wx advanced user interface - docking window manager
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-05-17
+// RCS-ID:
+// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_AUI
+
+#include "wx/image.h"
+#include "wx/aui/framemanager.h"
+#include "wx/aui/dockart.h"
+
+#ifndef WX_PRECOMP
+// #include "wx/log.h"
+#endif
+
+// -- wxDefaultDockArt class implementation --
+
+// wxDefaultDockArt is an art provider class which does all of the drawing for
+// wxFrameManager. This allows the library caller to customize the dock art
+// (probably by deriving from this class), or to completely replace all drawing
+// with custom dock art (probably by writing a new stand-alone class derived
+// from the wxDockArt base class). The active dock art class can be set via
+// wxFrameManager::SetDockArt()
+
+
+// StepColour() it a utility function that simply darkens
+// or lightens a color, based on the specified percentage
+static wxColor StepColour(const wxColor& c, int percent)
+{
+ int r = c.Red(), g = c.Green(), b = c.Blue();
+ return wxColour(wxMin((r*percent)/100,255),
+ wxMin((g*percent)/100,255),
+ wxMin((b*percent)/100,255));
+}
+
+static wxColor LightContrastColour(const wxColour& c)
+{
+ int amount = 120;
+
+ // if the color is especially dark, then
+ // make the contrast even lighter
+ if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128)
+ amount = 160;
+
+ return StepColour(c, amount);
+}
+
+// BitmapFromBits() is a utility function that creates a
+// masked bitmap from raw bits (XBM format)
+static wxBitmap BitmapFromBits(const unsigned char bits[], int w, int h,
+ const wxColour& color)
+{
+ wxImage img = wxBitmap((const char*)bits, w, h).ConvertToImage();
+ img.Replace(255,255,255,123,123,123);
+ img.Replace(0,0,0,color.Red(),color.Green(),color.Blue());
+ img.SetMaskColour(123,123,123);
+ return wxBitmap(img);
+}
+
+
+static void DrawGradientRectangle(wxDC& dc,
+ const wxRect& rect,
+ const wxColour& start_color,
+ const wxColour& end_color,
+ int direction)
+{
+ int rd, gd, bd, high = 0;
+ rd = end_color.Red() - start_color.Red();
+ gd = end_color.Green() - start_color.Green();
+ bd = end_color.Blue() - start_color.Blue();
+
+ if (direction == wxAUI_GRADIENT_VERTICAL)
+ high = rect.GetHeight()-1;
+ else
+ high = rect.GetWidth()-1;
+
+ for (int i = 0; i <= high; ++i)
+ {
+ int r = start_color.Red() + ((i*rd*100)/high)/100;
+ int g = start_color.Green() + ((i*gd*100)/high)/100;
+ int b = start_color.Blue() + ((i*bd*100)/high)/100;
+
+ wxPen p(wxColor(r,g,b));
+ dc.SetPen(p);
+
+ if (direction == wxAUI_GRADIENT_VERTICAL)
+ dc.DrawLine(rect.x, rect.y+i, rect.x+rect.width, rect.y+i);
+ else
+ dc.DrawLine(rect.x+i, rect.y, rect.x+i, rect.y+rect.height);
+ }
+
+}
+
+wxDefaultDockArt::wxDefaultDockArt()
+{
+#ifdef __WXMAC__
+ wxBrush toolbarbrush;
+ toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground );
+ wxColor base_color = toolbarbrush.GetColour();
+#else
+ wxColor base_color = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+#endif
+
+ wxColor darker1_color = StepColour(base_color, 85);
+ wxColor darker2_color = StepColour(base_color, 70);
+ wxColor darker3_color = StepColour(base_color, 60);
+ wxColor darker4_color = StepColour(base_color, 50);
+ wxColor darker5_color = StepColour(base_color, 40);
+
+ m_active_caption_colour = LightContrastColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+ m_active_caption_gradient_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+ m_active_caption_text_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ m_inactive_caption_colour = StepColour(darker1_color, 80);
+ m_inactive_caption_gradient_colour = darker1_color;
+ m_inactive_caption_text_colour = *wxBLACK;
+
+#ifdef __WXMAC__
+ m_sash_brush = toolbarbrush;
+ m_background_brush = toolbarbrush;
+ m_gripper_brush = toolbarbrush;
+#else
+ m_sash_brush = wxBrush(base_color);
+ m_background_brush = wxBrush(base_color);
+ m_gripper_brush = wxBrush(base_color);
+#endif
+ m_border_pen = wxPen(darker2_color);
+ m_gripper_pen1 = wxPen(darker5_color);
+ m_gripper_pen2 = wxPen(darker3_color);
+ m_gripper_pen3 = *wxWHITE_PEN;
+
+#ifdef __WXMAC__
+ m_caption_font = *wxSMALL_FONT;
+#else
+ m_caption_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE);
+#endif
+
+ // some built in bitmaps
+#ifdef __WXMAC__
+ static unsigned char close_bits[]={
+ 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
+ 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
+ 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
+#else
+ static unsigned char close_bits[]={
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xfb,0xcf,0xf9,
+ 0x9f,0xfc,0x3f,0xfe,0x3f,0xfe,0x9f,0xfc,0xcf,0xf9,0xef,0xfb,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
+#endif
+
+ static unsigned char pin_bits[]={
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0xdf,0xfc,0xdf,0xfc,
+ 0xdf,0xfc,0xdf,0xfc,0xdf,0xfc,0x0f,0xf8,0x7f,0xff,0x7f,0xff,
+ 0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
+
+#ifdef __WXMAC__
+ m_inactive_close_bitmap = BitmapFromBits(close_bits, 16, 16, *wxWHITE);
+#else
+ m_inactive_close_bitmap = BitmapFromBits(close_bits, 16, 16, m_inactive_caption_text_colour);
+#endif
+ m_inactive_pin_bitmap = BitmapFromBits(pin_bits, 16, 16, m_inactive_caption_text_colour);
+#ifdef __WXMAC__
+ m_active_close_bitmap = BitmapFromBits(close_bits, 16, 16, *wxWHITE );
+#else
+ m_active_close_bitmap = BitmapFromBits(close_bits, 16, 16, m_active_caption_text_colour);
+#endif
+ m_active_pin_bitmap = BitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour);
+
+ // default metric values
+#ifdef __WXMAC__
+ SInt32 height;
+ GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height );
+ m_sash_size = height;
+#else
+ m_sash_size = 4;
+#endif
+ m_caption_size = 17;
+ m_border_size = 1;
+ m_button_size = 14;
+ m_gripper_size = 9;
+ m_gradient_type = wxAUI_GRADIENT_VERTICAL;
+}
+
+int wxDefaultDockArt::GetMetric(int id)
+{
+ switch (id)
+ {
+ case wxAUI_ART_SASH_SIZE: return m_sash_size;
+ case wxAUI_ART_CAPTION_SIZE: return m_caption_size;
+ case wxAUI_ART_GRIPPER_SIZE: return m_gripper_size;
+ case wxAUI_ART_PANE_BORDER_SIZE: return m_border_size;
+ case wxAUI_ART_PANE_BUTTON_SIZE: return m_button_size;
+ case wxAUI_ART_GRADIENT_TYPE: return m_gradient_type;
+ default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
+ }
+
+ return 0;
+}
+
+void wxDefaultDockArt::SetMetric(int id, int new_val)
+{
+ switch (id)
+ {
+ case wxAUI_ART_SASH_SIZE: m_sash_size = new_val; break;
+ case wxAUI_ART_CAPTION_SIZE: m_caption_size = new_val; break;
+ case wxAUI_ART_GRIPPER_SIZE: m_gripper_size = new_val; break;
+ case wxAUI_ART_PANE_BORDER_SIZE: m_border_size = new_val; break;
+ case wxAUI_ART_PANE_BUTTON_SIZE: m_button_size = new_val; break;
+ case wxAUI_ART_GRADIENT_TYPE: m_gradient_type = new_val; break;
+ default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
+ }
+}
+
+wxColour wxDefaultDockArt::GetColour(int id)
+{
+ switch (id)
+ {
+ case wxAUI_ART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); break;
+ case wxAUI_ART_SASH_COLOUR: return m_sash_brush.GetColour(); break;
+ case wxAUI_ART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; break;
+ case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; break;
+ case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; break;
+ case wxAUI_ART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; break;
+ case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; break;
+ case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; break;
+ case wxAUI_ART_BORDER_COLOUR: return m_border_pen.GetColour(); break;
+ case wxAUI_ART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); break;
+ default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
+ }
+
+ return wxColour();
+}
+
+void wxDefaultDockArt::SetColour(int id, const wxColor& colour)
+{
+ switch (id)
+ {
+ case wxAUI_ART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break;
+ case wxAUI_ART_SASH_COLOUR: m_sash_brush.SetColour(colour); break;
+ case wxAUI_ART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break;
+ case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break;
+ case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break;
+ case wxAUI_ART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break;
+ case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break;
+ case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break;
+ case wxAUI_ART_BORDER_COLOUR: m_border_pen.SetColour(colour); break;
+ case wxAUI_ART_GRIPPER_COLOUR:
+ m_gripper_brush.SetColour(colour);
+ m_gripper_pen1.SetColour(StepColour(colour, 40));
+ m_gripper_pen2.SetColour(StepColour(colour, 60));
+ break;
+ default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
+ }
+}
+
+void wxDefaultDockArt::SetFont(int id, const wxFont& font)
+{
+ if (id == wxAUI_ART_CAPTION_FONT)
+ m_caption_font = font;
+}
+
+wxFont wxDefaultDockArt::GetFont(int id)
+{
+ if (id == wxAUI_ART_CAPTION_FONT)
+ return m_caption_font;
+ return wxNullFont;
+}
+
+void wxDefaultDockArt::DrawSash(wxDC& dc, int, const wxRect& rect)
+{
+#ifdef __WXMAC__
+ HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height );
+ CGContextRef cgContext ;
+#if wxMAC_USE_CORE_GRAPHICS
+ cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext() ;
+#else
+ Rect bounds ;
+ GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
+ QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
+ CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
+ CGContextScaleCTM( cgContext , 1 , -1 ) ;
+#endif
+
+ HIThemeSplitterDrawInfo drawInfo ;
+ drawInfo.version = 0 ;
+ drawInfo.state = kThemeStateActive ;
+ drawInfo.adornment = kHIThemeSplitterAdornmentNone ;
+ HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;
+
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+ QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
+#endif
+
+#else
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.SetBrush(m_sash_brush);
+ dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+#endif
+}
+
+
+void wxDefaultDockArt::DrawBackground(wxDC& dc, int, const wxRect& rect)
+{
+ dc.SetPen(*wxTRANSPARENT_PEN);
+#ifdef __WXMAC__
+ // we have to clear first, otherwise we are drawing a light striped pattern
+ // over an already darker striped background
+ dc.SetBrush(*wxWHITE_BRUSH) ;
+ dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+#endif
+ dc.SetBrush(m_background_brush);
+ dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+}
+
+void wxDefaultDockArt::DrawBorder(wxDC& dc, const wxRect& _rect,
+ wxPaneInfo& pane)
+{
+ dc.SetPen(m_border_pen);
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+
+ wxRect rect = _rect;
+ int i, border_width = GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
+
+ if (pane.IsToolbar())
+ {
+ for (i = 0; i < border_width; ++i)
+ {
+ dc.SetPen(*wxWHITE_PEN);
+ dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y);
+ dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height);
+ dc.SetPen(m_border_pen);
+ dc.DrawLine(rect.x, rect.y+rect.height-1,
+ rect.x+rect.width, rect.y+rect.height-1);
+ dc.DrawLine(rect.x+rect.width-1, rect.y,
+ rect.x+rect.width-1, rect.y+rect.height);
+ rect.Deflate(1);
+ }
+ }
+ else
+ {
+ for (i = 0; i < border_width; ++i)
+ {
+ dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+ rect.Deflate(1);
+ }
+ }
+}
+
+
+void wxDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active)
+{
+ if (m_gradient_type == wxAUI_GRADIENT_NONE)
+ {
+ if (active)
+ dc.SetBrush(wxBrush(m_active_caption_colour));
+ else
+ dc.SetBrush(wxBrush(m_inactive_caption_colour));
+
+ dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ if (active)
+ {
+ // on mac the gradients are expected to become darker from the top
+#ifdef __WXMAC__
+ DrawGradientRectangle(dc, rect,
+ m_active_caption_gradient_colour,
+ m_active_caption_colour,
+ m_gradient_type);
+#else
+ DrawGradientRectangle(dc, rect,
+ m_active_caption_colour,
+ m_active_caption_gradient_colour,
+ m_gradient_type);
+#endif
+ }
+ else
+ {
+ // on mac the gradients are expected to become darker from the top
+#ifdef __WXMAC__
+ DrawGradientRectangle(dc, rect,
+ m_inactive_caption_gradient_colour,
+ m_inactive_caption_colour,
+ m_gradient_type);
+#else
+ DrawGradientRectangle(dc, rect,
+ m_inactive_caption_colour,
+ m_inactive_caption_gradient_colour,
+ m_gradient_type);
+#endif
+ }
+ }
+}
+
+
+void wxDefaultDockArt::DrawCaption(wxDC& dc,
+ const wxString& text,
+ const wxRect& rect,
+ wxPaneInfo& pane)
+{
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.SetFont(m_caption_font);
+
+ DrawCaptionBackground(dc, rect,
+ (pane.state & wxPaneInfo::optionActive)?true:false);
+
+ if (pane.state & wxPaneInfo::optionActive)
+ dc.SetTextForeground(m_active_caption_text_colour);
+ else
+ dc.SetTextForeground(m_inactive_caption_text_colour);
+
+
+ wxCoord w,h;
+ dc.GetTextExtent(wxT("ABCDEFHXfgkj"), &w, &h);
+
+ dc.SetClippingRegion(rect);
+ dc.DrawText(text, rect.x+3, rect.y+(rect.height/2)-(h/2)-1);
+ dc.DestroyClippingRegion();
+}
+
+void wxDefaultDockArt::DrawGripper(wxDC& dc,
+ const wxRect& rect,
+ wxPaneInfo& pane)
+{
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.SetBrush(m_gripper_brush);
+
+ dc.DrawRectangle(rect.x, rect.y, rect.width,rect.height);
+
+ if (!pane.HasGripperTop())
+ {
+ int y = 5;
+ while (1)
+ {
+ dc.SetPen(m_gripper_pen1);
+ dc.DrawPoint(rect.x+3, rect.y+y);
+ dc.SetPen(m_gripper_pen2);
+ dc.DrawPoint(rect.x+3, rect.y+y+1);
+ dc.DrawPoint(rect.x+4, rect.y+y);
+ dc.SetPen(m_gripper_pen3);
+ dc.DrawPoint(rect.x+5, rect.y+y+1);
+ dc.DrawPoint(rect.x+5, rect.y+y+2);
+ dc.DrawPoint(rect.x+4, rect.y+y+2);
+
+ y += 4;
+ if (y > rect.GetHeight()-5)
+ break;
+ }
+ }
+ else
+ {
+ int x = 5;
+ while (1)
+ {
+ dc.SetPen(m_gripper_pen1);
+ dc.DrawPoint(rect.x+x, rect.y+3);
+ dc.SetPen(m_gripper_pen2);
+ dc.DrawPoint(rect.x+x+1, rect.y+3);
+ dc.DrawPoint(rect.x+x, rect.y+4);
+ dc.SetPen(m_gripper_pen3);
+ dc.DrawPoint(rect.x+x+1, rect.y+5);
+ dc.DrawPoint(rect.x+x+2, rect.y+5);
+ dc.DrawPoint(rect.x+x+2, rect.y+4);
+
+ x += 4;
+ if (x > rect.GetWidth()-5)
+ break;
+ }
+ }
+}
+
+void wxDefaultDockArt::DrawPaneButton(wxDC& dc,
+ int button,
+ int button_state,
+ const wxRect& _rect,
+ wxPaneInfo& pane)
+{
+ wxRect rect = _rect;
+
+ if (button_state == wxAUI_BUTTON_STATE_PRESSED)
+ {
+ rect.x++;
+ rect.y++;
+ }
+
+ if (button_state == wxAUI_BUTTON_STATE_HOVER ||
+ button_state == wxAUI_BUTTON_STATE_PRESSED)
+ {
+ if (pane.state & wxPaneInfo::optionActive)
+ {
+ dc.SetBrush(wxBrush(StepColour(m_active_caption_colour, 120)));
+ dc.SetPen(wxPen(StepColour(m_active_caption_colour, 70)));
+ }
+ else
+ {
+ dc.SetBrush(wxBrush(StepColour(m_inactive_caption_colour, 120)));
+ dc.SetPen(wxPen(StepColour(m_inactive_caption_colour, 70)));
+ }
+
+ // draw the background behind the button
+ dc.DrawRectangle(rect.x, rect.y, 15, 15);
+ }
+
+ wxBitmap bmp;
+ switch (button)
+ {
+ default:
+ case wxPaneInfo::buttonClose:
+ if (pane.state & wxPaneInfo::optionActive)
+ bmp = m_active_close_bitmap;
+ else
+ bmp = m_inactive_close_bitmap;
+ break;
+ case wxPaneInfo::buttonPin:
+ if (pane.state & wxPaneInfo::optionActive)
+ bmp = m_active_pin_bitmap;
+ else
+ bmp = m_inactive_pin_bitmap;
+ break;
+ }
+
+ // draw the button itself
+ dc.DrawBitmap(bmp, rect.x, rect.y, true);
+}
+
+
+#endif // wxUSE_AUI
diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
new file mode 100644
index 0000000000..13cba0343b
--- /dev/null
+++ b/src/aui/floatpane.cpp
@@ -0,0 +1,215 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: floatpane.cpp
+// Purpose: wxaui: wx advanced user interface - docking window manager
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-05-17
+// RCS-ID:
+// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_AUI
+
+#include "wx/aui/framemanager.h"
+#include "wx/aui/floatpane.h"
+#include "wx/aui/dockart.h"
+
+#ifndef WX_PRECOMP
+// #include "wx/log.h"
+#endif
+
+wxFloatingPane::wxFloatingPane(wxWindow* parent,
+ wxFrameManager* owner_mgr,
+ wxWindowID id /*= -1*/,
+ const wxPoint& pos /*= wxDefaultPosition*/,
+ const wxSize& size /*= wxDefaultSize*/)
+ : wxFloatingPaneBaseClass(parent, id, wxT(""), pos, size,
+ wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
+ wxCLOSE_BOX | wxFRAME_NO_TASKBAR |
+ wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN)
+{
+ m_owner_mgr = owner_mgr;
+ m_moving = false;
+ m_last_rect = wxRect();
+ m_mgr.SetFrame(this);
+ SetExtraStyle(wxWS_EX_PROCESS_IDLE);
+}
+
+wxFloatingPane::~wxFloatingPane()
+{
+ m_mgr.UnInit();
+}
+
+void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
+{
+ m_pane_window = pane.window;
+ m_pane_window->Reparent(this);
+
+ wxPaneInfo contained_pane = pane;
+ contained_pane.Dock().Center().Show().
+ CaptionVisible(false).
+ PaneBorder(false).
+ Layer(0).Row(0).Position(0);
+
+ m_mgr.AddPane(m_pane_window, contained_pane);
+ m_mgr.Update();
+
+ if (pane.min_size.IsFullySpecified())
+ {
+ // because SetSizeHints() calls Fit() too (which sets the window
+ // size to its minimum allowed), we keep the size before calling
+ // SetSizeHints() and reset it afterwards...
+ wxSize tmp = GetSize();
+ GetSizer()->SetSizeHints(this);
+ SetSize(tmp);
+ }
+
+ SetTitle(pane.caption);
+
+ if (contained_pane.IsFixed())
+ SetWindowStyle(GetWindowStyle() & ~wxRESIZE_BORDER);
+
+ if (pane.floating_size != wxDefaultSize)
+ {
+ SetSize(pane.floating_size);
+ }
+ else
+ {
+ wxSize size = pane.best_size;
+ if (size == wxDefaultSize)
+ size = pane.min_size;
+ if (size == wxDefaultSize)
+ size = m_pane_window->GetSize();
+ if (pane.HasGripper())
+ {
+ if (pane.HasGripperTop())
+ size.y += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+ else
+ size.x += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+ }
+
+ SetClientSize(size);
+ }
+}
+
+void wxFloatingPane::OnSize(wxSizeEvent& event)
+{
+ m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
+}
+
+void wxFloatingPane::OnClose(wxCloseEvent& WXUNUSED(event))
+{
+ m_owner_mgr->OnFloatingPaneClosed(m_pane_window);
+ Destroy();
+}
+
+void wxFloatingPane::OnMoveEvent(wxMoveEvent& event)
+{
+ wxRect win_rect = GetRect();
+
+ // skip the first move event
+ if (m_last_rect.IsEmpty())
+ {
+ m_last_rect = win_rect;
+ return;
+ }
+
+ // prevent frame redocking during resize
+ if (m_last_rect.GetSize() != win_rect.GetSize())
+ {
+ m_last_rect = win_rect;
+ return;
+ }
+
+ m_last_rect = win_rect;
+
+ if (!isMouseDown())
+ return;
+
+ if (!m_moving)
+ {
+ OnMoveStart();
+ m_moving = true;
+ }
+
+ OnMoving(event.GetRect());
+}
+
+void wxFloatingPane::OnIdle(wxIdleEvent& event)
+{
+ if (m_moving)
+ {
+ if (!isMouseDown())
+ {
+ m_moving = false;
+ OnMoveFinished();
+ }
+ else
+ {
+ event.RequestMore();
+ }
+ }
+}
+
+void wxFloatingPane::OnMoveStart()
+{
+ // notify the owner manager that the pane has started to move
+ m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window);
+}
+
+void wxFloatingPane::OnMoving(const wxRect& WXUNUSED(window_rect))
+{
+ // notify the owner manager that the pane is moving
+ m_owner_mgr->OnFloatingPaneMoving(m_pane_window);
+}
+
+void wxFloatingPane::OnMoveFinished()
+{
+ // notify the owner manager that the pane has finished moving
+ m_owner_mgr->OnFloatingPaneMoved(m_pane_window);
+}
+
+void wxFloatingPane::OnActivate(wxActivateEvent& event)
+{
+ if (event.GetActive())
+ {
+ m_owner_mgr->OnFloatingPaneActivated(m_pane_window);
+ }
+}
+
+// utility function which determines the state of the mouse button
+// (independant of having a wxMouseEvent handy) - utimately a better
+// mechanism for this should be found (possibly by adding the
+// functionality to wxWidgets itself)
+bool wxFloatingPane::isMouseDown()
+{
+ return wxGetMouseState().LeftDown();
+}
+
+
+BEGIN_EVENT_TABLE(wxFloatingPane, wxFloatingPaneBaseClass)
+ EVT_SIZE(wxFloatingPane::OnSize)
+ EVT_MOVE(wxFloatingPane::OnMoveEvent)
+ EVT_MOVING(wxFloatingPane::OnMoveEvent)
+ EVT_CLOSE(wxFloatingPane::OnClose)
+ EVT_IDLE(wxFloatingPane::OnIdle)
+ EVT_ACTIVATE(wxFloatingPane::OnActivate)
+END_EVENT_TABLE()
+
+
+#endif // wxUSE_AUI
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
new file mode 100644
index 0000000000..609be6a75b
--- /dev/null
+++ b/src/aui/framemanager.cpp
@@ -0,0 +1,3485 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: framemanager.cpp
+// Purpose: wxaui: wx advanced user interface - docking window manager
+// Author: Benjamin I. Williams
+// Modified by:
+// Created: 2005-05-17
+// RCS-ID:
+// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
+// Licence: wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_AUI
+
+#include "wx/aui/framemanager.h"
+#include "wx/aui/dockart.h"
+#include "wx/aui/floatpane.h"
+
+#ifndef WX_PRECOMP
+// #include "wx/log.h"
+#endif
+
+//#include "wx/dcbuffer.h"
+
+#include "wx/app.h"
+#include "wx/image.h"
+WX_CHECK_BUILD_OPTIONS("wxAUI")
+
+#include "wx/arrimpl.cpp"
+WX_DECLARE_OBJARRAY(wxRect, wxAuiRectArray);
+WX_DEFINE_OBJARRAY(wxAuiRectArray)
+WX_DEFINE_OBJARRAY(wxDockUIPartArray)
+WX_DEFINE_OBJARRAY(wxDockInfoArray)
+WX_DEFINE_OBJARRAY(wxPaneButtonArray)
+WX_DEFINE_OBJARRAY(wxPaneInfoArray)
+
+wxPaneInfo wxNullPaneInfo;
+wxDockInfo wxNullDockInfo;
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON)
+
+#ifdef __WXMAC__
+ // a few defines to avoid nameclashes
+ #define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1
+ #define __AIFF__
+ #include "wx/mac/private.h"
+#endif
+
+
+// -- static utility functions --
+
+static wxBitmap wxPaneCreateStippleBitmap()
+{
+ unsigned char data[] = { 0,0,0,192,192,192, 192,192,192,0,0,0 };
+ wxImage img(2,2,data,true);
+ return wxBitmap(img);
+}
+
+static void DrawResizeHint(wxDC& dc, const wxRect& rect)
+{
+ wxBitmap stipple = wxPaneCreateStippleBitmap();
+ wxBrush brush(stipple);
+ dc.SetBrush(brush);
+ dc.SetPen(*wxTRANSPARENT_PEN);
+
+ dc.SetLogicalFunction(wxXOR);
+ dc.DrawRectangle(rect);
+}
+
+#ifdef __WXMSW__
+
+// on supported windows systems (Win2000 and greater), this function
+// will make a frame window transparent by a certain amount
+static void MakeWindowTransparent(wxWindow* wnd, int amount)
+{
+ // this API call is not in all SDKs, only the newer ones, so
+ // we will runtime bind this
+ typedef DWORD (WINAPI *PSETLAYEREDWINDOWATTR)(HWND, DWORD, BYTE, DWORD);
+ static PSETLAYEREDWINDOWATTR pSetLayeredWindowAttributes = NULL;
+ static HMODULE h = NULL;
+ HWND hwnd = (HWND)wnd->GetHWND();
+
+ if (!h)
+ h = LoadLibrary(_T("user32"));
+
+ if (!pSetLayeredWindowAttributes)
+ {
+ pSetLayeredWindowAttributes =
+ (PSETLAYEREDWINDOWATTR)GetProcAddress(h,"SetLayeredWindowAttributes");
+ }
+
+ if (pSetLayeredWindowAttributes == NULL)
+ return;
+
+ LONG exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+ if (0 == (exstyle & 0x80000) /*WS_EX_LAYERED*/)
+ SetWindowLong(hwnd, GWL_EXSTYLE, exstyle | 0x80000 /*WS_EX_LAYERED*/);
+
+ pSetLayeredWindowAttributes(hwnd, 0, amount, 2 /*LWA_ALPHA*/);
+}
+
+#endif
+
+
+// CopyDocksAndPanes() - this utility function creates copies of
+// the dock and pane info. wxDockInfo's usually contain pointers
+// to wxPaneInfo classes, thus this function is necessary to reliably
+// reconstruct that relationship in the new dock info and pane info arrays
+
+static void CopyDocksAndPanes(wxDockInfoArray& dest_docks,
+ wxPaneInfoArray& dest_panes,
+ const wxDockInfoArray& src_docks,
+ const wxPaneInfoArray& src_panes)
+{
+ dest_docks = src_docks;
+ dest_panes = src_panes;
+ int i, j, k, dock_count, pc1, pc2;
+ for (i = 0, dock_count = dest_docks.GetCount(); i < dock_count; ++i)
+ {
+ wxDockInfo& dock = dest_docks.Item(i);
+ for (j = 0, pc1 = dock.panes.GetCount(); j < pc1; ++j)
+ for (k = 0, pc2 = src_panes.GetCount(); k < pc2; ++k)
+ if (dock.panes.Item(j) == &src_panes.Item(k))
+ dock.panes.Item(j) = &dest_panes.Item(k);
+ }
+}
+
+// GetMaxLayer() is an internal function which returns
+// the highest layer inside the specified dock
+static int GetMaxLayer(const wxDockInfoArray& docks, int dock_direction)
+{
+ int i, dock_count, max_layer = 0;
+ for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
+ {
+ wxDockInfo& dock = docks.Item(i);
+ if (dock.dock_direction == dock_direction &&
+ dock.dock_layer > max_layer && !dock.fixed)
+ max_layer = dock.dock_layer;
+ }
+ return max_layer;
+}
+
+
+// GetMaxRow() is an internal function which returns
+// the highest layer inside the specified dock
+static int GetMaxRow(const wxPaneInfoArray& panes, int direction, int layer)
+{
+ int i, pane_count, max_row = 0;
+ for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& pane = panes.Item(i);
+ if (pane.dock_direction == direction &&
+ pane.dock_layer == layer &&
+ pane.dock_row > max_row)
+ max_row = pane.dock_row;
+ }
+ return max_row;
+}
+
+
+
+// DoInsertDockLayer() is an internal function that inserts a new dock
+// layer by incrementing all existing dock layer values by one
+static void DoInsertDockLayer(wxPaneInfoArray& panes,
+ int dock_direction,
+ int dock_layer)
+{
+ int i, pane_count;
+ for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& pane = panes.Item(i);
+ if (!pane.IsFloating() &&
+ pane.dock_direction == dock_direction &&
+ pane.dock_layer >= dock_layer)
+ pane.dock_layer++;
+ }
+}
+
+// DoInsertDockLayer() is an internal function that inserts a new dock
+// row by incrementing all existing dock row values by one
+static void DoInsertDockRow(wxPaneInfoArray& panes,
+ int dock_direction,
+ int dock_layer,
+ int dock_row)
+{
+ int i, pane_count;
+ for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& pane = panes.Item(i);
+ if (!pane.IsFloating() &&
+ pane.dock_direction == dock_direction &&
+ pane.dock_layer == dock_layer &&
+ pane.dock_row >= dock_row)
+ pane.dock_row++;
+ }
+}
+
+// DoInsertDockLayer() is an internal function that inserts a space for
+// another dock pane by incrementing all existing dock row values by one
+static void DoInsertPane(wxPaneInfoArray& panes,
+ int dock_direction,
+ int dock_layer,
+ int dock_row,
+ int dock_pos)
+{
+ int i, pane_count;
+ for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& pane = panes.Item(i);
+ if (!pane.IsFloating() &&
+ pane.dock_direction == dock_direction &&
+ pane.dock_layer == dock_layer &&
+ pane.dock_row == dock_row &&
+ pane.dock_pos >= dock_pos)
+ pane.dock_pos++;
+ }
+}
+
+// FindDocks() is an internal function that returns a list of docks which meet
+// the specified conditions in the parameters and returns a sorted array
+// (sorted by layer and then row)
+static void FindDocks(wxDockInfoArray& docks,
+ int dock_direction,
+ int dock_layer,
+ int dock_row,
+ wxDockInfoPtrArray& arr)
+{
+ int begin_layer = dock_layer;
+ int end_layer = dock_layer;
+ int begin_row = dock_row;
+ int end_row = dock_row;
+ int dock_count = docks.GetCount();
+ int layer, row, i, max_row = 0, max_layer = 0;
+
+ // discover the maximum dock layer and the max row
+ for (i = 0; i < dock_count; ++i)
+ {
+ max_row = wxMax(max_row, docks.Item(i).dock_row);
+ max_layer = wxMax(max_layer, docks.Item(i).dock_layer);
+ }
+
+ // if no dock layer was specified, search all dock layers
+ if (dock_layer == -1)
+ {
+ begin_layer = 0;
+ end_layer = max_layer;
+ }
+
+ // if no dock row was specified, search all dock row
+ if (dock_row == -1)
+ {
+ begin_row = 0;
+ end_row = max_row;
+ }
+
+ arr.Clear();
+
+ for (layer = begin_layer; layer <= end_layer; ++layer)
+ for (row = begin_row; row <= end_row; ++row)
+ for (i = 0; i < dock_count; ++i)
+ {
+ wxDockInfo& d = docks.Item(i);
+ if (dock_direction == -1 || dock_direction == d.dock_direction)
+ {
+ if (d.dock_layer == layer && d.dock_row == row)
+ arr.Add(&d);
+ }
+ }
+}
+
+// FindPaneInDock() looks up a specified window pointer inside a dock.
+// If found, the corresponding wxPaneInfo pointer is returned, otherwise NULL.
+static wxPaneInfo* FindPaneInDock(const wxDockInfo& dock, wxWindow* window)
+{
+ int i, count = dock.panes.GetCount();
+ for (i = 0; i < count; ++i)
+ {
+ wxPaneInfo* p = dock.panes.Item(i);
+ if (p->window == window)
+ return p;
+ }
+ return NULL;
+}
+
+// RemovePaneFromDocks() removes a pane window from all docks
+// with a possible exception specified by parameter "except"
+static void RemovePaneFromDocks(wxDockInfoArray& docks,
+ wxPaneInfo& pane,
+ wxDockInfo* except = NULL)
+{
+ int i, dock_count;
+ for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
+ {
+ wxDockInfo& d = docks.Item(i);
+ if (&d == except)
+ continue;
+ wxPaneInfo* pi = FindPaneInDock(d, pane.window);
+ if (pi)
+ d.panes.Remove(pi);
+ }
+}
+
+// RenumberDockRows() takes a dock and assigns sequential numbers
+// to existing rows. Basically it takes out the gaps; so if a
+// dock has rows with numbers 0,2,5, they will become 0,1,2
+static void RenumberDockRows(wxDockInfoPtrArray& docks)
+{
+ int i, dock_count, j, pane_count;
+ for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
+ {
+ wxDockInfo& dock = *docks.Item(i);
+ dock.dock_row = i;
+ for (j = 0, pane_count = dock.panes.GetCount(); j < pane_count; ++j)
+ dock.panes.Item(j)->dock_row = i;
+ }
+}
+
+
+
+static void SetActivePane(wxPaneInfoArray& panes, wxWindow* active_pane)
+{
+ int i, pane_count;
+ for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& pane = panes.Item(i);
+ pane.state &= ~wxPaneInfo::optionActive;
+ if (pane.window == active_pane)
+ pane.state |= wxPaneInfo::optionActive;
+ }
+}
+
+
+// this function is used to sort panes by dock position
+static int PaneSortFunc(wxPaneInfo** p1, wxPaneInfo** p2)
+{
+ return ((*p1)->dock_pos < (*p2)->dock_pos) ? -1 : 1;
+}
+
+
+// -- wxFrameManager class implementation --
+
+
+BEGIN_EVENT_TABLE(wxFrameManager, wxEvtHandler)
+ EVT_AUI_PANEBUTTON(wxFrameManager::OnPaneButton)
+ EVT_PAINT(wxFrameManager::OnPaint)
+ EVT_ERASE_BACKGROUND(wxFrameManager::OnEraseBackground)
+ EVT_SIZE(wxFrameManager::OnSize)
+ EVT_SET_CURSOR(wxFrameManager::OnSetCursor)
+ EVT_LEFT_DOWN(wxFrameManager::OnLeftDown)
+ EVT_LEFT_UP(wxFrameManager::OnLeftUp)
+ EVT_MOTION(wxFrameManager::OnMotion)
+ EVT_LEAVE_WINDOW(wxFrameManager::OnLeaveWindow)
+ EVT_CHILD_FOCUS(wxFrameManager::OnChildFocus)
+ EVT_TIMER(101, wxFrameManager::OnHintFadeTimer)
+END_EVENT_TABLE()
+
+
+wxFrameManager::wxFrameManager(wxFrame* frame, unsigned int flags)
+{
+ m_action = actionNone;
+ m_last_mouse_move = wxPoint();
+ m_hover_button = NULL;
+ m_art = new wxDefaultDockArt;
+ m_hint_wnd = NULL;
+ m_flags = flags;
+
+ if (frame)
+ {
+ SetFrame(frame);
+ }
+}
+
+wxFrameManager::~wxFrameManager()
+{
+ delete m_art;
+}
+
+// GetPane() looks up a wxPaneInfo structure based
+// on the supplied window pointer. Upon failure, GetPane()
+// returns an empty wxPaneInfo, a condition which can be checked
+// by calling wxPaneInfo::IsOk().
+//
+// The pane info's structure may then be modified. Once a pane's
+// info is modified, wxFrameManager::Update() must be called to
+// realize the changes in the UI.
+
+wxPaneInfo& wxFrameManager::GetPane(wxWindow* window)
+{
+ int i, pane_count;
+ for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& p = m_panes.Item(i);
+ if (p.window == window)
+ return p;
+ }
+ return wxNullPaneInfo;
+}
+
+// this version of GetPane() looks up a pane based on a
+// 'pane name', see above comment for more info
+wxPaneInfo& wxFrameManager::GetPane(const wxString& name)
+{
+ int i, pane_count;
+ for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& p = m_panes.Item(i);
+ if (p.name == name)
+ return p;
+ }
+ return wxNullPaneInfo;
+}
+
+// GetAllPanes() returns a reference to all the pane info structures
+wxPaneInfoArray& wxFrameManager::GetAllPanes()
+{
+ return m_panes;
+}
+
+// HitTest() is an internal function which determines
+// which UI item the specified coordinates are over
+// (x,y) specify a position in client coordinates
+wxDockUIPart* wxFrameManager::HitTest(int x, int y)
+{
+ wxDockUIPart* result = NULL;
+
+ int i, part_count;
+ for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
+ {
+ wxDockUIPart* item = &m_uiparts.Item(i);
+
+ // we are not interested in typeDock, because this space
+ // isn't used to draw anything, just for measurements;
+ // besides, the entire dock area is covered with other
+ // rectangles, which we are interested in.
+ if (item->type == wxDockUIPart::typeDock)
+ continue;
+
+ // if we already have a hit on a more specific item, we are not
+ // interested in a pane hit. If, however, we don't already have
+ // a hit, returning a pane hit is necessary for some operations
+ if ((item->type == wxDockUIPart::typePane ||
+ item->type == wxDockUIPart::typePaneBorder) && result)
+ continue;
+
+ // if the point is inside the rectangle, we have a hit
+ if (item->rect.Inside(x,y))
+ result = item;
+ }
+
+ return result;
+}
+
+
+// SetFlags() and GetFlags() allow the owner to set various
+// options which are global to wxFrameManager
+void wxFrameManager::SetFlags(unsigned int flags)
+{
+ m_flags = flags;
+}
+
+unsigned int wxFrameManager::GetFlags() const
+{
+ return m_flags;
+}
+
+
+// SetFrame() is usually called once when the frame
+// manager class is being initialized. "frame" specifies
+// the frame which should be managed by the frame mananger
+void wxFrameManager::SetFrame(wxFrame* frame)
+{
+ wxASSERT_MSG(frame, wxT("specified frame must be non-NULL"));
+
+ m_frame = frame;
+ m_frame->PushEventHandler(this);
+
+#if wxUSE_MDI
+ // if the owner is going to manage an MDI parent frame,
+ // we need to add the MDI client window as the default
+ // center pane
+
+ if (frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
+ {
+ wxMDIParentFrame* mdi_frame = (wxMDIParentFrame*)frame;
+ wxMDIClientWindow* client_window = mdi_frame->GetClientWindow();
+
+ wxASSERT_MSG(client_window, wxT("Client window is NULL!"));
+
+ AddPane(client_window,
+ wxPaneInfo().Name(wxT("mdiclient")).
+ CenterPane().PaneBorder(false));
+ }
+#endif
+}
+
+
+// UnInit() must be called, usually in the destructor
+// of the frame class. If it is not called, usually this
+// will result in a crash upon program exit
+void wxFrameManager::UnInit()
+{
+ m_frame->RemoveEventHandler(this);
+}
+
+// GetFrame() returns the frame pointer being managed by wxFrameManager
+wxFrame* wxFrameManager::GetFrame() const
+{
+ return m_frame;
+}
+
+wxDockArt* wxFrameManager::GetArtProvider() const
+{
+ return m_art;
+}
+
+void wxFrameManager::ProcessMgrEvent(wxFrameManagerEvent& event)
+{
+ // first, give the owner frame a chance to override
+ if (m_frame)
+ {
+ if (m_frame->ProcessEvent(event))
+ return;
+ }
+
+ ProcessEvent(event);
+}
+
+// SetArtProvider() instructs wxFrameManager to use the
+// specified art provider for all drawing calls. This allows
+// plugable look-and-feel features
+void wxFrameManager::SetArtProvider(wxDockArt* art_provider)
+{
+ // delete the last art provider, if any
+ delete m_art;
+
+ // assign the new art provider
+ m_art = art_provider;
+}
+
+bool wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info)
+{
+ // check if the pane has a valid window
+ if (!window)
+ return false;
+
+ // check if the pane already exists
+ if (GetPane(pane_info.window).IsOk())
+ return false;
+
+ m_panes.Add(pane_info);
+
+ wxPaneInfo& pinfo = m_panes.Last();
+
+ // set the pane window
+ pinfo.window = window;
+
+ // if the pane's name identifier is blank, create a random string
+ if (pinfo.name.IsEmpty())
+ {
+ pinfo.name.Printf(wxT("%08x%08x%08x%08x"),
+ ((unsigned long)pinfo.window) & 0xffffffff,
+ (unsigned int)time(NULL),
+ (unsigned int)clock(), m_panes.GetCount());
+ }
+
+ // set initial proportion (if not already set)
+ if (pinfo.dock_proportion == 0)
+ pinfo.dock_proportion = 100000;
+
+ if (pinfo.HasCloseButton() &&
+ pinfo.buttons.size() == 0)
+ {
+ wxPaneButton button;
+ button.button_id = wxPaneInfo::buttonClose;
+ pinfo.buttons.Add(button);
+ }
+
+ if (pinfo.best_size == wxDefaultSize &&
+ pinfo.window)
+ {
+ pinfo.best_size = pinfo.window->GetClientSize();
+
+ if (pinfo.window->IsKindOf(CLASSINFO(wxToolBar)))
+ {
+ // GetClientSize() doesn't get the best size for
+ // a toolbar under some newer versions of wxWidgets,
+ // so use GetBestSize()
+ pinfo.best_size = pinfo.window->GetBestSize();
+
+ // for some reason, wxToolBar::GetBestSize() is returning
+ // a size that is a pixel shy of the correct amount.
+ // I believe this to be the correct action, until
+ // wxToolBar::GetBestSize() is fixed. Is this assumption
+ // correct?
+ pinfo.best_size.y++;
+ }
+
+ if (pinfo.min_size != wxDefaultSize)
+ {
+ if (pinfo.best_size.x < pinfo.min_size.x)
+ pinfo.best_size.x = pinfo.min_size.x;
+ if (pinfo.best_size.y < pinfo.min_size.y)
+ pinfo.best_size.y = pinfo.min_size.y;
+ }
+ }
+
+ return true;
+}
+
+bool wxFrameManager::AddPane(wxWindow* window,
+ int direction,
+ const wxString& caption)
+{
+ wxPaneInfo pinfo;
+ pinfo.Caption(caption);
+ switch (direction)
+ {
+ case wxTOP: pinfo.Top(); break;
+ case wxBOTTOM: pinfo.Bottom(); break;
+ case wxLEFT: pinfo.Left(); break;
+ case wxRIGHT: pinfo.Right(); break;
+ case wxCENTER: pinfo.CenterPane(); break;
+ }
+ return AddPane(window, pinfo);
+}
+
+bool wxFrameManager::InsertPane(wxWindow* window, const wxPaneInfo& pane_info,
+ int insert_level)
+{
+ // shift the panes around, depending on the insert level
+ switch (insert_level)
+ {
+ case wxAUI_INSERT_PANE:
+ DoInsertPane(m_panes,
+ pane_info.dock_direction,
+ pane_info.dock_layer,
+ pane_info.dock_row,
+ pane_info.dock_pos);
+ break;
+ case wxAUI_INSERT_ROW:
+ DoInsertDockRow(m_panes,
+ pane_info.dock_direction,
+ pane_info.dock_layer,
+ pane_info.dock_row);
+ break;
+ case wxAUI_INSERT_DOCK:
+ DoInsertDockLayer(m_panes,
+ pane_info.dock_direction,
+ pane_info.dock_layer);
+ break;
+ }
+
+ // if the window already exists, we are basically just moving/inserting the
+ // existing window. If it doesn't exist, we need to add it and insert it
+ wxPaneInfo& existing_pane = GetPane(window);
+ if (!existing_pane.IsOk())
+ {
+ return AddPane(window, pane_info);
+ }
+ else
+ {
+ if (pane_info.IsFloating())
+ {
+ existing_pane.Float();
+ if (pane_info.floating_pos != wxDefaultPosition)
+ existing_pane.FloatingPosition(pane_info.floating_pos);
+ if (pane_info.floating_size != wxDefaultSize)
+ existing_pane.FloatingSize(pane_info.floating_size);
+ }
+ else
+ {
+ existing_pane.Direction(pane_info.dock_direction);
+ existing_pane.Layer(pane_info.dock_layer);
+ existing_pane.Row(pane_info.dock_row);
+ existing_pane.Position(pane_info.dock_pos);
+ }
+ }
+
+ return true;
+}
+
+
+bool wxFrameManager::DetachPane(wxWindow* window)
+{
+ int i, count;
+ for (i = 0, count = m_panes.GetCount(); i < count; ++i)
+ {
+ wxPaneInfo& p = m_panes.Item(i);
+ if (p.window == window)
+ {
+ if (p.frame)
+ {
+ // we have a floating frame which is being detached. We need to
+ // reparent it to m_frame and destroy the floating frame
+
+ // reduce flicker
+ p.window->SetSize(1,1);
+ p.frame->Show(false);
+
+ // reparent to m_frame and destroy the pane
+ p.window->Reparent(m_frame);
+ p.frame->SetSizer(NULL);
+ p.frame->Destroy();
+ p.frame = NULL;
+ }
+ m_panes.RemoveAt(i);
+ return true;
+ }
+ }
+ return false;
+}
+
+
+// EscapeDelimiters() changes ";" into "\;" and "|" into "\|"
+// in the input string. This is an internal functions which is
+// used for saving perspectives
+static wxString EscapeDelimiters(const wxString& s)
+{
+ wxString result;
+ result.Alloc(s.Length());
+ const wxChar* ch = s.c_str();
+ while (*ch)
+ {
+ if (*ch == wxT(';') || *ch == wxT('|'))
+ result += wxT('\\');
+ result += *ch;
+ ++ch;
+ }
+ return result;
+}
+
+
+// SavePerspective() saves all pane information as a single string.
+// This string may later be fed into LoadPerspective() to restore
+// all pane settings. This save and load mechanism allows an
+// exact pane configuration to be saved and restored at a later time
+
+wxString wxFrameManager::SavePerspective()
+{
+ wxString result;
+ result.Alloc(500);
+ result = wxT("layout1|");
+
+ int pane_i, pane_count = m_panes.GetCount();
+ for (pane_i = 0; pane_i < pane_count; ++pane_i)
+ {
+ wxPaneInfo& pane = m_panes.Item(pane_i);
+
+ result += wxT("name=");
+ result += EscapeDelimiters(pane.name);
+ result += wxT(";");
+
+ result += wxT("caption=");
+ result += EscapeDelimiters(pane.caption);
+ result += wxT(";");
+
+ result += wxString::Format(wxT("state=%u;"), pane.state);
+ result += wxString::Format(wxT("dir=%d;"), pane.dock_direction);
+ result += wxString::Format(wxT("layer=%d;"), pane.dock_layer);
+ result += wxString::Format(wxT("row=%d;"), pane.dock_row);
+ result += wxString::Format(wxT("pos=%d;"), pane.dock_pos);
+ result += wxString::Format(wxT("prop=%d;"), pane.dock_proportion);
+ result += wxString::Format(wxT("bestw=%d;"), pane.best_size.x);
+ result += wxString::Format(wxT("besth=%d;"), pane.best_size.y);
+ result += wxString::Format(wxT("minw=%d;"), pane.min_size.x);
+ result += wxString::Format(wxT("minh=%d;"), pane.min_size.y);
+ result += wxString::Format(wxT("maxw=%d;"), pane.max_size.x);
+ result += wxString::Format(wxT("maxh=%d;"), pane.max_size.y);
+ result += wxString::Format(wxT("floatx=%d;"), pane.floating_pos.x);
+ result += wxString::Format(wxT("floaty=%d;"), pane.floating_pos.y);
+ result += wxString::Format(wxT("floatw=%d;"), pane.floating_size.x);
+ result += wxString::Format(wxT("floath=%d"), pane.floating_size.y);
+ result += wxT("|");
+ }
+
+ int dock_i, dock_count = m_docks.GetCount();
+ for (dock_i = 0; dock_i < dock_count; ++dock_i)
+ {
+ wxDockInfo& dock = m_docks.Item(dock_i);
+
+ result += wxString::Format(wxT("dock_size(%d,%d,%d)=%d|"),
+ dock.dock_direction, dock.dock_layer,
+ dock.dock_row, dock.size);
+ }
+
+ return result;
+}
+
+// LoadPerspective() loads a layout which was saved with SavePerspective()
+// If the "update" flag parameter is true, the GUI will immediately be updated
+
+bool wxFrameManager::LoadPerspective(const wxString& layout, bool update)
+{
+ wxString input = layout;
+ wxString part;
+
+ // check layout string version
+ part = input.BeforeFirst(wxT('|'));
+ input = input.AfterFirst(wxT('|'));
+ part.Trim(true);
+ part.Trim(false);
+ if (part != wxT("layout1"))
+ return false;
+
+
+ // mark all panes currently managed as docked and hidden
+ int pane_i, pane_count = m_panes.GetCount();
+ for (pane_i = 0; pane_i < pane_count; ++pane_i)
+ m_panes.Item(pane_i).Dock().Hide();
+
+ // clear out the dock array; this will be reconstructed
+ m_docks.Clear();
+
+ // replace escaped characters so we can
+ // split up the string easily
+ input.Replace(wxT("\\|"), wxT("\a"));
+ input.Replace(wxT("\\;"), wxT("\b"));
+
+ while (1)
+ {
+ wxPaneInfo pane;
+
+ wxString pane_part = input.BeforeFirst(wxT('|'));
+ input = input.AfterFirst(wxT('|'));
+ pane_part.Trim(true);
+
+ // if the string is empty, we're done parsing
+ if (pane_part.IsEmpty())
+ break;
+
+
+ if (pane_part.Left(9) == wxT("dock_size"))
+ {
+ wxString val_name = pane_part.BeforeFirst(wxT('='));
+ wxString value = pane_part.AfterFirst(wxT('='));
+
+ long dir, layer, row, size;
+ wxString piece = val_name.AfterFirst(wxT('('));
+ piece = piece.BeforeLast(wxT(')'));
+ piece.BeforeFirst(wxT(',')).ToLong(&dir);
+ piece = piece.AfterFirst(wxT(','));
+ piece.BeforeFirst(wxT(',')).ToLong(&layer);
+ piece.AfterFirst(wxT(',')).ToLong(&row);
+ value.ToLong(&size);
+
+ wxDockInfo dock;
+ dock.dock_direction = dir;
+ dock.dock_layer = layer;
+ dock.dock_row = row;
+ dock.size = size;
+ m_docks.Add(dock);
+ continue;
+ }
+
+ while (1)
+ {
+ wxString val_part = pane_part.BeforeFirst(wxT(';'));
+ pane_part = pane_part.AfterFirst(wxT(';'));
+ wxString val_name = val_part.BeforeFirst(wxT('='));
+ wxString value = val_part.AfterFirst(wxT('='));
+ val_name.MakeLower();
+ val_name.Trim(true);
+ val_name.Trim(false);
+ value.Trim(true);
+ value.Trim(false);
+
+ if (val_name.IsEmpty())
+ break;
+
+ if (val_name == wxT("name"))
+ pane.name = value;
+ else if (val_name == wxT("caption"))
+ pane.caption = value;
+ else if (val_name == wxT("state"))
+ pane.state = (unsigned int)wxAtoi(value.c_str());
+ else if (val_name == wxT("dir"))
+ pane.dock_direction = wxAtoi(value.c_str());
+ else if (val_name == wxT("layer"))
+ pane.dock_layer = wxAtoi(value.c_str());
+ else if (val_name == wxT("row"))
+ pane.dock_row = wxAtoi(value.c_str());
+ else if (val_name == wxT("pos"))
+ pane.dock_pos = wxAtoi(value.c_str());
+ else if (val_name == wxT("prop"))
+ pane.dock_proportion = wxAtoi(value.c_str());
+ else if (val_name == wxT("bestw"))
+ pane.best_size.x = wxAtoi(value.c_str());
+ else if (val_name == wxT("besth"))
+ pane.best_size.y = wxAtoi(value.c_str());
+ else if (val_name == wxT("minw"))
+ pane.min_size.x = wxAtoi(value.c_str());
+ else if (val_name == wxT("minh"))
+ pane.min_size.y = wxAtoi(value.c_str());
+ else if (val_name == wxT("maxw"))
+ pane.max_size.x = wxAtoi(value.c_str());
+ else if (val_name == wxT("maxh"))
+ pane.max_size.y = wxAtoi(value.c_str());
+ else if (val_name == wxT("floatx"))
+ pane.floating_pos.x = wxAtoi(value.c_str());
+ else if (val_name == wxT("floaty"))
+ pane.floating_pos.y = wxAtoi(value.c_str());
+ else if (val_name == wxT("floatw"))
+ pane.floating_size.x = wxAtoi(value.c_str());
+ else if (val_name == wxT("floath"))
+ pane.floating_size.y = wxAtoi(value.c_str());
+ else {
+ wxFAIL_MSG(wxT("Bad Perspective String"));
+ }
+ }
+
+ // replace escaped characters so we can
+ // split up the string easily
+ pane.name.Replace(wxT("\a"), wxT("|"));
+ pane.name.Replace(wxT("\b"), wxT(";"));
+ pane.caption.Replace(wxT("\a"), wxT("|"));
+ pane.caption.Replace(wxT("\b"), wxT(";"));
+
+ wxPaneInfo& p = GetPane(pane.name);
+ if (!p.IsOk())
+ {
+ // the pane window couldn't be found
+ // in the existing layout
+ return false;
+ }
+
+ pane.window = p.window;
+ pane.frame = p.frame;
+ pane.buttons = p.buttons;
+ p = pane;
+ }
+
+ if (update)
+ Update();
+
+ return true;
+}
+
+
+void wxFrameManager::GetPanePositionsAndSizes(wxDockInfo& dock,
+ wxArrayInt& positions,
+ wxArrayInt& sizes)
+{
+ int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
+ int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
+ int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+
+ positions.Empty();
+ sizes.Empty();
+
+ int offset, action_pane = -1;
+ int pane_i, pane_count = dock.panes.GetCount();
+
+ // find the pane marked as our action pane
+ for (pane_i = 0; pane_i < pane_count; ++pane_i)
+ {
+ wxPaneInfo& pane = *(dock.panes.Item(pane_i));
+
+ if (pane.state & wxPaneInfo::actionPane)
+ {
+ wxASSERT_MSG(action_pane==-1, wxT("Too many fixed action panes"));
+ action_pane = pane_i;
+ }
+ }
+
+ // set up each panes default position, and
+ // determine the size (width or height, depending
+ // on the dock's orientation) of each pane
+ for (pane_i = 0; pane_i < pane_count; ++pane_i)
+ {
+ wxPaneInfo& pane = *(dock.panes.Item(pane_i));
+ positions.Add(pane.dock_pos);
+ int size = 0;
+
+ if (pane.HasBorder())
+ size += (pane_border_size*2);
+
+ if (dock.IsHorizontal())
+ {
+ if (pane.HasGripper() && !pane.HasGripperTop())
+ size += gripper_size;
+ size += pane.best_size.x;
+ }
+ else
+ {
+ if (pane.HasGripper() && pane.HasGripperTop())
+ size += gripper_size;
+
+ if (pane.HasCaption())
+ size += caption_size;
+ size += pane.best_size.y;
+ }
+
+ sizes.Add(size);
+ }
+
+ // if there is no action pane, just return the default
+ // positions (as specified in pane.pane_pos)
+ if (action_pane == -1)
+ return;
+
+ offset = 0;
+ for (pane_i = action_pane-1; pane_i >= 0; --pane_i)
+ {
+ int amount = positions[pane_i+1] - (positions[pane_i] + sizes[pane_i]);
+
+ if (amount >= 0)
+ offset += amount;
+ else
+ positions[pane_i] -= -amount;
+
+ offset += sizes[pane_i];
+ }
+
+ // if the dock mode is fixed, make sure none of the panes
+ // overlap; we will bump panes that overlap
+ offset = 0;
+ for (pane_i = action_pane; pane_i < pane_count; ++pane_i)
+ {
+ int amount = positions[pane_i] - offset;
+ if (amount >= 0)
+ offset += amount;
+ else
+ positions[pane_i] += -amount;
+
+ offset += sizes[pane_i];
+ }
+}
+
+
+void wxFrameManager::LayoutAddPane(wxSizer* cont,
+ wxDockInfo& dock,
+ wxPaneInfo& pane,
+ wxDockUIPartArray& uiparts,
+ bool spacer_only)
+{
+ wxDockUIPart part;
+ wxSizerItem* sizer_item;
+
+ int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
+ int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+ int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
+ int pane_button_size = m_art->GetMetric(wxAUI_ART_PANE_BUTTON_SIZE);
+
+ // find out the orientation of the item (orientation for panes
+ // is the same as the dock's orientation)
+ int orientation;
+ if (dock.IsHorizontal())
+ orientation = wxHORIZONTAL;
+ else
+ orientation = wxVERTICAL;
+
+ // this variable will store the proportion
+ // value that the pane will receive
+ int pane_proportion = pane.dock_proportion;
+
+ wxBoxSizer* horz_pane_sizer = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* vert_pane_sizer = new wxBoxSizer(wxVERTICAL);
+
+ if (pane.HasGripper())
+ {
+ if (pane.HasGripperTop())
+ sizer_item = vert_pane_sizer ->Add(1, gripper_size, 0, wxEXPAND);
+ else
+ sizer_item = horz_pane_sizer ->Add(gripper_size, 1, 0, wxEXPAND);
+
+ part.type = wxDockUIPart::typeGripper;
+ part.dock = &dock;
+ part.pane = &pane;
+ part.button = NULL;
+ part.orientation = orientation;
+ part.cont_sizer = horz_pane_sizer;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+
+ if (pane.HasCaption())
+ {
+ // create the caption sizer
+ wxBoxSizer* caption_sizer = new wxBoxSizer(wxHORIZONTAL);
+
+ sizer_item = caption_sizer->Add(1, caption_size, 1, wxEXPAND);
+
+ part.type = wxDockUIPart::typeCaption;
+ part.dock = &dock;
+ part.pane = &pane;
+ part.button = NULL;
+ part.orientation = orientation;
+ part.cont_sizer = vert_pane_sizer;
+ part.sizer_item = sizer_item;
+ int caption_part_idx = uiparts.GetCount();
+ uiparts.Add(part);
+
+ // add pane buttons to the caption
+ int i, button_count;
+ for (i = 0, button_count = pane.buttons.GetCount();
+ i < button_count; ++i)
+ {
+ wxPaneButton& button = pane.buttons.Item(i);
+
+ sizer_item = caption_sizer->Add(pane_button_size,
+ caption_size,
+ 0, wxEXPAND);
+
+ part.type = wxDockUIPart::typePaneButton;
+ part.dock = &dock;
+ part.pane = &pane;
+ part.button = &button;
+ part.orientation = orientation;
+ part.cont_sizer = caption_sizer;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+
+ // add the caption sizer
+ sizer_item = vert_pane_sizer->Add(caption_sizer, 0, wxEXPAND);
+
+ uiparts.Item(caption_part_idx).sizer_item = sizer_item;
+ }
+
+ // add the pane window itself
+ if (spacer_only)
+ {
+ sizer_item = vert_pane_sizer->Add(1, 1, 1, wxEXPAND);
+ }
+ else
+ {
+ sizer_item = vert_pane_sizer->Add(pane.window, 1, wxEXPAND);
+ vert_pane_sizer->SetItemMinSize(pane.window, 1, 1);
+ }
+
+ part.type = wxDockUIPart::typePane;
+ part.dock = &dock;
+ part.pane = &pane;
+ part.button = NULL;
+ part.orientation = orientation;
+ part.cont_sizer = vert_pane_sizer;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+
+
+ // determine if the pane should have a minimum size; if the pane is
+ // non-resizable (fixed) then we must set a minimum size. Alternitavely,
+ // if the pane.min_size is set, we must use that value as well
+
+ wxSize min_size = pane.min_size;
+ if (pane.IsFixed())
+ {
+ if (min_size == wxDefaultSize)
+ {
+ min_size = pane.best_size;
+ pane_proportion = 0;
+ }
+ }
+
+ if (min_size != wxDefaultSize)
+ {
+ vert_pane_sizer->SetItemMinSize(
+ vert_pane_sizer->GetChildren().GetCount()-1,
+ min_size.x, min_size.y);
+ }
+
+
+ // add the verticle sizer (caption, pane window) to the
+ // horizontal sizer (gripper, verticle sizer)
+ horz_pane_sizer->Add(vert_pane_sizer, 1, wxEXPAND);
+
+ // finally, add the pane sizer to the dock sizer
+
+ if (pane.HasBorder())
+ {
+ // allowing space for the pane's border
+ sizer_item = cont->Add(horz_pane_sizer, pane_proportion,
+ wxEXPAND | wxALL, pane_border_size);
+
+ part.type = wxDockUIPart::typePaneBorder;
+ part.dock = &dock;
+ part.pane = &pane;
+ part.button = NULL;
+ part.orientation = orientation;
+ part.cont_sizer = cont;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+ else
+ {
+ sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
+ }
+}
+
+void wxFrameManager::LayoutAddDock(wxSizer* cont,
+ wxDockInfo& dock,
+ wxDockUIPartArray& uiparts,
+ bool spacer_only)
+{
+ wxSizerItem* sizer_item;
+ wxDockUIPart part;
+
+ int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE);
+ int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL;
+
+ // resizable bottom and right docks have a sash before them
+ if (!dock.fixed && (dock.dock_direction == wxAUI_DOCK_BOTTOM ||
+ dock.dock_direction == wxAUI_DOCK_RIGHT))
+ {
+ sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND);
+
+ part.type = wxDockUIPart::typeDockSizer;
+ part.orientation = orientation;
+ part.dock = &dock;
+ part.pane = NULL;
+ part.button = NULL;
+ part.cont_sizer = cont;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+
+ // create the sizer for the dock
+ wxSizer* dock_sizer = new wxBoxSizer(orientation);
+
+ // add each pane to the dock
+ int pane_i, pane_count = dock.panes.GetCount();
+
+ if (dock.fixed)
+ {
+ wxArrayInt pane_positions, pane_sizes;
+
+ // figure out the real pane positions we will
+ // use, without modifying the each pane's pane_pos member
+ GetPanePositionsAndSizes(dock, pane_positions, pane_sizes);
+
+ int offset = 0;
+ for (pane_i = 0; pane_i < pane_count; ++pane_i)
+ {
+ wxPaneInfo& pane = *(dock.panes.Item(pane_i));
+ int pane_pos = pane_positions.Item(pane_i);
+
+ int amount = pane_pos - offset;
+ if (amount > 0)
+ {
+ if (dock.IsVertical())
+ sizer_item = dock_sizer->Add(1, amount, 0, wxEXPAND);
+ else
+ sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND);
+
+ part.type = wxDockUIPart::typeBackground;
+ part.dock = &dock;
+ part.pane = NULL;
+ part.button = NULL;
+ part.orientation = (orientation==wxHORIZONTAL) ? wxVERTICAL:wxHORIZONTAL;
+ part.cont_sizer = dock_sizer;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+
+ offset += amount;
+ }
+
+ LayoutAddPane(dock_sizer, dock, pane, uiparts, spacer_only);
+
+ offset += pane_sizes.Item(pane_i);
+ }
+
+ // at the end add a very small stretchable background area
+ sizer_item = dock_sizer->Add(1,1, 1, wxEXPAND);
+
+ part.type = wxDockUIPart::typeBackground;
+ part.dock = &dock;
+ part.pane = NULL;
+ part.button = NULL;
+ part.orientation = orientation;
+ part.cont_sizer = dock_sizer;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+ else
+ {
+ for (pane_i = 0; pane_i < pane_count; ++pane_i)
+ {
+ wxPaneInfo& pane = *(dock.panes.Item(pane_i));
+
+ // if this is not the first pane being added,
+ // we need to add a pane sizer
+ if (pane_i > 0)
+ {
+ sizer_item = dock_sizer->Add(sash_size, sash_size, 0, wxEXPAND);
+
+ part.type = wxDockUIPart::typePaneSizer;
+ part.dock = &dock;
+ part.pane = dock.panes.Item(pane_i-1);
+ part.button = NULL;
+ part.orientation = (orientation==wxHORIZONTAL) ? wxVERTICAL:wxHORIZONTAL;
+ part.cont_sizer = dock_sizer;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+
+ LayoutAddPane(dock_sizer, dock, pane, uiparts, spacer_only);
+ }
+ }
+
+ if (dock.dock_direction == wxAUI_DOCK_CENTER)
+ sizer_item = cont->Add(dock_sizer, 1, wxEXPAND);
+ else
+ sizer_item = cont->Add(dock_sizer, 0, wxEXPAND);
+
+ part.type = wxDockUIPart::typeDock;
+ part.dock = &dock;
+ part.pane = NULL;
+ part.button = NULL;
+ part.orientation = orientation;
+ part.cont_sizer = cont;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+
+ if (dock.IsHorizontal())
+ cont->SetItemMinSize(dock_sizer, 0, dock.size);
+ else
+ cont->SetItemMinSize(dock_sizer, dock.size, 0);
+
+ // top and left docks have a sash after them
+ if (!dock.fixed && (dock.dock_direction == wxAUI_DOCK_TOP ||
+ dock.dock_direction == wxAUI_DOCK_LEFT))
+ {
+ sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND);
+
+ part.type = wxDockUIPart::typeDockSizer;
+ part.dock = &dock;
+ part.pane = NULL;
+ part.button = NULL;
+ part.orientation = orientation;
+ part.cont_sizer = cont;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+}
+
+wxSizer* wxFrameManager::LayoutAll(wxPaneInfoArray& panes,
+ wxDockInfoArray& docks,
+ wxDockUIPartArray& uiparts,
+ bool spacer_only)
+{
+ wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);
+
+ int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
+ int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
+ wxSize cli_size = m_frame->GetClientSize();
+ int i, dock_count, pane_count;
+
+
+ // empty all docks out
+ for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
+ docks.Item(i).panes.Empty();
+
+ // iterate through all known panes, filing each
+ // of them into the appropriate dock. If the
+ // pane does not exist in the dock, add it
+ for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& p = panes.Item(i);
+
+ // find any docks in this layer
+ wxDockInfo* dock;
+ wxDockInfoPtrArray arr;
+ FindDocks(docks, p.dock_direction, p.dock_layer, p.dock_row, arr);
+
+ if (arr.GetCount() > 0)
+ {
+ dock = arr.Item(0);
+ }
+ else
+ {
+ // dock was not found, so we need to create a new one
+ wxDockInfo d;
+ d.dock_direction = p.dock_direction;
+ d.dock_layer = p.dock_layer;
+ d.dock_row = p.dock_row;
+ docks.Add(d);
+ dock = &docks.Last();
+ }
+
+
+ if (p.IsDocked() && p.IsShown())
+ {
+ // remove the pane from any existing docks except this one
+ RemovePaneFromDocks(docks, p, dock);
+
+ // pane needs to be added to the dock,
+ // if it doesn't already exist
+ if (!FindPaneInDock(*dock, p.window))
+ dock->panes.Add(&p);
+ }
+ else
+ {
+ // remove the pane from any existing docks
+ RemovePaneFromDocks(docks, p);
+ }
+
+ }
+
+ // remove any empty docks
+ for (i = docks.GetCount()-1; i >= 0; --i)
+ {
+ if (docks.Item(i).panes.GetCount() == 0)
+ docks.RemoveAt(i);
+ }
+
+ // configure the docks further
+ for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
+ {
+ wxDockInfo& dock = docks.Item(i);
+ int j, dock_pane_count = dock.panes.GetCount();
+
+ // sort the dock pane array by the pane's
+ // dock position (dock_pos), in ascending order
+ dock.panes.Sort(PaneSortFunc);
+
+ // for newly created docks, set up their initial size
+ if (dock.size == 0)
+ {
+ int size = 0;
+
+ for (j = 0; j < dock_pane_count; ++j)
+ {
+ wxPaneInfo& pane = *dock.panes.Item(j);
+ wxSize pane_size = pane.best_size;
+ if (pane_size == wxDefaultSize)
+ pane_size = pane.min_size;
+ if (pane_size == wxDefaultSize)
+ pane_size = pane.window->GetSize();
+
+ if (dock.IsHorizontal())
+ size = wxMax(pane_size.y, size);
+ else
+ size = wxMax(pane_size.x, size);
+ }
+
+ // add space for the border (two times), but only
+ // if at least one pane inside the dock has a pane border
+ for (j = 0; j < dock_pane_count; ++j)
+ {
+ if (dock.panes.Item(j)->HasBorder())
+ {
+ size += (pane_border_size*2);
+ break;
+ }
+ }
+
+ // if pane is on the top or bottom, add the caption height,
+ // but only if at least one pane inside the dock has a caption
+ if (dock.IsHorizontal())
+ {
+ for (j = 0; j < dock_pane_count; ++j)
+ {
+ if (dock.panes.Item(j)->HasCaption())
+ {
+ size += caption_size;
+ break;
+ }
+ }
+ }
+
+ // new dock's size may not be more than 1/3 of the frame size
+ if (dock.IsHorizontal())
+ size = wxMin(size, cli_size.y/3);
+ else
+ size = wxMin(size, cli_size.x/3);
+
+ if (size < 10)
+ size = 10;
+ dock.size = size;
+ }
+
+
+ // determine the dock's minimum size
+ bool plus_border = false;
+ bool plus_caption = false;
+ int dock_min_size = 0;
+ for (j = 0; j < dock_pane_count; ++j)
+ {
+ wxPaneInfo& pane = *dock.panes.Item(j);
+ if (pane.min_size != wxDefaultSize)
+ {
+ if (pane.HasBorder())
+ plus_border = true;
+ if (pane.HasCaption())
+ plus_caption = true;
+ if (dock.IsHorizontal())
+ {
+ if (pane.min_size.y > dock_min_size)
+ dock_min_size = pane.min_size.y;
+ }
+ else
+ {
+ if (pane.min_size.x > dock_min_size)
+ dock_min_size = pane.min_size.x;
+ }
+ }
+ }
+
+ if (plus_border)
+ dock_min_size += (pane_border_size*2);
+ if (plus_caption && dock.IsHorizontal())
+ dock_min_size += (caption_size);
+
+ dock.min_size = dock_min_size;
+
+
+ // if the pane's current size is less than it's
+ // minimum, increase the dock's size to it's minimum
+ if (dock.size < dock.min_size)
+ dock.size = dock.min_size;
+
+
+ // determine the dock's mode (fixed or proportional);
+ // determine whether the dock has only toolbars
+ bool action_pane_marked = false;
+ dock.fixed = true;
+ dock.toolbar = true;
+ for (j = 0; j < dock_pane_count; ++j)
+ {
+ wxPaneInfo& pane = *dock.panes.Item(j);
+ if (!pane.IsFixed())
+ dock.fixed = false;
+ if (!pane.IsToolbar())
+ dock.toolbar = false;
+ if (pane.state & wxPaneInfo::actionPane)
+ action_pane_marked = true;
+ }
+
+
+ // if the dock mode is proportional and not fixed-pixel,
+ // reassign the dock_pos to the sequential 0, 1, 2, 3;
+ // e.g. remove gaps like 1, 2, 30, 500
+ if (!dock.fixed)
+ {
+ for (j = 0; j < dock_pane_count; ++j)
+ {
+ wxPaneInfo& pane = *dock.panes.Item(j);
+ pane.dock_pos = j;
+ }
+ }
+
+ // if the dock mode is fixed, and none of the panes
+ // are being moved right now, make sure the panes
+ // do not overlap each other. If they do, we will
+ // adjust the panes' positions
+ if (dock.fixed && !action_pane_marked)
+ {
+ wxArrayInt pane_positions, pane_sizes;
+ GetPanePositionsAndSizes(dock, pane_positions, pane_sizes);
+
+ int offset = 0;
+ for (j = 0; j < dock_pane_count; ++j)
+ {
+ wxPaneInfo& pane = *(dock.panes.Item(j));
+ pane.dock_pos = pane_positions[j];
+
+ int amount = pane.dock_pos - offset;
+ if (amount >= 0)
+ offset += amount;
+ else
+ pane.dock_pos += -amount;
+
+ offset += pane_sizes[j];
+ }
+ }
+ }
+
+ // discover the maximum dock layer
+ int max_layer = 0;
+ for (i = 0; i < dock_count; ++i)
+ max_layer = wxMax(max_layer, docks.Item(i).dock_layer);
+
+
+ // clear out uiparts
+ uiparts.Empty();
+
+ // create a bunch of box sizers,
+ // from the innermost level outwards.
+ wxSizer* cont = NULL;
+ wxSizer* middle = NULL;
+ int layer = 0;
+ int row, row_count;
+
+ for (layer = 0; layer <= max_layer; ++layer)
+ {
+ wxDockInfoPtrArray arr;
+
+ // find any docks in this layer
+ FindDocks(docks, -1, layer, -1, arr);
+
+ // if there aren't any, skip to the next layer
+ if (arr.IsEmpty())
+ continue;
+
+ wxSizer* old_cont = cont;
+
+ // create a container which will hold this layer's
+ // docks (top, bottom, left, right)
+ cont = new wxBoxSizer(wxVERTICAL);
+
+
+ // find any top docks in this layer
+ FindDocks(docks, wxAUI_DOCK_TOP, layer, -1, arr);
+ RenumberDockRows(arr);
+ if (!arr.IsEmpty())
+ {
+ for (row = 0, row_count = arr.GetCount(); row < row_count; ++row)
+ LayoutAddDock(cont, *arr.Item(row), uiparts, spacer_only);
+ }
+
+
+ // fill out the middle layer (which consists
+ // of left docks, content area and right docks)
+
+ middle = new wxBoxSizer(wxHORIZONTAL);
+
+ // find any left docks in this layer
+ FindDocks(docks, wxAUI_DOCK_LEFT, layer, -1, arr);
+ RenumberDockRows(arr);
+ if (!arr.IsEmpty())
+ {
+ for (row = 0, row_count = arr.GetCount(); row < row_count; ++row)
+ LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
+ }
+
+ // add content dock (or previous layer's sizer
+ // to the middle
+ if (!old_cont)
+ {
+ // find any center docks
+ FindDocks(docks, wxAUI_DOCK_CENTER, -1, -1, arr);
+ if (!arr.IsEmpty())
+ {
+ for (row = 0,row_count = arr.GetCount(); rowAdd(1,1, 1, wxEXPAND);
+ wxDockUIPart part;
+ part.type = wxDockUIPart::typeBackground;
+ part.pane = NULL;
+ part.dock = NULL;
+ part.button = NULL;
+ part.cont_sizer = middle;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+ }
+ else
+ {
+ middle->Add(old_cont, 1, wxEXPAND);
+ }
+
+ // find any right docks in this layer
+ FindDocks(docks, wxAUI_DOCK_RIGHT, layer, -1, arr);
+ RenumberDockRows(arr);
+ if (!arr.IsEmpty())
+ {
+ for (row = arr.GetCount()-1; row >= 0; --row)
+ LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
+ }
+
+ cont->Add(middle, 1, wxEXPAND);
+
+
+
+ // find any bottom docks in this layer
+ FindDocks(docks, wxAUI_DOCK_BOTTOM, layer, -1, arr);
+ RenumberDockRows(arr);
+ if (!arr.IsEmpty())
+ {
+ for (row = arr.GetCount()-1; row >= 0; --row)
+ LayoutAddDock(cont, *arr.Item(row), uiparts, spacer_only);
+ }
+
+ }
+
+ if (!cont)
+ {
+ // no sizer available, because there are no docks,
+ // therefore we will create a simple background area
+ cont = new wxBoxSizer(wxVERTICAL);
+ wxSizerItem* sizer_item = cont->Add(1,1, 1, wxEXPAND);
+ wxDockUIPart part;
+ part.type = wxDockUIPart::typeBackground;
+ part.pane = NULL;
+ part.dock = NULL;
+ part.button = NULL;
+ part.cont_sizer = middle;
+ part.sizer_item = sizer_item;
+ uiparts.Add(part);
+ }
+
+ container->Add(cont, 1, wxEXPAND);
+ return container;
+}
+
+
+// Update() updates the layout. Whenever changes are made to
+// one or more panes, this function should be called. It is the
+// external entry point for running the layout engine.
+
+void wxFrameManager::Update()
+{
+ wxSizer* sizer;
+ int i, pane_count = m_panes.GetCount();
+
+ // delete old sizer first
+ m_frame->SetSizer(NULL);
+
+ // destroy floating panes which have been
+ // redocked or are becoming non-floating
+ for (i = 0; i < pane_count; ++i)
+ {
+ wxPaneInfo& p = m_panes.Item(i);
+
+ if (!p.IsFloating() && p.frame)
+ {
+ // because the pane is no longer in a floating, we need to
+ // reparent it to m_frame and destroy the floating frame
+
+ // reduce flicker
+ p.window->SetSize(1,1);
+ p.frame->Show(false);
+
+ // reparent to m_frame and destroy the pane
+ p.window->Reparent(m_frame);
+ p.frame->SetSizer(NULL);
+ p.frame->Destroy();
+ p.frame = NULL;
+ }
+ }
+
+
+ // create a layout for all of the panes
+ sizer = LayoutAll(m_panes, m_docks, m_uiparts, false);
+
+ // hide or show panes as necessary,
+ // and float panes as necessary
+ for (i = 0; i < pane_count; ++i)
+ {
+ wxPaneInfo& p = m_panes.Item(i);
+
+ if (p.IsFloating())
+ {
+ if (p.frame == NULL)
+ {
+ // we need to create a frame for this
+ // pane, which has recently been floated
+ wxFloatingPane* frame = new wxFloatingPane(m_frame,
+ this, -1,
+ p.floating_pos,
+ p.floating_size);
+
+ // on MSW, if the owner desires transparent dragging, and
+ // the dragging is happening right now, then the floating
+ // window should have this style by default
+ #ifdef __WXMSW__
+ if (m_action == actionDragFloatingPane &&
+ (m_flags & wxAUI_MGR_TRANSPARENT_DRAG))
+ MakeWindowTransparent(frame, 150);
+ #endif
+
+ frame->SetPaneWindow(p);
+ p.frame = frame;
+
+ if (p.IsShown())
+ {
+ frame->Show();
+ }
+ }
+ else
+ {
+ // frame already exists, make sure it's position
+ // and size reflect the information in wxPaneInfo
+ if (p.frame->GetPosition() != p.floating_pos)
+ {
+ p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
+ -1, -1, wxSIZE_USE_EXISTING);
+ //p.frame->Move(p.floating_pos.x, p.floating_pos.y);
+ }
+
+ p.frame->Show(p.IsShown());
+ }
+ }
+ else
+ {
+ p.window->Show(p.IsShown());
+ }
+
+ // if "active panes" are no longer allowed, clear
+ // any optionActive values from the pane states
+ if ((m_flags & wxAUI_MGR_ALLOW_ACTIVE_PANE) == 0)
+ {
+ p.state &= ~wxPaneInfo::optionActive;
+ }
+ }
+
+
+ // keep track of the old window rectangles so we can
+ // refresh those windows whose rect has changed
+ wxAuiRectArray old_pane_rects;
+ for (i = 0; i < pane_count; ++i)
+ {
+ wxRect r;
+ wxPaneInfo& p = m_panes.Item(i);
+
+ if (p.window && p.IsShown() && p.IsDocked())
+ r = p.rect;
+
+ old_pane_rects.Add(r);
+ }
+
+
+
+
+ // apply the new sizer
+ m_frame->SetSizer(sizer);
+ m_frame->SetAutoLayout(false);
+ DoFrameLayout();
+
+
+
+ // now that the frame layout is done, we need to check
+ // the new pane rectangles against the old rectangles that
+ // we saved a few lines above here. If the rectangles have
+ // changed, the corresponding panes must also be updated
+ for (i = 0; i < pane_count; ++i)
+ {
+ wxPaneInfo& p = m_panes.Item(i);
+ if (p.window && p.window->IsShown() && p.IsDocked())
+ {
+ if (p.rect != old_pane_rects[i])
+ {
+ p.window->Refresh();
+ p.window->Update();
+ }
+ }
+ }
+
+
+ Repaint();
+
+ // set frame's minimum size
+
+/*
+ // N.B. More work needs to be done on frame minimum sizes;
+ // this is some intresting code that imposes the minimum size,
+ // but we may want to include a more flexible mechanism or
+ // options for multiple minimum-size modes, e.g. strict or lax
+ wxSize min_size = sizer->GetMinSize();
+ wxSize frame_size = m_frame->GetSize();
+ wxSize client_size = m_frame->GetClientSize();
+
+ wxSize minframe_size(min_size.x+frame_size.x-client_size.x,
+ min_size.y+frame_size.y-client_size.y );
+
+ m_frame->SetMinSize(minframe_size);
+
+ if (frame_size.x < minframe_size.x ||
+ frame_size.y < minframe_size.y)
+ sizer->Fit(m_frame);
+*/
+}
+
+
+// DoFrameLayout() is an internal function which invokes wxSizer::Layout
+// on the frame's main sizer, then measures all the various UI items
+// and updates their internal rectangles. This should always be called
+// instead of calling m_frame->Layout() directly
+
+void wxFrameManager::DoFrameLayout()
+{
+ m_frame->Layout();
+
+ int i, part_count;
+ for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
+ {
+ wxDockUIPart& part = m_uiparts.Item(i);
+
+ // get the rectangle of the UI part
+ // originally, this code looked like this:
+ // part.rect = wxRect(part.sizer_item->GetPosition(),
+ // part.sizer_item->GetSize());
+ // this worked quite well, with one exception: the mdi
+ // client window had a "deferred" size variable
+ // that returned the wrong size. It looks like
+ // a bug in wx, because the former size of the window
+ // was being returned. So, we will retrieve the part's
+ // rectangle via other means
+
+
+ part.rect = part.sizer_item->GetRect();
+ int flag = part.sizer_item->GetFlag();
+ int border = part.sizer_item->GetBorder();
+ if (flag & wxTOP)
+ {
+ part.rect.y -= border;
+ part.rect.height += border;
+ }
+ if (flag & wxLEFT)
+ {
+ part.rect.x -= border;
+ part.rect.width += border;
+ }
+ if (flag & wxBOTTOM)
+ part.rect.height += border;
+ if (flag & wxRIGHT)
+ part.rect.width += border;
+
+
+ if (part.type == wxDockUIPart::typeDock)
+ part.dock->rect = part.rect;
+ if (part.type == wxDockUIPart::typePane)
+ part.pane->rect = part.rect;
+ }
+}
+
+// GetPanePart() looks up the pane the pane border UI part (or the regular
+// pane part if there is no border). This allows the caller to get the exact
+// rectangle of the pane in question, including decorations like
+// caption and border (if any).
+
+wxDockUIPart* wxFrameManager::GetPanePart(wxWindow* wnd)
+{
+ int i, part_count;
+ for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
+ {
+ wxDockUIPart& part = m_uiparts.Item(i);
+ if (part.type == wxDockUIPart::typePaneBorder &&
+ part.pane && part.pane->window == wnd)
+ return ∂
+ }
+ for (i = 0, part_count = m_uiparts.GetCount(); i < part_count; ++i)
+ {
+ wxDockUIPart& part = m_uiparts.Item(i);
+ if (part.type == wxDockUIPart::typePane &&
+ part.pane && part.pane->window == wnd)
+ return ∂
+ }
+ return NULL;
+}
+
+
+
+// GetDockPixelOffset() is an internal function which returns
+// a dock's offset in pixels from the left side of the window
+// (for horizontal docks) or from the top of the window (for
+// vertical docks). This value is necessary for calculating
+// fixel-pane/toolbar offsets when they are dragged.
+
+int wxFrameManager::GetDockPixelOffset(wxPaneInfo& test)
+{
+ // the only way to accurately calculate the dock's
+ // offset is to actually run a theoretical layout
+
+ int i, part_count, dock_count;
+ wxDockInfoArray docks;
+ wxPaneInfoArray panes;
+ wxDockUIPartArray uiparts;
+ CopyDocksAndPanes(docks, panes, m_docks, m_panes);
+ panes.Add(test);
+
+ wxSizer* sizer = LayoutAll(panes, docks, uiparts, true);
+ wxSize client_size = m_frame->GetClientSize();
+ sizer->SetDimension(0, 0, client_size.x, client_size.y);
+ sizer->Layout();
+
+ for (i = 0, part_count = uiparts.GetCount(); i < part_count; ++i)
+ {
+ wxDockUIPart& part = uiparts.Item(i);
+ part.rect = wxRect(part.sizer_item->GetPosition(),
+ part.sizer_item->GetSize());
+ if (part.type == wxDockUIPart::typeDock)
+ part.dock->rect = part.rect;
+ }
+
+ delete sizer;
+
+ for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
+ {
+ wxDockInfo& dock = docks.Item(i);
+ if (test.dock_direction == dock.dock_direction &&
+ test.dock_layer==dock.dock_layer && test.dock_row==dock.dock_row)
+ {
+ if (dock.IsVertical())
+ return dock.rect.y;
+ else
+ return dock.rect.x;
+ }
+ }
+
+ return 0;
+}
+
+
+
+// ProcessDockResult() is a utility function used by DoDrop() - it checks
+// if a dock operation is allowed, the new dock position is copied into
+// the target info. If the operation was allowed, the function returns true.
+
+static bool ProcessDockResult(wxPaneInfo& target,
+ const wxPaneInfo& new_pos)
+{
+ bool allowed = false;
+ switch (new_pos.dock_direction)
+ {
+ case wxAUI_DOCK_TOP: allowed = target.IsTopDockable(); break;
+ case wxAUI_DOCK_BOTTOM: allowed = target.IsBottomDockable(); break;
+ case wxAUI_DOCK_LEFT: allowed = target.IsLeftDockable(); break;
+ case wxAUI_DOCK_RIGHT: allowed = target.IsRightDockable(); break;
+ }
+
+ if (allowed)
+ target = new_pos;
+
+ return allowed;
+}
+
+
+// DoDrop() is an important function. It basically takes a mouse position,
+// and determines where the pane's new position would be. If the pane is to be
+// dropped, it performs the drop operation using the specified dock and pane
+// arrays. By specifying copied dock and pane arrays when calling, a "what-if"
+// scenario can be performed, giving precise coordinates for drop hints.
+// If, however, wxFrameManager:m_docks and wxFrameManager::m_panes are specified
+// as parameters, the changes will be made to the main state arrays
+
+const int auiInsertRowPixels = 10;
+const int auiNewRowPixels = 40;
+const int auiLayerInsertPixels = 40;
+const int auiLayerInsertOffset = 5;
+
+bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
+ wxPaneInfoArray& panes,
+ wxPaneInfo& target,
+ const wxPoint& pt,
+ const wxPoint& offset)
+{
+ wxSize cli_size = m_frame->GetClientSize();
+
+ wxPaneInfo drop = target;
+
+
+ // The result should always be shown
+ drop.Show();
+
+
+ // Check to see if the pane has been dragged outside of the window
+ // (or near to the outside of the window), if so, dock it along the edge
+
+
+ int layer_insert_offset = auiLayerInsertOffset;
+ if (target.IsToolbar())
+ layer_insert_offset = 0;
+
+ if (pt.x < layer_insert_offset &&
+ pt.x > layer_insert_offset-auiLayerInsertPixels)
+ {
+ int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT),
+ GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)),
+ GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1;
+ drop.Dock().Left().
+ Layer(new_layer).
+ Row(0).
+ Position(pt.y - GetDockPixelOffset(drop) - offset.y);
+ return ProcessDockResult(target, drop);
+ }
+ else if (pt.y < layer_insert_offset &&
+ pt.y > layer_insert_offset-auiLayerInsertPixels)
+ {
+ int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
+ GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
+ GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
+ drop.Dock().Top().
+ Layer(new_layer).
+ Row(0).
+ Position(pt.x - GetDockPixelOffset(drop) - offset.x);
+ return ProcessDockResult(target, drop);
+ }
+ else if (pt.x >= cli_size.x - layer_insert_offset &&
+ pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels)
+ {
+ int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
+ GetMaxLayer(docks, wxAUI_DOCK_TOP)),
+ GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1;
+ drop.Dock().Right().
+ Layer(new_layer).
+ Row(0).
+ Position(pt.y - GetDockPixelOffset(drop) - offset.y);
+ return ProcessDockResult(target, drop);
+ }
+ else if (pt.y >= cli_size.y - layer_insert_offset &&
+ pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels)
+ {
+ int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
+ GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
+ GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
+ drop.Dock().Bottom().
+ Layer(new_layer).
+ Row(0).
+ Position(pt.x - GetDockPixelOffset(drop) - offset.x);
+ return ProcessDockResult(target, drop);
+ }
+
+
+ wxDockUIPart* part = HitTest(pt.x, pt.y);
+
+
+ if (drop.IsToolbar())
+ {
+ if (!part || !part->dock)
+ return false;
+
+
+ // calculate the offset from where the dock begins
+ // to the point where the user dropped the pane
+ int dock_drop_offset = 0;
+ if (part->dock->IsHorizontal())
+ dock_drop_offset = pt.x - part->dock->rect.x - offset.x;
+ else
+ dock_drop_offset = pt.y - part->dock->rect.y - offset.y;
+
+
+ // toolbars may only be moved in and to fixed-pane docks,
+ // otherwise we will try to float the pane. Also, the pane
+ // should float if being dragged over center pane windows
+ if (!part->dock->fixed || part->dock->dock_direction == wxAUI_DOCK_CENTER)
+ {
+ if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
+ (drop.IsFloatable() ||
+ (part->dock->dock_direction != wxAUI_DOCK_CENTER &&
+ part->dock->dock_direction != wxAUI_DOCK_NONE)))
+ {
+ drop.Float();
+ }
+
+ return ProcessDockResult(target, drop);
+ }
+
+ drop.Dock().
+ Direction(part->dock->dock_direction).
+ Layer(part->dock->dock_layer).
+ Row(part->dock->dock_row).
+ Position(dock_drop_offset);
+
+ if ((
+ ((pt.y < part->dock->rect.y + 2) && part->dock->IsHorizontal()) ||
+ ((pt.x < part->dock->rect.x + 2) && part->dock->IsVertical())
+ ) && part->dock->panes.GetCount() > 1)
+ {
+ int row = drop.dock_row;
+ DoInsertDockRow(panes, part->dock->dock_direction,
+ part->dock->dock_layer,
+ part->dock->dock_row);
+ drop.dock_row = row;
+ }
+
+ if ((
+ ((pt.y > part->dock->rect.y + part->dock->rect.height - 2 ) && part->dock->IsHorizontal()) ||
+ ((pt.x > part->dock->rect.x + part->dock->rect.width - 2 ) && part->dock->IsVertical())
+ ) && part->dock->panes.GetCount() > 1)
+ {
+ DoInsertDockRow(panes, part->dock->dock_direction,
+ part->dock->dock_layer,
+ part->dock->dock_row+1);
+ drop.dock_row = part->dock->dock_row+1;
+ }
+
+ return ProcessDockResult(target, drop);
+ }
+
+
+
+
+ if (!part)
+ return false;
+
+ if (part->type == wxDockUIPart::typePaneBorder ||
+ part->type == wxDockUIPart::typeCaption ||
+ part->type == wxDockUIPart::typeGripper ||
+ part->type == wxDockUIPart::typePaneButton ||
+ part->type == wxDockUIPart::typePane ||
+ part->type == wxDockUIPart::typePaneSizer ||
+ part->type == wxDockUIPart::typeDockSizer ||
+ part->type == wxDockUIPart::typeBackground)
+ {
+ if (part->type == wxDockUIPart::typeDockSizer)
+ {
+ if (part->dock->panes.GetCount() != 1)
+ return false;
+ part = GetPanePart(part->dock->panes.Item(0)->window);
+ if (!part)
+ return false;
+ }
+
+
+
+ // If a normal frame is being dragged over a toolbar, insert it
+ // along the edge under the toolbar, but over all other panes.
+ // (this could be done much better, but somehow factoring this
+ // calculation with the one at the beginning of this function)
+ if (part->dock && part->dock->toolbar)
+ {
+ int layer = 0;
+
+ switch (part->dock->dock_direction)
+ {
+ case wxAUI_DOCK_LEFT:
+ layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT),
+ GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)),
+ GetMaxLayer(docks, wxAUI_DOCK_TOP));
+ break;
+ case wxAUI_DOCK_TOP:
+ layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
+ GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
+ GetMaxLayer(docks, wxAUI_DOCK_RIGHT));
+ break;
+ case wxAUI_DOCK_RIGHT:
+ layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
+ GetMaxLayer(docks, wxAUI_DOCK_TOP)),
+ GetMaxLayer(docks, wxAUI_DOCK_BOTTOM));
+ break;
+ case wxAUI_DOCK_BOTTOM:
+ layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
+ GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
+ GetMaxLayer(docks, wxAUI_DOCK_RIGHT));
+ break;
+ }
+
+ DoInsertDockRow(panes, part->dock->dock_direction,
+ layer, 0);
+ drop.Dock().
+ Direction(part->dock->dock_direction).
+ Layer(layer).Row(0).Position(0);
+ return ProcessDockResult(target, drop);
+ }
+
+
+ if (!part->pane)
+ return false;
+
+ part = GetPanePart(part->pane->window);
+ if (!part)
+ return false;
+
+ bool insert_dock_row = false;
+ int insert_row = part->pane->dock_row;
+ int insert_dir = part->pane->dock_direction;
+ int insert_layer = part->pane->dock_layer;
+
+ switch (part->pane->dock_direction)
+ {
+ case wxAUI_DOCK_TOP:
+ if (pt.y >= part->rect.y &&
+ pt.y < part->rect.y+auiInsertRowPixels)
+ insert_dock_row = true;
+ break;
+ case wxAUI_DOCK_BOTTOM:
+ if (pt.y > part->rect.y+part->rect.height-auiInsertRowPixels &&
+ pt.y <= part->rect.y + part->rect.height)
+ insert_dock_row = true;
+ break;
+ case wxAUI_DOCK_LEFT:
+ if (pt.x >= part->rect.x &&
+ pt.x < part->rect.x+auiInsertRowPixels)
+ insert_dock_row = true;
+ break;
+ case wxAUI_DOCK_RIGHT:
+ if (pt.x > part->rect.x+part->rect.width-auiInsertRowPixels &&
+ pt.x <= part->rect.x+part->rect.width)
+ insert_dock_row = true;
+ break;
+ case wxAUI_DOCK_CENTER:
+ {
+ // "new row pixels" will be set to the default, but
+ // must never exceed 20% of the window size
+ int new_row_pixels_x = auiNewRowPixels;
+ int new_row_pixels_y = auiNewRowPixels;
+
+ if (new_row_pixels_x > (part->rect.width*20)/100)
+ new_row_pixels_x = (part->rect.width*20)/100;
+
+ if (new_row_pixels_y > (part->rect.height*20)/100)
+ new_row_pixels_y = (part->rect.height*20)/100;
+
+
+ // determine if the mouse pointer is in a location that
+ // will cause a new row to be inserted. The hot spot positions
+ // are along the borders of the center pane
+
+ insert_layer = 0;
+ insert_dock_row = true;
+ if (pt.x >= part->rect.x &&
+ pt.x < part->rect.x+new_row_pixels_x)
+ insert_dir = wxAUI_DOCK_LEFT;
+ else
+ if (pt.y >= part->rect.y &&
+ pt.y < part->rect.y+new_row_pixels_y)
+ insert_dir = wxAUI_DOCK_TOP;
+ else
+ if (pt.x >= part->rect.x + part->rect.width-new_row_pixels_x &&
+ pt.x < part->rect.x + part->rect.width)
+ insert_dir = wxAUI_DOCK_RIGHT;
+ else
+ if (pt.y >= part->rect.y+ part->rect.height-new_row_pixels_y &&
+ pt.y < part->rect.y + part->rect.height)
+ insert_dir = wxAUI_DOCK_BOTTOM;
+ else
+ return false;
+
+ insert_row = GetMaxRow(panes, insert_dir, insert_layer) + 1;
+ }
+ }
+
+ if (insert_dock_row)
+ {
+ DoInsertDockRow(panes, insert_dir, insert_layer, insert_row);
+ drop.Dock().Direction(insert_dir).
+ Layer(insert_layer).
+ Row(insert_row).
+ Position(0);
+ return ProcessDockResult(target, drop);
+ }
+
+ // determine the mouse offset and the pane size, both in the
+ // direction of the dock itself, and perpendicular to the dock
+
+ int offset, size;
+
+ if (part->orientation == wxVERTICAL)
+ {
+ offset = pt.y - part->rect.y;
+ size = part->rect.GetHeight();
+ }
+ else
+ {
+ offset = pt.x - part->rect.x;
+ size = part->rect.GetWidth();
+ }
+
+ int drop_position = part->pane->dock_pos;
+
+ // if we are in the top/left part of the pane,
+ // insert the pane before the pane being hovered over
+ if (offset <= size/2)
+ {
+ drop_position = part->pane->dock_pos;
+ DoInsertPane(panes,
+ part->pane->dock_direction,
+ part->pane->dock_layer,
+ part->pane->dock_row,
+ part->pane->dock_pos);
+ }
+
+ // if we are in the bottom/right part of the pane,
+ // insert the pane before the pane being hovered over
+ if (offset > size/2)
+ {
+ drop_position = part->pane->dock_pos+1;
+ DoInsertPane(panes,
+ part->pane->dock_direction,
+ part->pane->dock_layer,
+ part->pane->dock_row,
+ part->pane->dock_pos+1);
+ }
+
+ drop.Dock().
+ Direction(part->dock->dock_direction).
+ Layer(part->dock->dock_layer).
+ Row(part->dock->dock_row).
+ Position(drop_position);
+ return ProcessDockResult(target, drop);
+ }
+
+ return false;
+}
+
+
+void wxFrameManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+ if (!m_hint_wnd || m_hint_fadeamt >= 50)
+ {
+ m_hint_fadetimer.Stop();
+ return;
+ }
+
+ m_hint_fadeamt += 5;
+ MakeWindowTransparent(m_hint_wnd, m_hint_fadeamt);
+#endif
+}
+
+void wxFrameManager::ShowHint(const wxRect& rect)
+{
+ #ifdef __WXMSW__
+
+ // First, determine if the operating system can handle transparency.
+ // Transparency is available on Win2000 and above
+
+ static int os_type = -1;
+ static int ver_major = -1;
+
+ if (os_type == -1)
+ os_type = ::wxGetOsVersion(&ver_major);
+
+ // If the transparent flag is set, and the OS supports it,
+ // go ahead and use a transparent hint
+
+ if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) != 0 &&
+ os_type == wxWINDOWS_NT && ver_major >= 5)
+ {
+ if (m_last_hint == rect)
+ return;
+ m_last_hint = rect;
+
+ int initial_fade = 50;
+ if (m_flags & wxAUI_MGR_TRANSPARENT_HINT_FADE)
+ initial_fade = 0;
+
+ if (m_hint_wnd == NULL)
+ {
+ wxPoint pt = rect.GetPosition();
+ wxSize size = rect.GetSize();
+ m_hint_wnd = new wxFrame(m_frame, -1, wxEmptyString, pt, size,
+ wxFRAME_TOOL_WINDOW |
+ wxFRAME_FLOAT_ON_PARENT |
+ wxFRAME_NO_TASKBAR |
+ wxNO_BORDER);
+
+ MakeWindowTransparent(m_hint_wnd, initial_fade);
+ m_hint_wnd->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION));
+ m_hint_wnd->Show();
+
+ // if we are dragging a floating pane, set the focus
+ // back to that floating pane (otherwise it becomes unfocused)
+ if (m_action == actionDragFloatingPane && m_action_window)
+ m_action_window->SetFocus();
+
+ }
+ else
+ {
+ wxPoint pt = rect.GetPosition();
+ wxSize size = rect.GetSize();
+ MakeWindowTransparent(m_hint_wnd, initial_fade);
+ m_hint_wnd->SetSize(pt.x, pt.y, rect.width, rect.height);
+ }
+
+ if (m_flags & wxAUI_MGR_TRANSPARENT_HINT_FADE)
+ {
+ // start fade in timer
+ m_hint_fadeamt = 0;
+ m_hint_fadetimer.SetOwner(this, 101);
+ m_hint_fadetimer.Start(5);
+ }
+
+ return;
+ }
+ #endif
+
+ if (m_last_hint != rect)
+ {
+ // remove the last hint rectangle
+ m_last_hint = rect;
+ m_frame->Refresh();
+ m_frame->Update();
+ }
+
+ wxScreenDC screendc;
+ wxRegion clip(1, 1, 10000, 10000);
+
+ // clip all floating windows, so we don't draw over them
+ int i, pane_count;
+ for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
+ {
+ wxPaneInfo& pane = m_panes.Item(i);
+
+ if (pane.IsFloating() &&
+ pane.frame->IsShown())
+ {
+ wxRect rect = pane.frame->GetRect();
+ #ifdef __WXGTK__
+ // wxGTK returns the client size, not the whole frame size
+ rect.width += 15;
+ rect.height += 35;
+ rect.Inflate(5);
+ #endif
+
+ clip.Subtract(rect);
+ }
+ }
+
+ screendc.SetClippingRegion(clip);
+
+ wxBitmap stipple = wxPaneCreateStippleBitmap();
+ wxBrush brush(stipple);
+ screendc.SetBrush(brush);
+ screendc.SetPen(*wxTRANSPARENT_PEN);
+
+ screendc.DrawRectangle(rect.x, rect.y, 5, rect.height);
+ screendc.DrawRectangle(rect.x+5, rect.y, rect.width-10, 5);
+ screendc.DrawRectangle(rect.x+rect.width-5, rect.y, 5, rect.height);
+ screendc.DrawRectangle(rect.x+5, rect.y+rect.height-5, rect.width-10, 5);
+}
+
+void wxFrameManager::HideHint()
+{
+ // hides a transparent window hint (currently wxMSW only)
+ #ifdef __WXMSW__
+ if (m_hint_wnd)
+ {
+ MakeWindowTransparent(m_hint_wnd, 0);
+ m_hint_fadetimer.Stop();
+ m_last_hint = wxRect();
+ return;
+ }
+ #endif
+
+ // hides a painted hint by redrawing the frame window
+ if (!m_last_hint.IsEmpty())
+ {
+ m_frame->Refresh();
+ m_frame->Update();
+ m_last_hint = wxRect();
+ }
+}
+
+
+
+// DrawHintRect() draws a drop hint rectangle. First calls DoDrop() to
+// determine the exact position the pane would be at were if dropped. If
+// the pame would indeed become docked at the specified drop point,
+// DrawHintRect() then calls ShowHint() to indicate this drop rectangle.
+// "pane_window" is the window pointer of the pane being dragged, pt is
+// the mouse position, in client coordinates
+void wxFrameManager::DrawHintRect(wxWindow* pane_window,
+ const wxPoint& pt,
+ const wxPoint& offset)
+{
+ wxRect rect;
+
+ // we need to paint a hint rectangle; to find out the exact hint rectangle,
+ // we will create a new temporary layout and then measure the resulting
+ // rectangle; we will create a copy of the docking structures (m_dock)
+ // so that we don't modify the real thing on screen
+
+ int i, pane_count, part_count;
+ wxDockInfoArray docks;
+ wxPaneInfoArray panes;
+ wxDockUIPartArray uiparts;
+ wxPaneInfo hint = GetPane(pane_window);
+ hint.name = wxT("__HINT__");
+
+ if (!hint.IsOk())
+ return;
+
+ CopyDocksAndPanes(docks, panes, m_docks, m_panes);
+
+ // remove any pane already there which bears the same window;
+ // this happens when you are moving a pane around in a dock
+ for (i = 0, pane_count = panes.GetCount(); i < pane_count; ++i)
+ {
+ if (panes.Item(i).window == pane_window)
+ {
+ RemovePaneFromDocks(docks, panes.Item(i));
+ panes.RemoveAt(i);
+ break;
+ }
+ }
+
+ // find out where the new pane would be
+ if (!DoDrop(docks, panes, hint, pt, offset))
+ {
+ HideHint();
+ return;
+ }
+
+ panes.Add(hint);
+
+ wxSizer* sizer = LayoutAll(panes, docks, uiparts, true);
+ wxSize client_size = m_frame->GetClientSize();
+ sizer->SetDimension(0, 0, client_size.x, client_size.y);
+ sizer->Layout();
+
+ for (i = 0, part_count = uiparts.GetCount();
+ i < part_count; ++i)
+ {
+ wxDockUIPart& part = uiparts.Item(i);
+
+ if (part.type == wxDockUIPart::typePaneBorder &&
+ part.pane && part.pane->name == wxT("__HINT__"))
+ {
+ rect = wxRect(part.sizer_item->GetPosition(),
+ part.sizer_item->GetSize());
+ break;
+ }
+ }
+
+ delete sizer;
+
+ if (rect.IsEmpty())
+ {
+ HideHint();
+ return;
+ }
+
+ // actually show the hint rectangle on the screen
+ m_frame->ClientToScreen(&rect.x, &rect.y);
+ ShowHint(rect);
+}
+
+void wxFrameManager::OnFloatingPaneMoveStart(wxWindow* wnd)
+{
+ // try to find the pane
+ wxPaneInfo& pane = GetPane(wnd);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ #ifdef __WXMSW__
+ if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
+ MakeWindowTransparent(pane.frame, 150);
+ #endif
+}
+
+void wxFrameManager::OnFloatingPaneMoving(wxWindow* wnd)
+{
+ // try to find the pane
+ wxPaneInfo& pane = GetPane(wnd);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ wxPoint pt = ::wxGetMousePosition();
+ wxPoint client_pt = m_frame->ScreenToClient(pt);
+
+ // calculate the offset from the upper left-hand corner
+ // of the frame to the mouse pointer
+ wxPoint frame_pos = pane.frame->GetPosition();
+ wxPoint action_offset(pt.x-frame_pos.x, pt.y-frame_pos.y);
+
+ // no hint for toolbar floating windows
+ if (pane.IsToolbar() && m_action == actionDragFloatingPane)
+ {
+ if (m_action == actionDragFloatingPane)
+ {
+ wxDockInfoArray docks;
+ wxPaneInfoArray panes;
+ wxDockUIPartArray uiparts;
+ wxPaneInfo hint = pane;
+
+ CopyDocksAndPanes(docks, panes, m_docks, m_panes);
+
+ // find out where the new pane would be
+ if (!DoDrop(docks, panes, hint, client_pt))
+ return;
+ if (hint.IsFloating())
+ return;
+
+ pane = hint;
+ m_action = actionDragToolbarPane;
+ m_action_window = pane.window;
+
+ Update();
+ }
+
+ return;
+ }
+
+
+ // if a key modifier is pressed while dragging the frame,
+ // don't dock the window
+ if (wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT))
+ {
+ HideHint();
+ return;
+ }
+
+
+ DrawHintRect(wnd, client_pt, action_offset);
+
+ #ifdef __WXGTK__
+ // this cleans up some screen artifacts that are caused on GTK because
+ // we aren't getting the exact size of the window (see comment
+ // in DrawHintRect)
+ //Refresh();
+ #endif
+
+
+ // reduces flicker
+ m_frame->Update();
+}
+
+void wxFrameManager::OnFloatingPaneMoved(wxWindow* wnd)
+{
+ // try to find the pane
+ wxPaneInfo& pane = GetPane(wnd);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ wxPoint pt = ::wxGetMousePosition();
+ wxPoint client_pt = m_frame->ScreenToClient(pt);
+
+ // calculate the offset from the upper left-hand corner
+ // of the frame to the mouse pointer
+ wxPoint frame_pos = pane.frame->GetPosition();
+ wxPoint action_offset(pt.x-frame_pos.x, pt.y-frame_pos.y);
+
+
+ // if a key modifier is pressed while dragging the frame,
+ // don't dock the window
+ if (wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT))
+ {
+ HideHint();
+ return;
+ }
+
+
+ // do the drop calculation
+ DoDrop(m_docks, m_panes, pane, client_pt, action_offset);
+
+ // if the pane is still floating, update it's floating
+ // position (that we store)
+ if (pane.IsFloating())
+ {
+ pane.floating_pos = pane.frame->GetPosition();
+
+ #ifdef __WXMSW__
+ if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
+ MakeWindowTransparent(pane.frame, 255);
+ #endif
+ }
+
+ Update();
+
+ HideHint();
+}
+
+void wxFrameManager::OnFloatingPaneResized(wxWindow* wnd, const wxSize& size)
+{
+ // try to find the pane
+ wxPaneInfo& pane = GetPane(wnd);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ pane.floating_size = size;
+}
+
+void wxFrameManager::OnFloatingPaneClosed(wxWindow* wnd)
+{
+ // try to find the pane
+ wxPaneInfo& pane = GetPane(wnd);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ // reparent the pane window back to us and
+ // prepare the frame window for destruction
+ pane.window->Show(false);
+ pane.window->Reparent(m_frame);
+ pane.frame = NULL;
+ pane.Hide();
+}
+
+void wxFrameManager::OnFloatingPaneActivated(wxWindow* wnd)
+{
+ if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
+ {
+ // try to find the pane
+ wxPaneInfo& pane = GetPane(wnd);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ SetActivePane(m_panes, wnd);
+ Repaint();
+ }
+}
+
+// Render() draws all of the pane captions, sashes,
+// backgrounds, captions, grippers, pane borders and buttons.
+// It renders the entire user interface.
+
+void wxFrameManager::Render(wxDC* dc)
+{
+#ifdef __WXMAC__
+ dc->Clear() ;
+#endif
+ int i, part_count;
+ for (i = 0, part_count = m_uiparts.GetCount();
+ i < part_count; ++i)
+ {
+ wxDockUIPart& part = m_uiparts.Item(i);
+
+ // don't draw hidden pane items
+ if (part.sizer_item && !part.sizer_item->IsShown())
+ continue;
+
+ switch (part.type)
+ {
+ case wxDockUIPart::typeDockSizer:
+ case wxDockUIPart::typePaneSizer:
+ m_art->DrawSash(*dc, part.orientation, part.rect);
+ break;
+ case wxDockUIPart::typeBackground:
+ m_art->DrawBackground(*dc, part.orientation, part.rect);
+ break;
+ case wxDockUIPart::typeCaption:
+ m_art->DrawCaption(*dc, part.pane->caption, part.rect, *part.pane);
+ break;
+ case wxDockUIPart::typeGripper:
+ m_art->DrawGripper(*dc, part.rect, *part.pane);
+ break;
+ case wxDockUIPart::typePaneBorder:
+ m_art->DrawBorder(*dc, part.rect, *part.pane);
+ break;
+ case wxDockUIPart::typePaneButton:
+ m_art->DrawPaneButton(*dc, part.button->button_id,
+ wxAUI_BUTTON_STATE_NORMAL, part.rect, *part.pane);
+ break;
+ }
+ }
+}
+
+void wxFrameManager::Repaint(wxDC* dc)
+{
+#ifdef __WXMAC__
+ if ( dc == NULL )
+ {
+ m_frame->Refresh() ;
+ m_frame->Update() ;
+ return ;
+ }
+#endif
+ int w, h;
+ m_frame->GetClientSize(&w, &h);
+
+ // figure out which dc to use; if one
+ // has been specified, use it, otherwise
+ // make a client dc
+ wxClientDC* client_dc = NULL;
+ if (!dc)
+ {
+ client_dc = new wxClientDC(m_frame);
+ dc = client_dc;
+ }
+
+ // if the frame has a toolbar, the client area
+ // origin will not be (0,0).
+ wxPoint pt = m_frame->GetClientAreaOrigin();
+ if (pt.x != 0 || pt.y != 0)
+ dc->SetDeviceOrigin(pt.x, pt.y);
+
+ // render all the items
+ Render(dc);
+
+ // if we created a client_dc, delete it
+ if (client_dc)
+ delete client_dc;
+}
+
+void wxFrameManager::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+ wxPaintDC dc(m_frame);
+ Repaint(&dc);
+}
+
+void wxFrameManager::OnEraseBackground(wxEraseEvent& event)
+{
+#ifdef __WXMAC__
+ event.Skip() ;
+#else
+ wxUnusedVar(event);
+#endif
+}
+
+void wxFrameManager::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+ if (m_frame)
+ {
+ DoFrameLayout();
+ Repaint();
+ }
+}
+
+
+void wxFrameManager::OnSetCursor(wxSetCursorEvent& event)
+{
+ // determine cursor
+ wxDockUIPart* part = HitTest(event.GetX(), event.GetY());
+ wxCursor cursor = wxNullCursor;
+
+ if (part)
+ {
+ if (part->type == wxDockUIPart::typeDockSizer ||
+ part->type == wxDockUIPart::typePaneSizer)
+ {
+ // a dock may not be resized if it has a single
+ // pane which is not resizable
+ if (part->type == wxDockUIPart::typeDockSizer && part->dock &&
+ part->dock->panes.GetCount() == 1 &&
+ part->dock->panes.Item(0)->IsFixed())
+ return;
+
+ // panes that may not be resized do not get a sizing cursor
+ if (part->pane && part->pane->IsFixed())
+ return;
+
+ if (part->orientation == wxVERTICAL)
+ cursor = wxCursor(wxCURSOR_SIZEWE);
+ else
+ cursor = wxCursor(wxCURSOR_SIZENS);
+ }
+ else if (part->type == wxDockUIPart::typeGripper)
+ {
+ cursor = wxCursor(wxCURSOR_SIZING);
+ }
+ }
+
+ event.SetCursor(cursor);
+}
+
+
+
+void wxFrameManager::UpdateButtonOnScreen(wxDockUIPart* button_ui_part,
+ const wxMouseEvent& event)
+{
+ wxDockUIPart* hit_test = HitTest(event.GetX(), event.GetY());
+
+ int state = wxAUI_BUTTON_STATE_NORMAL;
+
+ if (hit_test == button_ui_part)
+ {
+ if (event.LeftDown())
+ state = wxAUI_BUTTON_STATE_PRESSED;
+ else
+ state = wxAUI_BUTTON_STATE_HOVER;
+ }
+ else
+ {
+ if (event.LeftDown())
+ state = wxAUI_BUTTON_STATE_HOVER;
+ }
+
+ // now repaint the button with hover state
+ wxClientDC cdc(m_frame);
+
+ // if the frame has a toolbar, the client area
+ // origin will not be (0,0).
+ wxPoint pt = m_frame->GetClientAreaOrigin();
+ if (pt.x != 0 || pt.y != 0)
+ cdc.SetDeviceOrigin(pt.x, pt.y);
+
+ m_art->DrawPaneButton(cdc,
+ button_ui_part->button->button_id,
+ state,
+ button_ui_part->rect,
+ *hit_test->pane);
+}
+
+void wxFrameManager::OnLeftDown(wxMouseEvent& event)
+{
+ wxDockUIPart* part = HitTest(event.GetX(), event.GetY());
+ if (part)
+ {
+ if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
+ return;
+
+ if (part->type == wxDockUIPart::typeDockSizer ||
+ part->type == wxDockUIPart::typePaneSizer)
+ {
+ // a dock may not be resized if it has a single
+ // pane which is not resizable
+ if (part->type == wxDockUIPart::typeDockSizer && part->dock &&
+ part->dock->panes.GetCount() == 1 &&
+ part->dock->panes.Item(0)->IsFixed())
+ return;
+
+ // panes that may not be resized should be ignored here
+ if (part->pane && part->pane->IsFixed())
+ return;
+
+ m_action = actionResize;
+ m_action_part = part;
+ m_action_hintrect = wxRect();
+ m_action_start = wxPoint(event.m_x, event.m_y);
+ m_action_offset = wxPoint(event.m_x - part->rect.x,
+ event.m_y - part->rect.y);
+ m_frame->CaptureMouse();
+ }
+ else if (part->type == wxDockUIPart::typePaneButton)
+ {
+ m_action = actionClickButton;
+ m_action_part = part;
+ m_action_start = wxPoint(event.m_x, event.m_y);
+ m_frame->CaptureMouse();
+
+ UpdateButtonOnScreen(part, event);
+ }
+ else if (part->type == wxDockUIPart::typeCaption ||
+ part->type == wxDockUIPart::typeGripper)
+ {
+ if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
+ {
+ // set the caption as active
+ SetActivePane(m_panes, part->pane->window);
+ Repaint();
+ }
+
+ m_action = actionClickCaption;
+ m_action_part = part;
+ m_action_start = wxPoint(event.m_x, event.m_y);
+ m_action_offset = wxPoint(event.m_x - part->rect.x,
+ event.m_y - part->rect.y);
+ m_frame->CaptureMouse();
+ }
+#ifdef __WXMAC__
+ else
+ {
+ event.Skip();
+ }
+#endif
+ }
+#ifdef __WXMAC__
+ else
+ {
+ event.Skip();
+ }
+#else
+ event.Skip();
+#endif
+}
+
+
+void wxFrameManager::OnLeftUp(wxMouseEvent& event)
+{
+ if (m_action == actionResize)
+ {
+ m_frame->ReleaseMouse();
+
+ // get rid of the hint rectangle
+ wxScreenDC dc;
+ DrawResizeHint(dc, m_action_hintrect);
+
+ // resize the dock or the pane
+ if (m_action_part && m_action_part->type==wxDockUIPart::typeDockSizer)
+ {
+ wxRect& rect = m_action_part->dock->rect;
+
+ wxPoint new_pos(event.m_x - m_action_offset.x,
+ event.m_y - m_action_offset.y);
+
+ switch (m_action_part->dock->dock_direction)
+ {
+ case wxAUI_DOCK_LEFT:
+ m_action_part->dock->size = new_pos.x - rect.x;
+ break;
+ case wxAUI_DOCK_TOP:
+ m_action_part->dock->size = new_pos.y - rect.y;
+ break;
+ case wxAUI_DOCK_RIGHT:
+ m_action_part->dock->size = rect.x + rect.width -
+ new_pos.x - m_action_part->rect.GetWidth();
+ break;
+ case wxAUI_DOCK_BOTTOM:
+ m_action_part->dock->size = rect.y + rect.height -
+ new_pos.y - m_action_part->rect.GetHeight();
+ break;
+ }
+
+ Update();
+ Repaint(NULL);
+ }
+ else if (m_action_part &&
+ m_action_part->type == wxDockUIPart::typePaneSizer)
+ {
+ wxDockInfo& dock = *m_action_part->dock;
+ wxPaneInfo& pane = *m_action_part->pane;
+
+ int total_proportion = 0;
+ int dock_pixels = 0;
+ int new_pixsize = 0;
+
+ int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
+ int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
+ int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE);
+
+ wxPoint new_pos(event.m_x - m_action_offset.x,
+ event.m_y - m_action_offset.y);
+
+ // determine the pane rectangle by getting the pane part
+ wxDockUIPart* pane_part = GetPanePart(pane.window);
+ wxASSERT_MSG(pane_part,
+ wxT("Pane border part not found -- shouldn't happen"));
+
+ // determine the new pixel size that the user wants;
+ // this will help us recalculate the pane's proportion
+ if (dock.IsHorizontal())
+ new_pixsize = new_pos.x - pane_part->rect.x;
+ else
+ new_pixsize = new_pos.y - pane_part->rect.y;
+
+ // determine the size of the dock, based on orientation
+ if (dock.IsHorizontal())
+ dock_pixels = dock.rect.GetWidth();
+ else
+ dock_pixels = dock.rect.GetHeight();
+
+ // determine the total proportion of all resizable panes,
+ // and the total size of the dock minus the size of all
+ // the fixed panes
+ int i, dock_pane_count = dock.panes.GetCount();
+ int pane_position = -1;
+ for (i = 0; i < dock_pane_count; ++i)
+ {
+ wxPaneInfo& p = *dock.panes.Item(i);
+ if (p.window == pane.window)
+ pane_position = i;
+
+ // while we're at it, subtract the pane sash
+ // width from the dock width, because this would
+ // skew our proportion calculations
+ if (i > 0)
+ dock_pixels -= sash_size;
+
+ // also, the whole size (including decorations) of
+ // all fixed panes must also be subtracted, because they
+ // are not part of the proportion calculation
+ if (p.IsFixed())
+ {
+ if (dock.IsHorizontal())
+ dock_pixels -= p.best_size.x;
+ else
+ dock_pixels -= p.best_size.y;
+ }
+ else
+ {
+ total_proportion += p.dock_proportion;
+ }
+ }
+
+ // find a pane in our dock to 'steal' space from or to 'give'
+ // space to -- this is essentially what is done when a pane is
+ // resized; the pane should usually be the first non-fixed pane
+ // to the right of the action pane
+ int borrow_pane = -1;
+ for (i = pane_position+1; i < dock_pane_count; ++i)
+ {
+ wxPaneInfo& p = *dock.panes.Item(i);
+ if (!p.IsFixed())
+ {
+ borrow_pane = i;
+ break;
+ }
+ }
+
+
+ // demand that the pane being resized is found in this dock
+ // (this assert really never should be raised)
+ wxASSERT_MSG(pane_position != -1, wxT("Pane not found in dock"));
+
+ // prevent division by zero
+ if (dock_pixels == 0 || total_proportion == 0 || borrow_pane == -1)
+ {
+ m_action = actionNone;
+ return;
+ }
+
+ // calculate the new proportion of the pane
+ int new_proportion = (new_pixsize*total_proportion)/dock_pixels;
+
+ // default minimum size
+ int min_size = 0;
+
+ // check against the pane's minimum size, if specified. please note
+ // that this is not enough to ensure that the minimum size will
+ // not be violated, because the whole frame might later be shrunk,
+ // causing the size of the pane to violate it's minimum size
+ if (pane.min_size.IsFullySpecified())
+ {
+ min_size = 0;
+
+ if (pane.HasBorder())
+ min_size += (pane_border_size*2);
+
+ // calculate minimum size with decorations (border,caption)
+ if (pane_part->orientation == wxVERTICAL)
+ {
+ min_size += pane.min_size.y;
+ if (pane.HasCaption())
+ min_size += caption_size;
+ }
+ else
+ {
+ min_size += pane.min_size.x;
+ }
+ }
+
+
+ // for some reason, an arithmatic error somewhere is causing
+ // the proportion calculations to always be off by 1 pixel;
+ // for now we will add the 1 pixel on, but we really should
+ // determine what's causing this.
+ min_size++;
+
+ int min_proportion = (min_size*total_proportion)/dock_pixels;
+
+ if (new_proportion < min_proportion)
+ new_proportion = min_proportion;
+
+
+
+ int prop_diff = new_proportion - pane.dock_proportion;
+
+ // borrow the space from our neighbor pane to the
+ // right or bottom (depending on orientation)
+ dock.panes.Item(borrow_pane)->dock_proportion -= prop_diff;
+ pane.dock_proportion = new_proportion;
+
+ // repaint
+ Update();
+ Repaint(NULL);
+ }
+ }
+ else if (m_action == actionClickButton)
+ {
+ m_hover_button = NULL;
+ m_frame->ReleaseMouse();
+ UpdateButtonOnScreen(m_action_part, event);
+
+ // make sure we're still over the item that was originally clicked
+ if (m_action_part == HitTest(event.GetX(), event.GetY()))
+ {
+ // fire button-click event
+ wxFrameManagerEvent e(wxEVT_AUI_PANEBUTTON);
+ e.SetPane(m_action_part->pane);
+ e.SetButton(m_action_part->button->button_id);
+ ProcessMgrEvent(e);
+ }
+ }
+ else if (m_action == actionClickCaption)
+ {
+ m_frame->ReleaseMouse();
+ }
+ else if (m_action == actionDragFloatingPane)
+ {
+ m_frame->ReleaseMouse();
+ }
+ else if (m_action == actionDragToolbarPane)
+ {
+ m_frame->ReleaseMouse();
+
+ wxPaneInfo& pane = GetPane(m_action_window);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ // save the new positions
+ wxDockInfoPtrArray docks;
+ FindDocks(m_docks, pane.dock_direction,
+ pane.dock_layer, pane.dock_row, docks);
+ if (docks.GetCount() == 1)
+ {
+ wxDockInfo& dock = *docks.Item(0);
+
+ wxArrayInt pane_positions, pane_sizes;
+ GetPanePositionsAndSizes(dock, pane_positions, pane_sizes);
+
+ int i, dock_pane_count = dock.panes.GetCount();
+ for (i = 0; i < dock_pane_count; ++i)
+ dock.panes.Item(i)->dock_pos = pane_positions[i];
+ }
+
+ pane.state &= ~wxPaneInfo::actionPane;
+ Update();
+ }
+ else
+ {
+ event.Skip();
+ }
+
+ m_action = actionNone;
+ m_last_mouse_move = wxPoint(); // see comment in OnMotion()
+}
+
+
+void wxFrameManager::OnMotion(wxMouseEvent& event)
+{
+ // sometimes when Update() is called from inside this method,
+ // a spurious mouse move event is generated; this check will make
+ // sure that only real mouse moves will get anywhere in this method;
+ // this appears to be a bug somewhere, and I don't know where the
+ // mouse move event is being generated. only verified on MSW
+
+ wxPoint mouse_pos = event.GetPosition();
+ if (m_last_mouse_move == mouse_pos)
+ return;
+ m_last_mouse_move = mouse_pos;
+
+
+ if (m_action == actionResize)
+ {
+ wxPoint pos = m_action_part->rect.GetPosition();
+ if (m_action_part->orientation == wxHORIZONTAL)
+ pos.y = wxMax(0, event.m_y - m_action_offset.y);
+ else
+ pos.x = wxMax(0, event.m_x - m_action_offset.x);
+
+ wxRect rect(m_frame->ClientToScreen(pos),
+ m_action_part->rect.GetSize());
+
+ wxScreenDC dc;
+ if (!m_action_hintrect.IsEmpty())
+ DrawResizeHint(dc, m_action_hintrect);
+ DrawResizeHint(dc, rect);
+ m_action_hintrect = rect;
+ }
+ else if (m_action == actionClickCaption)
+ {
+ int drag_x_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
+ int drag_y_threshold = wxSystemSettings::GetMetric(wxSYS_DRAG_Y);
+
+ // caption has been clicked. we need to check if the mouse
+ // is now being dragged. if it is, we need to change the
+ // mouse action to 'drag'
+ if (abs(event.m_x - m_action_start.x) > drag_x_threshold ||
+ abs(event.m_y - m_action_start.y) > drag_y_threshold)
+ {
+ wxPaneInfo* pane_info = m_action_part->pane;
+
+ if (!pane_info->IsToolbar())
+ {
+ if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
+ pane_info->IsFloatable())
+ {
+ m_action = actionDragFloatingPane;
+
+ // set initial float position
+ wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
+ pane_info->floating_pos = wxPoint(pt.x - m_action_offset.x,
+ pt.y - m_action_offset.y);
+ // float the window
+ pane_info->Float();
+ Update();
+
+ m_action_window = pane_info->frame;
+
+ // action offset is used here to make it feel "natural" to the user
+ // to drag a docked pane and suddenly have it become a floating frame.
+ // Sometimes, however, the offset where the user clicked on the docked
+ // caption is bigger than the width of the floating frame itself, so
+ // in that case we need to set the action offset to a sensible value
+ wxSize frame_size = m_action_window->GetSize();
+ if (frame_size.x <= m_action_offset.x)
+ m_action_offset.x = 30;
+ }
+ }
+ else
+ {
+ m_action = actionDragToolbarPane;
+ m_action_window = pane_info->window;
+ }
+ }
+ }
+ else if (m_action == actionDragFloatingPane)
+ {
+ wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
+ m_action_window->Move(pt.x - m_action_offset.x,
+ pt.y - m_action_offset.y);
+ }
+ else if (m_action == actionDragToolbarPane)
+ {
+ wxPaneInfo& pane = GetPane(m_action_window);
+ wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+
+ pane.state |= wxPaneInfo::actionPane;
+
+ wxPoint pt = event.GetPosition();
+ DoDrop(m_docks, m_panes, pane, pt, m_action_offset);
+
+ // if DoDrop() decided to float the pane, set up
+ // the floating pane's initial position
+ if (pane.IsFloating())
+ {
+ wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
+ pane.floating_pos = wxPoint(pt.x - m_action_offset.x,
+ pt.y - m_action_offset.y);
+ }
+
+ // this will do the actiual move operation;
+ // in the case that the pane has been floated,
+ // this call will create the floating pane
+ // and do the reparenting
+ Update();
+
+ // if the pane has been floated, change the mouse
+ // action actionDragFloatingPane so that subsequent
+ // EVT_MOTION() events will move the floating pane
+ if (pane.IsFloating())
+ {
+ pane.state &= ~wxPaneInfo::actionPane;
+ m_action = actionDragFloatingPane;
+ m_action_window = pane.frame;
+ }
+ }
+ else
+ {
+ wxDockUIPart* part = HitTest(event.GetX(), event.GetY());
+ if (part && part->type == wxDockUIPart::typePaneButton)
+ {
+ if (part != m_hover_button)
+ {
+ // make the old button normal
+ if (m_hover_button)
+ UpdateButtonOnScreen(m_hover_button, event);
+
+ // mouse is over a button, so repaint the
+ // button in hover mode
+ UpdateButtonOnScreen(part, event);
+ m_hover_button = part;
+ }
+ }
+ else
+ {
+ if (m_hover_button)
+ {
+ m_hover_button = NULL;
+ Repaint();
+ }
+ else
+ {
+ event.Skip();
+ }
+ }
+ }
+}
+
+void wxFrameManager::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
+{
+ if (m_hover_button)
+ {
+ m_hover_button = NULL;
+ Repaint();
+ }
+}
+
+void wxFrameManager::OnChildFocus(wxChildFocusEvent& event)
+{
+ // when a child pane has it's focus set, we should change the
+ // pane's active state to reflect this. (this is only true if
+ // active panes are allowed by the owner)
+ if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
+ {
+ if (GetPane(event.GetWindow()).IsOk())
+ {
+ SetActivePane(m_panes, event.GetWindow());
+ m_frame->Refresh();
+ }
+ }
+}
+
+
+// OnPaneButton() is an event handler that is called
+// when a pane button has been pressed.
+void wxFrameManager::OnPaneButton(wxFrameManagerEvent& event)
+{
+ wxPaneInfo& pane = *(event.pane);
+
+ if (event.button == wxPaneInfo::buttonClose)
+ {
+ pane.Hide();
+ Update();
+ }
+ else if (event.button == wxPaneInfo::buttonPin)
+ {
+ if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
+ pane.IsFloatable())
+ pane.Float();
+ Update();
+ }
+}
+
+#endif // wxUSE_AUI
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 44851caed6..2edfd5a505 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -1743,6 +1743,18 @@ SOURCE=.\msw\window.cpp
# PROP Default_Filter ""
# Begin Source File
+SOURCE=.\aui\dockart.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\aui\floatpane.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\aui\framemanager.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\richtext\richtextbuffer.cpp
# End Source File
# Begin Source File
@@ -2107,6 +2119,22 @@ SOURCE=..\include\wx\artprov.h
# End Source File
# Begin Source File
+SOURCE=..\include\wx\aui\aui.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\aui\dockart.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\aui\floatpane.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\aui\framemanager.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\beforestd.h
# End Source File
# Begin Source File
@@ -3987,6 +4015,10 @@ SOURCE=..\include\wx\generic\clrpicker.h
# End Source File
# Begin Source File
+SOURCE=..\include\wx\generic\clrpickerg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\generic\colrdlgg.h
# End Source File
# Begin Source File
@@ -4023,6 +4055,10 @@ SOURCE=..\include\wx\generic\filepicker.h
# End Source File
# Begin Source File
+SOURCE=..\include\wx\generic\filepickerg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\generic\fontdlgg.h
# End Source File
# Begin Source File
@@ -4031,6 +4067,10 @@ SOURCE=..\include\wx\generic\fontpicker.h
# End Source File
# Begin Source File
+SOURCE=..\include\wx\generic\fontpickerg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\generic\grid.h
# End Source File
# Begin Source File