Reuse common sample resources. Remove unused files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
parent
e83844692e
commit
1226b3b335
@ -47,9 +47,9 @@ RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
RICHTEXT_OBJECTS = \
|
||||
$(__richtext___win32rc) \
|
||||
$(__richtext_os2_lib_res) \
|
||||
richtext_richtext.o
|
||||
richtext_richtext.o \
|
||||
$(__richtext___win32rc)
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@ -92,7 +92,6 @@ COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_PLATFORM_WIN32_1@__richtext___win32rc = richtext_sample_rc.o
|
||||
@COND_PLATFORM_OS2_1@__richtext_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__richtext_bundle___depname = richtext_bundle
|
||||
@ -118,6 +117,7 @@ COND_MONOLITHIC_0___WXLIB_XML_p = \
|
||||
COND_MONOLITHIC_0___WXLIB_BASE_p = \
|
||||
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
|
||||
@COND_PLATFORM_WIN32_1@__richtext___win32rc = richtext_sample_rc.o
|
||||
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
||||
@ -194,12 +194,12 @@ richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@richtext_bundle: $(____richtext_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
richtext_sample_rc.o: $(srcdir)/../../samples/sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
|
||||
|
||||
richtext_richtext.o: $(srcdir)/richtext.cpp
|
||||
$(CXXC) -c -o $@ $(RICHTEXT_CXXFLAGS) $(srcdir)/richtext.cpp
|
||||
|
||||
richtext_sample_rc.o: $(srcdir)/../sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
/* XPM */
|
||||
static const char *sample_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 6 1",
|
||||
" c black",
|
||||
". c navy",
|
||||
"X c red",
|
||||
"o c yellow",
|
||||
"O c gray100",
|
||||
"+ c None",
|
||||
/* pixels */
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++ ++++++++++",
|
||||
"++++++++ ............ ++++++++++",
|
||||
"++++++++ ............ ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO...... ",
|
||||
"++++++++ .OO...... oooooooooooo ",
|
||||
" .OO...... oooooooooooo ",
|
||||
" XXXXXXX .OO...... oOOooooooooo ",
|
||||
" XXXXXXX .OO...... oOOooooooooo ",
|
||||
" XOOXXXX ......... oOOooooooooo ",
|
||||
" XOOXXXX ......... oOOooooooooo ",
|
||||
" XOOXXXX oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oooooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oooooooooooo ",
|
||||
" XXXXXXXXXXXX ++++ ",
|
||||
" XXXXXXXXXXXX ++++++++++++++++++",
|
||||
" ++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++"
|
||||
};
|
||||
@ -233,9 +233,9 @@ $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
|
||||
c0w32.obj $(RICHTEXT_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\richtext_sample.res
|
||||
|
|
||||
|
||||
$(OBJS)\richtext_sample.res: .\..\..\samples\sample.rc
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
|
||||
|
||||
$(OBJS)\richtext_richtext.obj: .\richtext.cpp
|
||||
$(CXX) -q -c -P -o$@ $(RICHTEXT_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\richtext_sample.res: .\..\sample.rc
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
|
||||
|
||||
|
||||
@ -27,8 +27,8 @@ RICHTEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
|
||||
-DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
RICHTEXT_OBJECTS = \
|
||||
$(OBJS)\richtext_sample_rc.o \
|
||||
$(OBJS)\richtext_richtext.o
|
||||
$(OBJS)\richtext_richtext.o \
|
||||
$(OBJS)\richtext_sample_rc.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@ -226,12 +226,12 @@ clean:
|
||||
$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample_rc.o
|
||||
$(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
|
||||
|
||||
$(OBJS)\richtext_sample_rc.o: ./../../samples/sample.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
|
||||
|
||||
$(OBJS)\richtext_richtext.o: ./richtext.cpp
|
||||
$(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\richtext_sample_rc.o: ./../sample.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
|
||||
|
||||
.PHONY: all clean
|
||||
|
||||
|
||||
|
||||
@ -27,8 +27,8 @@ RICHTEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
/I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
RICHTEXT_OBJECTS = \
|
||||
$(OBJS)\richtext_sample.res \
|
||||
$(OBJS)\richtext_richtext.obj
|
||||
$(OBJS)\richtext_richtext.obj \
|
||||
$(OBJS)\richtext_sample.res
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@ -308,9 +308,9 @@ $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
|
||||
$(RICHTEXT_OBJECTS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
|
||||
<<
|
||||
|
||||
$(OBJS)\richtext_sample.res: .\..\..\samples\sample.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
|
||||
|
||||
$(OBJS)\richtext_richtext.obj: .\richtext.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXT_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\richtext_sample.res: .\..\sample.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
|
||||
|
||||
|
||||
273
samples/richtext/makefile.wat
Normal file
273
samples/richtext/makefile.wat
Normal file
@ -0,0 +1,273 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
!include ../../build/msw/config.wat
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
# Speed up compilation a bit:
|
||||
!ifdef __LOADDLL__
|
||||
! loaddll wcc wccd
|
||||
! loaddll wccaxp wccdaxp
|
||||
! loaddll wcc386 wccd386
|
||||
! loaddll wpp wppdi86
|
||||
! loaddll wppaxp wppdaxp
|
||||
! loaddll wpp386 wppd386
|
||||
! loaddll wlink wlink
|
||||
! loaddll wlib wlibd
|
||||
!endif
|
||||
|
||||
# We need these variables in some bakefile-made rules:
|
||||
WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
PORTNAME =
|
||||
!ifeq USE_GUI 0
|
||||
PORTNAME = base
|
||||
!endif
|
||||
!ifeq USE_GUI 1
|
||||
PORTNAME = msw
|
||||
!endif
|
||||
WXDEBUGFLAG =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_FLAG default
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_FLAG 1
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
WXUNICODEFLAG =
|
||||
!ifeq UNICODE 1
|
||||
WXUNICODEFLAG = u
|
||||
!endif
|
||||
WXUNIVNAME =
|
||||
!ifeq WXUNIV 1
|
||||
WXUNIVNAME = univ
|
||||
!endif
|
||||
WXDLLFLAG =
|
||||
!ifeq SHARED 1
|
||||
WXDLLFLAG = dll
|
||||
!endif
|
||||
LIBTYPE_SUFFIX =
|
||||
!ifeq SHARED 0
|
||||
LIBTYPE_SUFFIX = lib
|
||||
!endif
|
||||
!ifeq SHARED 1
|
||||
LIBTYPE_SUFFIX = dll
|
||||
!endif
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!ifeq MONOLITHIC 0
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
!ifeq MONOLITHIC 1
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
__DEBUGINFO_0 =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_0 = -d2
|
||||
!endif
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_0 = -d0
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 0
|
||||
__DEBUGINFO_0 = -d0
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 1
|
||||
__DEBUGINFO_0 = -d2
|
||||
!endif
|
||||
__DEBUGINFO_1 =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_1 = debug all
|
||||
!endif
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
!ifeq DEBUG_INFO default
|
||||
__DEBUGINFO_1 =
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 0
|
||||
__DEBUGINFO_1 =
|
||||
!endif
|
||||
!ifeq DEBUG_INFO 1
|
||||
__DEBUGINFO_1 = debug all
|
||||
!endif
|
||||
__OPTIMIZEFLAG_2 =
|
||||
!ifeq BUILD debug
|
||||
__OPTIMIZEFLAG_2 = -od
|
||||
!endif
|
||||
!ifeq BUILD release
|
||||
__OPTIMIZEFLAG_2 = -ot -ox
|
||||
!endif
|
||||
__THREADSFLAG_5 =
|
||||
!ifeq USE_THREADS 0
|
||||
__THREADSFLAG_5 =
|
||||
!endif
|
||||
!ifeq USE_THREADS 1
|
||||
__THREADSFLAG_5 = -bm
|
||||
!endif
|
||||
__RUNTIME_LIBS_6 =
|
||||
!ifeq RUNTIME_LIBS dynamic
|
||||
__RUNTIME_LIBS_6 = -br
|
||||
!endif
|
||||
!ifeq RUNTIME_LIBS static
|
||||
__RUNTIME_LIBS_6 =
|
||||
!endif
|
||||
__RTTIFLAG_7 =
|
||||
!ifeq USE_RTTI 0
|
||||
__RTTIFLAG_7 =
|
||||
!endif
|
||||
!ifeq USE_RTTI 1
|
||||
__RTTIFLAG_7 = -xr
|
||||
!endif
|
||||
__EXCEPTIONSFLAG_8 =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONSFLAG_8 =
|
||||
!endif
|
||||
!ifeq USE_EXCEPTIONS 1
|
||||
__EXCEPTIONSFLAG_8 = -xs
|
||||
!endif
|
||||
__WXLIB_RICHTEXT_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_RICHTEXT_p = &
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
|
||||
!endif
|
||||
__WXLIB_ADV_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_ADV_p = &
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
|
||||
!endif
|
||||
__WXLIB_HTML_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_HTML_p = &
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
|
||||
!endif
|
||||
__WXLIB_CORE_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_CORE_p = &
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
|
||||
!endif
|
||||
__WXLIB_XML_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_XML_p = &
|
||||
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
|
||||
!endif
|
||||
__WXLIB_BASE_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_BASE_p = &
|
||||
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
!endif
|
||||
__WXLIB_MONO_p =
|
||||
!ifeq MONOLITHIC 1
|
||||
__WXLIB_MONO_p = &
|
||||
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
||||
!endif
|
||||
__LIB_TIFF_p =
|
||||
!ifeq USE_GUI 1
|
||||
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
__LIB_JPEG_p =
|
||||
!ifeq USE_GUI 1
|
||||
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
__LIB_PNG_p =
|
||||
!ifeq USE_GUI 1
|
||||
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
__WXUNIV_DEFINE_p =
|
||||
!ifeq WXUNIV 1
|
||||
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
|
||||
!endif
|
||||
__DEBUG_DEFINE_p =
|
||||
!ifeq BUILD debug
|
||||
!ifeq DEBUG_FLAG default
|
||||
__DEBUG_DEFINE_p = -d__WXDEBUG__
|
||||
!endif
|
||||
!endif
|
||||
!ifeq DEBUG_FLAG 1
|
||||
__DEBUG_DEFINE_p = -d__WXDEBUG__
|
||||
!endif
|
||||
__EXCEPTIONS_DEFINE_p =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
|
||||
!endif
|
||||
__RTTI_DEFINE_p =
|
||||
!ifeq USE_RTTI 0
|
||||
__RTTI_DEFINE_p = -dwxNO_RTTI
|
||||
!endif
|
||||
__THREAD_DEFINE_p =
|
||||
!ifeq USE_THREADS 0
|
||||
__THREAD_DEFINE_p = -dwxNO_THREADS
|
||||
!endif
|
||||
__UNICODE_DEFINE_p =
|
||||
!ifeq UNICODE 1
|
||||
__UNICODE_DEFINE_p = -d_UNICODE
|
||||
!endif
|
||||
__DLLFLAG_p =
|
||||
!ifeq SHARED 1
|
||||
__DLLFLAG_p = -dWXUSINGDLL
|
||||
!endif
|
||||
|
||||
### Variables: ###
|
||||
|
||||
WX_RELEASE_NODOT = 27
|
||||
OBJS = &
|
||||
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = &
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
RICHTEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
|
||||
$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -wx -wcd=549 &
|
||||
-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
|
||||
$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
|
||||
RICHTEXT_OBJECTS = &
|
||||
$(OBJS)\richtext_richtext.obj
|
||||
|
||||
|
||||
all : $(OBJS)
|
||||
$(OBJS) :
|
||||
-if not exist $(OBJS) mkdir $(OBJS)
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all : .SYMBOLIC $(OBJS)\richtext.exe
|
||||
|
||||
clean : .SYMBOLIC
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
-if exist $(OBJS)\*.res del $(OBJS)\*.res
|
||||
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
|
||||
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
|
||||
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
|
||||
-if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe
|
||||
|
||||
$(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res
|
||||
@%create $(OBJS)\richtext.lbc
|
||||
@%append $(OBJS)\richtext.lbc option quiet
|
||||
@%append $(OBJS)\richtext.lbc name $^@
|
||||
@%append $(OBJS)\richtext.lbc option caseexact
|
||||
@%append $(OBJS)\richtext.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i
|
||||
@for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\richtext.lbc library %i
|
||||
@%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res
|
||||
@for %i in () do @%append $(OBJS)\richtext.lbc option stack=%i
|
||||
wlink @$(OBJS)\richtext.lbc
|
||||
|
||||
$(OBJS)\richtext_richtext.obj : .AUTODEPEND .\richtext.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\richtext_sample.res : .AUTODEPEND .\..\sample.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>xml</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>../sample.rc</win32-res>
|
||||
</exe>
|
||||
|
||||
</makefile>
|
||||
|
||||
@ -35,7 +35,10 @@
|
||||
#include "wx/sstream.h"
|
||||
#include "wx/html/htmlwin.h"
|
||||
|
||||
#include "bitmaps/sample.xpm"
|
||||
#ifndef __WXMSW__
|
||||
#include "../sample.xpm"
|
||||
#endif
|
||||
|
||||
#include "bitmaps/smiley.xpm"
|
||||
// #include "bitmaps/idea.xpm"
|
||||
#include "bitmaps/zebra.xpm"
|
||||
@ -384,7 +387,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
|
||||
: wxFrame(NULL, id, title, pos, size, style)
|
||||
{
|
||||
// set the frame icon
|
||||
SetIcon(sample_xpm);
|
||||
SetIcon(wxICON(sample));
|
||||
|
||||
// create a menu bar
|
||||
wxMenu *fileMenu = new wxMenu;
|
||||
|
||||
@ -472,7 +472,7 @@ SOURCE=.\richtext.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\..\..\samples\sample.rc
|
||||
SOURCE=.\..\sample.rc
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
aaaa ICON "../sample.ico"
|
||||
#include "wx/msw/wx.rc"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user