From 7f9d2f2aaf13fb20b24d8630040fa45388211a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 19 Oct 2005 16:56:27 +0000 Subject: [PATCH] richtext.bkl added and dmars makefiles removed. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/richtext/makefile.dmc | 45 -------- samples/richtext/makefile.dms | 207 ---------------------------------- samples/richtext/richtext.bkl | 17 +++ 3 files changed, 17 insertions(+), 252 deletions(-) delete mode 100644 samples/richtext/makefile.dmc delete mode 100644 samples/richtext/makefile.dms create mode 100644 samples/richtext/richtext.bkl diff --git a/samples/richtext/makefile.dmc b/samples/richtext/makefile.dmc deleted file mode 100644 index d476f91299..0000000000 --- a/samples/richtext/makefile.dmc +++ /dev/null @@ -1,45 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.1.9 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.dmc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 27 -OBJS = dmc_mswd$(CFG) -LIBTYPE_SUFFIX = lib -LIBDIRNAME = .\..\..\lib\dmc_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = $(LIBDIRNAME)\mswd -RICHTEXT_CXXFLAGS = -g -o+none -D_WIN32_WINNT=0x0400 -D__WXMSW__ -D__WXDEBUG__ \ - -I.\..\..\include -I$(SETUPHDIR) -w- -I. -WA -I.\..\..\samples -DNOPCH -Ar -Ae \ - $(CPPFLAGS) $(CXXFLAGS) -RICHTEXT_OBJECTS = \ - $(OBJS)\richtext_richtext.obj - -### Targets: ### - -all : $(OBJS)\richtext.exe - -clean : - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.sym del $(OBJS)\*.sym - -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe - -if exist $(OBJS)\richtext.map del $(OBJS)\richtext.map - -$(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_richtext.res - link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS) /DEBUG /CODEVIEW /su:windows:4.0 $(RICHTEXT_OBJECTS),$@,$(OBJS)\richtext.map, $(LIBDIRNAME)\ wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_adv.lib wxbase$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_xml.lib wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_html.lib wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_core.lib wxbase$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR).lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ,, $(OBJS)\richtext_richtext.res - -$(OBJS)\richtext_richtext.obj : .\richtext.cpp - $(CXX) -mn -c -cpp -o$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp - -$(OBJS)\richtext_richtext.res : .\richtext.rc - rcc $** -o$@ -D_WIN32_WINNT=0x0400 -D__WXMSW__ -D__WXDEBUG__ -I.\..\..\include -I$(SETUPHDIR) -I. -I.\..\..\samples -DNOPCH -32 -v- - diff --git a/samples/richtext/makefile.dms b/samples/richtext/makefile.dms deleted file mode 100644 index 56ef62b3cb..0000000000 --- a/samples/richtext/makefile.dms +++ /dev/null @@ -1,207 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.1.9 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.LONGCOMMANDLINE: dmc link lib smake - -!include ../../build/msw/config.dms - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" -!if "$(DEBUG_FLAG)" == "default" -WXDEBUGFLAG = d -!endif -!endif -!if "$(DEBUG_FLAG)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" -!if "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -g -!endif -!endif -!if "$(BUILD)" == "release" -!if "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = -g -!endif -!if "$(BUILD)" == "debug" -!if "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG /CODEVIEW -!endif -!endif -!if "$(BUILD)" == "release" -!if "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG /CODEVIEW -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -o+none -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -o -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_5 = -ND -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_5 = -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_6 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_6 = -Ar -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_7 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_7 = -Ae -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(BUILD)" == "debug" -!if "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p = -D__WXDEBUG__ -!endif -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p = -D__WXDEBUG__ -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 27 -OBJS = dmc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\dmc_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -RICHTEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__RUNTIME_LIBS_5) -D_WIN32_WINNT=0x0400 -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -w- -I. $(__DLLFLAG_p) -WA -I.\..\..\samples -DNOPCH $(__RTTIFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) -RICHTEXT_OBJECTS = $(OBJS)\richtext_richtext.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - - -all : $(OBJS)\richtext.exe - -clean : - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.sym del $(OBJS)\*.sym - -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe - -if exist $(OBJS)\richtext.map del $(OBJS)\richtext.map - -$(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_richtext.res - link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS) $(__DEBUGINFO_1) /su:windows:4.0 $(RICHTEXT_OBJECTS),$@,$(OBJS)\richtext.map, $(LIBDIRNAME)\ $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ,, $(OBJS)\richtext_richtext.res - -$(OBJS)\richtext_richtext.obj : .\richtext.cpp - $(CXX) -mn -c -cpp -o$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp - -$(OBJS)\richtext_richtext.res : .\richtext.rc - rcc $** -o$@ -D_WIN32_WINNT=0x0400 -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH -32 -v- diff --git a/samples/richtext/richtext.bkl b/samples/richtext/richtext.bkl new file mode 100644 index 0000000000..d3147138e2 --- /dev/null +++ b/samples/richtext/richtext.bkl @@ -0,0 +1,17 @@ + + + + + + + + richtext.cpp + + html + adv + core + xml + base + + +