diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt index a016e010a0..7901834269 100644 --- a/build/cmake/samples/CMakeLists.txt +++ b/build/cmake/samples/CMakeLists.txt @@ -89,7 +89,6 @@ wx_add_sample(layout layout.cpp layout.h) wx_add_sample(listctrl listtest.cpp listtest.h RES listtest.rc DEPENDS wxUSE_LISTCTRL) wx_add_sample(mdi mdi.cpp mdi.h RES mdi.rc DEPENDS wxUSE_MDI wxUSE_DOC_VIEW_ARCHITECTURE wxUSE_MDI_ARCHITECTURE) wx_add_sample(mediaplayer LIBRARIES wxmedia DEPENDS wxUSE_MEDIACTRL) -wx_add_sample(memcheck) wx_add_sample(menu DEPENDS wxUSE_MENUS wxUSE_MENUBAR) wx_add_sample(minimal IMPORTANT) wx_add_sample(notebook notebook.cpp notebook.h LIBRARIES wxaui DEPENDS wxUSE_NOTEBOOK) diff --git a/configure b/configure index 8c4b25236b..398ed09890 100755 --- a/configure +++ b/configure @@ -35642,7 +35642,6 @@ if test "$wxUSE_MEM_TRACING" = "yes" ; then $as_echo "#define wxUSE_DEBUG_NEW_ALWAYS 1" >>confdefs.h - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" fi if test "$wxUSE_DMALLOC" = "yes" ; then diff --git a/configure.in b/configure.in index dbf5cd271f..f06951dafd 100644 --- a/configure.in +++ b/configure.in @@ -4801,7 +4801,6 @@ if test "$wxUSE_MEM_TRACING" = "yes" ; then AC_DEFINE(wxUSE_MEMORY_TRACING) AC_DEFINE(wxUSE_GLOBAL_MEMORY_OPERATORS) AC_DEFINE(wxUSE_DEBUG_NEW_ALWAYS) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" fi if test "$wxUSE_DMALLOC" = "yes" ; then diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h index 97565a9cde..6a4115b0f5 100644 --- a/docs/doxygen/mainpages/samples.h +++ b/docs/doxygen/mainpages/samples.h @@ -506,14 +506,6 @@ It replaces the old @c dynamic sample. @sampledir{mediaplayer} -@section page_samples_memcheck Memory Checking Sample - -@sampleabout{memory tracing using wxDebugContext} - -@sampledir{memcheck} - -@buildwith{wxUSE_MEMORY_TRACING, wxUSE_DEBUG_CONTEXT} - @section page_samples_menu Menu Sample @sampleabout{wxMenu classes} diff --git a/samples/makefile.gcc b/samples/makefile.gcc index b01d19ac3f..5c6353e79b 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -167,7 +167,6 @@ clean: $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean access: $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all @@ -448,9 +447,6 @@ xrc: endif endif -memcheck: - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all - .PHONY: all clean access animate archive artprov aui calendar caret clipboard \ collpane combo config console dataview dialogs dialup display dll dnd docview \ dragimag drawing erase event except exec font grid help htlbox html image internat \ @@ -459,7 +455,7 @@ memcheck: regtest render ribbon richtext sashtest scroll secretstore shaped sockets sound \ splash splitter statbar stc svg taborder taskbar text thread toolbar treelist \ treectrl typetest uiaction validate vscroll webview webrequest widgets wizard \ - wrapsizer xrc memcheck + wrapsizer xrc SHELL := $(COMSPEC) diff --git a/samples/makefile.vc b/samples/makefile.vc index 1b2fe47870..67ca5e35e2 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -333,9 +333,6 @@ clean: cd mfc $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" - cd memcheck - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" sub_access: cd access @@ -783,8 +780,3 @@ sub_mfc: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -sub_memcheck: - cd memcheck - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in deleted file mode 100644 index 54ebc97cd6..0000000000 --- a/samples/memcheck/Makefile.in +++ /dev/null @@ -1,193 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.13 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - -@MAKE_SET@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datarootdir = @datarootdir@ -INSTALL = @INSTALL@ -EXEEXT = @EXEEXT@ -WINDRES = @WINDRES@ -NM = @NM@ -BK_DEPS = @BK_DEPS@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -LIBS = @LIBS@ -LDFLAGS_GUI = @LDFLAGS_GUI@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -USE_DPI_AWARE_MANIFEST = @USE_DPI_AWARE_MANIFEST@ -WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ -TOOLKIT = @TOOLKIT@ -TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ -EXTRALIBS = @EXTRALIBS@ -EXTRALIBS_XML = @EXTRALIBS_XML@ -EXTRALIBS_GUI = @EXTRALIBS_GUI@ -WX_CPPFLAGS = @WX_CPPFLAGS@ -WX_CXXFLAGS = @WX_CXXFLAGS@ -WX_LDFLAGS = @WX_LDFLAGS@ -HOST_SUFFIX = @HOST_SUFFIX@ -SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ -SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@ -wx_top_builddir = @wx_top_builddir@ - -### Variables: ### - -DESTDIR = -WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).0 -LIBDIRNAME = $(wx_top_builddir)/lib -MEMCHECK_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ - $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -MEMCHECK_OBJECTS = \ - $(__memcheck___win32rc) \ - memcheck_memcheck.o - -### Conditionally set variables: ### - -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) -@COND_USE_GUI_0@PORTNAME = base -@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_debug@WXDEBUGFLAG = d -@COND_WXUNIV_1@WXUNIVNAME = univ -@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ -@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) -@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL -@COND_PLATFORM_WIN32_1@__WIN32_DPI_MANIFEST_p = \ -@COND_PLATFORM_WIN32_1@ --define \ -@COND_PLATFORM_WIN32_1@ wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) -COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd = $(NM) memcheck$(EXEEXT) | if \ - grep -q pmwin.763 ; then emxbind -ep memcheck$(EXEEXT) ; fi -@COND_PLATFORM_OS2_1@__memcheck___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_sample_rc.o -@COND_PLATFORM_MACOSX_1@__memcheck_app_Contents_PkgInfo___depname \ -@COND_PLATFORM_MACOSX_1@ = memcheck.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1@__memcheck_bundle___depname = memcheck_bundle -@COND_TOOLKIT_MAC@____memcheck_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_MAC@ $(__memcheck_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_CARBON@____memcheck_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_CARBON@ = $(__memcheck_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_COCOA@____memcheck_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_COCOA@ = $(__memcheck_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_IPHONE@____memcheck_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_IPHONE@ = $(__memcheck_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_COCOA@____memcheck_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ $(__memcheck_app_Contents_PkgInfo___depname) -COND_MONOLITHIC_0___WXLIB_CORE_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) -COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \ -@COND_MONOLITHIC_1_USE_STC_1@ = \ -@COND_MONOLITHIC_1_USE_STC_1@ -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ -@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ -@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ -@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ -@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ -@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = \ -@COND_wxUSE_REGEX_builtin@ -lwxregexu$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \ -@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) - -### Targets: ### - -all: memcheck$(EXEEXT) $(__memcheck_bundle___depname) - -install: - -uninstall: - -install-strip: install - -clean: - rm -rf ./.deps ./.pch - rm -f ./*.o - rm -f memcheck$(EXEEXT) - rm -rf memcheck.app - -distclean: clean - rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile - -memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) - $(CXX) -o $@ $(MEMCHECK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - $(__memcheck___os2_emxbindcmd) - -@COND_PLATFORM_MACOSX_1@memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns -@COND_PLATFORM_MACOSX_1@ mkdir -p memcheck.app/Contents -@COND_PLATFORM_MACOSX_1@ mkdir -p memcheck.app/Contents/MacOS -@COND_PLATFORM_MACOSX_1@ mkdir -p memcheck.app/Contents/Resources -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.memcheck/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/memcheck/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/memcheck/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/memcheck version $(WX_VERSION), (c) 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >memcheck.app/Contents/Info.plist -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >memcheck.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns - -@COND_PLATFORM_MACOSX_1@memcheck_bundle: $(____memcheck_BUNDLE_TGT_REF_DEP) - -memcheck_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include - -memcheck_memcheck.o: $(srcdir)/memcheck.cpp - $(CXXC) -c -o $@ $(MEMCHECK_CXXFLAGS) $(srcdir)/memcheck.cpp - - -# Include dependency info, if present: -@IF_GNU_MAKE@-include ./.deps/*.d - -.PHONY: all install uninstall clean distclean memcheck_bundle diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc deleted file mode 100644 index db75a1dbdc..0000000000 --- a/samples/memcheck/makefile.gcc +++ /dev/null @@ -1,217 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.13 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 33 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG) -MEMCHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \ - -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -MEMCHECK_OBJECTS = \ - $(OBJS)\memcheck_sample_rc.o \ - $(OBJS)\memcheck_memcheck.o - -### Conditionally set variables: ### - -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw$(TOOLKIT_VERSION) -endif -ifeq ($(OFFICIAL_BUILD),1) -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p = -DNDEBUG -endif -ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p_1 = --define NDEBUG -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(USE_CAIRO),1) -____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo -endif -ifeq ($(USE_CAIRO),1) -__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = -lwxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -ifeq ($(USE_STC),1) -__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) -endif -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(USE_CAIRO),1) -__CAIRO_LIB_p = -lcairo -endif -ifeq ($(USE_CAIRO),1) -____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\memcheck.exe - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe - -$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_sample_rc.o - $(foreach f,$(subst \,/,$(MEMCHECK_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) - @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme - @-del $@.rsp - -$(OBJS)\memcheck_sample_rc.o: ./../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH - -$(OBJS)\memcheck_memcheck.o: ./memcheck.cpp - $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all clean - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx deleted file mode 100644 index a5600b1951..0000000000 --- a/samples/memcheck/makefile.unx +++ /dev/null @@ -1,100 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.13 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C++ compiler -CXX = `$(WX_CONFIG) --cxx` - -# Standard flags for C++ -CXXFLAGS ?= - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS ?= - -# Standard linker flags -LDFLAGS ?= - -# Location and arguments of wx-config script -WX_CONFIG ?= wx-config - -# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb] -WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) - -# Use DLL build of wx library to use? [0,1] -WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi) - -# Compile Unicode build of wxWidgets? [0,1] -WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/') - -# Version of the wx library to build against. -WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/') - - - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP -WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) -WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) -WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \ - --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -MEMCHECK_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \ - $(CXXFLAGS) -MEMCHECK_OBJECTS = \ - memcheck_memcheck.o - -### Conditionally set variables: ### - -ifeq ($(WX_UNICODE),0) -WX_CONFIG_UNICODE_FLAG = --unicode=no -endif -ifeq ($(WX_UNICODE),1) -WX_CONFIG_UNICODE_FLAG = --unicode=yes -endif -ifeq ($(WX_SHARED),0) -WX_CONFIG_SHARED_FLAG = --static=yes -endif -ifeq ($(WX_SHARED),1) -WX_CONFIG_SHARED_FLAG = --static=no -endif - - -### Targets: ### - -all: test_for_selected_wxbuild memcheck - -install: - -uninstall: - -clean: - rm -f ./*.o - rm -f ./*.d - rm -f memcheck - -test_for_selected_wxbuild: - @$(WX_CONFIG) $(WX_CONFIG_FLAGS) - -memcheck: $(MEMCHECK_OBJECTS) - $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` - -memcheck_memcheck.o: ./memcheck.cpp - $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all install uninstall clean - - -# Dependencies tracking: --include ./*.d diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc deleted file mode 100644 index 3719dd0a91..0000000000 --- a/samples/memcheck/makefile.vc +++ /dev/null @@ -1,420 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.13 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 33 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG) -MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(____DEBUGRUNTIME_3_p) \ - $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) -MEMCHECK_OBJECTS = \ - $(OBJS)\memcheck_memcheck.obj -MEMCHECK_RESOURCES = \ - $(OBJS)\memcheck_sample.res - -### Conditionally set variables: ### - -!if "$(TARGET_CPU)" == "AMD64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "ARM64" -ARCH_SUFFIX = _arm64 -!endif -!if "$(TARGET_CPU)" == "IA64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "X64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "amd64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "arm64" -ARCH_SUFFIX = _arm64 -!endif -!if "$(TARGET_CPU)" == "ia64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "x64" -ARCH_SUFFIX = _x64 -!endif -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw$(TOOLKIT_VERSION) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "ARM64" -LINK_TARGET_CPU = /MACHINE:ARM64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "X64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "arm64" -LINK_TARGET_CPU = /MACHINE:ARM64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "x64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "14.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "15.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "16.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "1" && "$(VISUALSTUDIOVERSION)" == "17.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware.manifest -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "14.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "15.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "16.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest -!endif -!if "$(USE_DPI_AWARE_MANIFEST)" == "2" && "$(VISUALSTUDIOVERSION)" == "17.0" -WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \ - /MANIFESTINPUT:./../../include/wx/msw/wx_dpi_aware_pmv2.manifest -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_3_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_3_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_3_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_3_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_4 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_4 = d -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_5 = -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_5 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_5 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_5 = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_6 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_6 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_9 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_9 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_10 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_11 = /GR- -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_11 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_12 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_12 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(TARGET_CPU)" == "" -__TARGET_CPU_COMPFLAG_p = /DTARGET_CPU_COMPFLAG=0 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -__TARGET_CPU_COMPFLAG_p = -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -__TARGET_CPU_COMPFLAG_p = -!endif -!if "$(TARGET_CPU)" == "" -__TARGET_CPU_COMPFLAG_p_1 = /d TARGET_CPU_COMPFLAG=0 -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -__TARGET_CPU_COMPFLAG_p_1 = -!endif -!if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -__TARGET_CPU_COMPFLAG_p_1 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p_1 = /d NDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p_1 = /d NDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(USE_CAIRO)" == "1" -__CAIRO_LIB_p = cairo.lib -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\memcheck.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe - -if exist $(OBJS)\memcheck.ilk del $(OBJS)\memcheck.ilk - -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb - -$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< - $(MEMCHECK_OBJECTS) $(MEMCHECK_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib -<< - -$(OBJS)\memcheck_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp - diff --git a/samples/memcheck/memcheck.bkl b/samples/memcheck/memcheck.bkl deleted file mode 100644 index 1363745558..0000000000 --- a/samples/memcheck/memcheck.bkl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - memcheck.cpp - core - base - - - diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp deleted file mode 100644 index c8663ed3a9..0000000000 --- a/samples/memcheck/memcheck.cpp +++ /dev/null @@ -1,134 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: memcheck.cpp -// Purpose: Memory-checking sample -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#include "wx/datetime.h" - -#ifndef wxHAS_IMAGES_IN_RESOURCES - #include "../sample.xpm" -#endif - -#ifndef __WXDEBUG__ -#error This program must be compiled in debug mode. -#endif - -// Normally, new is automatically defined to be the -// debugging version. If not, this does it. -#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_MEMORY_TRACING && wxUSE_GLOBAL_MEMORY_OPERATORS -#define new WXDEBUG_NEW -#endif - -// Define a new application type -class MyApp: public wxApp -{ public: - bool OnInit(void) override; -}; - -// Define a new frame type -class MyFrame: public wxFrame -{ public: - MyFrame(wxFrame *parent); - void OnQuit(wxCommandEvent& event); - - wxDECLARE_EVENT_TABLE(); -}; - -wxIMPLEMENT_APP(MyApp); - -// `Main program' equivalent, creating windows and returning main app frame -bool MyApp::OnInit(void) -{ - if ( !wxApp::OnInit() ) - return false; - - // Create the main frame window - MyFrame *frame = new MyFrame(nullptr); - - // Give it an icon - frame->SetIcon(wxICON(sample)); - - // Make a menubar - wxMenu *file_menu = new wxMenu; - - file_menu->Append(wxID_EXIT, "E&xit"); - wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "File"); - frame->SetMenuBar(menu_bar); - - // Make a panel with a message - wxPanel *panel = new wxPanel(frame); - - (void)new wxStaticText(panel, wxID_ANY, "Hello, this is a minimal debugging wxWidgets program!", wxPoint(10, 10)); - - // Show the frame - frame->Show(true); - -#if wxUSE_MEMORY_TRACING - wxDebugContext::SetCheckpoint(); -#endif - - // object allocation - wxBrush* brush = new wxBrush(*wxRED_BRUSH); - wxBitmap* bitmap = new wxBitmap(100, 100); - - // non-object allocation - char *ordinaryNonObject = new char[1000]; - - wxString *thing = new wxString; - -#if wxUSE_DATETIME - wxDateTime* date = new wxDateTime; -#endif // wxUSE_DATETIME - - const char *data = (const char*) thing ; - -#if wxUSE_MEMORY_TRACING - // On MSW, Dump() crashes if using wxLogGui, - // so use wxLogStderr instead. - wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr); - - wxDebugContext::PrintClasses(); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - - // Set back to wxLogGui - delete wxLog::SetActiveTarget(oldLog); -#endif - - // Don't delete these objects, to force wxApp to flag a memory leak. -// delete thing; -// delete date; -// delete[] ordinaryNonObject; - - return true; -} - -wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(wxID_EXIT, MyFrame::OnQuit) -wxEND_EVENT_TABLE() - -// My frame constructor -MyFrame::MyFrame(wxFrame *parent): - wxFrame(parent, wxID_ANY, "MemCheck wxWidgets Sample", wxDefaultPosition, wxSize(400, 200)) -{} - -// Intercept menu commands -void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) -{ - Close(true); -} - diff --git a/samples/samples.bkl b/samples/samples.bkl index 24e25131e8..33eed136a6 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -97,15 +97,12 @@ -