X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa65c8433369f3bbe5ba6a6f030d7a0af7df5009..91b34dd9e1b29ace037dddc60513fbe79560403f:/build/makefile.vc diff --git a/build/makefile.vc b/build/makefile.vc index a151247636..c5f12883ab 100644 --- a/build/makefile.vc +++ b/build/makefile.vc @@ -12,22 +12,71 @@ ### Variables: ### -BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +ADVDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \ + $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" +ADVDLL_OBJECTS = \ + $(OBJS)\advdll_dummy.obj \ + $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_dcbuffer.obj \ + $(OBJS)\advdll_grid.obj \ + $(OBJS)\advdll_gridctrl.obj \ + $(OBJS)\advdll_gridsel.obj \ + $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_sashwin.obj \ + $(OBJS)\advdll_splash.obj \ + $(OBJS)\advdll_tipdlg.obj \ + $(OBJS)\advdll_wizard.obj \ + $(OBJS)\advdll_taskbarcmn.obj \ + $(OBJS)\advdll_joystick.obj \ + $(OBJS)\advdll_taskbar.obj \ + $(OBJS)\advdll_wave.obj +ADVLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) /DWIN32 \ + $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \ + $(____DEBUGRUNTIME_131_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_advlib.pch" +ADVLIB_OBJECTS = \ + $(OBJS)\advlib_dummy.obj \ + $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_dcbuffer.obj \ + $(OBJS)\advlib_grid.obj \ + $(OBJS)\advlib_gridctrl.obj \ + $(OBJS)\advlib_gridsel.obj \ + $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_sashwin.obj \ + $(OBJS)\advlib_splash.obj \ + $(OBJS)\advlib_tipdlg.obj \ + $(OBJS)\advlib_wizard.obj \ + $(OBJS)\advlib_taskbarcmn.obj \ + $(OBJS)\advlib_joystick.obj \ + $(OBJS)\advlib_taskbar.obj \ + $(OBJS)\advlib_wave.obj +BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_basedll.pch /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ - /DwxUSE_GUI=0 $(CFLAGS) -BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) +BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_basedll.pch /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ - /DwxUSE_GUI=0 $(CXXFLAGS) /Yuwx/wxprec.h + $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_appbase.obj \ @@ -36,8 +85,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_config.obj \ $(OBJS)\basedll_datetime.obj \ $(OBJS)\basedll_datstrm.obj \ - $(OBJS)\basedll_db.obj \ - $(OBJS)\basedll_dbtable.obj \ $(OBJS)\basedll_dircmn.obj \ $(OBJS)\basedll_dynarray.obj \ $(OBJS)\basedll_dynlib.obj \ @@ -51,12 +98,9 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_filename.obj \ $(OBJS)\basedll_filesys.obj \ $(OBJS)\basedll_fmapbase.obj \ - $(OBJS)\basedll_fs_inet.obj \ $(OBJS)\basedll_fs_zip.obj \ - $(OBJS)\basedll_ftp.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ - $(OBJS)\basedll_http.obj \ $(OBJS)\basedll_init.obj \ $(OBJS)\basedll_intl.obj \ $(OBJS)\basedll_ipcbase.obj \ @@ -69,13 +113,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_mstream.obj \ $(OBJS)\basedll_object.obj \ $(OBJS)\basedll_process.obj \ - $(OBJS)\basedll_protocol.obj \ $(OBJS)\basedll_regex.obj \ - $(OBJS)\basedll_sckaddr.obj \ - $(OBJS)\basedll_sckfile.obj \ - $(OBJS)\basedll_sckipc.obj \ - $(OBJS)\basedll_sckstrm.obj \ - $(OBJS)\basedll_socket.obj \ $(OBJS)\basedll_stopwatch.obj \ $(OBJS)\basedll_strconv.obj \ $(OBJS)\basedll_stream.obj \ @@ -86,15 +124,13 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_tokenzr.obj \ $(OBJS)\basedll_txtstrm.obj \ $(OBJS)\basedll_unzip.obj \ - $(OBJS)\basedll_url.obj \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ $(OBJS)\basedll_wxchar.obj \ $(OBJS)\basedll_zipstrm.obj \ $(OBJS)\basedll_zstream.obj \ - $(OBJS)\basedll_gsocket.obj \ - $(OBJS)\basedll_gsockmsw.obj \ $(OBJS)\basedll_basemsw.obj \ + $(OBJS)\basedll_crashrpt.obj \ $(OBJS)\basedll_dde.obj \ $(OBJS)\basedll_dir.obj \ $(OBJS)\basedll_mimetype.obj \ @@ -104,7 +140,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_thread.obj \ $(OBJS)\basedll_utils.obj \ $(OBJS)\basedll_utilsexc.obj \ - $(OBJS)\basedll_crashrpt.obj \ $(OBJS)\basedll_event.obj \ $(OBJS)\basedll_fs_mem.obj \ $(OBJS)\basedll_msgout.obj \ @@ -112,21 +147,21 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_main.obj \ $(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_volume.obj -BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_baselib.pch /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) -BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) +BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_baselib.pch /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) \ - /Yuwx/wxprec.h + $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_baselib.pch" BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_appbase.obj \ @@ -135,8 +170,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_config.obj \ $(OBJS)\baselib_datetime.obj \ $(OBJS)\baselib_datstrm.obj \ - $(OBJS)\baselib_db.obj \ - $(OBJS)\baselib_dbtable.obj \ $(OBJS)\baselib_dircmn.obj \ $(OBJS)\baselib_dynarray.obj \ $(OBJS)\baselib_dynlib.obj \ @@ -150,12 +183,9 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_filename.obj \ $(OBJS)\baselib_filesys.obj \ $(OBJS)\baselib_fmapbase.obj \ - $(OBJS)\baselib_fs_inet.obj \ $(OBJS)\baselib_fs_zip.obj \ - $(OBJS)\baselib_ftp.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ - $(OBJS)\baselib_http.obj \ $(OBJS)\baselib_init.obj \ $(OBJS)\baselib_intl.obj \ $(OBJS)\baselib_ipcbase.obj \ @@ -168,13 +198,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_mstream.obj \ $(OBJS)\baselib_object.obj \ $(OBJS)\baselib_process.obj \ - $(OBJS)\baselib_protocol.obj \ $(OBJS)\baselib_regex.obj \ - $(OBJS)\baselib_sckaddr.obj \ - $(OBJS)\baselib_sckfile.obj \ - $(OBJS)\baselib_sckipc.obj \ - $(OBJS)\baselib_sckstrm.obj \ - $(OBJS)\baselib_socket.obj \ $(OBJS)\baselib_stopwatch.obj \ $(OBJS)\baselib_strconv.obj \ $(OBJS)\baselib_stream.obj \ @@ -185,15 +209,13 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_tokenzr.obj \ $(OBJS)\baselib_txtstrm.obj \ $(OBJS)\baselib_unzip.obj \ - $(OBJS)\baselib_url.obj \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ $(OBJS)\baselib_wxchar.obj \ $(OBJS)\baselib_zipstrm.obj \ $(OBJS)\baselib_zstream.obj \ - $(OBJS)\baselib_gsocket.obj \ - $(OBJS)\baselib_gsockmsw.obj \ $(OBJS)\baselib_basemsw.obj \ + $(OBJS)\baselib_crashrpt.obj \ $(OBJS)\baselib_dde.obj \ $(OBJS)\baselib_dir.obj \ $(OBJS)\baselib_mimetype.obj \ @@ -203,7 +225,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_thread.obj \ $(OBJS)\baselib_utils.obj \ $(OBJS)\baselib_utilsexc.obj \ - $(OBJS)\baselib_crashrpt.obj \ $(OBJS)\baselib_event.obj \ $(OBJS)\baselib_fs_mem.obj \ $(OBJS)\baselib_msgout.obj \ @@ -211,14 +232,14 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \ + /DWIN32 $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_coredll.pch /DWXUSINGDLL /DWXMAKINGDLL_CORE \ - /DwxUSE_BASE=0 $(CXXFLAGS) /Yuwx/wxprec.h + $(____DEBUGRUNTIME_104_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE \ + /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ $(OBJS)\coredll_event.obj \ @@ -229,13 +250,14 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \ + /DWIN32 $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_corelib.pch /DwxUSE_BASE=0 $(CXXFLAGS) /Yuwx/wxprec.h + $(____DEBUGRUNTIME_113_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DwxUSE_BASE=0 $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ $(OBJS)\corelib_event.obj \ @@ -246,107 +268,131 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_158_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_DBGRID \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgriddll.pch" +DBGRIDDLL_OBJECTS = \ + $(OBJS)\dbgriddll_dummy.obj \ + $(OBJS)\dbgriddll_dbgrid.obj +DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.pdb \ + $(____DEBUGRUNTIME_167_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_dbgridlib.pch" +DBGRIDLIB_OBJECTS = \ + $(OBJS)\dbgridlib_dummy.obj \ + $(OBJS)\dbgridlib_dbgrid.obj +GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_gldll.pch /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) \ - /Yuwx/wxprec.h + $(____DEBUGRUNTIME_212_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_222) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_gllib.pch $(CXXFLAGS) /Yuwx/wxprec.h + $(____DEBUGRUNTIME_221_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_gllib.pch" GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcanvas.obj -HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_177) \ + /DWIN32 $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_htmldll.pch /DWXUSINGDLL /DWXMAKINGDLL_HTML $(CXXFLAGS) \ - /Yuwx/wxprec.h + $(____DEBUGRUNTIME_176_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ + $(OBJS)\htmldll_helpctrl.obj \ $(OBJS)\htmldll_helpdata.obj \ $(OBJS)\htmldll_helpfrm.obj \ - $(OBJS)\htmldll_helpctrl.obj \ $(OBJS)\htmldll_htmlcell.obj \ $(OBJS)\htmldll_htmlfilt.obj \ $(OBJS)\htmldll_htmlpars.obj \ $(OBJS)\htmldll_htmltag.obj \ $(OBJS)\htmldll_htmlwin.obj \ - $(OBJS)\htmldll_winpars.obj \ + $(OBJS)\htmldll_htmprint.obj \ + $(OBJS)\htmldll_m_dflist.obj \ $(OBJS)\htmldll_m_fonts.obj \ $(OBJS)\htmldll_m_hline.obj \ $(OBJS)\htmldll_m_image.obj \ $(OBJS)\htmldll_m_layout.obj \ $(OBJS)\htmldll_m_links.obj \ $(OBJS)\htmldll_m_list.obj \ - $(OBJS)\htmldll_m_dflist.obj \ $(OBJS)\htmldll_m_pre.obj \ - $(OBJS)\htmldll_m_tables.obj \ $(OBJS)\htmldll_m_style.obj \ - $(OBJS)\htmldll_htmprint.obj \ + $(OBJS)\htmldll_m_tables.obj \ + $(OBJS)\htmldll_winpars.obj \ $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_186) \ + /DWIN32 $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_htmllib.pch $(CXXFLAGS) /Yuwx/wxprec.h + $(____DEBUGRUNTIME_185_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_htmllib.pch" HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ + $(OBJS)\htmllib_helpctrl.obj \ $(OBJS)\htmllib_helpdata.obj \ $(OBJS)\htmllib_helpfrm.obj \ - $(OBJS)\htmllib_helpctrl.obj \ $(OBJS)\htmllib_htmlcell.obj \ $(OBJS)\htmllib_htmlfilt.obj \ $(OBJS)\htmllib_htmlpars.obj \ $(OBJS)\htmllib_htmltag.obj \ $(OBJS)\htmllib_htmlwin.obj \ - $(OBJS)\htmllib_winpars.obj \ + $(OBJS)\htmllib_htmprint.obj \ + $(OBJS)\htmllib_m_dflist.obj \ $(OBJS)\htmllib_m_fonts.obj \ $(OBJS)\htmllib_m_hline.obj \ $(OBJS)\htmllib_m_image.obj \ $(OBJS)\htmllib_m_layout.obj \ $(OBJS)\htmllib_m_links.obj \ $(OBJS)\htmllib_m_list.obj \ - $(OBJS)\htmllib_m_dflist.obj \ $(OBJS)\htmllib_m_pre.obj \ - $(OBJS)\htmllib_m_tables.obj \ $(OBJS)\htmllib_m_style.obj \ - $(OBJS)\htmllib_htmprint.obj \ + $(OBJS)\htmllib_m_tables.obj \ + $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj LIBDIRNAME = \ ..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monodll.pch /DwxUSE_BASE=1 /DWXMAKINGDLL $(CFLAGS) -MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL $(CFLAGS) +MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monodll.pch /DwxUSE_BASE=1 /DWXMAKINGDLL $(CXXFLAGS) \ - /Yuwx/wxprec.h + $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_monodll.pch" MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_appbase.obj \ @@ -355,8 +401,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_config.obj \ $(OBJS)\monodll_datetime.obj \ $(OBJS)\monodll_datstrm.obj \ - $(OBJS)\monodll_db.obj \ - $(OBJS)\monodll_dbtable.obj \ $(OBJS)\monodll_dircmn.obj \ $(OBJS)\monodll_dynarray.obj \ $(OBJS)\monodll_dynlib.obj \ @@ -370,12 +414,9 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_filename.obj \ $(OBJS)\monodll_filesys.obj \ $(OBJS)\monodll_fmapbase.obj \ - $(OBJS)\monodll_fs_inet.obj \ $(OBJS)\monodll_fs_zip.obj \ - $(OBJS)\monodll_ftp.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ - $(OBJS)\monodll_http.obj \ $(OBJS)\monodll_init.obj \ $(OBJS)\monodll_intl.obj \ $(OBJS)\monodll_ipcbase.obj \ @@ -388,13 +429,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_mstream.obj \ $(OBJS)\monodll_object.obj \ $(OBJS)\monodll_process.obj \ - $(OBJS)\monodll_protocol.obj \ $(OBJS)\monodll_regex.obj \ - $(OBJS)\monodll_sckaddr.obj \ - $(OBJS)\monodll_sckfile.obj \ - $(OBJS)\monodll_sckipc.obj \ - $(OBJS)\monodll_sckstrm.obj \ - $(OBJS)\monodll_socket.obj \ $(OBJS)\monodll_stopwatch.obj \ $(OBJS)\monodll_strconv.obj \ $(OBJS)\monodll_stream.obj \ @@ -405,15 +440,13 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_tokenzr.obj \ $(OBJS)\monodll_txtstrm.obj \ $(OBJS)\monodll_unzip.obj \ - $(OBJS)\monodll_url.obj \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ $(OBJS)\monodll_wxchar.obj \ $(OBJS)\monodll_zipstrm.obj \ $(OBJS)\monodll_zstream.obj \ - $(OBJS)\monodll_gsocket.obj \ - $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_basemsw.obj \ + $(OBJS)\monodll_crashrpt.obj \ $(OBJS)\monodll_dde.obj \ $(OBJS)\monodll_dir.obj \ $(OBJS)\monodll_mimetype.obj \ @@ -423,7 +456,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_thread.obj \ $(OBJS)\monodll_utils.obj \ $(OBJS)\monodll_utilsexc.obj \ - $(OBJS)\monodll_crashrpt.obj \ $(OBJS)\monodll_event.obj \ $(OBJS)\monodll_fs_mem.obj \ $(OBJS)\monodll_msgout.obj \ @@ -431,22 +463,35 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_main.obj \ $(OBJS)\monodll_mslu.obj \ $(OBJS)\monodll_volume.obj \ + $(OBJS)\monodll_fs_inet.obj \ + $(OBJS)\monodll_ftp.obj \ + $(OBJS)\monodll_http.obj \ + $(OBJS)\monodll_protocol.obj \ + $(OBJS)\monodll_sckaddr.obj \ + $(OBJS)\monodll_sckfile.obj \ + $(OBJS)\monodll_sckipc.obj \ + $(OBJS)\monodll_sckstrm.obj \ + $(OBJS)\monodll_socket.obj \ + $(OBJS)\monodll_url.obj \ + $(OBJS)\monodll_gsocket.obj \ + $(OBJS)\monodll_gsockmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.obj -MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monolib.pch /DwxUSE_BASE=1 $(CFLAGS) -MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DwxUSE_BASE=1 $(CFLAGS) +MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monolib.pch /DwxUSE_BASE=1 $(CXXFLAGS) /Yuwx/wxprec.h + $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DwxUSE_BASE=1 $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_monolib.pch" MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ $(OBJS)\monolib_appbase.obj \ @@ -455,8 +500,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_config.obj \ $(OBJS)\monolib_datetime.obj \ $(OBJS)\monolib_datstrm.obj \ - $(OBJS)\monolib_db.obj \ - $(OBJS)\monolib_dbtable.obj \ $(OBJS)\monolib_dircmn.obj \ $(OBJS)\monolib_dynarray.obj \ $(OBJS)\monolib_dynlib.obj \ @@ -470,12 +513,9 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_filename.obj \ $(OBJS)\monolib_filesys.obj \ $(OBJS)\monolib_fmapbase.obj \ - $(OBJS)\monolib_fs_inet.obj \ $(OBJS)\monolib_fs_zip.obj \ - $(OBJS)\monolib_ftp.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ - $(OBJS)\monolib_http.obj \ $(OBJS)\monolib_init.obj \ $(OBJS)\monolib_intl.obj \ $(OBJS)\monolib_ipcbase.obj \ @@ -488,13 +528,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_mstream.obj \ $(OBJS)\monolib_object.obj \ $(OBJS)\monolib_process.obj \ - $(OBJS)\monolib_protocol.obj \ $(OBJS)\monolib_regex.obj \ - $(OBJS)\monolib_sckaddr.obj \ - $(OBJS)\monolib_sckfile.obj \ - $(OBJS)\monolib_sckipc.obj \ - $(OBJS)\monolib_sckstrm.obj \ - $(OBJS)\monolib_socket.obj \ $(OBJS)\monolib_stopwatch.obj \ $(OBJS)\monolib_strconv.obj \ $(OBJS)\monolib_stream.obj \ @@ -505,15 +539,13 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_tokenzr.obj \ $(OBJS)\monolib_txtstrm.obj \ $(OBJS)\monolib_unzip.obj \ - $(OBJS)\monolib_url.obj \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ $(OBJS)\monolib_wxchar.obj \ $(OBJS)\monolib_zipstrm.obj \ $(OBJS)\monolib_zstream.obj \ - $(OBJS)\monolib_gsocket.obj \ - $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_basemsw.obj \ + $(OBJS)\monolib_crashrpt.obj \ $(OBJS)\monolib_dde.obj \ $(OBJS)\monolib_dir.obj \ $(OBJS)\monolib_mimetype.obj \ @@ -523,7 +555,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_thread.obj \ $(OBJS)\monolib_utils.obj \ $(OBJS)\monolib_utilsexc.obj \ - $(OBJS)\monolib_crashrpt.obj \ $(OBJS)\monolib_event.obj \ $(OBJS)\monolib_fs_mem.obj \ $(OBJS)\monolib_msgout.obj \ @@ -531,22 +562,115 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_main.obj \ $(OBJS)\monolib_mslu.obj \ $(OBJS)\monolib_volume.obj \ + $(OBJS)\monolib_fs_inet.obj \ + $(OBJS)\monolib_ftp.obj \ + $(OBJS)\monolib_http.obj \ + $(OBJS)\monolib_protocol.obj \ + $(OBJS)\monolib_sckaddr.obj \ + $(OBJS)\monolib_sckfile.obj \ + $(OBJS)\monolib_sckipc.obj \ + $(OBJS)\monolib_sckstrm.obj \ + $(OBJS)\monolib_socket.obj \ + $(OBJS)\monolib_url.obj \ + $(OBJS)\monolib_gsocket.obj \ + $(OBJS)\monolib_gsockmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj +NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \ + $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS) +NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \ + $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" +NETDLL_OBJECTS = \ + $(OBJS)\netdll_dummy.obj \ + $(OBJS)\netdll_fs_inet.obj \ + $(OBJS)\netdll_ftp.obj \ + $(OBJS)\netdll_http.obj \ + $(OBJS)\netdll_protocol.obj \ + $(OBJS)\netdll_sckaddr.obj \ + $(OBJS)\netdll_sckfile.obj \ + $(OBJS)\netdll_sckipc.obj \ + $(OBJS)\netdll_sckstrm.obj \ + $(OBJS)\netdll_socket.obj \ + $(OBJS)\netdll_url.obj \ + $(OBJS)\netdll_gsocket.obj \ + $(OBJS)\netdll_gsockmsw.obj +NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \ + $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ + $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \ + $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ + $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \ + /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \ + /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" +NETLIB_OBJECTS = \ + $(OBJS)\netlib_dummy.obj \ + $(OBJS)\netlib_fs_inet.obj \ + $(OBJS)\netlib_ftp.obj \ + $(OBJS)\netlib_http.obj \ + $(OBJS)\netlib_protocol.obj \ + $(OBJS)\netlib_sckaddr.obj \ + $(OBJS)\netlib_sckfile.obj \ + $(OBJS)\netlib_sckipc.obj \ + $(OBJS)\netlib_sckstrm.obj \ + $(OBJS)\netlib_socket.obj \ + $(OBJS)\netlib_url.obj \ + $(OBJS)\netlib_gsocket.obj \ + $(OBJS)\netlib_gsockmsw.obj OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ - /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) \ - /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CFLAGS) +ODBCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_140_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ODBC \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" +ODBCDLL_OBJECTS = \ + $(OBJS)\odbcdll_dummy.obj \ + $(OBJS)\odbcdll_db.obj \ + $(OBJS)\odbcdll_dbtable.obj +ODBCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) \ + /DWIN32 $(__DEBUGINFO_38) \ + /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.pdb \ + $(____DEBUGRUNTIME_149_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_odbclib.pch" +ODBCLIB_OBJECTS = \ + $(OBJS)\odbclib_dummy.obj \ + $(OBJS)\odbclib_db.obj \ + $(OBJS)\odbclib_dbtable.obj +WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) /DWIN32 \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ + $(____DEBUGRUNTIME_42_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) \ + /DCOMPILED_FROM_DSP $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj -WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ - /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) \ - /I$(LIBDIRNAME) $(CFLAGS) +WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \ + $(____DEBUGRUNTIME_26_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.obj \ $(OBJS)\wxjpeg_jutils.obj \ @@ -594,10 +718,9 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant1.obj \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj -WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ - /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) /I..\src\zlib \ - $(CFLAGS) +WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_19) /DWIN32 \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \ + $(____DEBUGRUNTIME_18_p) $(__OPTIMIZEFLAG) /I..\src\zlib $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.obj \ $(OBJS)\wxpng_pngerror.obj \ @@ -616,17 +739,17 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwrite.obj \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj -WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ - /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS) +WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ $(OBJS)\wxregex_regexec.obj \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj -WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ - /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS) +WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_35) /DWIN32 \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \ + $(____DEBUGRUNTIME_34_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ $(OBJS)\wxtiff_tif_aux.obj \ @@ -661,9 +784,9 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_warning.obj \ $(OBJS)\wxtiff_tif_write.obj \ $(OBJS)\wxtiff_tif_zip.obj -WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ - /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS) +WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \ + $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \ + $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ $(OBJS)\wxzlib_compress.obj \ @@ -679,24 +802,25 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_infcodes.obj \ $(OBJS)\wxzlib_infutil.obj \ $(OBJS)\wxzlib_inffast.obj -XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_xmldll.pch /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) \ - /Yuwx/wxprec.h + $(____DEBUGRUNTIME_194_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj -XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_204) /DWIN32 \ + $(__DEBUGINFO_38) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ - /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_xmllib.pch $(CXXFLAGS) /Yuwx/wxprec.h + $(____DEBUGRUNTIME_203_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \ + /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \ + /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xmllib.pch" XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj @@ -715,7 +839,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -727,25 +854,280 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1_3 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1_3 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_25 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_33 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_25 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_33 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_33 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_33 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_38 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_38 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_38 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_38 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_105 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_105 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_105 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_11 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_11 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_11 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_114 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_114 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_114 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_123 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_123 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_123 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_132 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_132 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_132 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_141 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_141 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_141 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_150 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_150 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_150 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_159 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_159 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_159 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_168 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_168 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_168 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_177 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_177 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_177 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_186 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_186 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_186 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_19 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_19 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_19 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_195 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_195 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_195 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_204 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_204 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_204 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_213 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_213 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_213 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_222 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_222 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_222 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_27 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_27 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_27 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_35 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_35 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_35 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_43 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_43 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_43 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_51 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_51 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_51 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_60 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_60 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_60 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_69 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_69 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_69 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_78 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_78 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_78 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_87 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_87 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_87 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_96 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_96 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_96 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(USE_GUI)" == "1" @@ -815,30 +1197,26 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.obj \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_minifram.obj \ + $(OBJS)\monolib_automtn.obj \ + $(OBJS)\monolib_dataobj.obj \ + $(OBJS)\monolib_dropsrc.obj \ + $(OBJS)\monolib_droptgt.obj \ + $(OBJS)\monolib_oleutils.obj \ + $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_region.obj \ + $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ - $(OBJS)\monolib_wave.obj \ + $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ - $(OBJS)\monolib_automtn.obj \ - $(OBJS)\monolib_dataobj.obj \ - $(OBJS)\monolib_dropsrc.obj \ - $(OBJS)\monolib_droptgt.obj \ - $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_statusbr.obj \ - $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_access.obj \ $(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_bmpbuttn.obj \ $(OBJS)\monolib_button.obj \ @@ -866,13 +1244,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msgdlg.obj \ $(OBJS)\monolib_nativdlg.obj \ $(OBJS)\monolib_notebook.obj \ + $(OBJS)\monolib_access.obj \ $(OBJS)\monolib_ownerdrw.obj \ $(OBJS)\monolib_penwin.obj \ $(OBJS)\monolib_printdlg.obj \ $(OBJS)\monolib_printwin.obj \ $(OBJS)\monolib_radiobox.obj \ $(OBJS)\monolib_radiobut.obj \ - $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_scrolbar.obj \ $(OBJS)\monolib_slider95.obj \ $(OBJS)\monolib_spinbutt.obj \ @@ -887,40 +1265,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ - $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_calctrl.obj \ - $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_dcbuffer.obj \ - $(OBJS)\monolib_dcpsg.obj \ - $(OBJS)\monolib_dirctrlg.obj \ - $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_laywin.obj \ - $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_sashwin.obj \ - $(OBJS)\monolib_scrlwing.obj \ - $(OBJS)\monolib_selstore.obj \ - $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_tbarsmpl.obj \ - $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_tipwin.obj \ - $(OBJS)\monolib_treectlg.obj \ - $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_appcmn.obj \ - $(OBJS)\monolib_fontmap.obj \ $(OBJS)\monolib_accesscmn.obj \ + $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ @@ -933,7 +1279,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_ctrlsub.obj \ $(OBJS)\monolib_datacmn.obj \ - $(OBJS)\monolib_dbgrid.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ @@ -946,9 +1291,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fddlgcmn.obj \ $(OBJS)\monolib_fldlgcmn.obj \ $(OBJS)\monolib_fontcmn.obj \ + $(OBJS)\monolib_fontmap.obj \ $(OBJS)\monolib_framecmn.obj \ - $(OBJS)\monolib_timercmn.obj \ - $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_gaugecmn.obj \ $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_geometry.obj \ @@ -958,6 +1302,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_imagall.obj \ $(OBJS)\monolib_imagbmp.obj \ $(OBJS)\monolib_image.obj \ + $(OBJS)\monolib_imagfill.obj \ $(OBJS)\monolib_imaggif.obj \ $(OBJS)\monolib_imagiff.obj \ $(OBJS)\monolib_imagjpeg.obj \ @@ -966,7 +1311,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_imagpnm.obj \ $(OBJS)\monolib_imagtiff.obj \ $(OBJS)\monolib_imagxpm.obj \ - $(OBJS)\monolib_imagfill.obj \ $(OBJS)\monolib_layout.obj \ $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_matrix.obj \ @@ -977,36 +1321,59 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ $(OBJS)\monolib_radiocmn.obj \ + $(OBJS)\monolib_rendcmn.obj \ $(OBJS)\monolib_rgncmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ $(OBJS)\monolib_statbar.obj \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ + $(OBJS)\monolib_timercmn.obj \ + $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_valgen.obj \ $(OBJS)\monolib_validate.obj \ $(OBJS)\monolib_valtext.obj \ $(OBJS)\monolib_wincmn.obj \ - $(OBJS)\monolib_xpmdecod.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_app.obj \ - $(OBJS)\monolib_bitmap.obj \ - $(OBJS)\monolib_brush.obj \ - $(OBJS)\monolib_caret.obj \ - $(OBJS)\monolib_clipbrd.obj \ - $(OBJS)\monolib_colour.obj \ - $(OBJS)\monolib_cursor.obj \ - $(OBJS)\monolib_data.obj \ - $(OBJS)\monolib_dc.obj \ - $(OBJS)\monolib_dcclient.obj \ - $(OBJS)\monolib_dcmemory.obj \ - $(OBJS)\monolib_dcprint.obj \ - $(OBJS)\monolib_dcscreen.obj \ - $(OBJS)\monolib_dialup.obj \ - $(OBJS)\monolib_dib.obj \ + $(OBJS)\monolib_xpmdecod.obj \ + $(OBJS)\monolib_busyinfo.obj \ + $(OBJS)\monolib_choicdgg.obj \ + $(OBJS)\monolib_dcpsg.obj \ + $(OBJS)\monolib_dirctrlg.obj \ + $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_logg.obj \ + $(OBJS)\monolib_numdlgg.obj \ + $(OBJS)\monolib_panelg.obj \ + $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_scrlwing.obj \ + $(OBJS)\monolib_selstore.obj \ + $(OBJS)\monolib_spinctlg.obj \ + $(OBJS)\monolib_splitter.obj \ + $(OBJS)\monolib_tbarsmpl.obj \ + $(OBJS)\monolib_textdlgg.obj \ + $(OBJS)\monolib_tipwin.obj \ + $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_vlbox.obj \ + $(OBJS)\monolib_vscroll.obj +!endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +____CORE_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_app.obj \ + $(OBJS)\monolib_bitmap.obj \ + $(OBJS)\monolib_brush.obj \ + $(OBJS)\monolib_caret.obj \ + $(OBJS)\monolib_clipbrd.obj \ + $(OBJS)\monolib_colour.obj \ + $(OBJS)\monolib_cursor.obj \ + $(OBJS)\monolib_data.obj \ + $(OBJS)\monolib_dc.obj \ + $(OBJS)\monolib_dcclient.obj \ + $(OBJS)\monolib_dcmemory.obj \ + $(OBJS)\monolib_dcprint.obj \ + $(OBJS)\monolib_dcscreen.obj \ + $(OBJS)\monolib_dialup.obj \ + $(OBJS)\monolib_dib.obj \ $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_display.obj \ $(OBJS)\monolib_enhmeta.obj \ @@ -1019,28 +1386,38 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.obj \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_minifram.obj \ + $(OBJS)\monolib_automtn.obj \ + $(OBJS)\monolib_dataobj.obj \ + $(OBJS)\monolib_dropsrc.obj \ + $(OBJS)\monolib_droptgt.obj \ + $(OBJS)\monolib_oleutils.obj \ + $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ $(OBJS)\monolib_region.obj \ + $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ - $(OBJS)\monolib_wave.obj \ + $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ - $(OBJS)\monolib_automtn.obj \ - $(OBJS)\monolib_dataobj.obj \ - $(OBJS)\monolib_dropsrc.obj \ - $(OBJS)\monolib_droptgt.obj \ - $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_textctrl.obj \ + $(OBJS)\monolib_accel.obj \ + $(OBJS)\monolib_colrdlgg.obj \ + $(OBJS)\monolib_dirdlgg.obj \ + $(OBJS)\monolib_fdrepdlg.obj \ + $(OBJS)\monolib_filedlgg.obj \ + $(OBJS)\monolib_fontdlgg.obj \ + $(OBJS)\monolib_imaglist.obj \ + $(OBJS)\monolib_listctrl.obj \ + $(OBJS)\monolib_mdig.obj \ + $(OBJS)\monolib_msgdlgg.obj \ + $(OBJS)\monolib_prntdlgg.obj \ + $(OBJS)\monolib_tabg.obj \ $(OBJS)\monolib_bmpbuttn.obj \ $(OBJS)\monolib_button.obj \ $(OBJS)\monolib_checkbox.obj \ @@ -1049,9 +1426,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_colschem.obj \ $(OBJS)\monolib_combobox.obj \ $(OBJS)\monolib_control.obj \ + $(OBJS)\monolib_ctrlrend.obj \ $(OBJS)\monolib_dialog.obj \ $(OBJS)\monolib_framuniv.obj \ - $(OBJS)\monolib_topluniv.obj \ $(OBJS)\monolib_gauge.obj \ $(OBJS)\monolib_inpcons.obj \ $(OBJS)\monolib_inphand.obj \ @@ -1060,7 +1437,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notebook.obj \ $(OBJS)\monolib_radiobox.obj \ $(OBJS)\monolib_radiobut.obj \ - $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_scrarrow.obj \ $(OBJS)\monolib_scrolbar.obj \ $(OBJS)\monolib_scrthumb.obj \ @@ -1071,58 +1447,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_statline.obj \ $(OBJS)\monolib_stattext.obj \ $(OBJS)\monolib_statusbr.obj \ - $(OBJS)\monolib_toolbar.obj \ $(OBJS)\monolib_theme.obj \ + $(OBJS)\monolib_toolbar.obj \ + $(OBJS)\monolib_topluniv.obj \ $(OBJS)\monolib_winuniv.obj \ - $(OBJS)\monolib_mdig.obj \ - $(OBJS)\monolib_imaglist.obj \ - $(OBJS)\monolib_colrdlgg.obj \ - $(OBJS)\monolib_listctrl.obj \ - $(OBJS)\monolib_filedlgg.obj \ - $(OBJS)\monolib_dirdlgg.obj \ - $(OBJS)\monolib_prntdlgg.obj \ - $(OBJS)\monolib_accel.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_fdrepdlg.obj \ - $(OBJS)\monolib_fontdlgg.obj \ - $(OBJS)\monolib_tabg.obj \ $(OBJS)\monolib_gtk.obj \ - $(OBJS)\monolib_win32.obj \ $(OBJS)\monolib_metal.obj \ - $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_calctrl.obj \ - $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_dcbuffer.obj \ - $(OBJS)\monolib_dcpsg.obj \ - $(OBJS)\monolib_dirctrlg.obj \ - $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_laywin.obj \ - $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_panelg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_sashwin.obj \ - $(OBJS)\monolib_scrlwing.obj \ - $(OBJS)\monolib_selstore.obj \ - $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_tbarsmpl.obj \ - $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_tipwin.obj \ - $(OBJS)\monolib_treectlg.obj \ - $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_appcmn.obj \ - $(OBJS)\monolib_fontmap.obj \ + $(OBJS)\monolib_win32.obj \ $(OBJS)\monolib_accesscmn.obj \ + $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ @@ -1135,7 +1468,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ctrlcmn.obj \ $(OBJS)\monolib_ctrlsub.obj \ $(OBJS)\monolib_datacmn.obj \ - $(OBJS)\monolib_dbgrid.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ @@ -1148,9 +1480,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fddlgcmn.obj \ $(OBJS)\monolib_fldlgcmn.obj \ $(OBJS)\monolib_fontcmn.obj \ + $(OBJS)\monolib_fontmap.obj \ $(OBJS)\monolib_framecmn.obj \ - $(OBJS)\monolib_timercmn.obj \ - $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_gaugecmn.obj \ $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_geometry.obj \ @@ -1160,6 +1491,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_imagall.obj \ $(OBJS)\monolib_imagbmp.obj \ $(OBJS)\monolib_image.obj \ + $(OBJS)\monolib_imagfill.obj \ $(OBJS)\monolib_imaggif.obj \ $(OBJS)\monolib_imagiff.obj \ $(OBJS)\monolib_imagjpeg.obj \ @@ -1168,7 +1500,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_imagpnm.obj \ $(OBJS)\monolib_imagtiff.obj \ $(OBJS)\monolib_imagxpm.obj \ - $(OBJS)\monolib_imagfill.obj \ $(OBJS)\monolib_layout.obj \ $(OBJS)\monolib_lboxcmn.obj \ $(OBJS)\monolib_matrix.obj \ @@ -1179,18 +1510,41 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ $(OBJS)\monolib_radiocmn.obj \ + $(OBJS)\monolib_rendcmn.obj \ $(OBJS)\monolib_rgncmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ $(OBJS)\monolib_statbar.obj \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ + $(OBJS)\monolib_timercmn.obj \ + $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_valgen.obj \ $(OBJS)\monolib_validate.obj \ $(OBJS)\monolib_valtext.obj \ $(OBJS)\monolib_wincmn.obj \ - $(OBJS)\monolib_xpmdecod.obj + $(OBJS)\monolib_xpmdecod.obj \ + $(OBJS)\monolib_busyinfo.obj \ + $(OBJS)\monolib_choicdgg.obj \ + $(OBJS)\monolib_dcpsg.obj \ + $(OBJS)\monolib_dirctrlg.obj \ + $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_logg.obj \ + $(OBJS)\monolib_numdlgg.obj \ + $(OBJS)\monolib_panelg.obj \ + $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_scrlwing.obj \ + $(OBJS)\monolib_selstore.obj \ + $(OBJS)\monolib_spinctlg.obj \ + $(OBJS)\monolib_splitter.obj \ + $(OBJS)\monolib_tbarsmpl.obj \ + $(OBJS)\monolib_textdlgg.obj \ + $(OBJS)\monolib_tipwin.obj \ + $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_vlbox.obj \ + $(OBJS)\monolib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -1221,30 +1575,26 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.obj \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_joystick.obj \ $(OBJS)\coredll_minifram.obj \ + $(OBJS)\coredll_automtn.obj \ + $(OBJS)\coredll_dataobj.obj \ + $(OBJS)\coredll_dropsrc.obj \ + $(OBJS)\coredll_droptgt.obj \ + $(OBJS)\coredll_oleutils.obj \ + $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_region.obj \ + $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_taskbarcmn.obj \ - $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ - $(OBJS)\coredll_wave.obj \ + $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ - $(OBJS)\coredll_automtn.obj \ - $(OBJS)\coredll_dataobj.obj \ - $(OBJS)\coredll_dropsrc.obj \ - $(OBJS)\coredll_droptgt.obj \ - $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_statusbr.obj \ - $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_access.obj \ $(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_bmpbuttn.obj \ $(OBJS)\coredll_button.obj \ @@ -1272,13 +1622,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msgdlg.obj \ $(OBJS)\coredll_nativdlg.obj \ $(OBJS)\coredll_notebook.obj \ + $(OBJS)\coredll_access.obj \ $(OBJS)\coredll_ownerdrw.obj \ $(OBJS)\coredll_penwin.obj \ $(OBJS)\coredll_printdlg.obj \ $(OBJS)\coredll_printwin.obj \ $(OBJS)\coredll_radiobox.obj \ $(OBJS)\coredll_radiobut.obj \ - $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_scrolbar.obj \ $(OBJS)\coredll_slider95.obj \ $(OBJS)\coredll_spinbutt.obj \ @@ -1293,40 +1643,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ - $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_calctrl.obj \ - $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_dcbuffer.obj \ - $(OBJS)\coredll_dcpsg.obj \ - $(OBJS)\coredll_dirctrlg.obj \ - $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_grid.obj \ - $(OBJS)\coredll_gridctrl.obj \ - $(OBJS)\coredll_gridsel.obj \ - $(OBJS)\coredll_helpext.obj \ - $(OBJS)\coredll_laywin.obj \ - $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_sashwin.obj \ - $(OBJS)\coredll_scrlwing.obj \ - $(OBJS)\coredll_selstore.obj \ - $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splash.obj \ - $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_tbarsmpl.obj \ - $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipdlg.obj \ - $(OBJS)\coredll_tipwin.obj \ - $(OBJS)\coredll_treectlg.obj \ - $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_wizard.obj \ - $(OBJS)\coredll_appcmn.obj \ - $(OBJS)\coredll_fontmap.obj \ $(OBJS)\coredll_accesscmn.obj \ + $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ @@ -1339,7 +1657,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_ctrlsub.obj \ $(OBJS)\coredll_datacmn.obj \ - $(OBJS)\coredll_dbgrid.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ @@ -1352,9 +1669,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fddlgcmn.obj \ $(OBJS)\coredll_fldlgcmn.obj \ $(OBJS)\coredll_fontcmn.obj \ + $(OBJS)\coredll_fontmap.obj \ $(OBJS)\coredll_framecmn.obj \ - $(OBJS)\coredll_timercmn.obj \ - $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_gaugecmn.obj \ $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_geometry.obj \ @@ -1364,6 +1680,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_imagall.obj \ $(OBJS)\coredll_imagbmp.obj \ $(OBJS)\coredll_image.obj \ + $(OBJS)\coredll_imagfill.obj \ $(OBJS)\coredll_imaggif.obj \ $(OBJS)\coredll_imagiff.obj \ $(OBJS)\coredll_imagjpeg.obj \ @@ -1372,7 +1689,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_imagpnm.obj \ $(OBJS)\coredll_imagtiff.obj \ $(OBJS)\coredll_imagxpm.obj \ - $(OBJS)\coredll_imagfill.obj \ $(OBJS)\coredll_layout.obj \ $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_matrix.obj \ @@ -1383,18 +1699,41 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ $(OBJS)\coredll_radiocmn.obj \ + $(OBJS)\coredll_rendcmn.obj \ $(OBJS)\coredll_rgncmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ $(OBJS)\coredll_statbar.obj \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ + $(OBJS)\coredll_timercmn.obj \ + $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_valgen.obj \ $(OBJS)\coredll_validate.obj \ $(OBJS)\coredll_valtext.obj \ $(OBJS)\coredll_wincmn.obj \ - $(OBJS)\coredll_xpmdecod.obj + $(OBJS)\coredll_xpmdecod.obj \ + $(OBJS)\coredll_busyinfo.obj \ + $(OBJS)\coredll_choicdgg.obj \ + $(OBJS)\coredll_dcpsg.obj \ + $(OBJS)\coredll_dirctrlg.obj \ + $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_logg.obj \ + $(OBJS)\coredll_numdlgg.obj \ + $(OBJS)\coredll_panelg.obj \ + $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_scrlwing.obj \ + $(OBJS)\coredll_selstore.obj \ + $(OBJS)\coredll_spinctlg.obj \ + $(OBJS)\coredll_splitter.obj \ + $(OBJS)\coredll_tbarsmpl.obj \ + $(OBJS)\coredll_textdlgg.obj \ + $(OBJS)\coredll_tipwin.obj \ + $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_vlbox.obj \ + $(OBJS)\coredll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -1425,28 +1764,38 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.obj \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_joystick.obj \ $(OBJS)\coredll_minifram.obj \ + $(OBJS)\coredll_automtn.obj \ + $(OBJS)\coredll_dataobj.obj \ + $(OBJS)\coredll_dropsrc.obj \ + $(OBJS)\coredll_droptgt.obj \ + $(OBJS)\coredll_oleutils.obj \ + $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ $(OBJS)\coredll_region.obj \ + $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_taskbarcmn.obj \ - $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ - $(OBJS)\coredll_wave.obj \ + $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ - $(OBJS)\coredll_automtn.obj \ - $(OBJS)\coredll_dataobj.obj \ - $(OBJS)\coredll_dropsrc.obj \ - $(OBJS)\coredll_droptgt.obj \ - $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_textctrl.obj \ + $(OBJS)\coredll_accel.obj \ + $(OBJS)\coredll_colrdlgg.obj \ + $(OBJS)\coredll_dirdlgg.obj \ + $(OBJS)\coredll_fdrepdlg.obj \ + $(OBJS)\coredll_filedlgg.obj \ + $(OBJS)\coredll_fontdlgg.obj \ + $(OBJS)\coredll_imaglist.obj \ + $(OBJS)\coredll_listctrl.obj \ + $(OBJS)\coredll_mdig.obj \ + $(OBJS)\coredll_msgdlgg.obj \ + $(OBJS)\coredll_prntdlgg.obj \ + $(OBJS)\coredll_tabg.obj \ $(OBJS)\coredll_bmpbuttn.obj \ $(OBJS)\coredll_button.obj \ $(OBJS)\coredll_checkbox.obj \ @@ -1455,9 +1804,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_colschem.obj \ $(OBJS)\coredll_combobox.obj \ $(OBJS)\coredll_control.obj \ + $(OBJS)\coredll_ctrlrend.obj \ $(OBJS)\coredll_dialog.obj \ $(OBJS)\coredll_framuniv.obj \ - $(OBJS)\coredll_topluniv.obj \ $(OBJS)\coredll_gauge.obj \ $(OBJS)\coredll_inpcons.obj \ $(OBJS)\coredll_inphand.obj \ @@ -1466,7 +1815,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_notebook.obj \ $(OBJS)\coredll_radiobox.obj \ $(OBJS)\coredll_radiobut.obj \ - $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_scrarrow.obj \ $(OBJS)\coredll_scrolbar.obj \ $(OBJS)\coredll_scrthumb.obj \ @@ -1477,58 +1825,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_statline.obj \ $(OBJS)\coredll_stattext.obj \ $(OBJS)\coredll_statusbr.obj \ - $(OBJS)\coredll_toolbar.obj \ $(OBJS)\coredll_theme.obj \ + $(OBJS)\coredll_toolbar.obj \ + $(OBJS)\coredll_topluniv.obj \ $(OBJS)\coredll_winuniv.obj \ - $(OBJS)\coredll_mdig.obj \ - $(OBJS)\coredll_imaglist.obj \ - $(OBJS)\coredll_colrdlgg.obj \ - $(OBJS)\coredll_listctrl.obj \ - $(OBJS)\coredll_filedlgg.obj \ - $(OBJS)\coredll_dirdlgg.obj \ - $(OBJS)\coredll_prntdlgg.obj \ - $(OBJS)\coredll_accel.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_fdrepdlg.obj \ - $(OBJS)\coredll_fontdlgg.obj \ - $(OBJS)\coredll_tabg.obj \ $(OBJS)\coredll_gtk.obj \ - $(OBJS)\coredll_win32.obj \ $(OBJS)\coredll_metal.obj \ - $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_calctrl.obj \ - $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_dcbuffer.obj \ - $(OBJS)\coredll_dcpsg.obj \ - $(OBJS)\coredll_dirctrlg.obj \ - $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_grid.obj \ - $(OBJS)\coredll_gridctrl.obj \ - $(OBJS)\coredll_gridsel.obj \ - $(OBJS)\coredll_helpext.obj \ - $(OBJS)\coredll_laywin.obj \ - $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_panelg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_sashwin.obj \ - $(OBJS)\coredll_scrlwing.obj \ - $(OBJS)\coredll_selstore.obj \ - $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splash.obj \ - $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_tbarsmpl.obj \ - $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipdlg.obj \ - $(OBJS)\coredll_tipwin.obj \ - $(OBJS)\coredll_treectlg.obj \ - $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_wizard.obj \ - $(OBJS)\coredll_appcmn.obj \ - $(OBJS)\coredll_fontmap.obj \ + $(OBJS)\coredll_win32.obj \ $(OBJS)\coredll_accesscmn.obj \ + $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ @@ -1541,7 +1846,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ctrlcmn.obj \ $(OBJS)\coredll_ctrlsub.obj \ $(OBJS)\coredll_datacmn.obj \ - $(OBJS)\coredll_dbgrid.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ @@ -1554,9 +1858,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fddlgcmn.obj \ $(OBJS)\coredll_fldlgcmn.obj \ $(OBJS)\coredll_fontcmn.obj \ + $(OBJS)\coredll_fontmap.obj \ $(OBJS)\coredll_framecmn.obj \ - $(OBJS)\coredll_timercmn.obj \ - $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_gaugecmn.obj \ $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_geometry.obj \ @@ -1566,6 +1869,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_imagall.obj \ $(OBJS)\coredll_imagbmp.obj \ $(OBJS)\coredll_image.obj \ + $(OBJS)\coredll_imagfill.obj \ $(OBJS)\coredll_imaggif.obj \ $(OBJS)\coredll_imagiff.obj \ $(OBJS)\coredll_imagjpeg.obj \ @@ -1574,7 +1878,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_imagpnm.obj \ $(OBJS)\coredll_imagtiff.obj \ $(OBJS)\coredll_imagxpm.obj \ - $(OBJS)\coredll_imagfill.obj \ $(OBJS)\coredll_layout.obj \ $(OBJS)\coredll_lboxcmn.obj \ $(OBJS)\coredll_matrix.obj \ @@ -1585,18 +1888,41 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ $(OBJS)\coredll_radiocmn.obj \ + $(OBJS)\coredll_rendcmn.obj \ $(OBJS)\coredll_rgncmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ $(OBJS)\coredll_statbar.obj \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ + $(OBJS)\coredll_timercmn.obj \ + $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_valgen.obj \ $(OBJS)\coredll_validate.obj \ $(OBJS)\coredll_valtext.obj \ $(OBJS)\coredll_wincmn.obj \ - $(OBJS)\coredll_xpmdecod.obj + $(OBJS)\coredll_xpmdecod.obj \ + $(OBJS)\coredll_busyinfo.obj \ + $(OBJS)\coredll_choicdgg.obj \ + $(OBJS)\coredll_dcpsg.obj \ + $(OBJS)\coredll_dirctrlg.obj \ + $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_logg.obj \ + $(OBJS)\coredll_numdlgg.obj \ + $(OBJS)\coredll_panelg.obj \ + $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_scrlwing.obj \ + $(OBJS)\coredll_selstore.obj \ + $(OBJS)\coredll_spinctlg.obj \ + $(OBJS)\coredll_splitter.obj \ + $(OBJS)\coredll_tbarsmpl.obj \ + $(OBJS)\coredll_textdlgg.obj \ + $(OBJS)\coredll_tipwin.obj \ + $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_vlbox.obj \ + $(OBJS)\coredll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -1627,30 +1953,26 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.obj \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_joystick.obj \ $(OBJS)\corelib_minifram.obj \ + $(OBJS)\corelib_automtn.obj \ + $(OBJS)\corelib_dataobj.obj \ + $(OBJS)\corelib_dropsrc.obj \ + $(OBJS)\corelib_droptgt.obj \ + $(OBJS)\corelib_oleutils.obj \ + $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_region.obj \ + $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_taskbarcmn.obj \ - $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ - $(OBJS)\corelib_wave.obj \ + $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ - $(OBJS)\corelib_automtn.obj \ - $(OBJS)\corelib_dataobj.obj \ - $(OBJS)\corelib_dropsrc.obj \ - $(OBJS)\corelib_droptgt.obj \ - $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_statusbr.obj \ - $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_access.obj \ $(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_bmpbuttn.obj \ $(OBJS)\corelib_button.obj \ @@ -1678,13 +2000,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msgdlg.obj \ $(OBJS)\corelib_nativdlg.obj \ $(OBJS)\corelib_notebook.obj \ + $(OBJS)\corelib_access.obj \ $(OBJS)\corelib_ownerdrw.obj \ $(OBJS)\corelib_penwin.obj \ $(OBJS)\corelib_printdlg.obj \ $(OBJS)\corelib_printwin.obj \ $(OBJS)\corelib_radiobox.obj \ $(OBJS)\corelib_radiobut.obj \ - $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_scrolbar.obj \ $(OBJS)\corelib_slider95.obj \ $(OBJS)\corelib_spinbutt.obj \ @@ -1699,40 +2021,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ - $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_calctrl.obj \ - $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_dcbuffer.obj \ - $(OBJS)\corelib_dcpsg.obj \ - $(OBJS)\corelib_dirctrlg.obj \ - $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_grid.obj \ - $(OBJS)\corelib_gridctrl.obj \ - $(OBJS)\corelib_gridsel.obj \ - $(OBJS)\corelib_helpext.obj \ - $(OBJS)\corelib_laywin.obj \ - $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_sashwin.obj \ - $(OBJS)\corelib_scrlwing.obj \ - $(OBJS)\corelib_selstore.obj \ - $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splash.obj \ - $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_tbarsmpl.obj \ - $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipdlg.obj \ - $(OBJS)\corelib_tipwin.obj \ - $(OBJS)\corelib_treectlg.obj \ - $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_wizard.obj \ - $(OBJS)\corelib_appcmn.obj \ - $(OBJS)\corelib_fontmap.obj \ $(OBJS)\corelib_accesscmn.obj \ + $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ @@ -1745,7 +2035,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_ctrlsub.obj \ $(OBJS)\corelib_datacmn.obj \ - $(OBJS)\corelib_dbgrid.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ @@ -1758,9 +2047,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fddlgcmn.obj \ $(OBJS)\corelib_fldlgcmn.obj \ $(OBJS)\corelib_fontcmn.obj \ + $(OBJS)\corelib_fontmap.obj \ $(OBJS)\corelib_framecmn.obj \ - $(OBJS)\corelib_timercmn.obj \ - $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_gaugecmn.obj \ $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_geometry.obj \ @@ -1770,6 +2058,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_imagall.obj \ $(OBJS)\corelib_imagbmp.obj \ $(OBJS)\corelib_image.obj \ + $(OBJS)\corelib_imagfill.obj \ $(OBJS)\corelib_imaggif.obj \ $(OBJS)\corelib_imagiff.obj \ $(OBJS)\corelib_imagjpeg.obj \ @@ -1778,7 +2067,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_imagpnm.obj \ $(OBJS)\corelib_imagtiff.obj \ $(OBJS)\corelib_imagxpm.obj \ - $(OBJS)\corelib_imagfill.obj \ $(OBJS)\corelib_layout.obj \ $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_matrix.obj \ @@ -1789,18 +2077,41 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ $(OBJS)\corelib_radiocmn.obj \ + $(OBJS)\corelib_rendcmn.obj \ $(OBJS)\corelib_rgncmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ $(OBJS)\corelib_statbar.obj \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ + $(OBJS)\corelib_timercmn.obj \ + $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_valgen.obj \ $(OBJS)\corelib_validate.obj \ $(OBJS)\corelib_valtext.obj \ $(OBJS)\corelib_wincmn.obj \ - $(OBJS)\corelib_xpmdecod.obj + $(OBJS)\corelib_xpmdecod.obj \ + $(OBJS)\corelib_busyinfo.obj \ + $(OBJS)\corelib_choicdgg.obj \ + $(OBJS)\corelib_dcpsg.obj \ + $(OBJS)\corelib_dirctrlg.obj \ + $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_logg.obj \ + $(OBJS)\corelib_numdlgg.obj \ + $(OBJS)\corelib_panelg.obj \ + $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_scrlwing.obj \ + $(OBJS)\corelib_selstore.obj \ + $(OBJS)\corelib_spinctlg.obj \ + $(OBJS)\corelib_splitter.obj \ + $(OBJS)\corelib_tbarsmpl.obj \ + $(OBJS)\corelib_textdlgg.obj \ + $(OBJS)\corelib_tipwin.obj \ + $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_vlbox.obj \ + $(OBJS)\corelib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -1831,28 +2142,38 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.obj \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_joystick.obj \ $(OBJS)\corelib_minifram.obj \ + $(OBJS)\corelib_automtn.obj \ + $(OBJS)\corelib_dataobj.obj \ + $(OBJS)\corelib_dropsrc.obj \ + $(OBJS)\corelib_droptgt.obj \ + $(OBJS)\corelib_oleutils.obj \ + $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ $(OBJS)\corelib_region.obj \ + $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_taskbarcmn.obj \ - $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ - $(OBJS)\corelib_wave.obj \ + $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ - $(OBJS)\corelib_automtn.obj \ - $(OBJS)\corelib_dataobj.obj \ - $(OBJS)\corelib_dropsrc.obj \ - $(OBJS)\corelib_droptgt.obj \ - $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_textctrl.obj \ + $(OBJS)\corelib_accel.obj \ + $(OBJS)\corelib_colrdlgg.obj \ + $(OBJS)\corelib_dirdlgg.obj \ + $(OBJS)\corelib_fdrepdlg.obj \ + $(OBJS)\corelib_filedlgg.obj \ + $(OBJS)\corelib_fontdlgg.obj \ + $(OBJS)\corelib_imaglist.obj \ + $(OBJS)\corelib_listctrl.obj \ + $(OBJS)\corelib_mdig.obj \ + $(OBJS)\corelib_msgdlgg.obj \ + $(OBJS)\corelib_prntdlgg.obj \ + $(OBJS)\corelib_tabg.obj \ $(OBJS)\corelib_bmpbuttn.obj \ $(OBJS)\corelib_button.obj \ $(OBJS)\corelib_checkbox.obj \ @@ -1861,80 +2182,36 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_colschem.obj \ $(OBJS)\corelib_combobox.obj \ $(OBJS)\corelib_control.obj \ + $(OBJS)\corelib_ctrlrend.obj \ $(OBJS)\corelib_dialog.obj \ $(OBJS)\corelib_framuniv.obj \ - $(OBJS)\corelib_topluniv.obj \ $(OBJS)\corelib_gauge.obj \ $(OBJS)\corelib_inpcons.obj \ $(OBJS)\corelib_inphand.obj \ $(OBJS)\corelib_listbox.obj \ $(OBJS)\corelib_menu.obj \ - $(OBJS)\corelib_notebook.obj \ - $(OBJS)\corelib_radiobox.obj \ - $(OBJS)\corelib_radiobut.obj \ - $(OBJS)\corelib_renderer.obj \ - $(OBJS)\corelib_scrarrow.obj \ - $(OBJS)\corelib_scrolbar.obj \ - $(OBJS)\corelib_scrthumb.obj \ - $(OBJS)\corelib_slider.obj \ - $(OBJS)\corelib_spinbutt.obj \ - $(OBJS)\corelib_statbmp.obj \ - $(OBJS)\corelib_statbox.obj \ - $(OBJS)\corelib_statline.obj \ - $(OBJS)\corelib_stattext.obj \ - $(OBJS)\corelib_statusbr.obj \ - $(OBJS)\corelib_toolbar.obj \ - $(OBJS)\corelib_theme.obj \ - $(OBJS)\corelib_winuniv.obj \ - $(OBJS)\corelib_mdig.obj \ - $(OBJS)\corelib_imaglist.obj \ - $(OBJS)\corelib_colrdlgg.obj \ - $(OBJS)\corelib_listctrl.obj \ - $(OBJS)\corelib_filedlgg.obj \ - $(OBJS)\corelib_dirdlgg.obj \ - $(OBJS)\corelib_prntdlgg.obj \ - $(OBJS)\corelib_accel.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_fdrepdlg.obj \ - $(OBJS)\corelib_fontdlgg.obj \ - $(OBJS)\corelib_tabg.obj \ - $(OBJS)\corelib_gtk.obj \ - $(OBJS)\corelib_win32.obj \ - $(OBJS)\corelib_metal.obj \ - $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_calctrl.obj \ - $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_dcbuffer.obj \ - $(OBJS)\corelib_dcpsg.obj \ - $(OBJS)\corelib_dirctrlg.obj \ - $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_grid.obj \ - $(OBJS)\corelib_gridctrl.obj \ - $(OBJS)\corelib_gridsel.obj \ - $(OBJS)\corelib_helpext.obj \ - $(OBJS)\corelib_laywin.obj \ - $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_panelg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_sashwin.obj \ - $(OBJS)\corelib_scrlwing.obj \ - $(OBJS)\corelib_selstore.obj \ - $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splash.obj \ - $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_tbarsmpl.obj \ - $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipdlg.obj \ - $(OBJS)\corelib_tipwin.obj \ - $(OBJS)\corelib_treectlg.obj \ - $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_wizard.obj \ - $(OBJS)\corelib_appcmn.obj \ - $(OBJS)\corelib_fontmap.obj \ + $(OBJS)\corelib_notebook.obj \ + $(OBJS)\corelib_radiobox.obj \ + $(OBJS)\corelib_radiobut.obj \ + $(OBJS)\corelib_scrarrow.obj \ + $(OBJS)\corelib_scrolbar.obj \ + $(OBJS)\corelib_scrthumb.obj \ + $(OBJS)\corelib_slider.obj \ + $(OBJS)\corelib_spinbutt.obj \ + $(OBJS)\corelib_statbmp.obj \ + $(OBJS)\corelib_statbox.obj \ + $(OBJS)\corelib_statline.obj \ + $(OBJS)\corelib_stattext.obj \ + $(OBJS)\corelib_statusbr.obj \ + $(OBJS)\corelib_theme.obj \ + $(OBJS)\corelib_toolbar.obj \ + $(OBJS)\corelib_topluniv.obj \ + $(OBJS)\corelib_winuniv.obj \ + $(OBJS)\corelib_gtk.obj \ + $(OBJS)\corelib_metal.obj \ + $(OBJS)\corelib_win32.obj \ $(OBJS)\corelib_accesscmn.obj \ + $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ @@ -1947,7 +2224,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ctrlcmn.obj \ $(OBJS)\corelib_ctrlsub.obj \ $(OBJS)\corelib_datacmn.obj \ - $(OBJS)\corelib_dbgrid.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ @@ -1960,9 +2236,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fddlgcmn.obj \ $(OBJS)\corelib_fldlgcmn.obj \ $(OBJS)\corelib_fontcmn.obj \ + $(OBJS)\corelib_fontmap.obj \ $(OBJS)\corelib_framecmn.obj \ - $(OBJS)\corelib_timercmn.obj \ - $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_gaugecmn.obj \ $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_geometry.obj \ @@ -1972,6 +2247,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_imagall.obj \ $(OBJS)\corelib_imagbmp.obj \ $(OBJS)\corelib_image.obj \ + $(OBJS)\corelib_imagfill.obj \ $(OBJS)\corelib_imaggif.obj \ $(OBJS)\corelib_imagiff.obj \ $(OBJS)\corelib_imagjpeg.obj \ @@ -1980,7 +2256,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_imagpnm.obj \ $(OBJS)\corelib_imagtiff.obj \ $(OBJS)\corelib_imagxpm.obj \ - $(OBJS)\corelib_imagfill.obj \ $(OBJS)\corelib_layout.obj \ $(OBJS)\corelib_lboxcmn.obj \ $(OBJS)\corelib_matrix.obj \ @@ -1991,18 +2266,41 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ $(OBJS)\corelib_radiocmn.obj \ + $(OBJS)\corelib_rendcmn.obj \ $(OBJS)\corelib_rgncmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ $(OBJS)\corelib_statbar.obj \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ + $(OBJS)\corelib_timercmn.obj \ + $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_valgen.obj \ $(OBJS)\corelib_validate.obj \ $(OBJS)\corelib_valtext.obj \ $(OBJS)\corelib_wincmn.obj \ - $(OBJS)\corelib_xpmdecod.obj + $(OBJS)\corelib_xpmdecod.obj \ + $(OBJS)\corelib_busyinfo.obj \ + $(OBJS)\corelib_choicdgg.obj \ + $(OBJS)\corelib_dcpsg.obj \ + $(OBJS)\corelib_dirctrlg.obj \ + $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_logg.obj \ + $(OBJS)\corelib_numdlgg.obj \ + $(OBJS)\corelib_panelg.obj \ + $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_scrlwing.obj \ + $(OBJS)\corelib_selstore.obj \ + $(OBJS)\corelib_spinctlg.obj \ + $(OBJS)\corelib_splitter.obj \ + $(OBJS)\corelib_tbarsmpl.obj \ + $(OBJS)\corelib_textdlgg.obj \ + $(OBJS)\corelib_tipwin.obj \ + $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_vlbox.obj \ + $(OBJS)\corelib_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2033,30 +2331,26 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.obj \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_minifram.obj \ + $(OBJS)\monodll_automtn.obj \ + $(OBJS)\monodll_dataobj.obj \ + $(OBJS)\monodll_dropsrc.obj \ + $(OBJS)\monodll_droptgt.obj \ + $(OBJS)\monodll_oleutils.obj \ + $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_region.obj \ + $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ - $(OBJS)\monodll_wave.obj \ + $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ - $(OBJS)\monodll_automtn.obj \ - $(OBJS)\monodll_dataobj.obj \ - $(OBJS)\monodll_dropsrc.obj \ - $(OBJS)\monodll_droptgt.obj \ - $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_statusbr.obj \ - $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_access.obj \ $(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_bmpbuttn.obj \ $(OBJS)\monodll_button.obj \ @@ -2084,13 +2378,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msgdlg.obj \ $(OBJS)\monodll_nativdlg.obj \ $(OBJS)\monodll_notebook.obj \ + $(OBJS)\monodll_access.obj \ $(OBJS)\monodll_ownerdrw.obj \ $(OBJS)\monodll_penwin.obj \ $(OBJS)\monodll_printdlg.obj \ $(OBJS)\monodll_printwin.obj \ $(OBJS)\monodll_radiobox.obj \ $(OBJS)\monodll_radiobut.obj \ - $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_scrolbar.obj \ $(OBJS)\monodll_slider95.obj \ $(OBJS)\monodll_spinbutt.obj \ @@ -2105,40 +2399,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ - $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_calctrl.obj \ - $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_dcbuffer.obj \ - $(OBJS)\monodll_dcpsg.obj \ - $(OBJS)\monodll_dirctrlg.obj \ - $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_laywin.obj \ - $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_sashwin.obj \ - $(OBJS)\monodll_scrlwing.obj \ - $(OBJS)\monodll_selstore.obj \ - $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_tbarsmpl.obj \ - $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_tipwin.obj \ - $(OBJS)\monodll_treectlg.obj \ - $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_appcmn.obj \ - $(OBJS)\monodll_fontmap.obj \ $(OBJS)\monodll_accesscmn.obj \ + $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ @@ -2151,7 +2413,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_ctrlsub.obj \ $(OBJS)\monodll_datacmn.obj \ - $(OBJS)\monodll_dbgrid.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ @@ -2164,9 +2425,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fddlgcmn.obj \ $(OBJS)\monodll_fldlgcmn.obj \ $(OBJS)\monodll_fontcmn.obj \ + $(OBJS)\monodll_fontmap.obj \ $(OBJS)\monodll_framecmn.obj \ - $(OBJS)\monodll_timercmn.obj \ - $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_gaugecmn.obj \ $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_geometry.obj \ @@ -2176,6 +2436,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_imagall.obj \ $(OBJS)\monodll_imagbmp.obj \ $(OBJS)\monodll_image.obj \ + $(OBJS)\monodll_imagfill.obj \ $(OBJS)\monodll_imaggif.obj \ $(OBJS)\monodll_imagiff.obj \ $(OBJS)\monodll_imagjpeg.obj \ @@ -2184,7 +2445,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_imagpnm.obj \ $(OBJS)\monodll_imagtiff.obj \ $(OBJS)\monodll_imagxpm.obj \ - $(OBJS)\monodll_imagfill.obj \ $(OBJS)\monodll_layout.obj \ $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_matrix.obj \ @@ -2195,18 +2455,41 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ $(OBJS)\monodll_radiocmn.obj \ + $(OBJS)\monodll_rendcmn.obj \ $(OBJS)\monodll_rgncmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ $(OBJS)\monodll_statbar.obj \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ + $(OBJS)\monodll_timercmn.obj \ + $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_valgen.obj \ $(OBJS)\monodll_validate.obj \ $(OBJS)\monodll_valtext.obj \ $(OBJS)\monodll_wincmn.obj \ - $(OBJS)\monodll_xpmdecod.obj + $(OBJS)\monodll_xpmdecod.obj \ + $(OBJS)\monodll_busyinfo.obj \ + $(OBJS)\monodll_choicdgg.obj \ + $(OBJS)\monodll_dcpsg.obj \ + $(OBJS)\monodll_dirctrlg.obj \ + $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_logg.obj \ + $(OBJS)\monodll_numdlgg.obj \ + $(OBJS)\monodll_panelg.obj \ + $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_scrlwing.obj \ + $(OBJS)\monodll_selstore.obj \ + $(OBJS)\monodll_spinctlg.obj \ + $(OBJS)\monodll_splitter.obj \ + $(OBJS)\monodll_tbarsmpl.obj \ + $(OBJS)\monodll_textdlgg.obj \ + $(OBJS)\monodll_tipwin.obj \ + $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_vlbox.obj \ + $(OBJS)\monodll_vscroll.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2237,28 +2520,38 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.obj \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_minifram.obj \ + $(OBJS)\monodll_automtn.obj \ + $(OBJS)\monodll_dataobj.obj \ + $(OBJS)\monodll_dropsrc.obj \ + $(OBJS)\monodll_droptgt.obj \ + $(OBJS)\monodll_oleutils.obj \ + $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ $(OBJS)\monodll_region.obj \ + $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ - $(OBJS)\monodll_wave.obj \ + $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ - $(OBJS)\monodll_automtn.obj \ - $(OBJS)\monodll_dataobj.obj \ - $(OBJS)\monodll_dropsrc.obj \ - $(OBJS)\monodll_droptgt.obj \ - $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_textctrl.obj \ + $(OBJS)\monodll_accel.obj \ + $(OBJS)\monodll_colrdlgg.obj \ + $(OBJS)\monodll_dirdlgg.obj \ + $(OBJS)\monodll_fdrepdlg.obj \ + $(OBJS)\monodll_filedlgg.obj \ + $(OBJS)\monodll_fontdlgg.obj \ + $(OBJS)\monodll_imaglist.obj \ + $(OBJS)\monodll_listctrl.obj \ + $(OBJS)\monodll_mdig.obj \ + $(OBJS)\monodll_msgdlgg.obj \ + $(OBJS)\monodll_prntdlgg.obj \ + $(OBJS)\monodll_tabg.obj \ $(OBJS)\monodll_bmpbuttn.obj \ $(OBJS)\monodll_button.obj \ $(OBJS)\monodll_checkbox.obj \ @@ -2267,9 +2560,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_colschem.obj \ $(OBJS)\monodll_combobox.obj \ $(OBJS)\monodll_control.obj \ + $(OBJS)\monodll_ctrlrend.obj \ $(OBJS)\monodll_dialog.obj \ $(OBJS)\monodll_framuniv.obj \ - $(OBJS)\monodll_topluniv.obj \ $(OBJS)\monodll_gauge.obj \ $(OBJS)\monodll_inpcons.obj \ $(OBJS)\monodll_inphand.obj \ @@ -2278,7 +2571,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notebook.obj \ $(OBJS)\monodll_radiobox.obj \ $(OBJS)\monodll_radiobut.obj \ - $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_scrarrow.obj \ $(OBJS)\monodll_scrolbar.obj \ $(OBJS)\monodll_scrthumb.obj \ @@ -2289,58 +2581,15 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_statline.obj \ $(OBJS)\monodll_stattext.obj \ $(OBJS)\monodll_statusbr.obj \ - $(OBJS)\monodll_toolbar.obj \ $(OBJS)\monodll_theme.obj \ + $(OBJS)\monodll_toolbar.obj \ + $(OBJS)\monodll_topluniv.obj \ $(OBJS)\monodll_winuniv.obj \ - $(OBJS)\monodll_mdig.obj \ - $(OBJS)\monodll_imaglist.obj \ - $(OBJS)\monodll_colrdlgg.obj \ - $(OBJS)\monodll_listctrl.obj \ - $(OBJS)\monodll_filedlgg.obj \ - $(OBJS)\monodll_dirdlgg.obj \ - $(OBJS)\monodll_prntdlgg.obj \ - $(OBJS)\monodll_accel.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_fdrepdlg.obj \ - $(OBJS)\monodll_fontdlgg.obj \ - $(OBJS)\monodll_tabg.obj \ $(OBJS)\monodll_gtk.obj \ - $(OBJS)\monodll_win32.obj \ $(OBJS)\monodll_metal.obj \ - $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_calctrl.obj \ - $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_dcbuffer.obj \ - $(OBJS)\monodll_dcpsg.obj \ - $(OBJS)\monodll_dirctrlg.obj \ - $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_laywin.obj \ - $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_panelg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_sashwin.obj \ - $(OBJS)\monodll_scrlwing.obj \ - $(OBJS)\monodll_selstore.obj \ - $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_tbarsmpl.obj \ - $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_tipwin.obj \ - $(OBJS)\monodll_treectlg.obj \ - $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_appcmn.obj \ - $(OBJS)\monodll_fontmap.obj \ + $(OBJS)\monodll_win32.obj \ $(OBJS)\monodll_accesscmn.obj \ + $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ @@ -2353,7 +2602,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ctrlcmn.obj \ $(OBJS)\monodll_ctrlsub.obj \ $(OBJS)\monodll_datacmn.obj \ - $(OBJS)\monodll_dbgrid.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ @@ -2366,9 +2614,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fddlgcmn.obj \ $(OBJS)\monodll_fldlgcmn.obj \ $(OBJS)\monodll_fontcmn.obj \ + $(OBJS)\monodll_fontmap.obj \ $(OBJS)\monodll_framecmn.obj \ - $(OBJS)\monodll_timercmn.obj \ - $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_gaugecmn.obj \ $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_geometry.obj \ @@ -2378,6 +2625,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_imagall.obj \ $(OBJS)\monodll_imagbmp.obj \ $(OBJS)\monodll_image.obj \ + $(OBJS)\monodll_imagfill.obj \ $(OBJS)\monodll_imaggif.obj \ $(OBJS)\monodll_imagiff.obj \ $(OBJS)\monodll_imagjpeg.obj \ @@ -2386,7 +2634,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_imagpnm.obj \ $(OBJS)\monodll_imagtiff.obj \ $(OBJS)\monodll_imagxpm.obj \ - $(OBJS)\monodll_imagfill.obj \ $(OBJS)\monodll_layout.obj \ $(OBJS)\monodll_lboxcmn.obj \ $(OBJS)\monodll_matrix.obj \ @@ -2397,76 +2644,383 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ $(OBJS)\monodll_radiocmn.obj \ + $(OBJS)\monodll_rendcmn.obj \ $(OBJS)\monodll_rgncmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ $(OBJS)\monodll_statbar.obj \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ + $(OBJS)\monodll_timercmn.obj \ + $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_valgen.obj \ $(OBJS)\monodll_validate.obj \ $(OBJS)\monodll_valtext.obj \ $(OBJS)\monodll_wincmn.obj \ - $(OBJS)\monodll_xpmdecod.obj + $(OBJS)\monodll_xpmdecod.obj \ + $(OBJS)\monodll_busyinfo.obj \ + $(OBJS)\monodll_choicdgg.obj \ + $(OBJS)\monodll_dcpsg.obj \ + $(OBJS)\monodll_dirctrlg.obj \ + $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_logg.obj \ + $(OBJS)\monodll_numdlgg.obj \ + $(OBJS)\monodll_panelg.obj \ + $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_scrlwing.obj \ + $(OBJS)\monodll_selstore.obj \ + $(OBJS)\monodll_spinctlg.obj \ + $(OBJS)\monodll_splitter.obj \ + $(OBJS)\monodll_tbarsmpl.obj \ + $(OBJS)\monodll_textdlgg.obj \ + $(OBJS)\monodll_tipwin.obj \ + $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_vlbox.obj \ + $(OBJS)\monodll_vscroll.obj +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_104_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_104_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_104_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_10_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_10_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_10_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_113_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_113_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_113_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_122_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_122_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_122_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_131_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_131_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_131_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_140_p = !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_140_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_140_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_149_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_149_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_149_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_158_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_158_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_158_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_167_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_167_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_167_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_176_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_176_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_176_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_185_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_185_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_185_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_18_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_18_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_18_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_194_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_194_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_194_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_203_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_203_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_203_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_212_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_212_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_212_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_221_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_221_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_221_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_26_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_26_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_26_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_34_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_34_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_34_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_42_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_42_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_42_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_50_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_50_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_50_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_59_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_59_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_59_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_68_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_68_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_68_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_77_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_77_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_77_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_86_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_86_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_86_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_95_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_95_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_95_p = $(____DEBUGINFO) !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ + $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_dcbuffer.obj \ + $(OBJS)\monolib_grid.obj \ + $(OBJS)\monolib_gridctrl.obj \ + $(OBJS)\monolib_gridsel.obj \ + $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_sashwin.obj \ + $(OBJS)\monolib_splash.obj \ + $(OBJS)\monolib_tipdlg.obj \ + $(OBJS)\monolib_wizard.obj \ + $(OBJS)\monolib_taskbarcmn.obj \ + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_taskbar.obj \ + $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_helpbest.obj \ + $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ $(OBJS)\monolib_helpfrm.obj \ - $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_htmlcell.obj \ $(OBJS)\monolib_htmlfilt.obj \ $(OBJS)\monolib_htmlpars.obj \ $(OBJS)\monolib_htmltag.obj \ $(OBJS)\monolib_htmlwin.obj \ - $(OBJS)\monolib_winpars.obj \ + $(OBJS)\monolib_htmprint.obj \ + $(OBJS)\monolib_m_dflist.obj \ $(OBJS)\monolib_m_fonts.obj \ $(OBJS)\monolib_m_hline.obj \ $(OBJS)\monolib_m_image.obj \ $(OBJS)\monolib_m_layout.obj \ $(OBJS)\monolib_m_links.obj \ $(OBJS)\monolib_m_list.obj \ - $(OBJS)\monolib_m_dflist.obj \ $(OBJS)\monolib_m_pre.obj \ - $(OBJS)\monolib_m_tables.obj \ $(OBJS)\monolib_m_style.obj \ - $(OBJS)\monolib_htmprint.obj \ - $(OBJS)\monolib_htmllbox.obj + $(OBJS)\monolib_m_tables.obj \ + $(OBJS)\monolib_winpars.obj \ + $(OBJS)\monolib_htmllbox.obj \ + $(OBJS)\monolib_db.obj \ + $(OBJS)\monolib_dbtable.obj \ + $(OBJS)\monolib_dbgrid.obj !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ + $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_dcbuffer.obj \ + $(OBJS)\monodll_grid.obj \ + $(OBJS)\monodll_gridctrl.obj \ + $(OBJS)\monodll_gridsel.obj \ + $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_sashwin.obj \ + $(OBJS)\monodll_splash.obj \ + $(OBJS)\monodll_tipdlg.obj \ + $(OBJS)\monodll_wizard.obj \ + $(OBJS)\monodll_taskbarcmn.obj \ + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_taskbar.obj \ + $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_helpbest.obj \ + $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ $(OBJS)\monodll_helpfrm.obj \ - $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_htmlcell.obj \ $(OBJS)\monodll_htmlfilt.obj \ $(OBJS)\monodll_htmlpars.obj \ $(OBJS)\monodll_htmltag.obj \ $(OBJS)\monodll_htmlwin.obj \ - $(OBJS)\monodll_winpars.obj \ + $(OBJS)\monodll_htmprint.obj \ + $(OBJS)\monodll_m_dflist.obj \ $(OBJS)\monodll_m_fonts.obj \ $(OBJS)\monodll_m_hline.obj \ $(OBJS)\monodll_m_image.obj \ $(OBJS)\monodll_m_layout.obj \ $(OBJS)\monodll_m_links.obj \ $(OBJS)\monodll_m_list.obj \ - $(OBJS)\monodll_m_dflist.obj \ $(OBJS)\monodll_m_pre.obj \ - $(OBJS)\monodll_m_tables.obj \ $(OBJS)\monodll_m_style.obj \ - $(OBJS)\monodll_htmprint.obj \ - $(OBJS)\monodll_htmllbox.obj + $(OBJS)\monodll_m_tables.obj \ + $(OBJS)\monodll_winpars.obj \ + $(OBJS)\monodll_htmllbox.obj \ + $(OBJS)\monodll_db.obj \ + $(OBJS)\monodll_dbtable.obj \ + $(OBJS)\monodll_dbgrid.obj +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +__advdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +__advlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ @@ -2484,6 +3038,14 @@ __coredll___depname = \ __corelib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__dbgriddll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__dbgridlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +!endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll @@ -2508,6 +3070,22 @@ __monodll___depname = \ __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" +__netdll___depname = \ + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" +__netlib___depname = \ + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__odbcdll___depname = \ + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +__odbclib___depname = \ + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib +!endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib !endif @@ -2533,7 +3111,103 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) + +$(OBJS)\advdll_calctrl.obj: ..\src\generic\calctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\advdll_grid.obj: ..\src\generic\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_gridctrl.obj: ..\src\generic\gridctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_gridsel.obj: ..\src\generic\gridsel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_helpext.obj: ..\src\generic\helpext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_joystick.obj: ..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_laywin.obj: ..\src\generic\laywin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_sashwin.obj: ..\src\generic\sashwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_splash.obj: ..\src\generic\splash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_taskbar.obj: ..\src\msw\taskbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_tipdlg.obj: ..\src\generic\tipdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_wave.obj: ..\src\msw\wave.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_wizard.obj: ..\src\generic\wizard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advlib_calctrl.obj: ..\src\generic\calctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\advlib_grid.obj: ..\src\generic\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_gridctrl.obj: ..\src\generic\gridctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_gridsel.obj: ..\src\generic\gridsel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_helpext.obj: ..\src\generic\helpext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_joystick.obj: ..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_laywin.obj: ..\src\generic\laywin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_sashwin.obj: ..\src\generic\sashwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_splash.obj: ..\src\generic\splash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_taskbar.obj: ..\src\msw\taskbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_tipdlg.obj: ..\src\generic\tipdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_wave.obj: ..\src\msw\wave.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_wizard.obj: ..\src\generic\wizard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\basedll_appbase.obj: ..\src\common\appbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2559,12 +3233,6 @@ $(OBJS)\basedll_datetime.obj: ..\src\common\datetime.cpp $(OBJS)\basedll_datstrm.obj: ..\src\common\datstrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_db.obj: ..\src\common\db.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_dbtable.obj: ..\src\common\dbtable.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_dde.obj: ..\src\msw\dde.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2616,33 +3284,18 @@ $(OBJS)\basedll_filesys.obj: ..\src\common\filesys.cpp $(OBJS)\basedll_fmapbase.obj: ..\src\common\fmapbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_fs_inet.obj: ..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_fs_mem.obj: ..\src\common\fs_mem.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_fs_zip.obj: ..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_ftp.obj: ..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_gsocket.obj: ..\src\msw\gsocket.c - $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $** - -$(OBJS)\basedll_gsockmsw.obj: ..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_hashmap.obj: ..\src\common\hashmap.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_http.obj: ..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_init.obj: ..\src\common\init.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2691,9 +3344,6 @@ $(OBJS)\basedll_object.obj: ..\src\common\object.cpp $(OBJS)\basedll_process.obj: ..\src\common\process.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_protocol.obj: ..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_regconf.obj: ..\src\msw\regconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2703,24 +3353,9 @@ $(OBJS)\basedll_regex.obj: ..\src\common\regex.cpp $(OBJS)\basedll_registry.obj: ..\src\msw\registry.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_sckaddr.obj: ..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckfile.obj: ..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckipc.obj: ..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckstrm.obj: ..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_snglinst.obj: ..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_socket.obj: ..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_stopwatch.obj: ..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2754,9 +3389,6 @@ $(OBJS)\basedll_txtstrm.obj: ..\src\common\txtstrm.cpp $(OBJS)\basedll_unzip.obj: ..\src\common\unzip.c $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $** -$(OBJS)\basedll_url.obj: ..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_utils.obj: ..\src\msw\utils.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2808,12 +3440,6 @@ $(OBJS)\baselib_datetime.obj: ..\src\common\datetime.cpp $(OBJS)\baselib_datstrm.obj: ..\src\common\datstrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_db.obj: ..\src\common\db.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_dbtable.obj: ..\src\common\dbtable.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_dde.obj: ..\src\msw\dde.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -2865,33 +3491,18 @@ $(OBJS)\baselib_filesys.obj: ..\src\common\filesys.cpp $(OBJS)\baselib_fmapbase.obj: ..\src\common\fmapbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_fs_inet.obj: ..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_fs_mem.obj: ..\src\common\fs_mem.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_fs_zip.obj: ..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_ftp.obj: ..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_gsocket.obj: ..\src\msw\gsocket.c - $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $** - -$(OBJS)\baselib_gsockmsw.obj: ..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_hashmap.obj: ..\src\common\hashmap.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_http.obj: ..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_init.obj: ..\src\common\init.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -2940,9 +3551,6 @@ $(OBJS)\baselib_object.obj: ..\src\common\object.cpp $(OBJS)\baselib_process.obj: ..\src\common\process.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_protocol.obj: ..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_regconf.obj: ..\src\msw\regconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -2952,24 +3560,9 @@ $(OBJS)\baselib_regex.obj: ..\src\common\regex.cpp $(OBJS)\baselib_registry.obj: ..\src\msw\registry.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_sckaddr.obj: ..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckfile.obj: ..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckipc.obj: ..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckstrm.obj: ..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_snglinst.obj: ..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_socket.obj: ..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_stopwatch.obj: ..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -3003,9 +3596,6 @@ $(OBJS)\baselib_txtstrm.obj: ..\src\common\txtstrm.cpp $(OBJS)\baselib_unzip.obj: ..\src\common\unzip.c $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $** -$(OBJS)\baselib_url.obj: ..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_utils.obj: ..\src\msw\utils.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -3116,11 +3706,6 @@ $(OBJS)\coredll_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_calctrl.obj: ..\src\generic\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_caret.obj: ..\src\msw\caret.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3235,6 +3820,9 @@ $(OBJS)\coredll_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +$(OBJS)\coredll_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3260,11 +3848,6 @@ $(OBJS)\coredll_dataobj.obj: ..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dc.obj: ..\src\msw\dc.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3275,11 +3858,6 @@ $(OBJS)\coredll_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dcclient.obj: ..\src\msw\dcclient.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3524,21 +4102,6 @@ $(OBJS)\coredll_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_grid.obj: ..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridctrl.obj: ..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gridsel.obj: ..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_gtk.obj: ..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3552,11 +4115,6 @@ $(OBJS)\coredll_helpchm.obj: ..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpext.obj: ..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_helpwin.obj: ..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3651,21 +4209,11 @@ $(OBJS)\coredll_inpcons.obj: ..\src\univ\inpcons.cpp $(OBJS)\coredll_inphand.obj: ..\src\univ\inphand.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_joystick.obj: ..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_laywin.obj: ..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_lboxcmn.obj: ..\src\common\lboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3869,12 +4417,12 @@ $(OBJS)\coredll_region.obj: ..\src\msw\region.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\coredll_renderer.obj: ..\src\univ\renderer.cpp +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif @@ -3889,11 +4437,6 @@ $(OBJS)\coredll_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_sashwin.obj: ..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_scrarrow.obj: ..\src\univ\scrarrow.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -3959,11 +4502,6 @@ $(OBJS)\coredll_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\coredll_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_splash.obj: ..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_splitter.obj: ..\src\generic\splitter.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4033,16 +4571,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\coredll_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_taskbar.obj: ..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4092,11 +4620,6 @@ $(OBJS)\coredll_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tipdlg.obj: ..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_tipwin.obj: ..\src\generic\tipwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4149,8 +4672,10 @@ $(OBJS)\coredll_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\coredll_valgen.obj: ..\src\common\valgen.cpp @@ -4180,11 +4705,6 @@ $(OBJS)\coredll_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wave.obj: ..\src\msw\wave.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_win32.obj: ..\src\univ\themes\win32.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4201,11 +4721,6 @@ $(OBJS)\coredll_window.obj: ..\src\msw\window.cpp $(OBJS)\coredll_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wizard.obj: ..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4294,11 +4809,6 @@ $(OBJS)\corelib_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_calctrl.obj: ..\src\generic\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_caret.obj: ..\src\msw\caret.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4413,6 +4923,9 @@ $(OBJS)\corelib_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +$(OBJS)\corelib_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4438,11 +4951,6 @@ $(OBJS)\corelib_dataobj.obj: ..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dbgrid.obj: ..\src\common\dbgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dc.obj: ..\src\msw\dc.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4453,11 +4961,6 @@ $(OBJS)\corelib_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dcclient.obj: ..\src\msw\dcclient.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4702,21 +5205,6 @@ $(OBJS)\corelib_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_grid.obj: ..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridctrl.obj: ..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gridsel.obj: ..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_gtk.obj: ..\src\univ\themes\gtk.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4730,11 +5218,6 @@ $(OBJS)\corelib_helpchm.obj: ..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpext.obj: ..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_helpwin.obj: ..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -4829,21 +5312,11 @@ $(OBJS)\corelib_inpcons.obj: ..\src\univ\inpcons.cpp $(OBJS)\corelib_inphand.obj: ..\src\univ\inphand.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_joystick.obj: ..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_laywin.obj: ..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_lboxcmn.obj: ..\src\common\lboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5047,12 +5520,12 @@ $(OBJS)\corelib_region.obj: ..\src\msw\region.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\corelib_renderer.obj: ..\src\univ\renderer.cpp +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif @@ -5067,11 +5540,6 @@ $(OBJS)\corelib_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_sashwin.obj: ..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_scrarrow.obj: ..\src\univ\scrarrow.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5137,11 +5605,6 @@ $(OBJS)\corelib_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\corelib_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_splash.obj: ..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_splitter.obj: ..\src\generic\splitter.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5211,16 +5674,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\corelib_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_taskbar.obj: ..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5270,11 +5723,6 @@ $(OBJS)\corelib_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tipdlg.obj: ..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_tipwin.obj: ..\src\generic\tipwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5327,8 +5775,10 @@ $(OBJS)\corelib_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\corelib_valgen.obj: ..\src\common\valgen.cpp @@ -5358,11 +5808,6 @@ $(OBJS)\corelib_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wave.obj: ..\src\msw\wave.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_win32.obj: ..\src\univ\themes\win32.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5379,16 +5824,23 @@ $(OBJS)\corelib_window.obj: ..\src\msw\window.cpp $(OBJS)\corelib_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wizard.obj: ..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_xpmdecod.obj: ..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +$(OBJS)\dbgriddll_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $** + +$(OBJS)\dbgriddll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\dbgridlib_dbgrid.obj: ..\src\common\dbgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) $** + +$(OBJS)\dbgridlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h $** + $(OBJS)\gldll_dummy.obj: ..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $** @@ -5628,10 +6080,8 @@ $(OBJS)\monodll_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_calctrl.obj: ..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_caret.obj: ..\src\msw\caret.cpp @@ -5759,6 +6209,9 @@ $(OBJS)\monodll_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +$(OBJS)\monodll_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5793,10 +6246,8 @@ $(OBJS)\monodll_datstrm.obj: ..\src\common\datstrm.cpp $(OBJS)\monodll_db.obj: ..\src\common\db.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_dbgrid.obj: ..\src\common\dbgrid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5811,10 +6262,8 @@ $(OBJS)\monodll_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcbuffer.obj: ..\src\generic\dcbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcclient.obj: ..\src\msw\dcclient.cpp @@ -6114,20 +6563,14 @@ $(OBJS)\monodll_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_gridctrl.obj: ..\src\generic\gridctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_gridsel.obj: ..\src\generic\gridsel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_gsocket.obj: ..\src\msw\gsocket.c $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $** @@ -6163,10 +6606,8 @@ $(OBJS)\monodll_helpctrl.obj: ..\src\html\helpctrl.cpp $(OBJS)\monodll_helpdata.obj: ..\src\html\helpdata.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_helpext.obj: ..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_helpfrm.obj: ..\src\html\helpfrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6298,20 +6739,16 @@ $(OBJS)\monodll_intl.obj: ..\src\common\intl.cpp $(OBJS)\monodll_ipcbase.obj: ..\src\common\ipcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_joystick.obj: ..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_laywin.obj: ..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_lboxcmn.obj: ..\src\common\lboxcmn.cpp @@ -6588,12 +7025,12 @@ $(OBJS)\monodll_region.obj: ..\src\msw\region.cpp $(OBJS)\monodll_registry.obj: ..\src\msw\registry.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monodll_renderer.obj: ..\src\univ\renderer.cpp +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6608,10 +7045,8 @@ $(OBJS)\monodll_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_sashwin.obj: ..\src\generic\sashwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_sckaddr.obj: ..\src\common\sckaddr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6696,10 +7131,8 @@ $(OBJS)\monodll_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\monodll_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_splash.obj: ..\src\generic\splash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_splitter.obj: ..\src\generic\splitter.cpp @@ -6785,15 +7218,11 @@ $(OBJS)\monodll_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\monodll_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_taskbar.obj: ..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6853,10 +7282,8 @@ $(OBJS)\monodll_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_tipwin.obj: ..\src\generic\tipwin.cpp @@ -6928,8 +7355,10 @@ $(OBJS)\monodll_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_valgen.obj: ..\src\common\valgen.cpp @@ -6962,10 +7391,8 @@ $(OBJS)\monodll_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wave.obj: ..\src\msw\wave.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_wfstream.obj: ..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6989,10 +7416,8 @@ $(OBJS)\monodll_winpars.obj: ..\src\html\winpars.cpp $(OBJS)\monodll_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wizard.obj: ..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_wxchar.obj: ..\src\common\wxchar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7100,10 +7525,8 @@ $(OBJS)\monolib_button.obj: ..\src\msw\button.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_calctrl.obj: ..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_caret.obj: ..\src\msw\caret.cpp @@ -7231,6 +7654,9 @@ $(OBJS)\monolib_ctrlcmn.obj: ..\src\common\ctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +$(OBJS)\monolib_ctrlrend.obj: ..\src\univ\ctrlrend.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_ctrlsub.obj: ..\src\common\ctrlsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7265,10 +7691,8 @@ $(OBJS)\monolib_datstrm.obj: ..\src\common\datstrm.cpp $(OBJS)\monolib_db.obj: ..\src\common\db.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_dbgrid.obj: ..\src\common\dbgrid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_dbtable.obj: ..\src\common\dbtable.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7283,10 +7707,8 @@ $(OBJS)\monolib_dcbase.obj: ..\src\common\dcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcbuffer.obj: ..\src\generic\dcbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcclient.obj: ..\src\msw\dcclient.cpp @@ -7586,20 +8008,14 @@ $(OBJS)\monolib_gifdecod.obj: ..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_gridctrl.obj: ..\src\generic\gridctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_gridsel.obj: ..\src\generic\gridsel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_gsocket.obj: ..\src\msw\gsocket.c $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $** @@ -7635,10 +8051,8 @@ $(OBJS)\monolib_helpctrl.obj: ..\src\html\helpctrl.cpp $(OBJS)\monolib_helpdata.obj: ..\src\html\helpdata.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_helpext.obj: ..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_helpfrm.obj: ..\src\html\helpfrm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7770,20 +8184,16 @@ $(OBJS)\monolib_intl.obj: ..\src\common\intl.cpp $(OBJS)\monolib_ipcbase.obj: ..\src\common\ipcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_joystick.obj: ..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_laywin.obj: ..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_lboxcmn.obj: ..\src\common\lboxcmn.cpp @@ -8060,12 +8470,12 @@ $(OBJS)\monolib_region.obj: ..\src\msw\region.cpp $(OBJS)\monolib_registry.obj: ..\src\msw\registry.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monolib_renderer.obj: ..\src\univ\renderer.cpp +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_rendcmn.obj: ..\src\common\rendcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_renderer.obj: ..\src\msw\renderer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8080,10 +8490,8 @@ $(OBJS)\monolib_rgncmn.obj: ..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_sashwin.obj: ..\src\generic\sashwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_sckaddr.obj: ..\src\common\sckaddr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8168,10 +8576,8 @@ $(OBJS)\monolib_spinctlg.obj: ..\src\generic\spinctlg.cpp $(OBJS)\monolib_spinctrl.obj: ..\src\msw\spinctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_splash.obj: ..\src\generic\splash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_splitter.obj: ..\src\generic\splitter.cpp @@ -8257,15 +8663,11 @@ $(OBJS)\monolib_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\monolib_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_taskbar.obj: ..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8325,10 +8727,8 @@ $(OBJS)\monolib_timercmn.obj: ..\src\common\timercmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_tipwin.obj: ..\src\generic\tipwin.cpp @@ -8400,8 +8800,10 @@ $(OBJS)\monolib_uuid.obj: ..\src\msw\ole\uuid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_uxtheme.obj: ..\src\msw\uxtheme.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_valgen.obj: ..\src\common\valgen.cpp @@ -8434,10 +8836,8 @@ $(OBJS)\monolib_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wave.obj: ..\src\msw\wave.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_wfstream.obj: ..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8461,10 +8861,8 @@ $(OBJS)\monolib_winpars.obj: ..\src\html\winpars.cpp $(OBJS)\monolib_winuniv.obj: ..\src\univ\winuniv.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wizard.obj: ..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_wxchar.obj: ..\src\common\wxchar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8483,6 +8881,102 @@ $(OBJS)\monolib_zipstrm.obj: ..\src\common\zipstrm.cpp $(OBJS)\monolib_zstream.obj: ..\src\common\zstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\netdll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\netdll_fs_inet.obj: ..\src\common\fs_inet.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_ftp.obj: ..\src\common\ftp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_gsocket.obj: ..\src\msw\gsocket.c + $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $** + +$(OBJS)\netdll_gsockmsw.obj: ..\src\msw\gsockmsw.c + $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $** + +$(OBJS)\netdll_http.obj: ..\src\common\http.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_protocol.obj: ..\src\common\protocol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckaddr.obj: ..\src\common\sckaddr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckfile.obj: ..\src\common\sckfile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckipc.obj: ..\src\common\sckipc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckstrm.obj: ..\src\common\sckstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_socket.obj: ..\src\common\socket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_url.obj: ..\src\common\url.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\netlib_fs_inet.obj: ..\src\common\fs_inet.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_ftp.obj: ..\src\common\ftp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_gsocket.obj: ..\src\msw\gsocket.c + $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $** + +$(OBJS)\netlib_gsockmsw.obj: ..\src\msw\gsockmsw.c + $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $** + +$(OBJS)\netlib_http.obj: ..\src\common\http.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_protocol.obj: ..\src\common\protocol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckaddr.obj: ..\src\common\sckaddr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckfile.obj: ..\src\common\sckfile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckipc.obj: ..\src\common\sckipc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckstrm.obj: ..\src\common\sckstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_socket.obj: ..\src\common\socket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_url.obj: ..\src\common\url.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\odbcdll_db.obj: ..\src\common\db.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $** + +$(OBJS)\odbcdll_dbtable.obj: ..\src\common\dbtable.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $** + +$(OBJS)\odbcdll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\odbclib_db.obj: ..\src\common\db.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $** + +$(OBJS)\odbclib_dbtable.obj: ..\src\common\dbtable.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $** + +$(OBJS)\odbclib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) /Ycwx/wxprec.h $** + $(OBJS)\wxexpat_xmlparse.obj: ..\src\expat\lib\xmlparse.c $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $** @@ -8846,9 +9340,24 @@ $(OBJS)\xmllib_dummy.obj: ..\src\msw\dummy.cpp $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $** +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< + $(ADVDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(ADVLIB_OBJECTS) +<< +!endif + !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(BASEDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -8876,9 +9385,21 @@ clean: -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib @@ -8891,7 +9412,7 @@ clean: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(COREDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib << !endif @@ -8904,9 +9425,24 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li << !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< + $(DBGRIDDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(DBGRIDLIB_OBJECTS) +<< +!endif + !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(GLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib << !endif @@ -8921,7 +9457,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(HTMLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib << !endif @@ -8942,8 +9478,8 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< - $(MONODLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< + $(MONODLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -8958,6 +9494,36 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( ..\include\wx\msw\setup.h: if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< + $(NETDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(NETLIB_OBJECTS) +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< + $(ODBCDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(ODBCLIB_OBJECTS) +<< +!endif + $(LIBDIRNAME)\wx\setup.h: if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h @@ -9006,8 +9572,8 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) << !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< $(XMLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib << !endif