regenerated

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index b81707db357a4ef32d43acc4cc849a912fb3e03d..e967cb6ae314f986290e3d2a120eafbd10256189 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,36 +42,37 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) $(PIC_FLAG)
-HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     $(CXXFLAGS)
-HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG)
+MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) $(PIC_FLAG)
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   $(CXXFLAGS)
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DWXUSINGDLL_BASE -DWXUSINGDLL_CORE -DWXMAKINGDLL_HTML $(CXXFLAGS) $(PIC_FLAG)

 WXREGEX_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXPNG_CFLAGS = $(CPPFLAGS)   $(__INC_ZLIB_p) $(CFLAGS)
 WXREGEX_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXPNG_CFLAGS = $(CPPFLAGS)   $(__INC_ZLIB_p) $(CFLAGS)

-CORELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=0 $(CFLAGS)
+CORELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=0 $(CFLAGS)

 WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXJPEG_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXTIFF_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXJPEG_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXTIFF_CFLAGS = $(CPPFLAGS)   $(CFLAGS)

-CORELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=0 $(CXXFLAGS)
-COREDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DWXMAKINGDLL -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG)
-MONOLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=1 $(CXXFLAGS)
-BASELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)
-MONODLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG)
-COREDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DWXMAKINGDLL -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG)
+CORELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=0 $(CXXFLAGS)
+COREDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DWXUSINGDLL_BASE -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG)
+MONOLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=1 $(CXXFLAGS)
+BASELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)
+MONODLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG)
+COREDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DWXUSINGDLL_BASE -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG)

 WXODBC_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXODBC_CFLAGS = $(CPPFLAGS)   $(CFLAGS)

-MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=1 $(CFLAGS)
-BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DWXMAKINGDLL -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) $(PIC_FLAG)
-BASEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DWXMAKINGDLL -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG)
-BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)     -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
+MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=1 $(CFLAGS)
+BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) $(PIC_FLAG)
+BASEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG)
+BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p)   -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = 

 @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = wx/unix/gsockunx.h     \
 @COND_PLATFORM_UNIX_1@    wx/unix/mimetype.h
 @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = wx/msw/dde.h \
 @COND_PLATFORM_WIN32_1@    wx/msw/gccpriv.h \
 @COND_PLATFORM_WIN32_1@    wx/msw/mimetype.h \
 @COND_PLATFORM_WIN32_1@    wx/msw/winundef.h
 @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = wx/unix/gsockunx.h     \
 @COND_PLATFORM_UNIX_1@    wx/unix/mimetype.h
 @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = wx/msw/dde.h \
 @COND_PLATFORM_WIN32_1@    wx/msw/gccpriv.h \
 @COND_PLATFORM_WIN32_1@    wx/msw/mimetype.h \
 @COND_PLATFORM_WIN32_1@    wx/msw/winundef.h

+@COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = 
+@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = 

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)


@@ -515,8 +516,7 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_s
 @COND_TOOLKIT_OS2@    wx/os2/pnghand.h \
 @COND_TOOLKIT_OS2@    wx/os2/statbox.h \
 @COND_TOOLKIT_OS2@    wx/os2/toplevel.h
 @COND_TOOLKIT_OS2@    wx/os2/pnghand.h \
 @COND_TOOLKIT_OS2@    wx/os2/statbox.h \
 @COND_TOOLKIT_OS2@    wx/os2/toplevel.h

-@COND_TOOLKIT_COCOA@LOWLEVEL_HDR = wx/unix/gsockunx.h     \
-@COND_TOOLKIT_COCOA@    wx/unix/mimetype.h
+@COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 

 @COND_TOOLKIT_GTK@LOWLEVEL_HDR = wx/unix/fontutil.h \
 @COND_TOOLKIT_GTK@    wx/unix/utilsx11.h \
 @COND_TOOLKIT_GTK@    wx/unix/taskbarx11.h \
 @COND_TOOLKIT_GTK@LOWLEVEL_HDR = wx/unix/fontutil.h \
 @COND_TOOLKIT_GTK@    wx/unix/utilsx11.h \
 @COND_TOOLKIT_GTK@    wx/unix/taskbarx11.h \


@@ -600,36 +600,46 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_s
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ

-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_utilsunx.o

 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_main.o monodll_mslu.o monodll_volume.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_main.o monodll_mslu.o monodll_volume.o

-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_utilsunx.o
+@COND_TOOLKIT_COCOA@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_utilsunx.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = monodll_utilsunx.o

 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_main.o monolib_mslu.o monolib_volume.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_main.o monolib_mslu.o monolib_volume.o

-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_utilsunx.o
+@COND_TOOLKIT_COCOA@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_utilsunx.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = monolib_utilsunx.o

 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_main.o basedll_mslu.o basedll_volume.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_main.o basedll_mslu.o basedll_volume.o

-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_utilsunx.o
+@COND_TOOLKIT_COCOA@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_utilsunx.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = basedll_utilsunx.o

 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_main.o baselib_mslu.o baselib_volume.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_main.o baselib_mslu.o baselib_volume.o

-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_utilsunx.o
+@COND_TOOLKIT_COCOA@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_utilsunx.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = baselib_utilsunx.o

 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_main.o coredll_mslu.o coredll_volume.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_main.o coredll_mslu.o coredll_volume.o

-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_utilsunx.o
+@COND_TOOLKIT_COCOA@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_utilsunx.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = coredll_utilsunx.o

 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_main.o corelib_mslu.o corelib_volume.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_main.o corelib_mslu.o corelib_volume.o

-@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_baseunix.o monodll_dir.o monodll_gsocket.o monodll_mimetmac.o monodll_utils.o monodll_utilsexc.o
+@COND_TOOLKIT_COCOA@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_utilsunx.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = corelib_utilsunx.o

 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_baseunix.o monodll_dir.o monodll_gsocket.o monodll_mimetype.o monodll_snglinst.o monodll_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_gsocket.o monodll_gsockmsw.o monodll_basemsw.o monodll_dde.o monodll_dir.o monodll_mimetype.o monodll_regconf.o monodll_registry.o monodll_snglinst.o monodll_thread.o monodll_utils.o monodll_utilsexc.o
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_baseunix.o monodll_dir.o monodll_gsocket.o monodll_mimetype.o monodll_snglinst.o monodll_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = monodll_gsocket.o monodll_gsockmsw.o monodll_basemsw.o monodll_dde.o monodll_dir.o monodll_mimetype.o monodll_regconf.o monodll_registry.o monodll_snglinst.o monodll_thread.o monodll_utils.o monodll_utilsexc.o

-@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_baseunix.o monolib_dir.o monolib_gsocket.o monolib_mimetmac.o monolib_utils.o monolib_utilsexc.o
+@COND_TOOLKIT_COCOA@__BASE_PLATFORM_SRC_OBJECTS = monodll_baseunix.o monodll_dir.o monodll_gsocket.o monodll_mimetype.o monodll_snglinst.o monodll_threadpsx.o
+@COND_TOOLKIT_MAC@__BASE_PLATFORM_SRC_OBJECTS = monodll_baseunix.o monodll_dirmac.o monodll_gsocket.o monodll_mimetmac.o monodll_utils.o monodll_utilsexc.o

 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_baseunix.o monolib_dir.o monolib_gsocket.o monolib_mimetype.o monolib_snglinst.o monolib_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o monolib_gsockmsw.o monolib_basemsw.o monolib_dde.o monolib_dir.o monolib_mimetype.o monolib_regconf.o monolib_registry.o monolib_snglinst.o monolib_thread.o monolib_utils.o monolib_utilsexc.o
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_baseunix.o monolib_dir.o monolib_gsocket.o monolib_mimetype.o monolib_snglinst.o monolib_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o monolib_gsockmsw.o monolib_basemsw.o monolib_dde.o monolib_dir.o monolib_mimetype.o monolib_regconf.o monolib_registry.o monolib_snglinst.o monolib_thread.o monolib_utils.o monolib_utilsexc.o

-@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_baseunix.o basedll_dir.o basedll_gsocket.o basedll_mimetmac.o basedll_utils.o basedll_utilsexc.o
+@COND_TOOLKIT_COCOA@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_baseunix.o monolib_dir.o monolib_gsocket.o monolib_mimetype.o monolib_snglinst.o monolib_threadpsx.o
+@COND_TOOLKIT_MAC@__BASE_PLATFORM_SRC_OBJECTS_1 = monolib_baseunix.o monolib_dirmac.o monolib_gsocket.o monolib_mimetmac.o monolib_utils.o monolib_utilsexc.o

 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_baseunix.o basedll_dir.o basedll_gsocket.o basedll_mimetype.o basedll_snglinst.o basedll_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_gsocket.o basedll_gsockmsw.o basedll_basemsw.o basedll_dde.o basedll_dir.o basedll_mimetype.o basedll_regconf.o basedll_registry.o basedll_snglinst.o basedll_thread.o basedll_utils.o basedll_utilsexc.o
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_baseunix.o basedll_dir.o basedll_gsocket.o basedll_mimetype.o basedll_snglinst.o basedll_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_gsocket.o basedll_gsockmsw.o basedll_basemsw.o basedll_dde.o basedll_dir.o basedll_mimetype.o basedll_regconf.o basedll_registry.o basedll_snglinst.o basedll_thread.o basedll_utils.o basedll_utilsexc.o

-@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_baseunix.o baselib_dir.o baselib_gsocket.o baselib_mimetmac.o baselib_utils.o baselib_utilsexc.o
+@COND_TOOLKIT_COCOA@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_baseunix.o basedll_dir.o basedll_gsocket.o basedll_mimetype.o basedll_snglinst.o basedll_threadpsx.o
+@COND_TOOLKIT_MAC@__BASE_PLATFORM_SRC_OBJECTS_2 = basedll_baseunix.o basedll_dirmac.o basedll_gsocket.o basedll_mimetmac.o basedll_utils.o basedll_utilsexc.o

 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_baseunix.o baselib_dir.o baselib_gsocket.o baselib_mimetype.o baselib_snglinst.o baselib_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_gsocket.o baselib_gsockmsw.o baselib_basemsw.o baselib_dde.o baselib_dir.o baselib_mimetype.o baselib_regconf.o baselib_registry.o baselib_snglinst.o baselib_thread.o baselib_utils.o baselib_utilsexc.o
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_baseunix.o baselib_dir.o baselib_gsocket.o baselib_mimetype.o baselib_snglinst.o baselib_threadpsx.o
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_gsocket.o baselib_gsockmsw.o baselib_basemsw.o baselib_dde.o baselib_dir.o baselib_mimetype.o baselib_regconf.o baselib_registry.o baselib_snglinst.o baselib_thread.o baselib_utils.o baselib_utilsexc.o

+@COND_TOOLKIT_COCOA@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_baseunix.o baselib_dir.o baselib_gsocket.o baselib_mimetype.o baselib_snglinst.o baselib_threadpsx.o
+@COND_TOOLKIT_MAC@__BASE_PLATFORM_SRC_OBJECTS_3 = baselib_baseunix.o baselib_dirmac.o baselib_gsocket.o baselib_mimetmac.o baselib_utils.o baselib_utilsexc.o

 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) monodll_selstore.o monodll_busyinfo.o monodll_calctrl.o monodll_choicdgg.o monodll_dcbuffer.o monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o monodll_gridctrl.o monodll_gridsel.o monodll_laywin.o monodll_logg.o monodll_numdlgg.o monodll_panelg.o monodll_progdlgg.o monodll_sashwin.o monodll_scrlwing.o monodll_spinctlg.o monodll_splash.o monodll_splitter.o monodll_tbarsmpl.o monodll_textdlgg.o monodll_tipdlg.o monodll_tipwin.o monodll_treectlg.o monodll_wizard.o monodll_appcmn.o monodll_fontmap.o monodll_accesscmn.o monodll_artprov.o monodll_artstd.o monodll_bmpbase.o monodll_choiccmn.o monodll_clipcmn.o monodll_cmdproc.o monodll_cmndata.o monodll_containr.o monodll_cshelp.o monodll_ctrlcmn.o monodll_ctrlsub.o monodll_datacmn.o monodll_dbgrid.o monodll_dcbase.o monodll_dlgcmn.o monodll_dndcmn.o monodll_dobjcmn.o monodll_docmdi.o monodll_docview.o monodll_dpycmn.o monodll_dseldlg.o monodll_effects.o monodll_fddlgcmn.o monodll_fldlgcmn.o monodll_fontcmn.o monodll_framecmn.o monodll_timercmn.o monodll_toplvcmn.o monodll_gaugecmn.o monodll_gdicmn.o monodll_geometry.o monodll_gifdecod.o monodll_helpbase.o monodll_iconbndl.o monodll_imagall.o monodll_imagbmp.o monodll_image.o monodll_imaggif.o monodll_imagiff.o monodll_imagjpeg.o monodll_imagpcx.o monodll_imagpng.o monodll_imagpnm.o monodll_imagtiff.o monodll_imagxpm.o monodll_imagfill.o monodll_layout.o monodll_lboxcmn.o monodll_matrix.o monodll_menucmn.o monodll_nbkbase.o monodll_paper.o monodll_popupcmn.o monodll_prntbase.o monodll_quantize.o monodll_radiocmn.o monodll_rgncmn.o monodll_settcmn.o monodll_sizer.o monodll_statbar.o monodll_tbarbase.o monodll_textcmn.o monodll_treebase.o monodll_valgen.o monodll_validate.o monodll_valtext.o monodll_wincmn.o monodll_xpmdecod.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o monodll_button.o monodll_checkbox.o monodll_checklst.o monodll_choice.o monodll_colschem.o monodll_combobox.o monodll_control.o monodll_dialog.o monodll_framuniv.o monodll_topluniv.o monodll_gauge.o monodll_inpcons.o monodll_inphand.o monodll_listbox.o monodll_menu.o monodll_notebook.o monodll_radiobox.o monodll_radiobut.o monodll_renderer.o monodll_scrarrow.o monodll_scrolbar.o monodll_scrthumb.o monodll_slider.o monodll_spinbutt.o monodll_statbmp.o monodll_statbox.o monodll_statline.o monodll_stattext.o monodll_statusbr.o monodll_toolbar.o monodll_theme.o monodll_winuniv.o monodll_caret.o monodll_mdig.o monodll_imaglist.o monodll_colrdlgg.o monodll_listctrl.o monodll_filedlgg.o monodll_dirdlgg.o monodll_prntdlgg.o monodll_accel.o monodll_msgdlgg.o monodll_fdrepdlg.o monodll_fontdlgg.o monodll_tabg.o monodll_gtk.o monodll_win32.o monodll_metal.o monodll_selstore.o monodll_busyinfo.o monodll_calctrl.o monodll_choicdgg.o monodll_dcbuffer.o monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o monodll_gridctrl.o monodll_gridsel.o monodll_laywin.o monodll_logg.o monodll_numdlgg.o monodll_panelg.o monodll_progdlgg.o monodll_sashwin.o monodll_scrlwing.o monodll_spinctlg.o monodll_splash.o monodll_splitter.o monodll_tbarsmpl.o monodll_textdlgg.o monodll_tipdlg.o monodll_tipwin.o monodll_treectlg.o monodll_wizard.o monodll_appcmn.o monodll_fontmap.o monodll_accesscmn.o monodll_artprov.o monodll_artstd.o monodll_bmpbase.o monodll_choiccmn.o monodll_clipcmn.o monodll_cmdproc.o monodll_cmndata.o monodll_containr.o monodll_cshelp.o monodll_ctrlcmn.o monodll_ctrlsub.o monodll_datacmn.o monodll_dbgrid.o monodll_dcbase.o monodll_dlgcmn.o monodll_dndcmn.o monodll_dobjcmn.o monodll_docmdi.o monodll_docview.o monodll_dpycmn.o monodll_dseldlg.o monodll_effects.o monodll_fddlgcmn.o monodll_fldlgcmn.o monodll_fontcmn.o monodll_framecmn.o monodll_timercmn.o monodll_toplvcmn.o monodll_gaugecmn.o monodll_gdicmn.o monodll_geometry.o monodll_gifdecod.o monodll_helpbase.o monodll_iconbndl.o monodll_imagall.o monodll_imagbmp.o monodll_image.o monodll_imaggif.o monodll_imagiff.o monodll_imagjpeg.o monodll_imagpcx.o monodll_imagpng.o monodll_imagpnm.o monodll_imagtiff.o monodll_imagxpm.o monodll_imagfill.o monodll_layout.o monodll_lboxcmn.o monodll_matrix.o monodll_menucmn.o monodll_nbkbase.o monodll_paper.o monodll_popupcmn.o monodll_prntbase.o monodll_quantize.o monodll_radiocmn.o monodll_rgncmn.o monodll_settcmn.o monodll_sizer.o monodll_statbar.o monodll_tbarbase.o monodll_textcmn.o monodll_treebase.o monodll_valgen.o monodll_validate.o monodll_valtext.o monodll_wincmn.o monodll_xpmdecod.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_9) $(__GUI_SRC_OBJECTS_1) monolib_selstore.o monolib_busyinfo.o monolib_calctrl.o monolib_choicdgg.o monolib_dcbuffer.o monolib_dcpsg.o monolib_dirctrlg.o monolib_grid.o monolib_gridctrl.o monolib_gridsel.o monolib_laywin.o monolib_logg.o monolib_numdlgg.o monolib_panelg.o monolib_progdlgg.o monolib_sashwin.o monolib_scrlwing.o monolib_spinctlg.o monolib_splash.o monolib_splitter.o monolib_tbarsmpl.o monolib_textdlgg.o monolib_tipdlg.o monolib_tipwin.o monolib_treectlg.o monolib_wizard.o monolib_appcmn.o monolib_fontmap.o monolib_accesscmn.o monolib_artprov.o monolib_artstd.o monolib_bmpbase.o monolib_choiccmn.o monolib_clipcmn.o monolib_cmdproc.o monolib_cmndata.o monolib_containr.o monolib_cshelp.o monolib_ctrlcmn.o monolib_ctrlsub.o monolib_datacmn.o monolib_dbgrid.o monolib_dcbase.o monolib_dlgcmn.o monolib_dndcmn.o monolib_dobjcmn.o monolib_docmdi.o monolib_docview.o monolib_dpycmn.o monolib_dseldlg.o monolib_effects.o monolib_fddlgcmn.o monolib_fldlgcmn.o monolib_fontcmn.o monolib_framecmn.o monolib_timercmn.o monolib_toplvcmn.o monolib_gaugecmn.o monolib_gdicmn.o monolib_geometry.o monolib_gifdecod.o monolib_helpbase.o monolib_iconbndl.o monolib_imagall.o monolib_imagbmp.o monolib_image.o monolib_imaggif.o monolib_imagiff.o monolib_imagjpeg.o monolib_imagpcx.o monolib_imagpng.o monolib_imagpnm.o monolib_imagtiff.o monolib_imagxpm.o monolib_imagfill.o monolib_layout.o monolib_lboxcmn.o monolib_matrix.o monolib_menucmn.o monolib_nbkbase.o monolib_paper.o monolib_popupcmn.o monolib_prntbase.o monolib_quantize.o monolib_radiocmn.o monolib_rgncmn.o monolib_settcmn.o monolib_sizer.o monolib_statbar.o monolib_tbarbase.o monolib_textcmn.o monolib_treebase.o monolib_valgen.o monolib_validate.o monolib_valtext.o monolib_wincmn.o monolib_xpmdecod.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) monodll_selstore.o monodll_busyinfo.o monodll_calctrl.o monodll_choicdgg.o monodll_dcbuffer.o monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o monodll_gridctrl.o monodll_gridsel.o monodll_laywin.o monodll_logg.o monodll_numdlgg.o monodll_panelg.o monodll_progdlgg.o monodll_sashwin.o monodll_scrlwing.o monodll_spinctlg.o monodll_splash.o monodll_splitter.o monodll_tbarsmpl.o monodll_textdlgg.o monodll_tipdlg.o monodll_tipwin.o monodll_treectlg.o monodll_wizard.o monodll_appcmn.o monodll_fontmap.o monodll_accesscmn.o monodll_artprov.o monodll_artstd.o monodll_bmpbase.o monodll_choiccmn.o monodll_clipcmn.o monodll_cmdproc.o monodll_cmndata.o monodll_containr.o monodll_cshelp.o monodll_ctrlcmn.o monodll_ctrlsub.o monodll_datacmn.o monodll_dbgrid.o monodll_dcbase.o monodll_dlgcmn.o monodll_dndcmn.o monodll_dobjcmn.o monodll_docmdi.o monodll_docview.o monodll_dpycmn.o monodll_dseldlg.o monodll_effects.o monodll_fddlgcmn.o monodll_fldlgcmn.o monodll_fontcmn.o monodll_framecmn.o monodll_timercmn.o monodll_toplvcmn.o monodll_gaugecmn.o monodll_gdicmn.o monodll_geometry.o monodll_gifdecod.o monodll_helpbase.o monodll_iconbndl.o monodll_imagall.o monodll_imagbmp.o monodll_image.o monodll_imaggif.o monodll_imagiff.o monodll_imagjpeg.o monodll_imagpcx.o monodll_imagpng.o monodll_imagpnm.o monodll_imagtiff.o monodll_imagxpm.o monodll_imagfill.o monodll_layout.o monodll_lboxcmn.o monodll_matrix.o monodll_menucmn.o monodll_nbkbase.o monodll_paper.o monodll_popupcmn.o monodll_prntbase.o monodll_quantize.o monodll_radiocmn.o monodll_rgncmn.o monodll_settcmn.o monodll_sizer.o monodll_statbar.o monodll_tbarbase.o monodll_textcmn.o monodll_treebase.o monodll_valgen.o monodll_validate.o monodll_valtext.o monodll_wincmn.o monodll_xpmdecod.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o monodll_button.o monodll_checkbox.o monodll_checklst.o monodll_choice.o monodll_colschem.o monodll_combobox.o monodll_control.o monodll_dialog.o monodll_framuniv.o monodll_topluniv.o monodll_gauge.o monodll_inpcons.o monodll_inphand.o monodll_listbox.o monodll_menu.o monodll_notebook.o monodll_radiobox.o monodll_radiobut.o monodll_renderer.o monodll_scrarrow.o monodll_scrolbar.o monodll_scrthumb.o monodll_slider.o monodll_spinbutt.o monodll_statbmp.o monodll_statbox.o monodll_statline.o monodll_stattext.o monodll_statusbr.o monodll_toolbar.o monodll_theme.o monodll_winuniv.o monodll_caret.o monodll_mdig.o monodll_imaglist.o monodll_colrdlgg.o monodll_listctrl.o monodll_filedlgg.o monodll_dirdlgg.o monodll_prntdlgg.o monodll_accel.o monodll_msgdlgg.o monodll_fdrepdlg.o monodll_fontdlgg.o monodll_tabg.o monodll_gtk.o monodll_win32.o monodll_metal.o monodll_selstore.o monodll_busyinfo.o monodll_calctrl.o monodll_choicdgg.o monodll_dcbuffer.o monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o monodll_gridctrl.o monodll_gridsel.o monodll_laywin.o monodll_logg.o monodll_numdlgg.o monodll_panelg.o monodll_progdlgg.o monodll_sashwin.o monodll_scrlwing.o monodll_spinctlg.o monodll_splash.o monodll_splitter.o monodll_tbarsmpl.o monodll_textdlgg.o monodll_tipdlg.o monodll_tipwin.o monodll_treectlg.o monodll_wizard.o monodll_appcmn.o monodll_fontmap.o monodll_accesscmn.o monodll_artprov.o monodll_artstd.o monodll_bmpbase.o monodll_choiccmn.o monodll_clipcmn.o monodll_cmdproc.o monodll_cmndata.o monodll_containr.o monodll_cshelp.o monodll_ctrlcmn.o monodll_ctrlsub.o monodll_datacmn.o monodll_dbgrid.o monodll_dcbase.o monodll_dlgcmn.o monodll_dndcmn.o monodll_dobjcmn.o monodll_docmdi.o monodll_docview.o monodll_dpycmn.o monodll_dseldlg.o monodll_effects.o monodll_fddlgcmn.o monodll_fldlgcmn.o monodll_fontcmn.o monodll_framecmn.o monodll_timercmn.o monodll_toplvcmn.o monodll_gaugecmn.o monodll_gdicmn.o monodll_geometry.o monodll_gifdecod.o monodll_helpbase.o monodll_iconbndl.o monodll_imagall.o monodll_imagbmp.o monodll_image.o monodll_imaggif.o monodll_imagiff.o monodll_imagjpeg.o monodll_imagpcx.o monodll_imagpng.o monodll_imagpnm.o monodll_imagtiff.o monodll_imagxpm.o monodll_imagfill.o monodll_layout.o monodll_lboxcmn.o monodll_matrix.o monodll_menucmn.o monodll_nbkbase.o monodll_paper.o monodll_popupcmn.o monodll_prntbase.o monodll_quantize.o monodll_radiocmn.o monodll_rgncmn.o monodll_settcmn.o monodll_sizer.o monodll_statbar.o monodll_tbarbase.o monodll_textcmn.o monodll_treebase.o monodll_valgen.o monodll_validate.o monodll_valtext.o monodll_wincmn.o monodll_xpmdecod.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_9) $(__GUI_SRC_OBJECTS_1) monolib_selstore.o monolib_busyinfo.o monolib_calctrl.o monolib_choicdgg.o monolib_dcbuffer.o monolib_dcpsg.o monolib_dirctrlg.o monolib_grid.o monolib_gridctrl.o monolib_gridsel.o monolib_laywin.o monolib_logg.o monolib_numdlgg.o monolib_panelg.o monolib_progdlgg.o monolib_sashwin.o monolib_scrlwing.o monolib_spinctlg.o monolib_splash.o monolib_splitter.o monolib_tbarsmpl.o monolib_textdlgg.o monolib_tipdlg.o monolib_tipwin.o monolib_treectlg.o monolib_wizard.o monolib_appcmn.o monolib_fontmap.o monolib_accesscmn.o monolib_artprov.o monolib_artstd.o monolib_bmpbase.o monolib_choiccmn.o monolib_clipcmn.o monolib_cmdproc.o monolib_cmndata.o monolib_containr.o monolib_cshelp.o monolib_ctrlcmn.o monolib_ctrlsub.o monolib_datacmn.o monolib_dbgrid.o monolib_dcbase.o monolib_dlgcmn.o monolib_dndcmn.o monolib_dobjcmn.o monolib_docmdi.o monolib_docview.o monolib_dpycmn.o monolib_dseldlg.o monolib_effects.o monolib_fddlgcmn.o monolib_fldlgcmn.o monolib_fontcmn.o monolib_framecmn.o monolib_timercmn.o monolib_toplvcmn.o monolib_gaugecmn.o monolib_gdicmn.o monolib_geometry.o monolib_gifdecod.o monolib_helpbase.o monolib_iconbndl.o monolib_imagall.o monolib_imagbmp.o monolib_image.o monolib_imaggif.o monolib_imagiff.o monolib_imagjpeg.o monolib_imagpcx.o monolib_imagpng.o monolib_imagpnm.o monolib_imagtiff.o monolib_imagxpm.o monolib_imagfill.o monolib_layout.o monolib_lboxcmn.o monolib_matrix.o monolib_menucmn.o monolib_nbkbase.o monolib_paper.o monolib_popupcmn.o monolib_prntbase.o monolib_quantize.o monolib_radiocmn.o monolib_rgncmn.o monolib_settcmn.o monolib_sizer.o monolib_statbar.o monolib_tbarbase.o monolib_textcmn.o monolib_treebase.o monolib_valgen.o monolib_validate.o monolib_valtext.o monolib_wincmn.o monolib_xpmdecod.o


@@ -674,7 +684,7 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_s
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)

-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = monodll_baseunix.o monodll_dir.o monodll_gsocket.o monodll_mimetype.o monodll_snglinst.o monodll_threadpsx.o monodll_utilsunx.o
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = 

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = monodll_fontenum.o monodll_fontutil.o monodll_utilsx11.o monodll_taskbarcmn.o monodll_taskbarx11.o monodll_printps.o monodll_dialup.o monodll_gsockgtk.o monodll_win_gtk.o monodll_app.o monodll_bitmap.o monodll_brush.o monodll_clipbrd.o monodll_colour.o monodll_cursor.o monodll_data.o monodll_dataobj.o monodll_dc.o monodll_dcclient.o monodll_dcmemory.o monodll_dcscreen.o monodll_dnd.o monodll_evtloop.o monodll_font.o monodll_toplevel.o monodll_gdiobj.o monodll_icon.o monodll_main.o monodll_pen.o monodll_popupwin.o monodll_region.o monodll_settings.o monodll_timer.o monodll_tooltip.o monodll_utilsgtk.o monodll_window.o monodll_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = monodll_colour.o monodll_dc.o monodll_gdiobj.o monodll_palette.o monodll_region.o monodll_brush.o monodll_pen.o monodll_font.o monodll_data.o monodll_fontenum.o monodll_fontutil.o monodll_evtloop.o monodll_app.o monodll_bitmap.o monodll_dirmgl.o monodll_clipbrd.o monodll_cursor.o monodll_dcclient.o monodll_dcmemory.o monodll_dcscreen.o monodll_toplevel.o monodll_icon.o monodll_settings.o monodll_window.o monodll_utils.o monodll_timer.o
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = monodll_fontenum.o monodll_fontutil.o monodll_utilsx11.o monodll_taskbarcmn.o monodll_taskbarx11.o monodll_printps.o monodll_dialup.o monodll_gsockgtk.o monodll_win_gtk.o monodll_app.o monodll_bitmap.o monodll_brush.o monodll_clipbrd.o monodll_colour.o monodll_cursor.o monodll_data.o monodll_dataobj.o monodll_dc.o monodll_dcclient.o monodll_dcmemory.o monodll_dcscreen.o monodll_dnd.o monodll_evtloop.o monodll_font.o monodll_toplevel.o monodll_gdiobj.o monodll_icon.o monodll_main.o monodll_pen.o monodll_popupwin.o monodll_region.o monodll_settings.o monodll_timer.o monodll_tooltip.o monodll_utilsgtk.o monodll_window.o monodll_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = monodll_colour.o monodll_dc.o monodll_gdiobj.o monodll_palette.o monodll_region.o monodll_brush.o monodll_pen.o monodll_font.o monodll_data.o monodll_fontenum.o monodll_fontutil.o monodll_evtloop.o monodll_app.o monodll_bitmap.o monodll_dirmgl.o monodll_clipbrd.o monodll_cursor.o monodll_dcclient.o monodll_dcmemory.o monodll_dcscreen.o monodll_toplevel.o monodll_icon.o monodll_settings.o monodll_window.o monodll_utils.o monodll_timer.o


@@ -682,7 +692,7 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_s
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = monodll_app.o monodll_bitmap.o monodll_brush.o monodll_caret.o monodll_clipbrd.o monodll_colour.o monodll_cursor.o monodll_data.o monodll_dc.o monodll_dcclient.o monodll_dcmemory.o monodll_dcprint.o monodll_dcscreen.o monodll_dialup.o monodll_dib.o monodll_dirdlg.o monodll_display.o monodll_enhmeta.o monodll_helpbest.o monodll_evtloop.o monodll_font.o monodll_fontenum.o monodll_fontutil.o monodll_gdiimage.o monodll_gdiobj.o monodll_glcanvas.o monodll_helpchm.o monodll_helpwin.o monodll_icon.o monodll_joystick.o monodll_minifram.o monodll_palette.o monodll_pen.o monodll_popupwin.o monodll_region.o monodll_settings.o monodll_taskbarcmn.o monodll_taskbar.o monodll_timer.o monodll_tooltip.o monodll_toplevel.o monodll_utilsgui.o monodll_wave.o monodll_window.o monodll_automtn.o monodll_dataobj.o monodll_dropsrc.o monodll_droptgt.o monodll_oleutils.o monodll_uuid.o
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS = 
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = monodll_fontenum.o monodll_fontutil.o monodll_utilsx11.o monodll_taskbarcmn.o monodll_taskbarx11.o monodll_printps.o monodll_dialup.o monodll_gsockx11.o monodll_nanox.o monodll_app.o monodll_bitmap.o monodll_brush.o monodll_clipbrd.o monodll_colour.o monodll_cursor.o monodll_data.o monodll_dataobj.o monodll_dc.o monodll_dcclient.o monodll_dcmemory.o monodll_dcscreen.o monodll_evtloop.o monodll_font.o monodll_gdiobj.o monodll_glcanvas.o monodll_icon.o monodll_joystick.o monodll_main.o monodll_minifram.o monodll_palette.o monodll_pen.o monodll_popupwin.o monodll_region.o monodll_reparent.o monodll_settings.o monodll_toplevel.o monodll_utils.o monodll_utilsx.o monodll_window.o monodll_timer.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = monodll_app.o monodll_bitmap.o monodll_brush.o monodll_caret.o monodll_clipbrd.o monodll_colour.o monodll_cursor.o monodll_data.o monodll_dc.o monodll_dcclient.o monodll_dcmemory.o monodll_dcprint.o monodll_dcscreen.o monodll_dialup.o monodll_dib.o monodll_dirdlg.o monodll_display.o monodll_enhmeta.o monodll_helpbest.o monodll_evtloop.o monodll_font.o monodll_fontenum.o monodll_fontutil.o monodll_gdiimage.o monodll_gdiobj.o monodll_glcanvas.o monodll_helpchm.o monodll_helpwin.o monodll_icon.o monodll_joystick.o monodll_minifram.o monodll_palette.o monodll_pen.o monodll_popupwin.o monodll_region.o monodll_settings.o monodll_taskbarcmn.o monodll_taskbar.o monodll_timer.o monodll_tooltip.o monodll_toplevel.o monodll_utilsgui.o monodll_wave.o monodll_window.o monodll_automtn.o monodll_dataobj.o monodll_dropsrc.o monodll_droptgt.o monodll_oleutils.o monodll_uuid.o
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS = 
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = monodll_fontenum.o monodll_fontutil.o monodll_utilsx11.o monodll_taskbarcmn.o monodll_taskbarx11.o monodll_printps.o monodll_dialup.o monodll_gsockx11.o monodll_nanox.o monodll_app.o monodll_bitmap.o monodll_brush.o monodll_clipbrd.o monodll_colour.o monodll_cursor.o monodll_data.o monodll_dataobj.o monodll_dc.o monodll_dcclient.o monodll_dcmemory.o monodll_dcscreen.o monodll_evtloop.o monodll_font.o monodll_gdiobj.o monodll_glcanvas.o monodll_icon.o monodll_joystick.o monodll_main.o monodll_minifram.o monodll_palette.o monodll_pen.o monodll_popupwin.o monodll_region.o monodll_reparent.o monodll_settings.o monodll_toplevel.o monodll_utils.o monodll_utilsx.o monodll_window.o monodll_timer.o

-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = coredll_baseunix.o coredll_dir.o coredll_gsocket.o coredll_mimetype.o coredll_snglinst.o coredll_threadpsx.o coredll_utilsunx.o
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = 

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = coredll_fontenum.o coredll_fontutil.o coredll_utilsx11.o coredll_taskbarcmn.o coredll_taskbarx11.o coredll_printps.o coredll_dialup.o coredll_gsockgtk.o coredll_win_gtk.o coredll_app.o coredll_bitmap.o coredll_brush.o coredll_clipbrd.o coredll_colour.o coredll_cursor.o coredll_data.o coredll_dataobj.o coredll_dc.o coredll_dcclient.o coredll_dcmemory.o coredll_dcscreen.o coredll_dnd.o coredll_evtloop.o coredll_font.o coredll_toplevel.o coredll_gdiobj.o coredll_icon.o coredll_main.o coredll_pen.o coredll_popupwin.o coredll_region.o coredll_settings.o coredll_timer.o coredll_tooltip.o coredll_utilsgtk.o coredll_window.o coredll_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = coredll_colour.o coredll_dc.o coredll_gdiobj.o coredll_palette.o coredll_region.o coredll_brush.o coredll_pen.o coredll_font.o coredll_data.o coredll_fontenum.o coredll_fontutil.o coredll_evtloop.o coredll_app.o coredll_bitmap.o coredll_dirmgl.o coredll_clipbrd.o coredll_cursor.o coredll_dcclient.o coredll_dcmemory.o coredll_dcscreen.o coredll_toplevel.o coredll_icon.o coredll_settings.o coredll_window.o coredll_utils.o coredll_timer.o
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = coredll_fontenum.o coredll_fontutil.o coredll_utilsx11.o coredll_taskbarcmn.o coredll_taskbarx11.o coredll_printps.o coredll_dialup.o coredll_gsockgtk.o coredll_win_gtk.o coredll_app.o coredll_bitmap.o coredll_brush.o coredll_clipbrd.o coredll_colour.o coredll_cursor.o coredll_data.o coredll_dataobj.o coredll_dc.o coredll_dcclient.o coredll_dcmemory.o coredll_dcscreen.o coredll_dnd.o coredll_evtloop.o coredll_font.o coredll_toplevel.o coredll_gdiobj.o coredll_icon.o coredll_main.o coredll_pen.o coredll_popupwin.o coredll_region.o coredll_settings.o coredll_timer.o coredll_tooltip.o coredll_utilsgtk.o coredll_window.o coredll_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = coredll_colour.o coredll_dc.o coredll_gdiobj.o coredll_palette.o coredll_region.o coredll_brush.o coredll_pen.o coredll_font.o coredll_data.o coredll_fontenum.o coredll_fontutil.o coredll_evtloop.o coredll_app.o coredll_bitmap.o coredll_dirmgl.o coredll_clipbrd.o coredll_cursor.o coredll_dcclient.o coredll_dcmemory.o coredll_dcscreen.o coredll_toplevel.o coredll_icon.o coredll_settings.o coredll_window.o coredll_utils.o coredll_timer.o


@@ -690,7 +700,7 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_s
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = coredll_app.o coredll_bitmap.o coredll_brush.o coredll_caret.o coredll_clipbrd.o coredll_colour.o coredll_cursor.o coredll_data.o coredll_dc.o coredll_dcclient.o coredll_dcmemory.o coredll_dcprint.o coredll_dcscreen.o coredll_dialup.o coredll_dib.o coredll_dirdlg.o coredll_display.o coredll_enhmeta.o coredll_helpbest.o coredll_evtloop.o coredll_font.o coredll_fontenum.o coredll_fontutil.o coredll_gdiimage.o coredll_gdiobj.o coredll_glcanvas.o coredll_helpchm.o coredll_helpwin.o coredll_icon.o coredll_joystick.o coredll_minifram.o coredll_palette.o coredll_pen.o coredll_popupwin.o coredll_region.o coredll_settings.o coredll_taskbarcmn.o coredll_taskbar.o coredll_timer.o coredll_tooltip.o coredll_toplevel.o coredll_utilsgui.o coredll_wave.o coredll_window.o coredll_automtn.o coredll_dataobj.o coredll_dropsrc.o coredll_droptgt.o coredll_oleutils.o coredll_uuid.o
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = 
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = coredll_fontenum.o coredll_fontutil.o coredll_utilsx11.o coredll_taskbarcmn.o coredll_taskbarx11.o coredll_printps.o coredll_dialup.o coredll_gsockx11.o coredll_nanox.o coredll_app.o coredll_bitmap.o coredll_brush.o coredll_clipbrd.o coredll_colour.o coredll_cursor.o coredll_data.o coredll_dataobj.o coredll_dc.o coredll_dcclient.o coredll_dcmemory.o coredll_dcscreen.o coredll_evtloop.o coredll_font.o coredll_gdiobj.o coredll_glcanvas.o coredll_icon.o coredll_joystick.o coredll_main.o coredll_minifram.o coredll_palette.o coredll_pen.o coredll_popupwin.o coredll_region.o coredll_reparent.o coredll_settings.o coredll_toplevel.o coredll_utils.o coredll_utilsx.o coredll_window.o coredll_timer.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = coredll_app.o coredll_bitmap.o coredll_brush.o coredll_caret.o coredll_clipbrd.o coredll_colour.o coredll_cursor.o coredll_data.o coredll_dc.o coredll_dcclient.o coredll_dcmemory.o coredll_dcprint.o coredll_dcscreen.o coredll_dialup.o coredll_dib.o coredll_dirdlg.o coredll_display.o coredll_enhmeta.o coredll_helpbest.o coredll_evtloop.o coredll_font.o coredll_fontenum.o coredll_fontutil.o coredll_gdiimage.o coredll_gdiobj.o coredll_glcanvas.o coredll_helpchm.o coredll_helpwin.o coredll_icon.o coredll_joystick.o coredll_minifram.o coredll_palette.o coredll_pen.o coredll_popupwin.o coredll_region.o coredll_settings.o coredll_taskbarcmn.o coredll_taskbar.o coredll_timer.o coredll_tooltip.o coredll_toplevel.o coredll_utilsgui.o coredll_wave.o coredll_window.o coredll_automtn.o coredll_dataobj.o coredll_dropsrc.o coredll_droptgt.o coredll_oleutils.o coredll_uuid.o
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = 
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = coredll_fontenum.o coredll_fontutil.o coredll_utilsx11.o coredll_taskbarcmn.o coredll_taskbarx11.o coredll_printps.o coredll_dialup.o coredll_gsockx11.o coredll_nanox.o coredll_app.o coredll_bitmap.o coredll_brush.o coredll_clipbrd.o coredll_colour.o coredll_cursor.o coredll_data.o coredll_dataobj.o coredll_dc.o coredll_dcclient.o coredll_dcmemory.o coredll_dcscreen.o coredll_evtloop.o coredll_font.o coredll_gdiobj.o coredll_glcanvas.o coredll_icon.o coredll_joystick.o coredll_main.o coredll_minifram.o coredll_palette.o coredll_pen.o coredll_popupwin.o coredll_region.o coredll_reparent.o coredll_settings.o coredll_toplevel.o coredll_utils.o coredll_utilsx.o coredll_window.o coredll_timer.o

-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = corelib_baseunix.o corelib_dir.o corelib_gsocket.o corelib_mimetype.o corelib_snglinst.o corelib_threadpsx.o corelib_utilsunx.o
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = corelib_fontenum.o corelib_fontutil.o corelib_utilsx11.o corelib_taskbarcmn.o corelib_taskbarx11.o corelib_printps.o corelib_dialup.o corelib_gsockgtk.o corelib_win_gtk.o corelib_app.o corelib_bitmap.o corelib_brush.o corelib_clipbrd.o corelib_colour.o corelib_cursor.o corelib_data.o corelib_dataobj.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcscreen.o corelib_dnd.o corelib_evtloop.o corelib_font.o corelib_toplevel.o corelib_gdiobj.o corelib_icon.o corelib_main.o corelib_pen.o corelib_popupwin.o corelib_region.o corelib_settings.o corelib_timer.o corelib_tooltip.o corelib_utilsgtk.o corelib_window.o corelib_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = corelib_colour.o corelib_dc.o corelib_gdiobj.o corelib_palette.o corelib_region.o corelib_brush.o corelib_pen.o corelib_font.o corelib_data.o corelib_fontenum.o corelib_fontutil.o corelib_evtloop.o corelib_app.o corelib_bitmap.o corelib_dirmgl.o corelib_clipbrd.o corelib_cursor.o corelib_dcclient.o corelib_dcmemory.o corelib_dcscreen.o corelib_toplevel.o corelib_icon.o corelib_settings.o corelib_window.o corelib_utils.o corelib_timer.o
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = corelib_fontenum.o corelib_fontutil.o corelib_utilsx11.o corelib_taskbarcmn.o corelib_taskbarx11.o corelib_printps.o corelib_dialup.o corelib_gsockgtk.o corelib_win_gtk.o corelib_app.o corelib_bitmap.o corelib_brush.o corelib_clipbrd.o corelib_colour.o corelib_cursor.o corelib_data.o corelib_dataobj.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcscreen.o corelib_dnd.o corelib_evtloop.o corelib_font.o corelib_toplevel.o corelib_gdiobj.o corelib_icon.o corelib_main.o corelib_pen.o corelib_popupwin.o corelib_region.o corelib_settings.o corelib_timer.o corelib_tooltip.o corelib_utilsgtk.o corelib_window.o corelib_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = corelib_colour.o corelib_dc.o corelib_gdiobj.o corelib_palette.o corelib_region.o corelib_brush.o corelib_pen.o corelib_font.o corelib_data.o corelib_fontenum.o corelib_fontutil.o corelib_evtloop.o corelib_app.o corelib_bitmap.o corelib_dirmgl.o corelib_clipbrd.o corelib_cursor.o corelib_dcclient.o corelib_dcmemory.o corelib_dcscreen.o corelib_toplevel.o corelib_icon.o corelib_settings.o corelib_window.o corelib_utils.o corelib_timer.o


@@ -698,7 +708,7 @@ BASELIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_s
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = corelib_app.o corelib_bitmap.o corelib_brush.o corelib_caret.o corelib_clipbrd.o corelib_colour.o corelib_cursor.o corelib_data.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcprint.o corelib_dcscreen.o corelib_dialup.o corelib_dib.o corelib_dirdlg.o corelib_display.o corelib_enhmeta.o corelib_helpbest.o corelib_evtloop.o corelib_font.o corelib_fontenum.o corelib_fontutil.o corelib_gdiimage.o corelib_gdiobj.o corelib_glcanvas.o corelib_helpchm.o corelib_helpwin.o corelib_icon.o corelib_joystick.o corelib_minifram.o corelib_palette.o corelib_pen.o corelib_popupwin.o corelib_region.o corelib_settings.o corelib_taskbarcmn.o corelib_taskbar.o corelib_timer.o corelib_tooltip.o corelib_toplevel.o corelib_utilsgui.o corelib_wave.o corelib_window.o corelib_automtn.o corelib_dataobj.o corelib_dropsrc.o corelib_droptgt.o corelib_oleutils.o corelib_uuid.o
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = 
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = corelib_fontenum.o corelib_fontutil.o corelib_utilsx11.o corelib_taskbarcmn.o corelib_taskbarx11.o corelib_printps.o corelib_dialup.o corelib_gsockx11.o corelib_nanox.o corelib_app.o corelib_bitmap.o corelib_brush.o corelib_clipbrd.o corelib_colour.o corelib_cursor.o corelib_data.o corelib_dataobj.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcscreen.o corelib_evtloop.o corelib_font.o corelib_gdiobj.o corelib_glcanvas.o corelib_icon.o corelib_joystick.o corelib_main.o corelib_minifram.o corelib_palette.o corelib_pen.o corelib_popupwin.o corelib_region.o corelib_reparent.o corelib_settings.o corelib_toplevel.o corelib_utils.o corelib_utilsx.o corelib_window.o corelib_timer.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = corelib_app.o corelib_bitmap.o corelib_brush.o corelib_caret.o corelib_clipbrd.o corelib_colour.o corelib_cursor.o corelib_data.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcprint.o corelib_dcscreen.o corelib_dialup.o corelib_dib.o corelib_dirdlg.o corelib_display.o corelib_enhmeta.o corelib_helpbest.o corelib_evtloop.o corelib_font.o corelib_fontenum.o corelib_fontutil.o corelib_gdiimage.o corelib_gdiobj.o corelib_glcanvas.o corelib_helpchm.o corelib_helpwin.o corelib_icon.o corelib_joystick.o corelib_minifram.o corelib_palette.o corelib_pen.o corelib_popupwin.o corelib_region.o corelib_settings.o corelib_taskbarcmn.o corelib_taskbar.o corelib_timer.o corelib_tooltip.o corelib_toplevel.o corelib_utilsgui.o corelib_wave.o corelib_window.o corelib_automtn.o corelib_dataobj.o corelib_dropsrc.o corelib_droptgt.o corelib_oleutils.o corelib_uuid.o
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = 
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = corelib_fontenum.o corelib_fontutil.o corelib_utilsx11.o corelib_taskbarcmn.o corelib_taskbarx11.o corelib_printps.o corelib_dialup.o corelib_gsockx11.o corelib_nanox.o corelib_app.o corelib_bitmap.o corelib_brush.o corelib_clipbrd.o corelib_colour.o corelib_cursor.o corelib_data.o corelib_dataobj.o corelib_dc.o corelib_dcclient.o corelib_dcmemory.o corelib_dcscreen.o corelib_evtloop.o corelib_font.o corelib_gdiobj.o corelib_glcanvas.o corelib_icon.o corelib_joystick.o corelib_main.o corelib_minifram.o corelib_palette.o corelib_pen.o corelib_popupwin.o corelib_region.o corelib_reparent.o corelib_settings.o corelib_toplevel.o corelib_utils.o corelib_utilsx.o corelib_window.o corelib_timer.o

-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = monolib_baseunix.o monolib_dir.o monolib_gsocket.o monolib_mimetype.o monolib_snglinst.o monolib_threadpsx.o monolib_utilsunx.o
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = 

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = monolib_fontenum.o monolib_fontutil.o monolib_utilsx11.o monolib_taskbarcmn.o monolib_taskbarx11.o monolib_printps.o monolib_dialup.o monolib_gsockgtk.o monolib_win_gtk.o monolib_app.o monolib_bitmap.o monolib_brush.o monolib_clipbrd.o monolib_colour.o monolib_cursor.o monolib_data.o monolib_dataobj.o monolib_dc.o monolib_dcclient.o monolib_dcmemory.o monolib_dcscreen.o monolib_dnd.o monolib_evtloop.o monolib_font.o monolib_toplevel.o monolib_gdiobj.o monolib_icon.o monolib_main.o monolib_pen.o monolib_popupwin.o monolib_region.o monolib_settings.o monolib_timer.o monolib_tooltip.o monolib_utilsgtk.o monolib_window.o monolib_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = monolib_colour.o monolib_dc.o monolib_gdiobj.o monolib_palette.o monolib_region.o monolib_brush.o monolib_pen.o monolib_font.o monolib_data.o monolib_fontenum.o monolib_fontutil.o monolib_evtloop.o monolib_app.o monolib_bitmap.o monolib_dirmgl.o monolib_clipbrd.o monolib_cursor.o monolib_dcclient.o monolib_dcmemory.o monolib_dcscreen.o monolib_toplevel.o monolib_icon.o monolib_settings.o monolib_window.o monolib_utils.o monolib_timer.o
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = monolib_fontenum.o monolib_fontutil.o monolib_utilsx11.o monolib_taskbarcmn.o monolib_taskbarx11.o monolib_printps.o monolib_dialup.o monolib_gsockgtk.o monolib_win_gtk.o monolib_app.o monolib_bitmap.o monolib_brush.o monolib_clipbrd.o monolib_colour.o monolib_cursor.o monolib_data.o monolib_dataobj.o monolib_dc.o monolib_dcclient.o monolib_dcmemory.o monolib_dcscreen.o monolib_dnd.o monolib_evtloop.o monolib_font.o monolib_toplevel.o monolib_gdiobj.o monolib_icon.o monolib_main.o monolib_pen.o monolib_popupwin.o monolib_region.o monolib_settings.o monolib_timer.o monolib_tooltip.o monolib_utilsgtk.o monolib_window.o monolib_paletteg.o
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = 
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = monolib_colour.o monolib_dc.o monolib_gdiobj.o monolib_palette.o monolib_region.o monolib_brush.o monolib_pen.o monolib_font.o monolib_data.o monolib_fontenum.o monolib_fontutil.o monolib_evtloop.o monolib_app.o monolib_bitmap.o monolib_dirmgl.o monolib_clipbrd.o monolib_cursor.o monolib_dcclient.o monolib_dcmemory.o monolib_dcscreen.o monolib_toplevel.o monolib_icon.o monolib_settings.o monolib_window.o monolib_utils.o monolib_timer.o


@@ -829,8 +839,11 @@ basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 @COND_PLATFORM_UNIX_1@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

 
 basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<


@@ -859,8 +872,8 @@ basedll_dde.o: $(srcdir)/src/msw/dde.cpp
 @COND_PLATFORM_UNIX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@basedll_dir.o: $(srcdir)/src/unix/dir.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@basedll_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@basedll_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<


@@ -868,6 +881,9 @@ basedll_dde.o: $(srcdir)/src/msw/dde.cpp
 basedll_dircmn.o: $(srcdir)/src/common/dircmn.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_dircmn.o: $(srcdir)/src/common/dircmn.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+basedll_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 basedll_dynarray.o: $(srcdir)/src/common/dynarray.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_dynarray.o: $(srcdir)/src/common/dynarray.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -919,12 +935,15 @@ basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp
 basedll_ftp.o: $(srcdir)/src/common/ftp.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_ftp.o: $(srcdir)/src/common/ftp.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@basedll_gsocket.o: $(srcdir)/src/mac/gsocket.c
-@COND_PLATFORM_MACOSX_1@       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+@COND_TOOLKIT_MAC@basedll_gsocket.o: $(srcdir)/src/mac/gsocket.c
+@COND_TOOLKIT_MAC@     $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@basedll_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 
 
 @COND_PLATFORM_UNIX_1@basedll_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 

+@COND_TOOLKIT_COCOA@basedll_gsocket.o: $(srcdir)/src/unix/gsocket.c
+@COND_TOOLKIT_COCOA@   $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+

 @COND_PLATFORM_WIN32_1@basedll_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@basedll_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 


@@ -976,6 +995,9 @@ basedll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_UNIX_1@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_COCOA@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 basedll_module.o: $(srcdir)/src/common/module.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_module.o: $(srcdir)/src/common/module.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -1024,6 +1046,9 @@ basedll_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp
 @COND_PLATFORM_UNIX_1@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_COCOA@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 basedll_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -1051,8 +1076,11 @@ basedll_textfile.o: $(srcdir)/src/common/textfile.cpp
 basedll_thread.o: $(srcdir)/src/msw/thread.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_thread.o: $(srcdir)/src/msw/thread.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

 
 basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<


@@ -1066,8 +1094,8 @@ basedll_unzip.o: $(srcdir)/src/common/unzip.c
 basedll_url.o: $(srcdir)/src/common/url.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_url.o: $(srcdir)/src/common/url.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@basedll_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@basedll_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<


@@ -1078,14 +1106,17 @@ basedll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp
 @COND_PLATFORM_WIN32_1@basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@basedll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@basedll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 
 @COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

 
 basedll_variant.o: $(srcdir)/src/common/variant.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_variant.o: $(srcdir)/src/common/variant.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<


@@ -1119,8 +1150,11 @@ baselib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 @COND_PLATFORM_UNIX_1@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

 
 baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<


@@ -1149,8 +1183,8 @@ baselib_dde.o: $(srcdir)/src/msw/dde.cpp
 @COND_PLATFORM_UNIX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@baselib_dir.o: $(srcdir)/src/unix/dir.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@baselib_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@baselib_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<


@@ -1158,6 +1192,9 @@ baselib_dde.o: $(srcdir)/src/msw/dde.cpp
 baselib_dircmn.o: $(srcdir)/src/common/dircmn.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_dircmn.o: $(srcdir)/src/common/dircmn.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+baselib_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 baselib_dynarray.o: $(srcdir)/src/common/dynarray.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_dynarray.o: $(srcdir)/src/common/dynarray.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -1209,12 +1246,15 @@ baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp
 baselib_ftp.o: $(srcdir)/src/common/ftp.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_ftp.o: $(srcdir)/src/common/ftp.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@baselib_gsocket.o: $(srcdir)/src/mac/gsocket.c
-@COND_PLATFORM_MACOSX_1@       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+@COND_TOOLKIT_MAC@baselib_gsocket.o: $(srcdir)/src/mac/gsocket.c
+@COND_TOOLKIT_MAC@     $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@baselib_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 
 
 @COND_PLATFORM_UNIX_1@baselib_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 

+@COND_TOOLKIT_COCOA@baselib_gsocket.o: $(srcdir)/src/unix/gsocket.c
+@COND_TOOLKIT_COCOA@   $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+

 @COND_PLATFORM_WIN32_1@baselib_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@baselib_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 


@@ -1266,6 +1306,9 @@ baselib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_UNIX_1@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_COCOA@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 baselib_module.o: $(srcdir)/src/common/module.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_module.o: $(srcdir)/src/common/module.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -1314,6 +1357,9 @@ baselib_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp
 @COND_PLATFORM_UNIX_1@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_COCOA@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 baselib_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -1341,8 +1387,11 @@ baselib_textfile.o: $(srcdir)/src/common/textfile.cpp
 baselib_thread.o: $(srcdir)/src/msw/thread.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_thread.o: $(srcdir)/src/msw/thread.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

 
 baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<


@@ -1356,8 +1405,8 @@ baselib_unzip.o: $(srcdir)/src/common/unzip.c
 baselib_url.o: $(srcdir)/src/common/url.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_url.o: $(srcdir)/src/common/url.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@baselib_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@baselib_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<


@@ -1368,14 +1417,17 @@ baselib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp
 @COND_PLATFORM_WIN32_1@baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@baselib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@baselib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 
 @COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

 
 baselib_variant.o: $(srcdir)/src/common/variant.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_variant.o: $(srcdir)/src/common/variant.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<


@@ -1519,9 +1571,6 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-

 @COND_TOOLKIT_MGL_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MGL_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -2050,9 +2099,6 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-

 @COND_USE_GUI_1@coredll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@coredll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -2392,11 +2438,8 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 @COND_USE_GUI_1@coredll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@coredll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_gsocket.o: $(srcdir)/src/unix/gsocket.c
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
-
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
+coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c
+       $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<

 
 @COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<


@@ -2677,11 +2720,8 @@ coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp
 coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<


@@ -3052,11 +3092,8 @@ coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp
 coredll_slider95.o: $(srcdir)/src/msw/slider95.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_slider95.o: $(srcdir)/src/msw/slider95.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<


@@ -3316,9 +3353,6 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/mac/thread.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/mac/thread.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-

 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -3448,11 +3482,11 @@ coredll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
 @COND_PLATFORM_UNIX_1@coredll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@coredll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@coredll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@coredll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@coredll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<


@@ -3639,9 +3673,6 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-

 @COND_TOOLKIT_MGL_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MGL_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -4170,9 +4201,6 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-

 @COND_USE_GUI_1@corelib_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@corelib_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -4512,11 +4540,8 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 @COND_USE_GUI_1@corelib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@corelib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_gsocket.o: $(srcdir)/src/unix/gsocket.c
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
-
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
+corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c
+       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<

 
 @COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<


@@ -4797,11 +4822,8 @@ corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp
 corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<


@@ -5172,11 +5194,8 @@ corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp
 corelib_slider95.o: $(srcdir)/src/msw/slider95.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_slider95.o: $(srcdir)/src/msw/slider95.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<


@@ -5436,9 +5455,6 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/mac/thread.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/mac/thread.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-

 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -5568,11 +5584,11 @@ corelib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
 @COND_PLATFORM_UNIX_1@corelib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@corelib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@corelib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@corelib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@corelib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<


@@ -5891,7 +5907,7 @@ install-wxconfig:
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DATA) $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG).a $(libdir)
 
 @COND_TOOLKIT_MAC@lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r: 
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DATA) $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG).a $(libdir)
 
 @COND_TOOLKIT_MAC@lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r: 

-@COND_TOOLKIT_MAC@     $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r ../src/mac/corersrc.r -o lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc
+@COND_TOOLKIT_MAC@     $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc

 @COND_TOOLKIT_MAC@     $(DEREZ) lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc Carbon.r -useDF >lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 
 @COND_TOOLKIT_MAC@macos-res-install: $(__macos_res___depname)
 @COND_TOOLKIT_MAC@     $(DEREZ) lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc Carbon.r -useDF >lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 
 @COND_TOOLKIT_MAC@macos-res-install: $(__macos_res___depname)


@@ -6004,11 +6020,11 @@ monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 @COND_PLATFORM_UNIX_1@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_MGL_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MGL_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -6565,11 +6581,8 @@ monodll_dde.o: $(srcdir)/src/msw/dde.cpp
 @COND_PLATFORM_UNIX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monodll_dir.o: $(srcdir)/src/unix/dir.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@monodll_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monodll_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -6598,6 +6611,9 @@ monodll_dircmn.o: $(srcdir)/src/common/dircmn.cpp
 @COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+monodll_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -6961,14 +6977,14 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 @COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/mac/gsocket.c
-@COND_PLATFORM_MACOSX_1@       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+@COND_TOOLKIT_MAC@monodll_gsocket.o: $(srcdir)/src/mac/gsocket.c
+@COND_TOOLKIT_MAC@     $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 
 @COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+@COND_TOOLKIT_COCOA@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c
+@COND_TOOLKIT_COCOA@   $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<

 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<


@@ -7357,8 +7373,8 @@ monodll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_UNIX_1@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -7774,12 +7790,12 @@ monodll_slider95.o: $(srcdir)/src/msw/slider95.cpp
 @COND_PLATFORM_UNIX_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_COCOA@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-

 monodll_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -8068,8 +8084,8 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp
 @COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -8191,8 +8207,8 @@ monodll_url.o: $(srcdir)/src/common/url.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monodll_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monodll_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -8209,8 +8225,8 @@ monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monodll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monodll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_GTK_USE_GUI_1@monodll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@monodll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -8224,11 +8240,11 @@ monodll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
 @COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -8442,11 +8458,11 @@ monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 @COND_PLATFORM_UNIX_1@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_MGL_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MGL_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -9003,11 +9019,8 @@ monolib_dde.o: $(srcdir)/src/msw/dde.cpp
 @COND_PLATFORM_UNIX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monolib_dir.o: $(srcdir)/src/unix/dir.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@monolib_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monolib_dir.o: $(srcdir)/src/msw/dir.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -9036,6 +9049,9 @@ monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp
 @COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+monolib_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp
 @COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -9399,14 +9415,14 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 @COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/mac/gsocket.c
-@COND_PLATFORM_MACOSX_1@       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+@COND_TOOLKIT_MAC@monolib_gsocket.o: $(srcdir)/src/mac/gsocket.c
+@COND_TOOLKIT_MAC@     $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 
 @COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+@COND_TOOLKIT_COCOA@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c
+@COND_TOOLKIT_COCOA@   $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<

 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<


@@ -9795,8 +9811,8 @@ monolib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_UNIX_1@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
 @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -10212,12 +10228,12 @@ monolib_slider95.o: $(srcdir)/src/msw/slider95.cpp
 @COND_PLATFORM_UNIX_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_COCOA@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-

 monolib_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_socket.o: $(srcdir)/src/common/socket.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -10506,8 +10522,8 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp
 @COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -10629,8 +10645,8 @@ monolib_url.o: $(srcdir)/src/common/url.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monolib_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monolib_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -10647,8 +10663,8 @@ monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monolib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monolib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_GTK_USE_GUI_1@monolib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@monolib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -10662,11 +10678,11 @@ monolib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
 @COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_PLATFORM_MACOSX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_COCOA@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index a78291981efe75e37c019059619281775b8d162d..f4cac3688793368a20f1e0437d6fc28a24ca229d 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -4,12 +4,18 @@ dnl Do not modify, all changes will be overwritten!
 
     dnl Conditions:
 
 
     dnl Conditions:
 

-dnl ### begin block COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 ###
-    COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
+dnl ### begin block COND_BUILD_DEBUG ###
+    COND_BUILD_DEBUG="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILD_DEBUG=""

     fi
     fi

-    AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
+    AC_SUBST(COND_BUILD_DEBUG)
+dnl ### begin block COND_BUILD_RELEASE ###
+    COND_BUILD_RELEASE="#"
+    if test "x$BUILD" = "xrelease" ; then
+        COND_BUILD_RELEASE=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE)

 dnl ### begin block COND_DEPS_TRACKING_0 ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
 dnl ### begin block COND_DEPS_TRACKING_0 ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then


@@ -22,102 +28,156 @@ dnl ### begin block COND_DEPS_TRACKING_1 ###
         COND_DEPS_TRACKING_1=""
     fi
     AC_SUBST(COND_DEPS_TRACKING_1)
         COND_DEPS_TRACKING_1=""
     fi
     AC_SUBST(COND_DEPS_TRACKING_1)

-dnl ### begin block COND_TOOLKIT_MOTIF_USE_GUI_1 ###
-    COND_TOOLKIT_MOTIF_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MOTIF_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1)
-dnl ### begin block COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
-    COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
-dnl ### begin block COND_TOOLKIT_COCOA_USE_GUI_1 ###
-    COND_TOOLKIT_COCOA_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_COCOA_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1)
-dnl ### begin block COND_USE_SOVERSOLARIS_1 ###
-    COND_USE_SOVERSOLARIS_1="#"
-    if test "x$USE_SOVERSOLARIS" = "x1" ; then
-        COND_USE_SOVERSOLARIS_1=""
+dnl ### begin block COND_MONOLITHIC_0 ###
+    COND_MONOLITHIC_0="#"
+    if test "x$MONOLITHIC" = "x0" ; then
+        COND_MONOLITHIC_0=""

     fi
     fi

-    AC_SUBST(COND_USE_SOVERSOLARIS_1)
+    AC_SUBST(COND_MONOLITHIC_0)

 dnl ### begin block COND_MONOLITHIC_1 ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
         COND_MONOLITHIC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1)
 dnl ### begin block COND_MONOLITHIC_1 ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
         COND_MONOLITHIC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1)

+dnl ### begin block COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 ###
+    COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
+    fi
+    AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
+dnl ### begin block COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 ###
+    COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
+    fi
+    AC_SUBST(COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1)
+dnl ### begin block COND_PLATFORM_MACOSX_1 ###
+    COND_PLATFORM_MACOSX_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" ; then
+        COND_PLATFORM_MACOSX_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1)
+dnl ### begin block COND_PLATFORM_MAC_1 ###
+    COND_PLATFORM_MAC_1="#"
+    if test "x$PLATFORM_MAC" = "x1" ; then
+        COND_PLATFORM_MAC_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MAC_1)
+dnl ### begin block COND_PLATFORM_UNIX_1 ###
+    COND_PLATFORM_UNIX_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" ; then
+        COND_PLATFORM_UNIX_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1)
+dnl ### begin block COND_PLATFORM_WIN32_0 ###
+    COND_PLATFORM_WIN32_0="#"
+    if test "x$PLATFORM_WIN32" = "x0" ; then
+        COND_PLATFORM_WIN32_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_WIN32_0)
+dnl ### begin block COND_PLATFORM_WIN32_1 ###
+    COND_PLATFORM_WIN32_1="#"
+    if test "x$PLATFORM_WIN32" = "x1" ; then
+        COND_PLATFORM_WIN32_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_WIN32_1)
+dnl ### begin block COND_SHARED_1 ###
+    COND_SHARED_1="#"
+    if test "x$SHARED" = "x1" ; then
+        COND_SHARED_1=""
+    fi
+    AC_SUBST(COND_SHARED_1)
+dnl ### begin block COND_TOOLKIT_MAC ###
+    COND_TOOLKIT_MAC="#"
+    if test "x$TOOLKIT" = "xMAC" ; then
+        COND_TOOLKIT_MAC=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MAC)

 dnl ### begin block COND_UNICODE_1 ###
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)
 dnl ### begin block COND_UNICODE_1 ###
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)

-dnl ### begin block COND_MONOLITHIC_0 ###
-    COND_MONOLITHIC_0="#"
-    if test "x$MONOLITHIC" = "x0" ; then
-        COND_MONOLITHIC_0=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0)
-dnl ### begin block COND_TOOLKIT_MGL ###
-    COND_TOOLKIT_MGL="#"
-    if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKIT_MGL=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MGL)
-dnl ### begin block COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 ###
-    COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0)
-dnl ### begin block COND_WXUSE_ODBC_BUILTIN ###
-    COND_WXUSE_ODBC_BUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBC_BUILTIN=""
+dnl ### begin block COND_USE_GUI_0 ###
+    COND_USE_GUI_0="#"
+    if test "x$USE_GUI" = "x0" ; then
+        COND_USE_GUI_0=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
-dnl ### begin block COND_USE_SOVERSION_0 ###
-    COND_USE_SOVERSION_0="#"
-    if test "x$USE_SOVERSION" = "x0" ; then
-        COND_USE_SOVERSION_0=""
+    AC_SUBST(COND_USE_GUI_0)
+dnl ### begin block COND_USE_GUI_1 ###
+    COND_USE_GUI_1="#"
+    if test "x$USE_GUI" = "x1" ; then
+        COND_USE_GUI_1=""

     fi
     fi

-    AC_SUBST(COND_USE_SOVERSION_0)
+    AC_SUBST(COND_USE_GUI_1)

 dnl ### begin block COND_WXUNIV_1 ###
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)
 dnl ### begin block COND_WXUNIV_1 ###
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)

-dnl ### begin block COND_PLATFORM_UNIX_1 ###
-    COND_PLATFORM_UNIX_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" ; then
-        COND_PLATFORM_UNIX_1=""
+dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
+    COND_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_WXUSE_LIBJPEG_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_PLATFORM_UNIX_1)
-dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ###
-    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
+    AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ###
+    COND_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_WXUSE_LIBPNG_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
+    AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
+    COND_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_WXUSE_LIBTIFF_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block COND_WXUSE_ODBC_BUILTIN ###
+    COND_WXUSE_ODBC_BUILTIN="#"
+    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
+        COND_WXUSE_ODBC_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_ODBC_BUILTIN)

 dnl ### begin block COND_WXUSE_REGEX_BUILTIN ###
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_WXUSE_REGEX_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
 dnl ### begin block COND_WXUSE_REGEX_BUILTIN ###
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_WXUSE_REGEX_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_REGEX_BUILTIN)

-dnl ### begin block COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 ###
-    COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1=""
+dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
+    COND_WXUSE_ZLIB_BUILTIN="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_WXUSE_ZLIB_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1)
+    AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
+dnl ### begin block COND_MONOLITHIC_0_SHARED_0 ###
+    COND_MONOLITHIC_0_SHARED_0="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
+        COND_MONOLITHIC_0_SHARED_0=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0)
+dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ###
+    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1)
+dnl ### begin block COND_MONOLITHIC_0_SHARED_1 ###
+    COND_MONOLITHIC_0_SHARED_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1)
+dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ###
+    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1)

 dnl ### begin block COND_MONOLITHIC_1_SHARED_0 ###
     COND_MONOLITHIC_1_SHARED_0="#"
     if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
 dnl ### begin block COND_MONOLITHIC_1_SHARED_0 ###
     COND_MONOLITHIC_1_SHARED_0="#"
     if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then


@@ -130,54 +190,42 @@ dnl ### begin block COND_MONOLITHIC_1_SHARED_1 ###
         COND_MONOLITHIC_1_SHARED_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
         COND_MONOLITHIC_1_SHARED_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_SHARED_1)

-dnl ### begin block COND_TOOLKIT_X11 ###
-    COND_TOOLKIT_X11="#"
-    if test "x$TOOLKIT" = "xX11" ; then
-        COND_TOOLKIT_X11=""
-    fi
-    AC_SUBST(COND_TOOLKIT_X11)
-dnl ### begin block COND_OFFICIAL_BUILD_0 ###
-    COND_OFFICIAL_BUILD_0="#"
-    if test "x$OFFICIAL_BUILD" = "x0" ; then
-        COND_OFFICIAL_BUILD_0=""
-    fi
-    AC_SUBST(COND_OFFICIAL_BUILD_0)
-dnl ### begin block COND_TOOLKIT_OS2 ###
-    COND_TOOLKIT_OS2="#"
-    if test "x$TOOLKIT" = "xOS2" ; then
-        COND_TOOLKIT_OS2=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OS2)
-dnl ### begin block COND_TOOLKIT_MGL_USE_GUI_1 ###
-    COND_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MGL_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
-dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
-    COND_WXUSE_ZLIB_BUILTIN="#"
-    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_WXUSE_ZLIB_BUILTIN=""
-    fi
-    AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
-dnl ### begin block COND_TOOLKIT_MOTIF ###
-    COND_TOOLKIT_MOTIF="#"
-    if test "x$TOOLKIT" = "xMOTIF" ; then
-        COND_TOOLKIT_MOTIF=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MOTIF)
-dnl ### begin block COND_MONOLITHIC_0_SHARED_1 ###
-    COND_MONOLITHIC_0_SHARED_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1=""
+dnl ### begin block COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 ###
+    COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
+    if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
+        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""

     fi
     fi

-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1)
+    AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)

 dnl ### begin block COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ###
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
 dnl ### begin block COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ###
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)

+dnl ### begin block COND_TOOLKIT_COCOA ###
+    COND_TOOLKIT_COCOA="#"
+    if test "x$TOOLKIT" = "xCOCOA" ; then
+        COND_TOOLKIT_COCOA=""
+    fi
+    AC_SUBST(COND_TOOLKIT_COCOA)
+dnl ### begin block COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0)
+dnl ### begin block COND_TOOLKIT_GTK ###
+    COND_TOOLKIT_GTK="#"
+    if test "x$TOOLKIT" = "xGTK" ; then
+        COND_TOOLKIT_GTK=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK)
+dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1 ###
+    COND_TOOLKIT_GTK_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_GTK_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)

 dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 ###
     COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
 dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 ###
     COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then


@@ -190,120 +238,96 @@ dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 ###
         COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1)
         COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1)

-dnl ### begin block COND_MONOLITHIC_0_SHARED_0 ###
-    COND_MONOLITHIC_0_SHARED_0="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
-        COND_MONOLITHIC_0_SHARED_0=""
+dnl ### begin block COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""

     fi
     fi

-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0)
-dnl ### begin block COND_USE_GUI_1 ###
-    COND_USE_GUI_1="#"
-    if test "x$USE_GUI" = "x1" ; then
-        COND_USE_GUI_1=""
+    AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
+dnl ### begin block COND_TOOLKIT_MGL ###
+    COND_TOOLKIT_MGL="#"
+    if test "x$TOOLKIT" = "xMGL" ; then
+        COND_TOOLKIT_MGL=""

     fi
     fi

-    AC_SUBST(COND_USE_GUI_1)
-dnl ### begin block COND_USE_GUI_0 ###
-    COND_USE_GUI_0="#"
-    if test "x$USE_GUI" = "x0" ; then
-        COND_USE_GUI_0=""
+    AC_SUBST(COND_TOOLKIT_MGL)
+dnl ### begin block COND_TOOLKIT_MGL_USE_GUI_1 ###
+    COND_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MGL_USE_GUI_1=""

     fi
     fi

-    AC_SUBST(COND_USE_GUI_0)
+    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
+dnl ### begin block COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 ###
+    COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1)
+dnl ### begin block COND_TOOLKIT_MOTIF ###
+    COND_TOOLKIT_MOTIF="#"
+    if test "x$TOOLKIT" = "xMOTIF" ; then
+        COND_TOOLKIT_MOTIF=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MOTIF)
+dnl ### begin block COND_TOOLKIT_MOTIF_USE_GUI_1 ###
+    COND_TOOLKIT_MOTIF_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1)
+dnl ### begin block COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)

 dnl ### begin block COND_TOOLKIT_MSW ###
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
         COND_TOOLKIT_MSW=""
     fi
     AC_SUBST(COND_TOOLKIT_MSW)
 dnl ### begin block COND_TOOLKIT_MSW ###
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
         COND_TOOLKIT_MSW=""
     fi
     AC_SUBST(COND_TOOLKIT_MSW)

-dnl ### begin block COND_TOOLKIT_X11_USE_GUI_1 ###
-    COND_TOOLKIT_X11_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_X11_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
-dnl ### begin block COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 ###
-    COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""
+dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1 ###
+    COND_TOOLKIT_MSW_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1=""

     fi
     fi

-    AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0)
-dnl ### begin block COND_BUILD_DEBUG ###
-    COND_BUILD_DEBUG="#"
-    if test "x$BUILD" = "xdebug" ; then
-        COND_BUILD_DEBUG=""
+    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1)
+dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""

     fi
     fi

-    AC_SUBST(COND_BUILD_DEBUG)
+    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)

 dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 ###
     COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#"
     if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1)
 dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 ###
     COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#"
     if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1)

-dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
-    COND_WXUSE_LIBTIFF_BUILTIN="#"
-    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFF_BUILTIN=""
-    fi
-    AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
-dnl ### begin block COND_OFFICIAL_BUILD_1 ###
-    COND_OFFICIAL_BUILD_1="#"
-    if test "x$OFFICIAL_BUILD" = "x1" ; then
-        COND_OFFICIAL_BUILD_1=""
-    fi
-    AC_SUBST(COND_OFFICIAL_BUILD_1)
-dnl ### begin block COND_BUILD_RELEASE ###
-    COND_BUILD_RELEASE="#"
-    if test "x$BUILD" = "xrelease" ; then
-        COND_BUILD_RELEASE=""
-    fi
-    AC_SUBST(COND_BUILD_RELEASE)
-dnl ### begin block COND_USE_SOVERLINUX_1 ###
-    COND_USE_SOVERLINUX_1="#"
-    if test "x$USE_SOVERLINUX" = "x1" ; then
-        COND_USE_SOVERLINUX_1=""
-    fi
-    AC_SUBST(COND_USE_SOVERLINUX_1)
-dnl ### begin block COND_USE_SOSYMLINKS_1 ###
-    COND_USE_SOSYMLINKS_1="#"
-    if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS_1=""
-    fi
-    AC_SUBST(COND_USE_SOSYMLINKS_1)
-dnl ### begin block COND_TOOLKIT_COCOA ###
-    COND_TOOLKIT_COCOA="#"
-    if test "x$TOOLKIT" = "xCOCOA" ; then
-        COND_TOOLKIT_COCOA=""
-    fi
-    AC_SUBST(COND_TOOLKIT_COCOA)
-dnl ### begin block COND_PLATFORM_MACOSX_1 ###
-    COND_PLATFORM_MACOSX_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_PLATFORM_MACOSX_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1)
-dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
-    COND_WXUSE_LIBJPEG_BUILTIN="#"
-    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEG_BUILTIN=""
+dnl ### begin block COND_TOOLKIT_OS2 ###
+    COND_TOOLKIT_OS2="#"
+    if test "x$TOOLKIT" = "xOS2" ; then
+        COND_TOOLKIT_OS2=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
-dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ###
-    COND_WXUSE_LIBPNG_BUILTIN="#"
-    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNG_BUILTIN=""
+    AC_SUBST(COND_TOOLKIT_OS2)
+dnl ### begin block COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
-dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ###
-    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
+    AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0)
+dnl ### begin block COND_TOOLKIT_X11 ###
+    COND_TOOLKIT_X11="#"
+    if test "x$TOOLKIT" = "xX11" ; then
+        COND_TOOLKIT_X11=""

     fi
     fi

-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1)
-dnl ### begin block COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 ###
-    COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
-    if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
-        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
+    AC_SUBST(COND_TOOLKIT_X11)
+dnl ### begin block COND_TOOLKIT_X11_USE_GUI_1 ###
+    COND_TOOLKIT_X11_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_X11_USE_GUI_1=""

     fi
     fi

-    AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
+    AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)

 dnl ### begin block COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 ###
     COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
     if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
 dnl ### begin block COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 ###
     COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
     if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then


@@ -322,75 +346,33 @@ dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ###
         COND_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
         COND_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUNIV_1)

-dnl ### begin block COND_TOOLKIT_GTK ###
-    COND_TOOLKIT_GTK="#"
-    if test "x$TOOLKIT" = "xGTK" ; then
-        COND_TOOLKIT_GTK=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK)
-dnl ### begin block COND_PLATFORM_WIN32_0 ###
-    COND_PLATFORM_WIN32_0="#"
-    if test "x$PLATFORM_WIN32" = "x0" ; then
-        COND_PLATFORM_WIN32_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_0)
-dnl ### begin block COND_PLATFORM_WIN32_1 ###
-    COND_PLATFORM_WIN32_1="#"
-    if test "x$PLATFORM_WIN32" = "x1" ; then
-        COND_PLATFORM_WIN32_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1)
-dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1 ###
-    COND_TOOLKIT_GTK_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_GTK_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block COND_TOOLKIT_MAC ###
-    COND_TOOLKIT_MAC="#"
-    if test "x$TOOLKIT" = "xMAC" ; then
-        COND_TOOLKIT_MAC=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MAC)
-dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1 ###
-    COND_TOOLKIT_MSW_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MSW_USE_GUI_1=""
+dnl ### begin block COND_USE_SOSYMLINKS_1 ###
+    COND_USE_SOSYMLINKS_1="#"
+    if test "x$USE_SOSYMLINKS" = "x1" ; then
+        COND_USE_SOSYMLINKS_1=""

     fi
     fi

-    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1)
-dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ###
-    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
+    AC_SUBST(COND_USE_SOSYMLINKS_1)
+dnl ### begin block COND_USE_SOVERLINUX_1 ###
+    COND_USE_SOVERLINUX_1="#"
+    if test "x$USE_SOVERLINUX" = "x1" ; then
+        COND_USE_SOVERLINUX_1=""

     fi
     fi

-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1)
-dnl ### begin block COND_SHARED_1 ###
-    COND_SHARED_1="#"
-    if test "x$SHARED" = "x1" ; then
-        COND_SHARED_1=""
+    AC_SUBST(COND_USE_SOVERLINUX_1)
+dnl ### begin block COND_USE_SOVERSION_0 ###
+    COND_USE_SOVERSION_0="#"
+    if test "x$USE_SOVERSION" = "x0" ; then
+        COND_USE_SOVERSION_0=""

     fi
     fi

-    AC_SUBST(COND_SHARED_1)
-dnl ### begin block COND_PLATFORM_MAC_1 ###
-    COND_PLATFORM_MAC_1="#"
-    if test "x$PLATFORM_MAC" = "x1" ; then
-        COND_PLATFORM_MAC_1=""
+    AC_SUBST(COND_USE_SOVERSION_0)
+dnl ### begin block COND_USE_SOVERSOLARIS_1 ###
+    COND_USE_SOVERSOLARIS_1="#"
+    if test "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSOLARIS_1=""

     fi
     fi

-    AC_SUBST(COND_PLATFORM_MAC_1)
+    AC_SUBST(COND_USE_SOVERSOLARIS_1)

 dnl ### begin block COND_SHARED_0 ###
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)
 dnl ### begin block COND_SHARED_0 ###
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)

-dnl ### begin block COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 ###
-    COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
-    if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
-        COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
-    fi
-    AC_SUBST(COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1)
-dnl ### begin block COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 ###
-    COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
-    if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
-        COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
-    fi
-    AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)

diff --git a/configure b/configure
index 0541017e345082c969ea99b4cf180ec25305f18c..a3bda7b3da7e8b2091047210de7b16c40297288b 100755 (executable)
--- a/configure
+++ b/configure
@@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
 # include <unistd.h>
 #endif"
 

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_COCOA_USE_GUI_1 COND_USE_SOVERSOLARIS_1 COND_MONOLITHIC_1 COND_UNICODE_1 COND_MONOLITHIC_0 COND_TOOLKIT_MGL COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_WXUSE_ODBC_BUILTIN COND_USE_SOVERSION_0 COND_WXUNIV_1 COND_PLATFORM_UNIX_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_TOOLKIT_X11 COND_OFFICIAL_BUILD_0 COND_TOOLKIT_OS2 COND_TOOLKIT_MGL_USE_GUI_1 COND_WXUSE_ZLIB_BUILTIN COND_TOOLKIT_MOTIF COND_MONOLITHIC_0_SHARED_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_MONOLITHIC_0_SHARED_0 COND_USE_GUI_1 COND_USE_GUI_0 COND_TOOLKIT_MSW COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_BUILD_DEBUG COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_WXUSE_LIBTIFF_BUILTIN COND_OFFICIAL_BUILD_1 COND_BUILD_RELEASE COND_USE_SOVERLINUX_1 COND_USE_SOSYMLINKS_1 COND_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_GTK COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC COND_TOOLKIT_MSW_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_SHARED_1 COND_PLATFORM_MAC_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MAC_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_1 COND_TOOLKIT_MAC COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.
 ac_subst_files=''
 
 # Initialize some variables set by options.


@@ -10409,7 +10409,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \

-   '' \
+   ''\
+   '#include <stdlib.h>' \

    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \


@@ -10423,8 +10424,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-$ac_declaration

 #include <stdlib.h>
 #include <stdlib.h>

+$ac_declaration

 int
 main ()
 {
 int
 main ()
 {


@@ -11049,7 +11050,8 @@ else
   fi
 fi
 for ac_declaration in \
   fi
 fi
 for ac_declaration in \

-   '' \
+   ''\
+   '#include <stdlib.h>' \

    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \


@@ -11063,8 +11065,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-$ac_declaration

 #include <stdlib.h>
 #include <stdlib.h>

+$ac_declaration

 int
 main ()
 {
 int
 main ()
 {


@@ -34353,9 +34355,14 @@ fi
 
 
 
 
 
 

-    COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
+    COND_BUILD_DEBUG="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILD_DEBUG=""
+    fi
+
+    COND_BUILD_RELEASE="#"
+    if test "x$BUILD" = "xrelease" ; then
+        COND_BUILD_RELEASE=""

     fi
 
     COND_DEPS_TRACKING_0="#"
     fi
 
     COND_DEPS_TRACKING_0="#"


@@ -34368,24 +34375,9 @@ fi
         COND_DEPS_TRACKING_1=""
     fi
 
         COND_DEPS_TRACKING_1=""
     fi
 

-    COND_TOOLKIT_MOTIF_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MOTIF_USE_GUI_1=""
-    fi
-
-    COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
-    fi
-
-    COND_TOOLKIT_COCOA_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_COCOA_USE_GUI_1=""
-    fi
-
-    COND_USE_SOVERSOLARIS_1="#"
-    if test "x$USE_SOVERSOLARIS" = "x1" ; then
-        COND_USE_SOVERSOLARIS_1=""
+    COND_MONOLITHIC_0="#"
+    if test "x$MONOLITHIC" = "x0" ; then
+        COND_MONOLITHIC_0=""

     fi
 
     COND_MONOLITHIC_1="#"
     fi
 
     COND_MONOLITHIC_1="#"


@@ -34393,89 +34385,94 @@ fi
         COND_MONOLITHIC_1=""
     fi
 
         COND_MONOLITHIC_1=""
     fi
 

-    COND_UNICODE_1="#"
-    if test "x$UNICODE" = "x1" ; then
-        COND_UNICODE_1=""
+    COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""

     fi
 
     fi
 

-    COND_MONOLITHIC_0="#"
-    if test "x$MONOLITHIC" = "x0" ; then
-        COND_MONOLITHIC_0=""
+    COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_MGL="#"
-    if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKIT_MGL=""
+    COND_PLATFORM_MACOSX_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" ; then
+        COND_PLATFORM_MACOSX_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
+    COND_PLATFORM_MAC_1="#"
+    if test "x$PLATFORM_MAC" = "x1" ; then
+        COND_PLATFORM_MAC_1=""

     fi
 
     fi
 

-    COND_WXUSE_ODBC_BUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBC_BUILTIN=""
+    COND_PLATFORM_UNIX_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" ; then
+        COND_PLATFORM_UNIX_1=""

     fi
 
     fi
 

-    COND_USE_SOVERSION_0="#"
-    if test "x$USE_SOVERSION" = "x0" ; then
-        COND_USE_SOVERSION_0=""
+    COND_PLATFORM_WIN32_0="#"
+    if test "x$PLATFORM_WIN32" = "x0" ; then
+        COND_PLATFORM_WIN32_0=""

     fi
 
     fi
 

-    COND_WXUNIV_1="#"
-    if test "x$WXUNIV" = "x1" ; then
-        COND_WXUNIV_1=""
+    COND_PLATFORM_WIN32_1="#"
+    if test "x$PLATFORM_WIN32" = "x1" ; then
+        COND_PLATFORM_WIN32_1=""

     fi
 
     fi
 

-    COND_PLATFORM_UNIX_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" ; then
-        COND_PLATFORM_UNIX_1=""
+    COND_SHARED_1="#"
+    if test "x$SHARED" = "x1" ; then
+        COND_SHARED_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
+    COND_TOOLKIT_MAC="#"
+    if test "x$TOOLKIT" = "xMAC" ; then
+        COND_TOOLKIT_MAC=""

     fi
 
     fi
 

-    COND_WXUSE_REGEX_BUILTIN="#"
-    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_WXUSE_REGEX_BUILTIN=""
+    COND_UNICODE_1="#"
+    if test "x$UNICODE" = "x1" ; then
+        COND_UNICODE_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1=""
+    COND_USE_GUI_0="#"
+    if test "x$USE_GUI" = "x0" ; then
+        COND_USE_GUI_0=""

     fi
 
     fi
 

-    COND_MONOLITHIC_1_SHARED_0="#"
-    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
-        COND_MONOLITHIC_1_SHARED_0=""
+    COND_USE_GUI_1="#"
+    if test "x$USE_GUI" = "x1" ; then
+        COND_USE_GUI_1=""

     fi
 
     fi
 

-    COND_MONOLITHIC_1_SHARED_1="#"
-    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
-        COND_MONOLITHIC_1_SHARED_1=""
+    COND_WXUNIV_1="#"
+    if test "x$WXUNIV" = "x1" ; then
+        COND_WXUNIV_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_X11="#"
-    if test "x$TOOLKIT" = "xX11" ; then
-        COND_TOOLKIT_X11=""
+    COND_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_WXUSE_LIBJPEG_BUILTIN=""

     fi
 
     fi
 

-    COND_OFFICIAL_BUILD_0="#"
-    if test "x$OFFICIAL_BUILD" = "x0" ; then
-        COND_OFFICIAL_BUILD_0=""
+    COND_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_WXUSE_LIBPNG_BUILTIN=""

     fi
 
     fi
 

-    COND_TOOLKIT_OS2="#"
-    if test "x$TOOLKIT" = "xOS2" ; then
-        COND_TOOLKIT_OS2=""
+    COND_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_WXUSE_LIBTIFF_BUILTIN=""

     fi
 
     fi
 

-    COND_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MGL_USE_GUI_1=""
+    COND_WXUSE_ODBC_BUILTIN="#"
+    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
+        COND_WXUSE_ODBC_BUILTIN=""
+    fi
+
+    COND_WXUSE_REGEX_BUILTIN="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_WXUSE_REGEX_BUILTIN=""

     fi
 
     COND_WXUSE_ZLIB_BUILTIN="#"
     fi
 
     COND_WXUSE_ZLIB_BUILTIN="#"


@@ -34483,9 +34480,14 @@ fi
         COND_WXUSE_ZLIB_BUILTIN=""
     fi
 
         COND_WXUSE_ZLIB_BUILTIN=""
     fi
 

-    COND_TOOLKIT_MOTIF="#"
-    if test "x$TOOLKIT" = "xMOTIF" ; then
-        COND_TOOLKIT_MOTIF=""
+    COND_MONOLITHIC_0_SHARED_0="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
+        COND_MONOLITHIC_0_SHARED_0=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""

     fi
 
     COND_MONOLITHIC_0_SHARED_1="#"
     fi
 
     COND_MONOLITHIC_0_SHARED_1="#"


@@ -34493,114 +34495,134 @@ fi
         COND_MONOLITHIC_0_SHARED_1=""
     fi
 
         COND_MONOLITHIC_0_SHARED_1=""
     fi
 

+    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
+    fi
+
+    COND_MONOLITHIC_1_SHARED_0="#"
+    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
+        COND_MONOLITHIC_1_SHARED_0=""
+    fi
+
+    COND_MONOLITHIC_1_SHARED_1="#"
+    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
+        COND_MONOLITHIC_1_SHARED_1=""
+    fi
+
+    COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
+    if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
+        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
+    fi
+

     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
 
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
 

-    COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0=""
+    COND_TOOLKIT_COCOA="#"
+    if test "x$TOOLKIT" = "xCOCOA" ; then
+        COND_TOOLKIT_COCOA=""

     fi
 
     fi
 

-    COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1=""
+    COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""

     fi
 
     fi
 

-    COND_MONOLITHIC_0_SHARED_0="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
-        COND_MONOLITHIC_0_SHARED_0=""
+    COND_TOOLKIT_GTK="#"
+    if test "x$TOOLKIT" = "xGTK" ; then
+        COND_TOOLKIT_GTK=""

     fi
 
     fi
 

-    COND_USE_GUI_1="#"
-    if test "x$USE_GUI" = "x1" ; then
-        COND_USE_GUI_1=""
+    COND_TOOLKIT_GTK_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_GTK_USE_GUI_1=""

     fi
 
     fi
 

-    COND_USE_GUI_0="#"
-    if test "x$USE_GUI" = "x0" ; then
-        COND_USE_GUI_0=""
+    COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0=""

     fi
 
     fi
 

-    COND_TOOLKIT_MSW="#"
-    if test "x$TOOLKIT" = "xMSW" ; then
-        COND_TOOLKIT_MSW=""
+    COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_X11_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_X11_USE_GUI_1=""
+    COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""

     fi
 
     fi
 

-    COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""
+    COND_TOOLKIT_MGL="#"
+    if test "x$TOOLKIT" = "xMGL" ; then
+        COND_TOOLKIT_MGL=""

     fi
 
     fi
 

-    COND_BUILD_DEBUG="#"
-    if test "x$BUILD" = "xdebug" ; then
-        COND_BUILD_DEBUG=""
+    COND_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MGL_USE_GUI_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#"
-    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
-        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1=""
+    COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1=""

     fi
 
     fi
 

-    COND_WXUSE_LIBTIFF_BUILTIN="#"
-    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFF_BUILTIN=""
+    COND_TOOLKIT_MOTIF="#"
+    if test "x$TOOLKIT" = "xMOTIF" ; then
+        COND_TOOLKIT_MOTIF=""

     fi
 
     fi
 

-    COND_OFFICIAL_BUILD_1="#"
-    if test "x$OFFICIAL_BUILD" = "x1" ; then
-        COND_OFFICIAL_BUILD_1=""
+    COND_TOOLKIT_MOTIF_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1=""

     fi
 
     fi
 

-    COND_BUILD_RELEASE="#"
-    if test "x$BUILD" = "xrelease" ; then
-        COND_BUILD_RELEASE=""
+    COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""

     fi
 
     fi
 

-    COND_USE_SOVERLINUX_1="#"
-    if test "x$USE_SOVERLINUX" = "x1" ; then
-        COND_USE_SOVERLINUX_1=""
+    COND_TOOLKIT_MSW="#"
+    if test "x$TOOLKIT" = "xMSW" ; then
+        COND_TOOLKIT_MSW=""

     fi
 
     fi
 

-    COND_USE_SOSYMLINKS_1="#"
-    if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS_1=""
+    COND_TOOLKIT_MSW_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1=""

     fi
 
     fi
 

-    COND_TOOLKIT_COCOA="#"
-    if test "x$TOOLKIT" = "xCOCOA" ; then
-        COND_TOOLKIT_COCOA=""
+    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""

     fi
 
     fi
 

-    COND_PLATFORM_MACOSX_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_PLATFORM_MACOSX_1=""
+    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1=""

     fi
 
     fi
 

-    COND_WXUSE_LIBJPEG_BUILTIN="#"
-    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEG_BUILTIN=""
+    COND_TOOLKIT_OS2="#"
+    if test "x$TOOLKIT" = "xOS2" ; then
+        COND_TOOLKIT_OS2=""

     fi
 
     fi
 

-    COND_WXUSE_LIBPNG_BUILTIN="#"
-    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNG_BUILTIN=""
+    COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""

     fi
 
     fi
 

-    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
+    COND_TOOLKIT_X11="#"
+    if test "x$TOOLKIT" = "xX11" ; then
+        COND_TOOLKIT_X11=""

     fi
 
     fi
 

-    COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
-    if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
-        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
+    COND_TOOLKIT_X11_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_X11_USE_GUI_1=""

     fi
 
     COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
     fi
 
     COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"


@@ -34618,49 +34640,24 @@ fi
         COND_USE_GUI_1_WXUNIV_1=""
     fi
 
         COND_USE_GUI_1_WXUNIV_1=""
     fi
 

-    COND_TOOLKIT_GTK="#"
-    if test "x$TOOLKIT" = "xGTK" ; then
-        COND_TOOLKIT_GTK=""
-    fi
-
-    COND_PLATFORM_WIN32_0="#"
-    if test "x$PLATFORM_WIN32" = "x0" ; then
-        COND_PLATFORM_WIN32_0=""
-    fi
-
-    COND_PLATFORM_WIN32_1="#"
-    if test "x$PLATFORM_WIN32" = "x1" ; then
-        COND_PLATFORM_WIN32_1=""
-    fi
-
-    COND_TOOLKIT_GTK_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_GTK_USE_GUI_1=""
-    fi
-
-    COND_TOOLKIT_MAC="#"
-    if test "x$TOOLKIT" = "xMAC" ; then
-        COND_TOOLKIT_MAC=""
-    fi
-
-    COND_TOOLKIT_MSW_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MSW_USE_GUI_1=""
+    COND_USE_SOSYMLINKS_1="#"
+    if test "x$USE_SOSYMLINKS" = "x1" ; then
+        COND_USE_SOSYMLINKS_1=""

     fi
 
     fi
 

-    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
+    COND_USE_SOVERLINUX_1="#"
+    if test "x$USE_SOVERLINUX" = "x1" ; then
+        COND_USE_SOVERLINUX_1=""

     fi
 
     fi
 

-    COND_SHARED_1="#"
-    if test "x$SHARED" = "x1" ; then
-        COND_SHARED_1=""
+    COND_USE_SOVERSION_0="#"
+    if test "x$USE_SOVERSION" = "x0" ; then
+        COND_USE_SOVERSION_0=""

     fi
 
     fi
 

-    COND_PLATFORM_MAC_1="#"
-    if test "x$PLATFORM_MAC" = "x1" ; then
-        COND_PLATFORM_MAC_1=""
+    COND_USE_SOVERSOLARIS_1="#"
+    if test "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSOLARIS_1=""

     fi
 
     COND_SHARED_0="#"
     fi
 
     COND_SHARED_0="#"


@@ -35575,68 +35572,67 @@ s,@USE_MACVERSION@,$USE_MACVERSION,;t t
 s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t
 s,@SONAME_FLAG@,$SONAME_FLAG,;t t
 s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t
 s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t
 s,@SONAME_FLAG@,$SONAME_FLAG,;t t
 s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t

-s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
+s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t

 s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
 s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
 s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
 s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t

-s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t
-s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t
-s,@COND_TOOLKIT_COCOA_USE_GUI_1@,$COND_TOOLKIT_COCOA_USE_GUI_1,;t t
-s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
+s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t

 s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t
 s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t

+s,@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1,;t t
+s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t
+s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t
+s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
+s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t
+s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t
+s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t
+s,@COND_SHARED_1@,$COND_SHARED_1,;t t
+s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t

 s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
 s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t

-s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t
-s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
-s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t
-s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
-s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
+s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
+s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t

 s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
 s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t

-s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t
-s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t

 s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
 s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t

-s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;t t
-s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t
-s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_1,;t t
-s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
-s,@COND_OFFICIAL_BUILD_0@,$COND_OFFICIAL_BUILD_0,;t t
-s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t
-s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t

 s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
 s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t

-s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
+s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t

 s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t
 s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t

+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t
+s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_1,;t t
+s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t

 s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t
 s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t

+s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t
+s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t
+s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t

 s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1,;t t
 s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1,;t t

-s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t
-s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
-s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
+s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;t t

 s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t
 s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t

-s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
-s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0,;t t
-s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t

 s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1,;t t
 s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1,;t t

-s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
-s,@COND_OFFICIAL_BUILD_1@,$COND_OFFICIAL_BUILD_1,;t t
-s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t
-s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
-s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
-s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t
-s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t
-s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
-s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t
-s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t
-s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t
+s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t
+s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
+s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t

 s,@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1,;t t
 s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t
 s,@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1,;t t
 s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t

-s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t
-s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t
-s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t
-s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t
-s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
-s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
-s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t
-s,@COND_SHARED_1@,$COND_SHARED_1,;t t
-s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
+s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
+s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
+s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
+s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t

 s,@COND_SHARED_0@,$COND_SHARED_0,;t t
 s,@LEX_STEM@,$LEX_STEM,;t t
 s,@PATH_IFS@,$PATH_IFS,;t t
 s,@COND_SHARED_0@,$COND_SHARED_0,;t t
 s,@LEX_STEM@,$LEX_STEM,;t t
 s,@PATH_IFS@,$PATH_IFS,;t t

diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc
new file mode 100644 (file)
index 0000000..20d4d93
--- /dev/null
+++ b/samples/console/makefile.bcc
@@ -0,0 +1,149 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# Type of compiled binaries [debug,release]
+!ifndef BUILD
+BUILD = release
+!endif
+# Name of your custom configuration. This affects directory
+#            where object files are stored as well as the location of
+#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+!ifndef CFG
+CFG = 
+!endif
+# Standard preprocessor flags (common for CC and CXX) 
+!ifndef CPPFLAGS
+CPPFLAGS = 
+!endif
+# C++ compiler 
+!ifndef CXX
+CXX = bcc32
+!endif
+# Standard flags for C++ 
+!ifndef CXXFLAGS
+CXXFLAGS = 
+!endif
+# Standard linker flags 
+!ifndef LDFLAGS
+LDFLAGS = 
+!endif
+# Multiple libraries or single huge monolithic one? [0,1]
+!ifndef MONOLITHIC
+MONOLITHIC = 1
+!endif
+# Is this official build by wxWindows developers? [0,1]
+!ifndef OFFICIAL_BUILD
+OFFICIAL_BUILD = 0
+!endif
+# What type of library to build? [0,1]
+!ifndef SHARED
+SHARED = 1
+!endif
+# Compile Unicode build of wxWindows? [0,1]
+!ifndef UNICODE
+UNICODE = 0
+!endif
+# Build GUI libraries? [0,1]
+!ifndef USE_GUI
+USE_GUI = 1
+!endif
+# Build wxUniversal instead of native port? [0,1]
+!ifndef WXUNIV
+WXUNIV = 0
+!endif
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+!ifndef BCCDIR
+BCCDIR=$(MAKEDIR)\..
+!endif
+
+!if "$(BCCDIR)" == "\.."
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+
+### Variables: ###
+
+OBJS = objs_bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+CONSOLE_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib  -I./../../src/regex -I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__MULTILIB_FLAG_p = -DwxUSE_GUI=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = wx25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\console.exe data
+
+$(OBJS)\console_console.obj: .\console.cpp
+       $(CXX) -c -P -o$@ $(CONSOLE_CXXFLAGS) $**
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
+       -if exist $(OBJS)\testdata.fc del $(OBJS)\testdata.fc
+
+$(OBJS)\console.exe: $(OBJS)\console_console.obj
+       ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -ap -ap @&&|
+       c0x32.obj  $(OBJS)\console_console.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,,
+|
+
+data: 
+
+install: all
+
+uninstall: 

diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc
index 4a6eaf7b46b08b0c2f517feca2638f4f2c6f7f51..705aaa87cc8357d2942796c50d63215e92b0c5b7 100644 (file)
--- a/samples/console/makefile.vc
+++ b/samples/console/makefile.vc
@@ -1,19 +1,117 @@
-# Purpose: makefile for console sample (VC++ 32bit)
-# Created: 2000-01-03
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================

 
 

-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-wxUSE_GUI = 0
-EXTRAFLAGS=/DwxUSE_GUI=0

 
 

-PROGRAM=console 
-OBJECTS = $(PROGRAM).obj
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------

 
 

-!if "$(FINAL)" == "1"
-EXTRALIBS=$(WXDIR)\lib\zlib.lib
-!else
-EXTRALIBS=$(WXDIR)\lib\zlibd.lib
+# Type of compiled binaries [debug,release]
+BUILD = release
+# Name of your custom configuration. This affects directory
+#            where object files are stored as well as the location of
+#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+CFG = 
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS = /DWIN32 /D_WINDOWS
+# C++ compiler 
+CXX = cl
+# Standard flags for C++ 
+CXXFLAGS = 
+# Standard linker flags 
+LDFLAGS = 
+# Multiple libraries or single huge monolithic one? [0,1]
+MONOLITHIC = 1
+# Is this official build by wxWindows developers? [0,1]
+OFFICIAL_BUILD = 0
+# What type of library to build? [0,1]
+SHARED = 1
+# Compile Unicode build of wxWindows? [0,1]
+UNICODE = 0
+# Build GUI libraries? [0,1]
+USE_GUI = 1
+# Build wxUniversal instead of native port? [0,1]
+WXUNIV = 0
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+OBJS = objs_vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+CONSOLE_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib  /I./../../src/regex /I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__MULTILIB_FLAG_p = /DwxUSE_GUI=0

 !endif
 !endif

+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = wx25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\console.exe data
+
+$(OBJS)\console_console.obj: .\console.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CONSOLE_CXXFLAGS) $**
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
+       -if exist $(OBJS)\testdata.fc del $(OBJS)\testdata.fc
+
+$(OBJS)\console.exe: $(OBJS)\console_console.obj
+       link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:CONSOLE /SUBSYSTEM:CONSOLE @<<
+       $(OBJS)\console_console.obj  $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+<<
+
+data: 

 
 

-!include $(WXDIR)\src\makeprog.vc
+install: all

 
 

+uninstall: 

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 06caf16121bc4e9b4bc59992cae45e0b5ad39bab..7fac8d1cb279555a6b4baca4a954d660768d6694 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -8,180 +8,82 @@
 @MAKE_SET@
 
 CPPFLAGS = @CPPFLAGS@
 @MAKE_SET@
 
 CPPFLAGS = @CPPFLAGS@

-INSTALL_DIR = @INSTALL_DIR@
-DEREZ = @DEREZ@
-wxUSE_ZLIB = @wxUSE_ZLIB@
-MONOLITHIC = @MONOLITHIC@
-SONAME_FLAG = @SONAME_FLAG@
+CXX = @CXX@

 CXXFLAGS = @CXXFLAGS@
 CXXFLAGS = @CXXFLAGS@

-prefix = @prefix@
-INSTALL = @INSTALL@

 EXEEXT = @EXEEXT@
 EXEEXT = @EXEEXT@

-RESCOMP = @RESCOMP@
-PLATFORM_MAC = @PLATFORM_MAC@
-USE_SOVERSION = @USE_SOVERSION@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-wxUSE_LIBPNG = @wxUSE_LIBPNG@
-wxUSE_LIBTIFF = @wxUSE_LIBTIFF@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-TOOLKIT = @TOOLKIT@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS = @EXTRALIBS@

-CC = @CC@
-datadir = @datadir@
-PLATFORM_MSDOS = @PLATFORM_MSDOS@
-SETFILE = @SETFILE@

 LDFLAGS = @LDFLAGS@
 LDFLAGS = @LDFLAGS@

-STRIP = @STRIP@
-USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
-srcdir = @srcdir@
-wxUSE_ODBC = @wxUSE_ODBC@
-wxUSE_REGEX = @wxUSE_REGEX@
-bindir = @bindir@
-PIC_FLAG = @PIC_FLAG@
-USE_SOSYMLINKS = @USE_SOSYMLINKS@

 LDFLAGS_GUI = @LDFLAGS_GUI@
 LDFLAGS_GUI = @LDFLAGS_GUI@

-INSTALL_DATA = @INSTALL_DATA@
-USE_GUI = @USE_GUI@
-PLATFORM_UNIX = @PLATFORM_UNIX@
-RANLIB = @RANLIB@
-SO_SUFFIX = @SO_SUFFIX@
-top_srcdir = @top_srcdir@
-wxUSE_LIBJPEG = @wxUSE_LIBJPEG@
-AR = @AR@
-BUILD = @BUILD@
-PLATFORM_WIN32 = @PLATFORM_WIN32@
-USE_MACVERSION = @USE_MACVERSION@
-PLATFORM_MACOSX = @PLATFORM_MACOSX@
-DEPS_TRACKING = @DEPS_TRACKING@
-OFFICIAL_BUILD = @OFFICIAL_BUILD@
-UNICODE = @UNICODE@
-WXUNIV = @WXUNIV@
+RESCOMP = @RESCOMP@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SETFILE = @SETFILE@
+TOOLKIT = @TOOLKIT@

 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@

-CXX = @CXX@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-VENDOR = @VENDOR@

 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@

-includedir = @includedir@
-LN_S = @LN_S@
-CFLAGS = @CFLAGS@
-DLLPREFIX = @DLLPREFIX@
-SHARED = @SHARED@
-USE_SOVERLINUX = @USE_SOVERLINUX@
+srcdir = @srcdir@

 top_builddir = @top_builddir@
 top_builddir = @top_builddir@

-SHARED_LD_CC = @SHARED_LD_CC@
+top_srcdir = @top_srcdir@

 
 ### Variables: ###
 
 
 ### Variables: ###
 

-DIALOGS_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CFLAGS)
-DIALOGS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
+DIALOGS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_BUILD_DEBUG@WXDEBUGFLAG = d
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg
-@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng$(WXDEBUGFLAG)
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib
-@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib
-@COND_BUILD_DEBUG@OPTIMIZEFLAG = off
-@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
-@COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
-@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
-@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib
-@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_PLATFORM_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p)
-@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(INC_TIFF) -i $(INC_JPEG) -i $(INC_PNG) -i $(INC_ZLIB) -i $(INC_ODBC) -i $(INC_REGEX) -i $(srcdir) $(__DLLFLAG_p_1) -o dialogs$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg
-@COND_SHARED_1@DLLFLAG = WXUSINGDLL
-@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
-@COND_WXUSE_REGEX_BUILTIN@INC_REGEX = $(srcdir)/src/regex
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)

-@COND_PLATFORM_UNIX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
-@COND_PLATFORM_MACOSX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
-@COND_PLATFORM_WIN32_1@TIFF_PLATFORM_SRC = src/tiff/tif_win32.c
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u

 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUNIV_1@WXUNIVNAME = univ

-@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT)
-@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG)
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL

 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL

-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx

 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL

-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@INC_TIFF = $(srcdir)/src/tiff
-@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
-@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
-@COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs-dialogs_rc.o
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)

 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)

-@COND_OFFICIAL_BUILD_1@VENDORTAG = 
-@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)   -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o dialogs$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex
-@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG)
-@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_BUILD_DEBUG@DEBUGFLAG = on
-@COND_BUILD_RELEASE@DEBUGFLAG = off
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG)
+@COND_PLATFORM_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT)
+@COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_dialogs_rc.o

 
 ### Targets: ###
 
 all: dialogs$(EXEEXT) data
 
 
 ### Targets: ###
 
 all: dialogs$(EXEEXT) data
 

-install-strip: install
-
-dialogs$(EXEEXT): dialogs-dialogs.o $(__dialogs___win32rc)
-       $(CXX) -o $@  dialogs-dialogs.o $(__dialogs___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
-       $(__dialogs___mac_rezcmd)
-       $(__dialogs___mac_setfilecmd)
-

 clean: 
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f dialogs$(EXEEXT)
        rm -f ./tips.txt
 
 clean: 
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f dialogs$(EXEEXT)
        rm -f ./tips.txt
 

-install: all
-
-dialogs-dialogs.o: $(srcdir)/dialogs.cpp
-       $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
-
-distclean: clean
-       rm -f configure config.cache config.log config.status
-       rm -f bk-deps shared-ld-sh
-

 data: 
        @mkdir -p .
        @for f in tips.txt; do \
 data: 
        @mkdir -p .
        @for f in tips.txt; do \


@@ -190,8 +92,24 @@ data:
        fi; \
        done
 
        fi; \
        done
 

-dialogs-dialogs_rc.o: $(srcdir)/dialogs.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+dialogs$(EXEEXT): dialogs_dialogs.o $(__dialogs___win32rc)
+       $(CXX) -o $@  dialogs_dialogs.o $(__dialogs___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(__dialogs___mac_rezcmd)
+       $(__dialogs___mac_setfilecmd)
+
+dialogs_dialogs.o: $(srcdir)/dialogs.cpp
+       $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+dialogs_dialogs_rc.o: $(srcdir)/dialogs.rc
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+
+distclean: clean
+       rm -f configure config.cache config.log config.status
+       rm -f bk-deps shared-ld-sh
+
+install: all
+
+install-strip: install

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 08e7d4559074b2b287e6c022b265ee27419ee446..4dffb72782f20c50bce116f813e0aaa21bc94ec7 100644 (file)
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -1,19 +1,161 @@
-#
-# File:                makefile.bcc
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-#
-# Builds a BC++ 16-bit sample
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================

 
 

-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# Type of compiled binaries [debug,release]
+!ifndef BUILD
+BUILD = release
+!endif
+# Name of your custom configuration. This affects directory
+#            where object files are stored as well as the location of
+#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+!ifndef CFG
+CFG = 
+!endif
+# Standard preprocessor flags (common for CC and CXX) 
+!ifndef CPPFLAGS
+CPPFLAGS = 
+!endif
+# C++ compiler 
+!ifndef CXX
+CXX = bcc32
+!endif
+# Standard flags for C++ 
+!ifndef CXXFLAGS
+CXXFLAGS = 
+!endif
+# Standard linker flags 
+!ifndef LDFLAGS
+LDFLAGS = 
+!endif
+# Multiple libraries or single huge monolithic one? [0,1]
+!ifndef MONOLITHIC
+MONOLITHIC = 1
+!endif
+# Is this official build by wxWindows developers? [0,1]
+!ifndef OFFICIAL_BUILD
+OFFICIAL_BUILD = 0
+!endif
+# What type of library to build? [0,1]
+!ifndef SHARED
+SHARED = 1
+!endif
+# Compile Unicode build of wxWindows? [0,1]
+!ifndef UNICODE
+UNICODE = 0
+!endif
+# Build GUI libraries? [0,1]
+!ifndef USE_GUI
+USE_GUI = 1
+!endif
+# Build wxUniversal instead of native port? [0,1]
+!ifndef WXUNIV
+WXUNIV = 0
+!endif
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+!ifndef BCCDIR
+BCCDIR=$(MAKEDIR)\..
+!endif
+
+!if "$(BCCDIR)" == "\.."
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+
+### Variables: ###
+
+OBJS = objs_bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+DIALOGS_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib  -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS)
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base

 !endif
 !endif

+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dialogs.exe data
+
+$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
+       $(CXX) -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
+
+$(OBJS)\dialogs_dialogs.res: .\dialogs.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib  -i./../../src/regex -i. $(__DLLFLAG_p_1) $**
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
+       -if exist $(OBJS)\tips.txt del $(OBJS)\tips.txt

 
 

-WXDIR = $(WXWIN)
+data: 

 
 

-TARGET=dialogs
-OBJECTS=$(TARGET).obj
+$(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.obj  $(OBJS)\dialogs_dialogs.res
+       ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
+       c0w32.obj  $(OBJS)\dialogs_dialogs.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\dialogs_dialogs.res
+|

 
 

-!include $(WXDIR)\src\makeprog.bcc
+install: all

 
 

+uninstall: 

diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index ee79a94674ce52e27e5239b956f1f71c68755bb0..29eec3d6968493e9072f629c75f11b94352c341c 100644 (file)
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -1,18 +1,129 @@
-#
-# File:                makefile.vc
-# Author:      Julian Smart
-# Created:     1999
-# Updated:     
-# Copyright:   (c) Julian Smart
-#
-# Makefile : Builds sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================

 
 

-# Set WXDIR for your system
-WXDIR = $(WXWIN)

 
 

-PROGRAM=dialogs
-OBJECTS = $(PROGRAM).obj
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------

 
 

-!include $(WXDIR)\src\makeprog.vc
+# Type of compiled binaries [debug,release]
+BUILD = release
+# Name of your custom configuration. This affects directory
+#            where object files are stored as well as the location of
+#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+CFG = 
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS = /DWIN32 /D_WINDOWS
+# C++ compiler 
+CXX = cl
+# Standard flags for C++ 
+CXXFLAGS = 
+# Standard linker flags 
+LDFLAGS = 
+# Multiple libraries or single huge monolithic one? [0,1]
+MONOLITHIC = 1
+# Is this official build by wxWindows developers? [0,1]
+OFFICIAL_BUILD = 0
+# What type of library to build? [0,1]
+SHARED = 1
+# Compile Unicode build of wxWindows? [0,1]
+UNICODE = 0
+# Build GUI libraries? [0,1]
+USE_GUI = 1
+# Build wxUniversal instead of native port? [0,1]
+WXUNIV = 0

 
 

+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+OBJS = objs_vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+DIALOGS_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib  /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p_1 = /d__WXDEBUG__
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /dWXUSINGDLL
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\dialogs.exe data
+
+$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) $**
+
+$(OBJS)\dialogs_dialogs.res: .\dialogs.rc
+       rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib  /i./../../src/regex /i. $(__DLLFLAG_p_1) $**
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
+       -if exist $(OBJS)\tips.txt del $(OBJS)\tips.txt
+
+data: 
+
+$(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res
+       link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
+       $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+<<
+
+install: all
+
+uninstall: 

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 07ddeef2fc050ffe7e1cc32c8a90d05e3f08cf9c..7e8cd03d036c40c407087c00fe0dd4f4e37e5ce6 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -8,101 +8,101 @@
 @MAKE_SET@
 
 CPPFLAGS = @CPPFLAGS@
 @MAKE_SET@
 
 CPPFLAGS = @CPPFLAGS@

+CXX = @CXX@

 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@

-RESCOMP = @RESCOMP@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-TOOLKIT = @TOOLKIT@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS = @EXTRALIBS@

-SETFILE = @SETFILE@

 LDFLAGS = @LDFLAGS@
 LDFLAGS = @LDFLAGS@

-srcdir = @srcdir@

 LDFLAGS_GUI = @LDFLAGS_GUI@
 LDFLAGS_GUI = @LDFLAGS_GUI@

-top_srcdir = @top_srcdir@
+RESCOMP = @RESCOMP@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SETFILE = @SETFILE@
+TOOLKIT = @TOOLKIT@

 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@

-CXX = @CXX@

 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@

+srcdir = @srcdir@

 top_builddir = @top_builddir@
 top_builddir = @top_builddir@

+top_srcdir = @top_srcdir@

 
 ### Variables: ###
 
 
 ### Variables: ###
 

-MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
+MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_BUILD_DEBUG@WXDEBUGFLAG = d
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_minimal_rc.o
-@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT)
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(srcdir)/src/zlib
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(srcdir)/src/tiff
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(srcdir)/src/png
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(srcdir)/src/tiff
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(srcdir)/src/jpeg
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

-@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(srcdir)/src/zlib
+@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u

 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUNIV_1@WXUNIVNAME = univ

-@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL

 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL

-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(srcdir)/src/odbc
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)

 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)

+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

-@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(srcdir)/src/regex
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(srcdir)/src/odbc
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png
+@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)   -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r
+@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT)
+@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_minimal_rc.o

 
 ### Targets: ###
 
 all: minimal$(EXEEXT)
 
 
 ### Targets: ###
 
 all: minimal$(EXEEXT)
 

-install-strip: install
-

 clean: 
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f minimal$(EXEEXT)
 
 clean: 
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f minimal$(EXEEXT)
 

-install: all
-
-minimal_minimal_rc.o: $(srcdir)/minimal.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
-

 distclean: clean
        rm -f configure config.cache config.log config.status
        rm -f bk-deps shared-ld-sh
 
 distclean: clean
        rm -f configure config.cache config.log config.status
        rm -f bk-deps shared-ld-sh
 

-minimal_minimal.o: $(srcdir)/minimal.cpp
-       $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $<
+install: all
+
+install-strip: install

 
 minimal$(EXEEXT): minimal_minimal.o $(__minimal___win32rc)
 
 minimal$(EXEEXT): minimal_minimal.o $(__minimal___win32rc)

-       $(CXX) -o $@  minimal_minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
+       $(CXX) -o $@  minimal_minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)

        $(__minimal___mac_rezcmd)
        $(__minimal___mac_setfilecmd)
 
        $(__minimal___mac_rezcmd)
        $(__minimal___mac_setfilecmd)
 

+minimal_minimal.o: $(srcdir)/minimal.cpp
+       $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $<
+
+minimal_minimal_rc.o: $(srcdir)/minimal.rc
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+

 uninstall: 
 
 
 uninstall: 
 
 

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index a2a229e0765262d793a7a23c6d8a7d6d7a16b97b..33fdf9bf496847684a37386aa41375188ffa9919 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -8,183 +8,131 @@
 @MAKE_SET@
 
 CPPFLAGS = @CPPFLAGS@
 @MAKE_SET@
 
 CPPFLAGS = @CPPFLAGS@

-INSTALL_DIR = @INSTALL_DIR@
-DEREZ = @DEREZ@
-wxUSE_ZLIB = @wxUSE_ZLIB@
-MONOLITHIC = @MONOLITHIC@
-SONAME_FLAG = @SONAME_FLAG@
+CXX = @CXX@

 CXXFLAGS = @CXXFLAGS@
 CXXFLAGS = @CXXFLAGS@

-prefix = @prefix@
-INSTALL = @INSTALL@

 EXEEXT = @EXEEXT@
 EXEEXT = @EXEEXT@

-RESCOMP = @RESCOMP@
-PLATFORM_MAC = @PLATFORM_MAC@
-USE_SOVERSION = @USE_SOVERSION@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-wxUSE_LIBPNG = @wxUSE_LIBPNG@
-wxUSE_LIBTIFF = @wxUSE_LIBTIFF@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-TOOLKIT = @TOOLKIT@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS = @EXTRALIBS@

-CC = @CC@
-datadir = @datadir@
-PLATFORM_MSDOS = @PLATFORM_MSDOS@
-SETFILE = @SETFILE@

 LDFLAGS = @LDFLAGS@
 LDFLAGS = @LDFLAGS@

-STRIP = @STRIP@
-USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
-srcdir = @srcdir@
-wxUSE_ODBC = @wxUSE_ODBC@
-wxUSE_REGEX = @wxUSE_REGEX@
-bindir = @bindir@
-PIC_FLAG = @PIC_FLAG@
-USE_SOSYMLINKS = @USE_SOSYMLINKS@

 LDFLAGS_GUI = @LDFLAGS_GUI@
 LDFLAGS_GUI = @LDFLAGS_GUI@

-INSTALL_DATA = @INSTALL_DATA@
-USE_GUI = @USE_GUI@
-PLATFORM_UNIX = @PLATFORM_UNIX@
-RANLIB = @RANLIB@
-SO_SUFFIX = @SO_SUFFIX@
-top_srcdir = @top_srcdir@
-wxUSE_LIBJPEG = @wxUSE_LIBJPEG@
-AR = @AR@
-BUILD = @BUILD@
-PLATFORM_WIN32 = @PLATFORM_WIN32@
-USE_MACVERSION = @USE_MACVERSION@
-PLATFORM_MACOSX = @PLATFORM_MACOSX@
-DEPS_TRACKING = @DEPS_TRACKING@
-OFFICIAL_BUILD = @OFFICIAL_BUILD@
-UNICODE = @UNICODE@
-WXUNIV = @WXUNIV@
+RESCOMP = @RESCOMP@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SETFILE = @SETFILE@
+TOOLKIT = @TOOLKIT@

 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@

-CXX = @CXX@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-VENDOR = @VENDOR@

 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@

-includedir = @includedir@
-LN_S = @LN_S@
-CFLAGS = @CFLAGS@
-DLLPREFIX = @DLLPREFIX@
-SHARED = @SHARED@
-USE_SOVERLINUX = @USE_SOVERLINUX@
+srcdir = @srcdir@

 top_builddir = @top_builddir@
 top_builddir = @top_builddir@

-SHARED_LD_CC = @SHARED_LD_CC@
+top_srcdir = @top_srcdir@

 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
-WIDGETS_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CFLAGS)
+WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_BUILD_DEBUG@WXDEBUGFLAG = d
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg
-@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng$(WXDEBUGFLAG)
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib
-@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib
-@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = $(SETFILE) -a C widgets$(EXEEXT)
-@COND_BUILD_DEBUG@OPTIMIZEFLAG = off
-@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
-@COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
-@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
-@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib
-@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_PLATFORM_WIN32_1@__widgets___win32rc = widgets-widgets_rc.o
-@COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p)
-@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(INC_TIFF) -i $(INC_JPEG) -i $(INC_PNG) -i $(INC_ZLIB) -i $(INC_ODBC) -i $(INC_REGEX) -i $(srcdir) $(__DLLFLAG_p_1) -o widgets$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg
-@COND_SHARED_1@DLLFLAG = WXUSINGDLL
-@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
-@COND_WXUSE_REGEX_BUILTIN@INC_REGEX = $(srcdir)/src/regex
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)

-@COND_PLATFORM_UNIX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
-@COND_PLATFORM_MACOSX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
-@COND_PLATFORM_WIN32_1@TIFF_PLATFORM_SRC = src/tiff/tif_win32.c
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u

 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUNIV_1@WXUNIVNAME = univ

-@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG)
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL

 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL

-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx

 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL

-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@INC_TIFF = $(srcdir)/src/tiff
-@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
-@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)

 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)

-@COND_OFFICIAL_BUILD_1@VENDORTAG = 
-@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)   -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o widgets$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex
-@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG)
-@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_BUILD_DEBUG@DEBUGFLAG = on
-@COND_BUILD_RELEASE@DEBUGFLAG = off
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG)
+@COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = $(SETFILE) -a C widgets$(EXEEXT)
+@COND_PLATFORM_WIN32_1@__widgets___win32rc = widgets_widgets_rc.o

 
 ### Targets: ###
 
 all: widgets$(EXEEXT)
 
 
 ### Targets: ###
 
 all: widgets$(EXEEXT)
 

-install-strip: install
-

 clean: 
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f widgets$(EXEEXT)
 
 clean: 
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f widgets$(EXEEXT)
 

+distclean: clean
+       rm -f configure config.cache config.log config.status
+       rm -f bk-deps shared-ld-sh
+

 install: all
 
 install: all
 

-widgets-widgets.o: $(srcdir)/widgets.cpp
-       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+install-strip: install
+
+uninstall: 

 
 

-widgets$(EXEEXT): widgets-widgets.o $(__widgets___win32rc)
-       $(CXX) -o $@  widgets-widgets.o $(__widgets___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
+widgets$(EXEEXT): widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc)
+       $(CXX) -o $@  widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)

        $(__widgets___mac_rezcmd)
        $(__widgets___mac_setfilecmd)
 
        $(__widgets___mac_rezcmd)
        $(__widgets___mac_setfilecmd)
 

-distclean: clean
-       rm -f configure config.cache config.log config.status
-       rm -f bk-deps shared-ld-sh
+widgets_button.o: $(srcdir)/button.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<

 
 

-widgets-widgets_rc.o: $(srcdir)/widgets.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+widgets_combobox.o: $(srcdir)/combobox.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<

 
 

-uninstall: 
+widgets_gauge.o: $(srcdir)/gauge.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_listbox.o: $(srcdir)/listbox.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_notebook.o: $(srcdir)/notebook.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_radiobox.o: $(srcdir)/radiobox.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_slider.o: $(srcdir)/slider.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_spinbtn.o: $(srcdir)/spinbtn.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_static.o: $(srcdir)/static.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_textctrl.o: $(srcdir)/textctrl.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_widgets.o: $(srcdir)/widgets.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+widgets_widgets_rc.o: $(srcdir)/widgets.rc
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present:

diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index 1f3630e152bc9a3f6a5a81fe6905cab55ff8a4ff..a796022268e7e6b49371519ad9099c86a76c0fcb 100644 (file)
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -1,20 +1,188 @@
-#
-# File:                makefile.bcc
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-#
-# Builds a BC++ 16-bit sample
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================

 
 

-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# Type of compiled binaries [debug,release]
+!ifndef BUILD
+BUILD = release
+!endif
+# Name of your custom configuration. This affects directory
+#            where object files are stored as well as the location of
+#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+!ifndef CFG
+CFG = 
+!endif
+# Standard preprocessor flags (common for CC and CXX) 
+!ifndef CPPFLAGS
+CPPFLAGS = 
+!endif
+# C++ compiler 
+!ifndef CXX
+CXX = bcc32
+!endif
+# Standard flags for C++ 
+!ifndef CXXFLAGS
+CXXFLAGS = 
+!endif
+# Standard linker flags 
+!ifndef LDFLAGS
+LDFLAGS = 
+!endif
+# Multiple libraries or single huge monolithic one? [0,1]
+!ifndef MONOLITHIC
+MONOLITHIC = 1
+!endif
+# Is this official build by wxWindows developers? [0,1]
+!ifndef OFFICIAL_BUILD
+OFFICIAL_BUILD = 0
+!endif
+# What type of library to build? [0,1]
+!ifndef SHARED
+SHARED = 1
+!endif
+# Compile Unicode build of wxWindows? [0,1]
+!ifndef UNICODE
+UNICODE = 0
+!endif
+# Build GUI libraries? [0,1]
+!ifndef USE_GUI
+USE_GUI = 1
+!endif
+# Build wxUniversal instead of native port? [0,1]
+!ifndef WXUNIV
+WXUNIV = 0
+!endif
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+!ifndef BCCDIR
+BCCDIR=$(MAKEDIR)\..
+!endif
+
+!if "$(BCCDIR)" == "\.."
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+
+### Variables: ###
+
+OBJS = objs_bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+WIDGETS_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib  -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS)
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u

 !endif
 !endif

+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widgets.exe
+
+$(OBJS)\widgets_button.obj: .\button.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_combobox.obj: .\combobox.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_gauge.obj: .\gauge.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_listbox.obj: .\listbox.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_notebook.obj: .\notebook.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_slider.obj: .\slider.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_static.obj: .\static.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_widgets.obj: .\widgets.cpp
+       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_widgets.res: .\widgets.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib  -i./../../src/regex -i. $(__DLLFLAG_p_1) $**

 
 

-WXDIR = $(WXWIN)
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe

 
 

-TARGET=widgets button.obj combobox.obj gauge.obj listbox.obj\
- notebook.obj radiobox.obj slider.obj spinbtn.obj static.obj textctrl.obj
-OBJECTS=$(TARGET).obj
+install: all

 
 

-!include $(WXDIR)\src\makeprog.bcc
+uninstall: 

 
 

+$(OBJS)\widgets.exe: $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj  $(OBJS)\widgets_widgets.res
+       ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
+       c0w32.obj  $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\widgets_widgets.res
+|

diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index 2a838ef925d5d90924ce4b706766901536c94040..5f7e3ea7a46771df772c1ff023d25cd058655078 100644 (file)
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -1,19 +1,156 @@
-#
-# File:                makefile.vc
-# Author:      Julian Smart
-# Created:     1999
-# Updated:     
-# Copyright:   (c) Julian Smart
-#
-# Makefile : Builds sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================

 
 

-# Set WXDIR for your system
-WXDIR = $(WXWIN)

 
 

-PROGRAM=widgets
-OBJECTS = $(PROGRAM).obj button.obj combobox.obj gauge.obj listbox.obj\
- notebook.obj radiobox.obj slider.obj spinbtn.obj static.obj textctrl.obj
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------

 
 

-!include $(WXDIR)\src\makeprog.vc
+# Type of compiled binaries [debug,release]
+BUILD = release
+# Name of your custom configuration. This affects directory
+#            where object files are stored as well as the location of
+#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+CFG = 
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS = /DWIN32 /D_WINDOWS
+# C++ compiler 
+CXX = cl
+# Standard flags for C++ 
+CXXFLAGS = 
+# Standard linker flags 
+LDFLAGS = 
+# Multiple libraries or single huge monolithic one? [0,1]
+MONOLITHIC = 1
+# Is this official build by wxWindows developers? [0,1]
+OFFICIAL_BUILD = 0
+# What type of library to build? [0,1]
+SHARED = 1
+# Compile Unicode build of wxWindows? [0,1]
+UNICODE = 0
+# Build GUI libraries? [0,1]
+USE_GUI = 1
+# Build wxUniversal instead of native port? [0,1]
+WXUNIV = 0

 
 

+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+OBJS = objs_vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+WIDGETS_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib  /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUG_DEFINE_p_1 = /d__WXDEBUG__
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /dWXUSINGDLL
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+       -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\widgets.exe
+
+$(OBJS)\widgets_button.obj: .\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_combobox.obj: .\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_gauge.obj: .\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_listbox.obj: .\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_notebook.obj: .\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_slider.obj: .\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_static.obj: .\static.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_widgets.obj: .\widgets.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_widgets.res: .\widgets.rc
+       rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib  /i./../../src/regex /i. $(__DLLFLAG_p_1) $**
+
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
+
+install: all
+
+uninstall: 
+
+$(OBJS)\widgets.exe: $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res
+       link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
+       $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+<<