diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h
index 0b9f20d5b9..1d755e15c4 100644
--- a/docs/doxygen/overviews/bitmap.h
+++ b/docs/doxygen/overviews/bitmap.h
@@ -33,7 +33,7 @@ include the XPM inline as below, since it's C code, or you can load it at
run-time.
@code
-#include "mondrian.xpm"
+#include "sample.xpm"
@endcode
Sometimes you wish to use a .ico resource on Windows, and XPMs on other
@@ -44,16 +44,16 @@ A macro, wxICON(), is available which creates an icon using an XPM on the
appropriate platform, or an icon resource on Windows:
@code
-wxIcon icon(wxICON(mondrian));
+wxIcon icon(wxICON(sample));
// The above line is equivalent to this:
#if defined(__WXGTK__) || defined(__WXMOTIF__)
- wxIcon icon(mondrian_xpm);
+ wxIcon icon(sample_xpm);
#endif
#if defined(__WXMSW__)
- wxIcon icon("mondrian");
+ wxIcon icon("sample");
#endif
@endcode
diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 3679ccbe1b..588e27ce81 100644
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -427,13 +427,13 @@ g++ myfoo.cpp `wx-config --cxxflags --libs` -o myfoo
Using this way, a make file for the minimal sample would look
like this
-CC = gcc
+CXX = g++
minimal: minimal.o
- $(CC) -o minimal minimal.o `wx-config --libs`
+ $(CXX) -o minimal minimal.o `wx-config --libs`
-minimal.o: minimal.cpp mondrian.xpm
- $(CC) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
+minimal.o: minimal.cpp
+ $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
clean:
rm -f *.o minimal
diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt
index adf60c38ac..8afa4e38b6 100644
--- a/docs/mgl/install.txt
+++ b/docs/mgl/install.txt
@@ -99,10 +99,10 @@ will output necessary C++ compiler flags and wx-config --libs will list all
needed libraries. See an example of wxWidgets application makefile:
minimal: minimal.o
- $(CC) -o minimal minimal.o `wx-config --libs`
+ $(CXX) -o minimal minimal.o `wx-config --libs`
-minimal.o: minimal.cpp mondrian.xpm
- $(CC) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
+minimal.o: minimal.cpp
+ $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
* Using configure to build MS-DOS version
diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index b8fc8d22fd..2625218853 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -455,15 +455,12 @@ CXX = g++
minimal: minimal.o
$(CXX) -o minimal minimal.o `wx-config --libs`
-minimal.o: minimal.cpp mondrian.xpm
+minimal.o: minimal.cpp
$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
clean:
rm -f *.o minimal
-This is certain to become the standard way unless we decide
-to stick to tmake.
-
If your application uses only some of wxWidgets libraries, you can
specify required libraries when running wx-config. For example,
`wx-config --libs=html,core` will only output link command to link
diff --git a/docs/wine/install.txt b/docs/wine/install.txt
index fc5c65575e..9a5cd5da1a 100644
--- a/docs/wine/install.txt
+++ b/docs/wine/install.txt
@@ -308,13 +308,13 @@ g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
Using this way, a make file for the minimal sample would look
like this
-CC = g++
+CXX = g++
minimal: minimal.o
- $(CC) -o minimal minimal.o `wx-config --libs`
+ $(CXX) -o minimal minimal.o `wx-config --libs`
-minimal.o: minimal.cpp mondrian.xpm
- $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
+minimal.o: minimal.cpp
+ $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
clean:
rm -f *.o minimal
diff --git a/docs/x11/install.txt b/docs/x11/install.txt
index ada821077d..ee1a011bb6 100644
--- a/docs/x11/install.txt
+++ b/docs/x11/install.txt
@@ -437,7 +437,7 @@ CXX = g++
minimal: minimal.o
$(CXX) -o minimal minimal.o `wx-config --libs`
-minimal.o: minimal.cpp mondrian.xpm
+minimal.o: minimal.cpp
$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
clean:
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index a72fc76e27..154c6652c4 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -160,12 +160,12 @@ enum wxStockCursor
/* Useful macro for creating icons portably, for example:
- wxIcon *icon = new wxICON(mondrian);
+ wxIcon *icon = new wxICON(sample);
expands into:
- wxIcon *icon = new wxIcon("mondrian"); // On wxMSW
- wxIcon *icon = new wxIcon(mondrian_xpm); // On wxGTK
+ wxIcon *icon = new wxIcon("sample"); // On wxMSW
+ wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK
*/
#ifdef __WXMSW__
diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index 80a40419da..4937fdae5f 100644
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -118,15 +118,15 @@ public:
the appropriate platform, or an icon resource on Windows.
@code
- wxIcon icon(wxICON(mondrian));
+ wxIcon icon(wxICON(sample));
// Equivalent to:
#if defined(__WXGTK__) || defined(__WXMOTIF__)
- wxIcon icon(mondrian_xpm);
+ wxIcon icon(sample_xpm);
#endif
#if defined(__WXMSW__)
- wxIcon icon("mondrian");
+ wxIcon icon("sample");
#endif
@endcode
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index ea44030db0..479e54e7a8 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -47,9 +47,9 @@ ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
ACCESSTEST_OBJECTS = \
+ $(__accesstest___win32rc) \
$(__accesstest_os2_lib_res) \
- accesstest_accesstest.o \
- $(__accesstest___win32rc)
+ accesstest_accesstest.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \
@COND_PLATFORM_OS2_1@__accesstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_sample_rc.o
@COND_PLATFORM_OS2_1@__accesstest_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__accesstest_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__accesstest___win32rc = accesstest_accesstest_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)
@@ -174,12 +174,12 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
@COND_PLATFORM_MACOSX_1@accesstest_bundle: $(____accesstest_BUNDLE_TGT_REF_DEP)
+accesstest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
accesstest_accesstest.o: $(srcdir)/accesstest.cpp
$(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(srcdir)/accesstest.cpp
-accesstest_accesstest_rc.o: $(srcdir)/accesstest.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/access/access.bkl b/samples/access/access.bkl
index 8e8cdf4d64..57ee881608 100644
--- a/samples/access/access.bkl
+++ b/samples/access/access.bkl
@@ -7,7 +7,6 @@
accesstest.cpp
core
base
- accesstest.rc
diff --git a/samples/access/access.dsp b/samples/access/access.dsp
index ac8b68f86e..96502c00e5 100644
--- a/samples/access/access.dsp
+++ b/samples/access/access.dsp
@@ -256,7 +256,7 @@ SOURCE=.\accesstest.cpp
# End Source File
# Begin Source File
-SOURCE=.\accesstest.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/access/access_vc7.vcproj b/samples/access/access_vc7.vcproj
index 1db883ce31..adb7b031fb 100644
--- a/samples/access/access_vc7.vcproj
+++ b/samples/access/access_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/access/access_vc8.vcproj b/samples/access/access_vc8.vcproj
index 56054e7bed..7cec0a19a6 100644
--- a/samples/access/access_vc8.vcproj
+++ b/samples/access/access_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/access/access_vc9.vcproj b/samples/access/access_vc9.vcproj
index 3eaf1ac018..bf03379c25 100644
--- a/samples/access/access_vc9.vcproj
+++ b/samples/access/access_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp
index 47653bdabd..b8db737d81 100644
--- a/samples/access/accesstest.cpp
+++ b/samples/access/accesstest.cpp
@@ -59,8 +59,8 @@
// ----------------------------------------------------------------------------
// the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
@@ -329,7 +329,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
SetAccessible(new FrameAccessible(this));
// set the frame icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
#if wxUSE_MENUS
// create a menu bar
diff --git a/samples/access/accesstest.rc b/samples/access/accesstest.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/access/accesstest.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc
index 9544274b7d..e6a734b524 100644
--- a/samples/access/makefile.bcc
+++ b/samples/access/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\accesstest.ilf del $(OBJS)\accesstest.ilf
-if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils
-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res
+$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_accesstest.res
+ c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_sample.res
|
+$(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp
$(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp
-$(OBJS)\accesstest_accesstest.res: .\accesstest.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\accesstest.rc
-
diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index dccaaadc2f..3143e4973b 100644
--- a/samples/access/makefile.gcc
+++ b/samples/access/makefile.gcc
@@ -29,8 +29,8 @@ ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ACCESSTEST_OBJECTS = \
- $(OBJS)\accesstest_accesstest.o \
- $(OBJS)\accesstest_accesstest_rc.o
+ $(OBJS)\accesstest_sample_rc.o \
+ $(OBJS)\accesstest_accesstest.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o
+$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample_rc.o
$(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\accesstest_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\accesstest_accesstest.o: ./accesstest.cpp
$(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\accesstest_accesstest_rc.o: ./accesstest.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc
index 8f29013459..3aa7d45170 100644
--- a/samples/access/makefile.vc
+++ b/samples/access/makefile.vc
@@ -32,7 +32,7 @@ ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
ACCESSTEST_OBJECTS = \
$(OBJS)\accesstest_accesstest.obj
ACCESSTEST_RESOURCES = \
- $(OBJS)\accesstest_accesstest.res
+ $(OBJS)\accesstest_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk
-if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb
-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res
+$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ACCESSTEST_OBJECTS) $(ACCESSTEST_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\accesstest_accesstest.obj: .\accesstest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp
-$(OBJS)\accesstest_accesstest.res: .\accesstest.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\accesstest.rc
-
diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat
index 31715d0b68..39720a44e1 100644
--- a/samples/access/makefile.wat
+++ b/samples/access/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
-$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res
+$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res
@%create $(OBJS)\accesstest.lbc
@%append $(OBJS)\accesstest.lbc option quiet
@%append $(OBJS)\accesstest.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.re
@%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\accesstest.lbc library %i
- @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res
+ @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_sample.res
@for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i
wlink @$(OBJS)\accesstest.lbc
+$(OBJS)\accesstest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<
-$(OBJS)\accesstest_accesstest.res : .AUTODEPEND .\accesstest.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/access/mondrian.ico b/samples/access/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/access/mondrian.ico and /dev/null differ
diff --git a/samples/access/mondrian.xpm b/samples/access/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/access/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index 6d4a4ecb00..13d00db097 100644
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -29,7 +29,7 @@
#endif
#ifndef __WXMSW__
- #include "sample.xpm"
+ #include "../sample.xpm"
#endif
#include "wx/aboutdlg.h"
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index b642478d1d..f81daacd45 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -47,10 +47,10 @@ ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
ARTTEST_OBJECTS = \
+ $(__arttest___win32rc) \
$(__arttest_os2_lib_res) \
arttest_arttest.o \
- arttest_artbrows.o \
- $(__arttest___win32rc)
+ arttest_artbrows.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__arttest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_sample_rc.o
@COND_PLATFORM_OS2_1@__arttest_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__arttest_app_Contents_PkgInfo___depname \
@@ -107,7 +108,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__arttest___win32rc = arttest_arttest_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)
@@ -175,15 +175,15 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
@COND_PLATFORM_MACOSX_1@arttest_bundle: $(____arttest_BUNDLE_TGT_REF_DEP)
+arttest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
arttest_arttest.o: $(srcdir)/arttest.cpp
$(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $(srcdir)/arttest.cpp
arttest_artbrows.o: $(srcdir)/artbrows.cpp
$(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $(srcdir)/artbrows.cpp
-arttest_arttest_rc.o: $(srcdir)/arttest.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/artprov/artprov.bkl b/samples/artprov/artprov.bkl
index 4930e8e634..9a3885a57a 100644
--- a/samples/artprov/artprov.bkl
+++ b/samples/artprov/artprov.bkl
@@ -8,7 +8,6 @@
artbrows.h
core
base
- arttest.rc
diff --git a/samples/artprov/artprov.dsp b/samples/artprov/artprov.dsp
index d7f4f5ebf6..066239e83f 100644
--- a/samples/artprov/artprov.dsp
+++ b/samples/artprov/artprov.dsp
@@ -260,7 +260,7 @@ SOURCE=.\arttest.cpp
# End Source File
# Begin Source File
-SOURCE=.\arttest.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj
index e021ebe762..b7c55ee625 100644
--- a/samples/artprov/artprov_vc7.vcproj
+++ b/samples/artprov/artprov_vc7.vcproj
@@ -561,7 +561,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj
index f0a445c0d1..9aac78950f 100644
--- a/samples/artprov/artprov_vc8.vcproj
+++ b/samples/artprov/artprov_vc8.vcproj
@@ -828,7 +828,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/artprov/artprov_vc9.vcproj b/samples/artprov/artprov_vc9.vcproj
index 1848d01362..8af3faae08 100644
--- a/samples/artprov/artprov_vc9.vcproj
+++ b/samples/artprov/artprov_vc9.vcproj
@@ -800,7 +800,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp
index 464bf3a27d..1c40be4ea3 100644
--- a/samples/artprov/arttest.cpp
+++ b/samples/artprov/arttest.cpp
@@ -21,7 +21,7 @@
#endif
#if !defined(__WXMSW__) && !defined(__WXPM__)
- #include "mondrian.xpm"
+ #include "../sample.xpm"
#endif
#include "wx/artprov.h"
@@ -150,7 +150,7 @@ wxBitmap MyArtProvider::CreateBitmap(const wxArtID& id,
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
: wxFrame(NULL, wxID_ANY, title, pos, size, style)
{
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
diff --git a/samples/artprov/arttest.rc b/samples/artprov/arttest.rc
deleted file mode 100644
index 755ae7b65e..0000000000
--- a/samples/artprov/arttest.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-aaaa ICON "mondrian.ico"
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc
index 4a107f3fa0..8eaec228c1 100644
--- a/samples/artprov/makefile.bcc
+++ b/samples/artprov/makefile.bcc
@@ -230,17 +230,17 @@ clean:
-if exist $(OBJS)\arttest.ilf del $(OBJS)\arttest.ilf
-if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils
-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
+$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_arttest.res
+ c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_sample.res
|
+$(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\arttest_arttest.obj: .\arttest.cpp
$(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp
$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp
$(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp
-$(OBJS)\arttest_arttest.res: .\arttest.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\arttest.rc
-
diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index f5b444413e..e5a8e37ba1 100644
--- a/samples/artprov/makefile.gcc
+++ b/samples/artprov/makefile.gcc
@@ -29,9 +29,9 @@ ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ARTTEST_OBJECTS = \
+ $(OBJS)\arttest_sample_rc.o \
$(OBJS)\arttest_arttest.o \
- $(OBJS)\arttest_artbrows.o \
- $(OBJS)\arttest_arttest_rc.o
+ $(OBJS)\arttest_artbrows.o
### Conditionally set variables: ###
@@ -219,18 +219,18 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o
+$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample_rc.o
$(CXX) -o $@ $(ARTTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\arttest_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\arttest_arttest.o: ./arttest.cpp
$(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\arttest_artbrows.o: ./artbrows.cpp
$(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\arttest_arttest_rc.o: ./arttest.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc
index 2b3e39f411..5a841a392d 100644
--- a/samples/artprov/makefile.vc
+++ b/samples/artprov/makefile.vc
@@ -33,7 +33,7 @@ ARTTEST_OBJECTS = \
$(OBJS)\arttest_arttest.obj \
$(OBJS)\arttest_artbrows.obj
ARTTEST_RESOURCES = \
- $(OBJS)\arttest_arttest.res
+ $(OBJS)\arttest_sample.res
### Conditionally set variables: ###
@@ -340,17 +340,17 @@ clean:
-if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk
-if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb
-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
+$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ARTTEST_OBJECTS) $(ARTTEST_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\arttest_arttest.obj: .\arttest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp
$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp
-$(OBJS)\arttest_arttest.res: .\arttest.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\arttest.rc
-
diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat
index fe8633ebc7..c7275b7a6e 100644
--- a/samples/artprov/makefile.wat
+++ b/samples/artprov/makefile.wat
@@ -249,7 +249,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
-$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
+$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res
@%create $(OBJS)\arttest.lbc
@%append $(OBJS)\arttest.lbc option quiet
@%append $(OBJS)\arttest.lbc name $^@
@@ -257,16 +257,16 @@ $(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res
@%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\arttest.lbc library %i
- @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res
+ @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_sample.res
@for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i
wlink @$(OBJS)\arttest.lbc
+$(OBJS)\arttest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<
$(OBJS)\arttest_artbrows.obj : .AUTODEPEND .\artbrows.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<
-$(OBJS)\arttest_arttest.res : .AUTODEPEND .\arttest.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/artprov/mondrian.ico b/samples/artprov/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/artprov/mondrian.ico and /dev/null differ
diff --git a/samples/artprov/mondrian.xpm b/samples/artprov/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/artprov/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index e8f6b9e220..bd06c9ec97 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -48,9 +48,9 @@ CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
CALENDAR_OBJECTS = \
+ $(__calendar___win32rc) \
$(__calendar_os2_lib_res) \
- calendar_calendar.o \
- $(__calendar___win32rc)
+ calendar_calendar.o
### Conditionally set variables: ###
@@ -87,6 +87,7 @@ COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__calendar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_sample_rc.o
@COND_PLATFORM_OS2_1@__calendar_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__calendar_app_Contents_PkgInfo___depname \
@@ -111,7 +112,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__calendar___win32rc = calendar_calendar_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)
@@ -179,12 +179,12 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
@COND_PLATFORM_MACOSX_1@calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP)
+calendar_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
calendar_calendar.o: $(srcdir)/calendar.cpp
$(CXXC) -c -o $@ $(CALENDAR_CXXFLAGS) $(srcdir)/calendar.cpp
-calendar_calendar_rc.o: $(srcdir)/calendar.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/calendar/calendar.bkl b/samples/calendar/calendar.bkl
index b1b6309a05..6d0f8aea5a 100644
--- a/samples/calendar/calendar.bkl
+++ b/samples/calendar/calendar.bkl
@@ -8,7 +8,6 @@
adv
core
base
- calendar.rc
diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index a6c6007c51..7496322332 100644
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -347,7 +347,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
// set the frame icon
- SetIcon(wxIcon(sample_xpm));
+ SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
diff --git a/samples/calendar/calendar.dsp b/samples/calendar/calendar.dsp
index 98f404e265..29769af8c8 100644
--- a/samples/calendar/calendar.dsp
+++ b/samples/calendar/calendar.dsp
@@ -256,7 +256,7 @@ SOURCE=.\calendar.cpp
# End Source File
# Begin Source File
-SOURCE=.\calendar.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj
index 5fef18f255..d5ef839a3a 100644
--- a/samples/calendar/calendar_vc7.vcproj
+++ b/samples/calendar/calendar_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/calendar/calendar_vc8.vcproj b/samples/calendar/calendar_vc8.vcproj
index a0291743dc..5f03e7c11c 100644
--- a/samples/calendar/calendar_vc8.vcproj
+++ b/samples/calendar/calendar_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/calendar/calendar_vc9.vcproj b/samples/calendar/calendar_vc9.vcproj
index e5fe0fe631..ab824c9171 100644
--- a/samples/calendar/calendar_vc9.vcproj
+++ b/samples/calendar/calendar_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc
index b19b0864c8..ace97b885c 100644
--- a/samples/calendar/makefile.bcc
+++ b/samples/calendar/makefile.bcc
@@ -233,14 +233,14 @@ clean:
-if exist $(OBJS)\calendar.ilf del $(OBJS)\calendar.ilf
-if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils
-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
+$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_calendar.res
+ c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_sample.res
|
+$(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\calendar_calendar.obj: .\calendar.cpp
$(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp
-$(OBJS)\calendar_calendar.res: .\calendar.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\calendar.rc
-
diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc
index 42a42f37e4..dbfd81dcf0 100644
--- a/samples/calendar/makefile.gcc
+++ b/samples/calendar/makefile.gcc
@@ -29,8 +29,8 @@ CALENDAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CALENDAR_OBJECTS = \
- $(OBJS)\calendar_calendar.o \
- $(OBJS)\calendar_calendar_rc.o
+ $(OBJS)\calendar_sample_rc.o \
+ $(OBJS)\calendar_calendar.o
### Conditionally set variables: ###
@@ -222,15 +222,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar_rc.o
+$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample_rc.o
$(CXX) -o $@ $(CALENDAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\calendar_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\calendar_calendar.o: ./calendar.cpp
$(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\calendar_calendar_rc.o: ./calendar.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc
index 2a6351a437..16f421b4f5 100644
--- a/samples/calendar/makefile.vc
+++ b/samples/calendar/makefile.vc
@@ -32,7 +32,7 @@ CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
CALENDAR_OBJECTS = \
$(OBJS)\calendar_calendar.obj
CALENDAR_RESOURCES = \
- $(OBJS)\calendar_calendar.res
+ $(OBJS)\calendar_sample.res
### Conditionally set variables: ###
@@ -343,14 +343,14 @@ clean:
-if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk
-if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb
-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
+$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CALENDAR_OBJECTS) $(CALENDAR_RESOURCES) $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\calendar_calendar.obj: .\calendar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp
-$(OBJS)\calendar_calendar.res: .\calendar.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\calendar.rc
-
diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat
index 9167125da6..c926834ed5 100644
--- a/samples/calendar/makefile.wat
+++ b/samples/calendar/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
-$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
+$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res
@%create $(OBJS)\calendar.lbc
@%append $(OBJS)\calendar.lbc option quiet
@%append $(OBJS)\calendar.lbc name $^@
@@ -261,13 +261,13 @@ $(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res
@%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i
@for %i in ( $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\calendar.lbc library %i
- @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res
+ @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_sample.res
@for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i
wlink @$(OBJS)\calendar.lbc
+$(OBJS)\calendar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $<
-$(OBJS)\calendar_calendar.res : .AUTODEPEND .\calendar.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 0b35b0123a..5daa47027c 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -47,9 +47,9 @@ CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
CARET_OBJECTS = \
+ $(__caret___win32rc) \
$(__caret_os2_lib_res) \
- caret_caret.o \
- $(__caret___win32rc)
+ caret_caret.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q
@COND_PLATFORM_OS2_1@__caret___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___caret___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__caret___win32rc = caret_sample_rc.o
@COND_PLATFORM_OS2_1@__caret_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__caret___win32rc = caret_caret_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)
@@ -174,12 +174,12 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
@COND_PLATFORM_MACOSX_1@caret_bundle: $(____caret_BUNDLE_TGT_REF_DEP)
+caret_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
caret_caret.o: $(srcdir)/caret.cpp
$(CXXC) -c -o $@ $(CARET_CXXFLAGS) $(srcdir)/caret.cpp
-caret_caret_rc.o: $(srcdir)/caret.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/caret/caret.bkl b/samples/caret/caret.bkl
index 6836d07cb1..a12ede3659 100644
--- a/samples/caret/caret.bkl
+++ b/samples/caret/caret.bkl
@@ -7,7 +7,6 @@
caret.cpp
core
base
- caret.rc
diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 596fa4b653..91c7fb83ef 100644
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -27,11 +27,12 @@
#include "wx/numdlg.h"
// ----------------------------------------------------------------------------
-// ressources
+// resources
// ----------------------------------------------------------------------------
+
// the application icon
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
@@ -206,7 +207,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
// set the frame icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
diff --git a/samples/caret/caret.dsp b/samples/caret/caret.dsp
index f4a7fb1574..c347abe682 100644
--- a/samples/caret/caret.dsp
+++ b/samples/caret/caret.dsp
@@ -256,7 +256,7 @@ SOURCE=.\caret.cpp
# End Source File
# Begin Source File
-SOURCE=.\caret.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/caret/caret.rc b/samples/caret/caret.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/caret/caret.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/caret/caret_vc7.vcproj b/samples/caret/caret_vc7.vcproj
index 49c660b50a..094d0cec72 100644
--- a/samples/caret/caret_vc7.vcproj
+++ b/samples/caret/caret_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/caret/caret_vc8.vcproj b/samples/caret/caret_vc8.vcproj
index 2c303f2c6f..0cd89621c9 100644
--- a/samples/caret/caret_vc8.vcproj
+++ b/samples/caret/caret_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/caret/caret_vc9.vcproj b/samples/caret/caret_vc9.vcproj
index 83855ddcc2..ebc8540ef1 100644
--- a/samples/caret/caret_vc9.vcproj
+++ b/samples/caret/caret_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc
index def3d5d785..95d244d316 100644
--- a/samples/caret/makefile.bcc
+++ b/samples/caret/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\caret.ilf del $(OBJS)\caret.ilf
-if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils
-$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res
+$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(CARET_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_caret.res
+ c0w32.obj $(CARET_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_sample.res
|
+$(OBJS)\caret_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\caret_caret.obj: .\caret.cpp
$(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp
-$(OBJS)\caret_caret.res: .\caret.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\caret.rc
-
diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc
index a55dd11dcb..bcb5c5a0a5 100644
--- a/samples/caret/makefile.gcc
+++ b/samples/caret/makefile.gcc
@@ -29,8 +29,8 @@ CARET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CARET_OBJECTS = \
- $(OBJS)\caret_caret.o \
- $(OBJS)\caret_caret_rc.o
+ $(OBJS)\caret_sample_rc.o \
+ $(OBJS)\caret_caret.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
-$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret_rc.o
+$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample_rc.o
$(CXX) -o $@ $(CARET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\caret_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\caret_caret.o: ./caret.cpp
$(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\caret_caret_rc.o: ./caret.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc
index 1ce2adc857..6eb5902164 100644
--- a/samples/caret/makefile.vc
+++ b/samples/caret/makefile.vc
@@ -32,7 +32,7 @@ CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
CARET_OBJECTS = \
$(OBJS)\caret_caret.obj
CARET_RESOURCES = \
- $(OBJS)\caret_caret.res
+ $(OBJS)\caret_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk
-if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb
-$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res
+$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CARET_OBJECTS) $(CARET_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\caret_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\caret_caret.obj: .\caret.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp
-$(OBJS)\caret_caret.res: .\caret.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\caret.rc
-
diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat
index e14d2bf1f2..e90b59b502 100644
--- a/samples/caret/makefile.wat
+++ b/samples/caret/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
-$(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res
+$(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_sample.res
@%create $(OBJS)\caret.lbc
@%append $(OBJS)\caret.lbc option quiet
@%append $(OBJS)\caret.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res
@%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\caret.lbc library %i
- @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res
+ @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_sample.res
@for %i in () do @%append $(OBJS)\caret.lbc option stack=%i
wlink @$(OBJS)\caret.lbc
+$(OBJS)\caret_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $<
-$(OBJS)\caret_caret.res : .AUTODEPEND .\caret.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/caret/mondrian.xpm b/samples/caret/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/caret/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index d00d3c021b..e8d69862d5 100644
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -47,9 +47,9 @@ CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
CLIPBOARD_OBJECTS = \
+ $(__clipboard___win32rc) \
$(__clipboard_os2_lib_res) \
- clipboard_clipboard.o \
- $(__clipboard___win32rc)
+ clipboard_clipboard.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd = $(NM) clipboard$(EXEEXT) | \
@COND_PLATFORM_OS2_1@__clipboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__clipboard___win32rc = clipboard_sample_rc.o
@COND_PLATFORM_OS2_1@__clipboard_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__clipboard_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__clipboard___win32rc = clipboard_clipboard_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)
@@ -174,12 +174,12 @@ clipboard$(EXEEXT): $(CLIPBOARD_OBJECTS) $(__clipboard___win32rc)
@COND_PLATFORM_MACOSX_1@clipboard_bundle: $(____clipboard_BUNDLE_TGT_REF_DEP)
+clipboard_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
clipboard_clipboard.o: $(srcdir)/clipboard.cpp
$(CXXC) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(srcdir)/clipboard.cpp
-clipboard_clipboard_rc.o: $(srcdir)/clipboard.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/clipboard/clipboard.bkl b/samples/clipboard/clipboard.bkl
index a8b1393306..ad52866696 100644
--- a/samples/clipboard/clipboard.bkl
+++ b/samples/clipboard/clipboard.bkl
@@ -7,7 +7,6 @@
clipboard.cpp
core
base
- clipboard.rc
diff --git a/samples/clipboard/clipboard.dsp b/samples/clipboard/clipboard.dsp
index 3edafe2498..66b17da7b8 100644
--- a/samples/clipboard/clipboard.dsp
+++ b/samples/clipboard/clipboard.dsp
@@ -256,7 +256,7 @@ SOURCE=.\clipboard.cpp
# End Source File
# Begin Source File
-SOURCE=.\clipboard.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/clipboard/clipboard.rc b/samples/clipboard/clipboard.rc
deleted file mode 100644
index bb8c713934..0000000000
--- a/samples/clipboard/clipboard.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../sample.rc"
-
diff --git a/samples/clipboard/clipboard_vc7.vcproj b/samples/clipboard/clipboard_vc7.vcproj
index 64c9652797..6c518c582f 100644
--- a/samples/clipboard/clipboard_vc7.vcproj
+++ b/samples/clipboard/clipboard_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/clipboard/clipboard_vc8.vcproj b/samples/clipboard/clipboard_vc8.vcproj
index 9090c8050b..846cdef0cc 100644
--- a/samples/clipboard/clipboard_vc8.vcproj
+++ b/samples/clipboard/clipboard_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/clipboard/clipboard_vc9.vcproj b/samples/clipboard/clipboard_vc9.vcproj
index a3dd209b0a..8c99455331 100644
--- a/samples/clipboard/clipboard_vc9.vcproj
+++ b/samples/clipboard/clipboard_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc
index 7c0bb26f1d..136f07bffa 100644
--- a/samples/clipboard/makefile.bcc
+++ b/samples/clipboard/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\clipboard.ilf del $(OBJS)\clipboard.ilf
-if exist $(OBJS)\clipboard.ils del $(OBJS)\clipboard.ils
-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res
+$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_clipboard.res
+ c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_sample.res
|
+$(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp
$(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp
-$(OBJS)\clipboard_clipboard.res: .\clipboard.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\clipboard.rc
-
diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc
index f6ee961492..35abd9ff5e 100644
--- a/samples/clipboard/makefile.gcc
+++ b/samples/clipboard/makefile.gcc
@@ -29,8 +29,8 @@ CLIPBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CLIPBOARD_OBJECTS = \
- $(OBJS)\clipboard_clipboard.o \
- $(OBJS)\clipboard_clipboard_rc.o
+ $(OBJS)\clipboard_sample_rc.o \
+ $(OBJS)\clipboard_clipboard.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard_rc.o
+$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample_rc.o
$(CXX) -o $@ $(CLIPBOARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\clipboard_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\clipboard_clipboard.o: ./clipboard.cpp
$(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\clipboard_clipboard_rc.o: ./clipboard.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc
index 84306804f7..95260a055b 100644
--- a/samples/clipboard/makefile.vc
+++ b/samples/clipboard/makefile.vc
@@ -32,7 +32,7 @@ CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
CLIPBOARD_OBJECTS = \
$(OBJS)\clipboard_clipboard.obj
CLIPBOARD_RESOURCES = \
- $(OBJS)\clipboard_clipboard.res
+ $(OBJS)\clipboard_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk
-if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb
-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res
+$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CLIPBOARD_OBJECTS) $(CLIPBOARD_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\clipboard_clipboard.obj: .\clipboard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp
-$(OBJS)\clipboard_clipboard.res: .\clipboard.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\clipboard.rc
-
diff --git a/samples/clipboard/makefile.wat b/samples/clipboard/makefile.wat
index d7ad411167..0b4cb18644 100644
--- a/samples/clipboard/makefile.wat
+++ b/samples/clipboard/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
-$(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res
+$(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res
@%create $(OBJS)\clipboard.lbc
@%append $(OBJS)\clipboard.lbc option quiet
@%append $(OBJS)\clipboard.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res
@%append $(OBJS)\clipboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\clipboard.lbc library %i
- @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_clipboard.res
+ @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_sample.res
@for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i
wlink @$(OBJS)\clipboard.lbc
+$(OBJS)\clipboard_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\clipboard_clipboard.obj : .AUTODEPEND .\clipboard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $<
-$(OBJS)\clipboard_clipboard.res : .AUTODEPEND .\clipboard.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 7a59f843af..45e31fdb8a 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -47,9 +47,9 @@ CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
CONFTEST_OBJECTS = \
+ $(__conftest___win32rc) \
$(__conftest_os2_lib_res) \
- conftest_conftest.o \
- $(__conftest___win32rc)
+ conftest_conftest.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__conftest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_sample_rc.o
@COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__conftest___win32rc = conftest_conftest_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)
@@ -174,12 +174,12 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
@COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP)
+conftest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
conftest_conftest.o: $(srcdir)/conftest.cpp
$(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $(srcdir)/conftest.cpp
-conftest_conftest_rc.o: $(srcdir)/conftest.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/config/config.bkl b/samples/config/config.bkl
index 6bf5b6c755..c8b26bf753 100644
--- a/samples/config/config.bkl
+++ b/samples/config/config.bkl
@@ -7,7 +7,6 @@
conftest.cpp
core
base
- conftest.rc
diff --git a/samples/config/config.dsp b/samples/config/config.dsp
index 139662ed55..a05beba752 100644
--- a/samples/config/config.dsp
+++ b/samples/config/config.dsp
@@ -256,7 +256,7 @@ SOURCE=.\conftest.cpp
# End Source File
# Begin Source File
-SOURCE=.\conftest.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj
index 225f3b5e2c..f339a8ce19 100644
--- a/samples/config/config_vc7.vcproj
+++ b/samples/config/config_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/config/config_vc8.vcproj b/samples/config/config_vc8.vcproj
index ee899db130..1d9ebd149d 100644
--- a/samples/config/config_vc8.vcproj
+++ b/samples/config/config_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/config/config_vc9.vcproj b/samples/config/config_vc9.vcproj
index 14c6a303b7..4f884a5638 100644
--- a/samples/config/config_vc9.vcproj
+++ b/samples/config/config_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/config/conftest.rc b/samples/config/conftest.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/config/conftest.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc
index 32edaf852e..12d168faf1 100644
--- a/samples/config/makefile.bcc
+++ b/samples/config/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\conftest.ilf del $(OBJS)\conftest.ilf
-if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils
-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
+$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_conftest.res
+ c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_sample.res
|
+$(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\conftest_conftest.obj: .\conftest.cpp
$(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp
-$(OBJS)\conftest_conftest.res: .\conftest.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\conftest.rc
-
diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc
index 0968758419..4c34b8e882 100644
--- a/samples/config/makefile.gcc
+++ b/samples/config/makefile.gcc
@@ -29,8 +29,8 @@ CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CONFTEST_OBJECTS = \
- $(OBJS)\conftest_conftest.o \
- $(OBJS)\conftest_conftest_rc.o
+ $(OBJS)\conftest_sample_rc.o \
+ $(OBJS)\conftest_conftest.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest_rc.o
+$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample_rc.o
$(CXX) -o $@ $(CONFTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\conftest_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\conftest_conftest.o: ./conftest.cpp
$(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\conftest_conftest_rc.o: ./conftest.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc
index 0e08ea73ad..d564db96d2 100644
--- a/samples/config/makefile.vc
+++ b/samples/config/makefile.vc
@@ -32,7 +32,7 @@ CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
CONFTEST_OBJECTS = \
$(OBJS)\conftest_conftest.obj
CONFTEST_RESOURCES = \
- $(OBJS)\conftest_conftest.res
+ $(OBJS)\conftest_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk
-if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb
-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
+$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CONFTEST_OBJECTS) $(CONFTEST_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\conftest_conftest.obj: .\conftest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp
-$(OBJS)\conftest_conftest.res: .\conftest.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\conftest.rc
-
diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index 870c9cd07f..28e8c85bd2 100644
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
-$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
+$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res
@%create $(OBJS)\conftest.lbc
@%append $(OBJS)\conftest.lbc option quiet
@%append $(OBJS)\conftest.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
@%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\conftest.lbc library %i
- @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res
+ @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_sample.res
@for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i
wlink @$(OBJS)\conftest.lbc
+$(OBJS)\conftest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $<
-$(OBJS)\conftest_conftest.res : .AUTODEPEND .\conftest.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index da9256e9b7..ef951a18bb 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -33,12 +33,7 @@
#endif // __WXMSW__
#endif // wxUSE_TOOLTIPS
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
- #define USE_XPM
-#endif
-
-#ifdef USE_XPM
- #include "mondrian.xpm"
+#ifndef __WXMSW__
#include "icons/choice.xpm"
#include "icons/combo.xpm"
#include "icons/list.xpm"
@@ -62,6 +57,10 @@
#define EVT_TOGGLEBUTTON EVT_CHECKBOX
#endif
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
+#endif
+
//----------------------------------------------------------------------
// class definitions
//----------------------------------------------------------------------
@@ -662,7 +661,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
wxT("examples.")
};
-#ifdef USE_XPM
+#ifndef __WXMSW__
// image ids
enum
{
@@ -691,7 +690,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
imagelist-> Add( wxBitmap( gauge_xpm ));
#endif // wxUSE_GAUGE
m_book->SetImageList(imagelist);
-#elif defined(__WXMSW__)
+#else
// load images from resources
enum
{
@@ -730,19 +729,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
}
m_book->SetImageList(imagelist);
-#else
-
- // No images for now
-#define Image_List -1
-#define Image_Choice -1
-#define Image_Combo -1
-#define Image_Text -1
-#define Image_Radio -1
-#if wxUSE_GAUGE
-#define Image_Gauge -1
-#endif // wxUSE_GAUGE
-#define Image_Max -1
-
#endif
wxPanel *panel = new wxPanel(m_book);
@@ -1800,9 +1786,7 @@ MyFrame::MyFrame(const wxChar *title, int x, int y)
// The wxICON() macros loads an icon from a resource under Windows
// and uses an #included XPM image under GTK+ and Motif
-#ifdef USE_XPM
- SetIcon( wxICON(mondrian) );
-#endif
+ SetIcon( wxICON(sample) );
wxMenu *file_menu = new wxMenu;
diff --git a/samples/controls/controls.rc b/samples/controls/controls.rc
index 746abb4618..51ff722dfe 100644
--- a/samples/controls/controls.rc
+++ b/samples/controls/controls.rc
@@ -1,4 +1,4 @@
-mondrian ICON "mondrian.ico"
+#include "../sample.rc"
choice BITMAP "icons/choice.bmp"
combo BITMAP "icons/combo.bmp"
@@ -6,5 +6,3 @@ gauge BITMAP "icons/gauge.bmp"
list BITMAP "icons/list.bmp"
radio BITMAP "icons/radio.bmp"
text BITMAP "icons/text.bmp"
-
-#include "wx/msw/wx.rc"
diff --git a/samples/controls/mondrian.ico b/samples/controls/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/controls/mondrian.ico and /dev/null differ
diff --git a/samples/controls/mondrian.xpm b/samples/controls/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/controls/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index d1e518cf87..d4ce98c492 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -48,10 +48,10 @@ DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
DIALOGS_OBJECTS = \
+ $(__dialogs___win32rc) \
$(__dialogs_os2_lib_res) \
dialogs_dialogs.o \
- $(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS) \
- $(__dialogs___win32rc)
+ $(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS)
### Conditionally set variables: ###
@@ -88,6 +88,7 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__dialogs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_sample_rc.o
@COND_PLATFORM_OS2_1@__dialogs_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__dialogs_app_Contents_PkgInfo___depname \
@@ -122,7 +123,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__dialogs___win32rc = dialogs_dialogs_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)
@@ -202,6 +202,9 @@ data:
esac; \
done
+dialogs_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
dialogs_dialogs.o: $(srcdir)/dialogs.cpp
$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/dialogs.cpp
@@ -235,9 +238,6 @@ dialogs_dialogs.o: $(srcdir)/dialogs.cpp
@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp
-dialogs_dialogs_rc.o: $(srcdir)/dialogs.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index b04b88e4f0..3b68225eb3 100644
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -36,7 +36,6 @@
adv
core
base
- dialogs.rc
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index d151f571ef..941ce02b02 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -496,7 +496,7 @@ bool MyApp::OnInit()
MyFrame::MyFrame(const wxString& title)
: wxFrame(NULL, wxID_ANY, title)
{
- SetIcon(sample_xpm);
+ SetIcon(wxICON(sample));
#if USE_MODAL_PRESENTATION
m_dialog = (MyModelessDialog *)NULL;
diff --git a/samples/dialogs/dialogs.dsp b/samples/dialogs/dialogs.dsp
index 5017e5de0f..7fe362c9f1 100644
--- a/samples/dialogs/dialogs.dsp
+++ b/samples/dialogs/dialogs.dsp
@@ -293,10 +293,6 @@ SOURCE=.\dialogs.cpp
# End Source File
# Begin Source File
-SOURCE=.\dialogs.rc
-# End Source File
-# Begin Source File
-
SOURCE=.\..\..\src\generic\dirdlgg.cpp
!IF "$(CFG)" == "dialogs - Win32 DLL Universal Release"
@@ -406,6 +402,10 @@ SOURCE=.\..\..\src\generic\fontdlgg.cpp
!ENDIF
# End Source File
+# Begin Source File
+
+SOURCE=.\..\..\samples\sample.rc
+# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/dialogs/dialogs.ico b/samples/dialogs/dialogs.ico
deleted file mode 100644
index 6e8c9aab41..0000000000
Binary files a/samples/dialogs/dialogs.ico and /dev/null differ
diff --git a/samples/dialogs/dialogs.rc b/samples/dialogs/dialogs.rc
deleted file mode 100644
index 3a98924530..0000000000
--- a/samples/dialogs/dialogs.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-dialogs ICON "dialogs.ico"
-
-#include "wx/msw/wx.rc"
-
diff --git a/samples/dialogs/dialogs.rcO b/samples/dialogs/dialogs.rcO
deleted file mode 100644
index 87a8a25faa..0000000000
--- a/samples/dialogs/dialogs.rcO
+++ /dev/null
@@ -1,4 +0,0 @@
-ICON 1 PRELOAD "dialogs.ico"
-
-RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc
-
diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj
index 580bb1ddea..476e421bf1 100644
--- a/samples/dialogs/dialogs_vc7.vcproj
+++ b/samples/dialogs/dialogs_vc7.vcproj
@@ -642,7 +642,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj
index 7dbba138d5..6b55c9dfe7 100644
--- a/samples/dialogs/dialogs_vc8.vcproj
+++ b/samples/dialogs/dialogs_vc8.vcproj
@@ -936,7 +936,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj
index 6c056fdde9..2072a4f03f 100644
--- a/samples/dialogs/dialogs_vc9.vcproj
+++ b/samples/dialogs/dialogs_vc9.vcproj
@@ -908,7 +908,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 64bdf6899e..7ef15dbbed 100644
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -241,15 +241,18 @@ clean:
-if exist $(OBJS)\dialogs.ilf del $(OBJS)\dialogs.ilf
-if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_dialogs.res
+ c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
@@ -265,6 +268,3 @@ $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
-$(OBJS)\dialogs_dialogs.res: .\dialogs.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dialogs.rc
-
diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index 8a8a78525e..dd329c13a3 100644
--- a/samples/dialogs/makefile.gcc
+++ b/samples/dialogs/makefile.gcc
@@ -29,9 +29,9 @@ DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
DIALOGS_OBJECTS = \
+ $(OBJS)\dialogs_sample_rc.o \
$(OBJS)\dialogs_dialogs.o \
- $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \
- $(OBJS)\dialogs_dialogs_rc.o
+ $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)
### Conditionally set variables: ###
@@ -232,13 +232,16 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample_rc.o
$(CXX) -o $@ $(DIALOGS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\dialogs_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\dialogs_dialogs.o: ./dialogs.cpp
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
@@ -254,9 +257,6 @@ $(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp
$(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index 3ae52d49ba..d05b035861 100644
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -33,7 +33,7 @@ DIALOGS_OBJECTS = \
$(OBJS)\dialogs_dialogs.obj \
$(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)
DIALOGS_RESOURCES = \
- $(OBJS)\dialogs_dialogs.res
+ $(OBJS)\dialogs_sample.res
### Conditionally set variables: ###
@@ -351,7 +351,7 @@ clean:
-if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk
-if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES) $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib
<<
@@ -360,6 +360,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\dialogs_dialogs.obj: .\dialogs.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
@@ -375,6 +378,3 @@ $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
-$(OBJS)\dialogs_dialogs.res: .\dialogs.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dialogs.rc
-
diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index 1f08ae851c..d4306bdc07 100644
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -264,7 +264,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
-$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
+$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
@%create $(OBJS)\dialogs.lbc
@%append $(OBJS)\dialogs.lbc option quiet
@%append $(OBJS)\dialogs.lbc name $^@
@@ -272,7 +272,7 @@ $(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
@%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i
@for %i in ( $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i
- @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res
+ @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_sample.res
@for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i
wlink @$(OBJS)\dialogs.lbc
@@ -280,6 +280,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\dialogs_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\dialogs_dialogs.obj : .AUTODEPEND .\dialogs.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
@@ -295,6 +298,3 @@ $(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp
$(OBJS)\dialogs_fontdlgg.obj : .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
-$(OBJS)\dialogs_dialogs.res : .AUTODEPEND .\dialogs.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index ea88ff0007..482120e1fc 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -47,9 +47,9 @@ NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
NETTEST_OBJECTS = \
+ $(__nettest___win32rc) \
$(__nettest_os2_lib_res) \
- nettest_nettest.o \
- $(__nettest___win32rc)
+ nettest_nettest.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__nettest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_sample_rc.o
@COND_PLATFORM_OS2_1@__nettest_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_app_Contents_PkgInfo___depname \
@@ -108,7 +109,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__nettest___win32rc = nettest_nettest_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)
@@ -176,12 +176,12 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
+nettest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
nettest_nettest.o: $(srcdir)/nettest.cpp
$(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $(srcdir)/nettest.cpp
-nettest_nettest_rc.o: $(srcdir)/nettest.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/dialup/dialup.bkl b/samples/dialup/dialup.bkl
index 598f24da81..c68d1d68f5 100644
--- a/samples/dialup/dialup.bkl
+++ b/samples/dialup/dialup.bkl
@@ -9,7 +9,6 @@
nettest.cpp
core
base
- nettest.rc
diff --git a/samples/dialup/dialup.dsp b/samples/dialup/dialup.dsp
index ee0707040d..3dd75fea64 100644
--- a/samples/dialup/dialup.dsp
+++ b/samples/dialup/dialup.dsp
@@ -256,7 +256,7 @@ SOURCE=.\nettest.cpp
# End Source File
# Begin Source File
-SOURCE=.\nettest.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj
index a1c8d346c6..5535ee5719 100644
--- a/samples/dialup/dialup_vc7.vcproj
+++ b/samples/dialup/dialup_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/dialup/dialup_vc8.vcproj b/samples/dialup/dialup_vc8.vcproj
index 5198d257ec..3d40ee3406 100644
--- a/samples/dialup/dialup_vc8.vcproj
+++ b/samples/dialup/dialup_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/dialup/dialup_vc9.vcproj b/samples/dialup/dialup_vc9.vcproj
index e82e6fe3db..d4dee25473 100644
--- a/samples/dialup/dialup_vc9.vcproj
+++ b/samples/dialup/dialup_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc
index 046643e99d..1b7dabcfc3 100644
--- a/samples/dialup/makefile.bcc
+++ b/samples/dialup/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\nettest.ilf del $(OBJS)\nettest.ilf
-if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils
-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
+$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(NETTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_nettest.res
+ c0w32.obj $(NETTEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_sample.res
|
+$(OBJS)\nettest_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\nettest_nettest.obj: .\nettest.cpp
$(CXX) -q -c -P -o$@ $(NETTEST_CXXFLAGS) .\nettest.cpp
-$(OBJS)\nettest_nettest.res: .\nettest.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\nettest.rc
-
diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc
index fd8c045c59..fa639f5aca 100644
--- a/samples/dialup/makefile.gcc
+++ b/samples/dialup/makefile.gcc
@@ -29,8 +29,8 @@ NETTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
NETTEST_OBJECTS = \
- $(OBJS)\nettest_nettest.o \
- $(OBJS)\nettest_nettest_rc.o
+ $(OBJS)\nettest_sample_rc.o \
+ $(OBJS)\nettest_nettest.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o
+$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_sample_rc.o
$(CXX) -o $@ $(NETTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\nettest_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\nettest_nettest.o: ./nettest.cpp
$(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\nettest_nettest_rc.o: ./nettest.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc
index e982a692a3..ef905531c4 100644
--- a/samples/dialup/makefile.vc
+++ b/samples/dialup/makefile.vc
@@ -32,7 +32,7 @@ NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
NETTEST_OBJECTS = \
$(OBJS)\nettest_nettest.obj
NETTEST_RESOURCES = \
- $(OBJS)\nettest_nettest.res
+ $(OBJS)\nettest_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk
-if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb
-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
+$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(NETTEST_OBJECTS) $(NETTEST_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\nettest_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\nettest_nettest.obj: .\nettest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp
-$(OBJS)\nettest_nettest.res: .\nettest.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nettest.rc
-
diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat
index 516778ed80..55439b1b66 100644
--- a/samples/dialup/makefile.wat
+++ b/samples/dialup/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
-$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
+$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_sample.res
@%create $(OBJS)\nettest.lbc
@%append $(OBJS)\nettest.lbc option quiet
@%append $(OBJS)\nettest.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res
@%append $(OBJS)\nettest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\nettest.lbc library %i
- @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res
+ @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_sample.res
@for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i
wlink @$(OBJS)\nettest.lbc
+$(OBJS)\nettest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\nettest_nettest.obj : .AUTODEPEND .\nettest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $<
-$(OBJS)\nettest_nettest.res : .AUTODEPEND .\nettest.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/dialup/nettest.rc b/samples/dialup/nettest.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/dialup/nettest.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/docview/docview.rc b/samples/docview/docview.rc
index 335d7ba3c0..3c46f4f160 100644
--- a/samples/docview/docview.rc
+++ b/samples/docview/docview.rc
@@ -1,4 +1,4 @@
-#include "wx/msw/wx.rc"
+#include "../sample.rc"
doc ICON "doc.ico"
chrt ICON "chart.ico"
diff --git a/samples/docview/mondrian.ico b/samples/docview/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/docview/mondrian.ico and /dev/null differ
diff --git a/samples/docview/mondrian.r b/samples/docview/mondrian.r
deleted file mode 100755
index 33ec670a30..0000000000
--- a/samples/docview/mondrian.r
+++ /dev/null
@@ -1,2667 +0,0 @@
-data 'ICN#' (128, "Application Icon") {
- $"FFFF FFFF F700 001D BB00 002B D700 0057"
- $"ED00 009D BB00 0539 DD00 1261 F700 A4E1"
- $"FFFE 539F 8100 A52F 8102 AED7 8105 4BAB"
- $"8103 BD12 810E 4A65 8105 2492 8102 F926"
- $"810B 5FA9 8114 0B7E 8108 05AC 8100 0021"
- $"8100 0027 8100 0021 8100 0021 8100 0021"
- $"81FF FFE1 8100 0FE1 8122 0AE1 8108 2FA1"
- $"8141 0DE1 8104 0B61 8100 9DA1 FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icl4' (128, "Application Icon") {
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"F333 333F 0000 0000 0000 0000 0003 3E0F"
- $"F333 333F 0000 0000 0000 0000 00A4 3AEF"
- $"F333 333F 0000 0000 0000 0000 0DCA 3EEF"
- $"F333 333F 0000 0000 0000 0000 E1C5 FE0F"
- $"F333 333F 0000 0000 000C CDCB 1DEA E00F"
- $"F333 333F 0000 0000 0CCC 1CB1 C3FD 000F"
- $"F333 333F 0000 0000 D02C CB1D A9E0 000F"
- $"FFFF FFFF FFFF FFFC C2C3 BCD3 EDDF FFFF"
- $"F000 000F 0000 00CC 2DAB 02BF 2DDD 666F"
- $"F000 000F 0000 0C1D BBB1 BEAB BDCB D66F"
- $"F000 000F 0000 CCD4 E2CB BAEE B42C CD6F"
- $"F000 000F 0000 C2BA BD2E FF3B DCC2 DCDD"
- $"F000 000F 0000 D3BD D2CC 2DCD 02D0 DCEB"
- $"F000 000F 0000 0EAC CDB2 CCCC 20D2 CDDB"
- $"F000 000F 0000 CBBB 3AAE E2D2 CC2C C2DC"
- $"F000 000F 0000 BC2E DD4A EEAE EBBB BBCD"
- $"F000 000F 000C DEDD 00CD DAEA AAEF 35DC"
- $"F000 000F 000B D000 0000 CCD4 DEBE EADC"
- $"F000 000F 0000 0000 0000 0000 00F0 0BCD"
- $"F000 000F 0000 0000 0000 0000 00F0 0FEE"
- $"F000 000F 0000 0000 0000 0000 00F0 000F"
- $"F000 000F 0000 0000 0000 0000 00F0 000F"
- $"F000 000F 0000 0000 0000 0000 00F0 000F"
- $"F000 000F FFFF FFFF FFFF FFFF FFF0 000F"
- $"F000 000F 1111 1111 1111 F999 99F0 000F"
- $"F000 000F 1111 1111 1111 F898 99F0 000F"
- $"F000 000F 1111 1111 1111 F999 98F0 000F"
- $"F000 000F 1111 1111 1111 F989 99F0 000F"
- $"F000 000F 1111 1111 1111 F899 89F0 000F"
- $"F000 000F 1111 1111 1111 F989 98F0 000F"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icl8' (128, "Application Icon") {
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 00DB 22FC 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 DB21 6BDB FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0081 2BDA 6BB2 FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 FB03 5581 FDFB 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0007 2C32 325E 0358 88DE FC00 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"002B 0832 0832 5803 3988 ADFB 0000 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"3208 3208 5658 0934 88AD FC00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF32"
- $"0833 3964 5809 3388 AD32 FBFF FFFF FFFF"
- $"FF00 0000 0000 00FF 0000 0000 0000 3208"
- $"3339 8858 0934 82DF 3933 3281 D2D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 002C 0833"
- $"6488 5E09 3388 B35E 6433 3233 81D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F608 395D"
- $"8858 0934 82E0 8888 5E39 332C 3281 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F739 5E8E"
- $"820F 5788 FFFD 645E 3357 0E32 3332 81F9"
- $"FF00 0000 0000 00FF 0000 0000 3965 8833"
- $"3933 3332 3357 320E 2C0E 322C 0E2D 815D"
- $"FF00 0000 0000 00FF 0000 0000 F5FC 8808"
- $"325D 5D34 320E 082C 0E2C 3233 3232 FA58"
- $"FF00 0000 0000 00FF 0000 0000 2B58 3464"
- $"88DE 8988 885E 5D33 3232 3332 335E F954"
- $"FF00 0000 0000 00FF 0000 0000 5D33 5D82"
- $"FA5D 8789 8EAC 89AC 885E 645E 5D64 5654"
- $"FF00 0000 0000 00FF 0000 002C 8187 5756"
- $"0000 F632 8189 B2DE 89B2 88AC 8888 F9F8"
- $"FF00 0000 0000 00FF 0000 0081 562B 0000"
- $"0000 0000 F6F7 325D 815E FB88 88FC 5656"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 005D 57F8"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 00FD AB88"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E5 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E5 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E5E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E5E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E6 E6E6 FF00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icm#' (128, "Application Icon") {
- $"F24B D007 B028 5557 81B1 124A 8236 1005"
- $"8000 1ABD 8030 557D FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icm4' (128, "Application Icon") {
- $"A33F CDCC DCCD CAAE A333 0000 0000 CDEE"
- $"333A 0000 CCCB 2E0D EDCE CDCD DB2B DB6F"
- $"D00D 00C2 BBEA BCD5 D00D 00BD 2D2D CC2D"
- $"D00D 0CDC CCDB BADC D00D 0000 0000 0DCE"
- $"D00D 0000 0000 0D0D D00D B1BB 1BF9 FD0D"
- $"D00D 1111 1199 8D0D ECDB BB1B B1F9 FECE"
-};
-
-data 'icm8' (128, "Application Icon") {
- $"DDDA DADD F8F8 F8F8 F8F8 F8F8 F864 8EAC"
- $"DB23 23DC 0000 0000 0000 0000 F85C 89FB"
- $"DC23 23DB 0000 0000 F608 3234 5E82 2AFA"
- $"FBF8 F8FB F8F8 5633 335D 3488 575D EFF1"
- $"F900 00FA 0000 2C63 5E34 FD64 5D2C 33AA"
- $"FA00 00F9 0000 395E 5D5D 5733 0832 33F9"
- $"F900 00FA 00F6 F92C 2B32 5D88 8888 88F8"
- $"FA00 00F9 0000 0000 0000 0000 00FA F781"
- $"F900 00FA 0000 0000 0000 0000 00F9 00F9"
- $"FA00 00F9 3559 5335 5959 E9E7 E7FA 00FA"
- $"F900 00FA 0505 0505 0505 E8E6 E6F9 00F9"
- $"FBF8 F8FB 592F 5959 2F59 E9E7 E7FB F8FB"
-};
-
-data 'icns' (128, "Application Icon") {
- $"6963 6E73 0000 9AB8 4943 4E23 0000 0108"
- $"FFFF FFFF F700 001D BB00 002B D700 0057"
- $"ED00 009D BB00 0539 DD00 1261 F700 A4E1"
- $"FFFE 539F 8100 A52F 8102 AED7 8105 4BAB"
- $"8103 BD12 810E 4A65 8105 2492 8102 F926"
- $"810B 5FA9 8114 0B7E 8108 05AC 8100 0021"
- $"8100 0027 8100 0021 8100 0021 8100 0021"
- $"81FF FFE1 8100 0FE1 8122 0AE1 8108 2FA1"
- $"8141 0DE1 8104 0B61 8100 9DA1 FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"6963 6C34 0000 0208 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF F333 333F 0000 0000"
- $"0000 0000 0003 3E0F F333 333F 0000 0000"
- $"0000 0000 00A4 3AEF F333 333F 0000 0000"
- $"0000 0000 0DCA 3EEF F333 333F 0000 0000"
- $"0000 0000 E1C5 FE0F F333 333F 0000 0000"
- $"000C CDCB 1DEA E00F F333 333F 0000 0000"
- $"0CCC 1CB1 C3FD 000F F333 333F 0000 0000"
- $"D02C CB1D A9E0 000F FFFF FFFF FFFF FFFC"
- $"C2C3 BCD3 EDDF FFFF F000 000F 0000 00CC"
- $"2DAB 02BF 2DDD 666F F000 000F 0000 0C1D"
- $"BBB1 BEAB BDCB D66F F000 000F 0000 CCD4"
- $"E2CB BAEE B42C CD6F F000 000F 0000 C2BA"
- $"BD2E FF3B DCC2 DCDD F000 000F 0000 D3BD"
- $"D2CC 2DCD 02D0 DCEB F000 000F 0000 0EAC"
- $"CDB2 CCCC 20D2 CDDB F000 000F 0000 CBBB"
- $"3AAE E2D2 CC2C C2DC F000 000F 0000 BC2E"
- $"DD4A EEAE EBBB BBCD F000 000F 000C DEDD"
- $"00CD DAEA AAEF 35DC F000 000F 000B D000"
- $"0000 CCD4 DEBE EADC F000 000F 0000 0000"
- $"0000 0000 00F0 0BCD F000 000F 0000 0000"
- $"0000 0000 00F0 0FEE F000 000F 0000 0000"
- $"0000 0000 00F0 000F F000 000F 0000 0000"
- $"0000 0000 00F0 000F F000 000F 0000 0000"
- $"0000 0000 00F0 000F F000 000F FFFF FFFF"
- $"FFFF FFFF FFF0 000F F000 000F 1111 1111"
- $"1111 F999 99F0 000F F000 000F 1111 1111"
- $"1111 F898 99F0 000F F000 000F 1111 1111"
- $"1111 F999 98F0 000F F000 000F 1111 1111"
- $"1111 F989 99F0 000F F000 000F 1111 1111"
- $"1111 F899 89F0 000F F000 000F 1111 1111"
- $"1111 F989 98F0 000F FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF 6963 6C38 0000 0408"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 00DB 22FC 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 DB21 6BDB FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0081 2BDA 6BB2 FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 FB03 5581 FDFB 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0007 2C32 325E 0358 88DE FC00 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"002B 0832 0832 5803 3988 ADFB 0000 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"3208 3208 5658 0934 88AD FC00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF32"
- $"0833 3964 5809 3388 AD32 FBFF FFFF FFFF"
- $"FF00 0000 0000 00FF 0000 0000 0000 3208"
- $"3339 8858 0934 82DF 3933 3281 D2D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 002C 0833"
- $"6488 5E09 3388 B35E 6433 3233 81D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F608 395D"
- $"8858 0934 82E0 8888 5E39 332C 3281 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F739 5E8E"
- $"820F 5788 FFFD 645E 3357 0E32 3332 81F9"
- $"FF00 0000 0000 00FF 0000 0000 3965 8833"
- $"3933 3332 3357 320E 2C0E 322C 0E2D 815D"
- $"FF00 0000 0000 00FF 0000 0000 F5FC 8808"
- $"325D 5D34 320E 082C 0E2C 3233 3232 FA58"
- $"FF00 0000 0000 00FF 0000 0000 2B58 3464"
- $"88DE 8988 885E 5D33 3232 3332 335E F954"
- $"FF00 0000 0000 00FF 0000 0000 5D33 5D82"
- $"FA5D 8789 8EAC 89AC 885E 645E 5D64 5654"
- $"FF00 0000 0000 00FF 0000 002C 8187 5756"
- $"0000 F632 8189 B2DE 89B2 88AC 8888 F9F8"
- $"FF00 0000 0000 00FF 0000 0081 562B 0000"
- $"0000 0000 F6F7 325D 815E FB88 88FC 5656"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 005D 57F8"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 00FD AB88"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E5 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E5 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E5E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E5E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E6 E6E6 FF00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"696C 3332 0000 0670 9E00 83FF 0000 90FF"
- $"058E EA44 FF00 0083 FF00 008F FF06 8FEA"
- $"AB8E 4400 0083 FF00 008E FF07 5ABE AB8E"
- $"4544 0000 83FF 0000 8DFF 0864 FE91 6945"
- $"44FF 0000 83FF 0000 88FF 0DE2 E1CB B8A1"
- $"FEB1 6245 44FF FF00 0083 FF00 0086 FF0A"
- $"E2E6 E9EF B89F FEC1 6245 4480 FF01 0000"
- $"83FF 0000 85FF 0AD9 E4E9 EBB8 9FFE C362"
- $"4544 81FF 8D00 0BD7 E3DE BA8F A2FE C662"
- $"45D0 6183 0083 FF00 0083 FF0D DAE5 D4B3"
- $"679A FEC8 6245 A5C9 D361 8200 83FF 0000"
- $"82FF 0FDC E2D4 A469 9EF2 C962 4579 9BC2"
- $"D2D0 6181 0083 FF00 0081 FF11 E8DD D2B3"
- $"6AA0 F3C7 5C1B 5D89 9CB5 CDD5 D361 8000"
- $"83FF 0000 81FF 14DF C29C 657A DEB3 6A0D"
- $"2082 ADBD C3D1 D5D7 D069 8800 83FF 0000"
- $"81FF 14AE 8170 B9C5 C1CE C7B2 AFDA E7EA"
- $"E1D9 D8D9 D469 8600 83FF 0000 81FF 14EE"
- $"5C75 EBD4 9FB3 C4DE E7EC EBE3 E4DD D6CE"
- $"C672 9C00 83FF 0000 81FF 14C6 A2C7 886F"
- $"4D61 6F7F 9094 C1DB CCC1 C0B7 AB82 A200"
- $"83FF 0000 81FF 1499 BFAE 5C8A 856D 504E"
- $"5A5B 556C 8F8B 8C95 888F A400 83FF 0000"
- $"80FF 15CA 667C 8C9F FFFF DCB5 8251 4A43"
- $"3F4B 535E 6860 8FA6 0083 FF00 0080 FF02"
- $"669F C283 FF0C DCC3 A88D 847B 686D 5A5E"
- $"8FAF 0083 FF00 008F FF06 00FF FF81 8FB5"
- $"0083 FF00 008F FF06 00FF FF22 4444 0083"
- $"FF00 008F FF00 0081 FF01 0000 83FF 0000"
- $"8FFF 0000 81FF 0100 0083 FF00 008F FF00"
- $"0081 FF01 0000 83FF 9100 81FF 0100 0083"
- $"FF00 0089 FF84 0081 FF01 0000 83FF 0000"
- $"89FF 8400 81FF 0100 0083 FF00 0089 FF84"
- $"0081 FF01 0000 83FF 0000 89FF 8400 81FF"
- $"0100 0083 FF00 0089 FF84 0081 FF01 0000"
- $"83FF 0000 89FF 8400 81FF 9E00 A500 90FF"
- $"0301 0044 FF86 008F FF04 0900 0001 4486"
- $"008E FF05 67BC 0001 1944 8600 8DFF 0666"
- $"E49D 7119 44FF 8600 88FF 0BC9 BEA7 9B82"
- $"E489 4419 44FF FF86 0086 FF0A CFB6 B9BB"
- $"9B79 E493 4419 4480 FF86 0085 FF0A B2AC"
- $"B6B5 9B7D E497 4419 4481 FF8D 000B AFAF"
- $"A06E 5180 E49A 4419 9B62 8300 83FF 0000"
- $"83FF 0DB2 B397 682E 76E4 9D44 1963 96A1"
- $"6282 0083 FF00 0082 FF0F BEB0 9953 307E"
- $"CF9C 4619 3459 8BA6 9C62 8100 83FF 0000"
- $"81FF 11E0 B191 672E 7ED0 9A44 0E2A 3C55"
- $"7BA0 A8A2 6280 0083 FF00 0081 FF14 C576"
- $"4B2D 51B5 864F 040E 3461 818A 9FA8 A7A1"
- $"687C 0083 FF00 0081 FF14 722D 3A7D 8683"
- $"9998 8C85 A0B3 B9AE A9AA AAA5 687E 0083"
- $"FF00 0081 FF14 E844 38B3 A962 6F7D 9DB2"
- $"BEBC B5B7 AFA5 9B95 7392 0083 FF00 0081"
- $"FF14 C283 9A44 3D1E 2934 4455 5C8E AC9A"
- $"8B89 7D75 829A 0083 FF00 0081 FF14 6E8B"
- $"8044 746B 4522 222F 302E 425C 5558 6055"
- $"8E9E 0083 FF00 0080 FF15 B466 5A81 9FFF"
- $"FFD6 9F5B 231B 1310 202B 333C 378E A000"
- $"83FF 0000 80FF 0266 9FC2 83FF 0CD6 B692"
- $"6F66 5B47 4931 3B8E A600 83FF 0000 8FFF"
- $"0600 FFFF 728E AB00 83FF 0000 8FFF 0600"
- $"FFFF 2244 4400 83FF 0000 8FFF 0000 81FF"
- $"0100 0083 FF00 008F FF00 0081 FF01 0000"
- $"83FF 0000 8FFF 0000 81FF 0100 0083 FF91"
- $"0081 FF01 0000 83FF 0000 89FF 0000 827B"
- $"0000 81FF 0100 0083 FF00 0089 FF00 0082"
- $"7B00 0081 FF01 0000 83FF 0000 89FF 0000"
- $"827B 0000 81FF 0100 0083 FF00 0089 FF00"
- $"0082 7B00 0081 FF01 0000 83FF 0000 89FF"
- $"0000 827B 0000 81FF 0100 0083 FF00 0089"
- $"FF00 0082 7B00 0081 FF9E 00A5 0090 FF03"
- $"0F43 44FF 8600 8FFF 0417 4316 0F44 8600"
- $"8EFF 0565 C416 0F1A 4486 008D FF06 5567"
- $"A76C 1A44 FF86 0088 FF0B BCA9 9293 3E67"
- $"4D23 1A44 FFFF 8600 86FF 0AC6 9A98 9893"
- $"3167 4A23 1A44 80FF 8600 85FF 0A9C 8E99"
- $"9593 3767 4F23 1A44 81FF 8D00 0B92 8F86"
- $"5747 3967 5223 1A7A 6183 0083 FF00 0083"
- $"FF0D 9591 7C51 2A32 6753 231A 4B78 8361"
- $"80FF 0100 0083 FF00 0082 FF13 A98B 7D41"
- $"2C37 6353 241A 2C44 6D8A 8061 FFFF 0000"
- $"83FF 0000 81FF 14DA 9278 5427 3761 5122"
- $"1124 323F 6084 8D86 61FF 0000 83FF 0000"
- $"81FF 14B7 5B3C 2730 5956 2A0A 0C2C 4F65"
- $"6C85 8D89 8869 8800 83FF 0000 81FF 1461"
- $"202F 6A76 7683 8378 748C 9A9D 918E 8E8C"
- $"8869 5500 83FF 0000 81FF 14E7 2230 9694"
- $"5354 5F80 95A2 9E9A 9D94 8881 7A73 4400"
- $"83FF 0000 81FF 14C6 4651 3538 191F 2A36"
- $"444A 7591 8173 7268 6081 FF00 83FF 0000"
- $"81FF 0859 6A49 2277 683C 1A1D 8028 0838"
- $"4D47 484F 478E FF00 83FF 0000 80FF 15A8"
- $"654A 7F9F FFFF D39A 551C 140E 0B1B 262B"
- $"3330 8E9A 0083 FF00 0080 FF02 659F C283"
- $"FF0C D3B2 8E69 5F56 4243 2B35 8E9F 0083"
- $"FF00 008F FF06 00FF FF6B 8EA7 0083 FF00"
- $"008F FF06 00FF FF22 4444 0083 FF00 008F"
- $"FF00 0081 FF01 0000 83FF 0000 8FFF 0000"
- $"81FF 0100 0083 FF00 008F FF00 0081 FF01"
- $"0000 83FF 9100 81FF 0100 0083 FF91 0081"
- $"FF01 0000 83FF 9100 81FF 0100 0083 FF91"
- $"0081 FF01 0000 83FF 9100 81FF 0100 0083"
- $"FF91 0081 FF01 0000 83FF 9100 81FF 9E00"
- $"6C38 6D6B 0000 0408 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF 6963 6823 0000 0248"
- $"FFFF FFFF FFFF FFFF FFFF FFFF F770 0000"
- $"0001 EEB0 0000 0001 F5D0 0000 0001 EF70"
- $"0000 0001 DBB0 0000 0001 F570 0000 0001"
- $"FED0 0000 0001 D5B0 0000 0001 EF70 0000"
- $"0001 FAD0 0000 0001 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF C010 0000 01FF C010 0000 01FF"
- $"C010 0000 01EF C010 0000 01FF C010 0000"
- $"01FB C010 0000 01DF C010 0000 01FF C010"
- $"0000 01FF C010 0000 01FF C010 0000 0181"
- $"C010 0000 0181 C010 0000 0181 C010 0000"
- $"0181 C010 0000 0181 C010 0000 0181 C010"
- $"0000 0181 C010 0000 0181 C010 0000 0181"
- $"C010 0000 0181 C010 0000 0181 C010 0000"
- $"0181 C010 0000 0181 C01F FFFF FF81 C01F"
- $"FFFF FF81 C010 0003 FF81 C011 1113 D581"
- $"C010 4443 6F81 C012 000B BB81 C010 8883"
- $"DD81 C014 2203 6B81 C011 004B BD81 C010"
- $"1103 F781 C014 0423 5B81 FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"6963 6834 0000 0488 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F666 666F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F666 666F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F666 666F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F FFFF FFFF FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F FFFF FFFF"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF F000 000F"
- $"FF00 0000 000F FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 9999 999F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"9989 898F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 8998 999F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"9899 989F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 9989 998F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"8999 899F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 9899 989F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"9999 899F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 8989 989F F000 000F"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF 6963 6838 0000 0908"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E6 E6E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E5E6 E5E6 E5FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E5E6 E6E6 E6E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E5 E6E5 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E5 E6E6 E6E6 E5FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E6 E5E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E5E6 E6E6 E6E5 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E5 E6E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E5 E6E6 E5E6 E6FF FF00 0000 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"6968 3332 0000 052A DF00 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF E000 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 0100 0083 FF80 0086"
- $"FF00 0098 FF01 0000 83FF 8000 86FF 0000"
- $"98FF 0100 0083 FF80 0086 FF00 0098 FF01"
- $"0000 83FF 8000 86FF 0000 98FF 0100 0083"
- $"FF80 0086 FF00 0098 FF01 0000 83FF 8000"
- $"86FF 0000 98FF 0100 0083 FF80 0086 FF00"
- $"0098 FF01 0000 83FF 8000 86FF 0000 98FF"
- $"0100 0083 FF80 0086 FF00 0098 FF01 0000"
- $"83FF 8000 86FF 0000 98FF 0100 0083 FF80"
- $"0086 FF00 0098 FF01 0000 83FF 8000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF9B 0083"
- $"FF80 0086 FF9B 0083 FF80 0086 FF00 008F"
- $"FF88 0083 FF80 0086 FF00 008F FF88 0083"
- $"FF80 0086 FF00 008F FF88 0083 FF80 0086"
- $"FF00 008F FF88 0083 FF80 0086 FF00 008F"
- $"FF88 0083 FF80 0086 FF00 008F FF88 0083"
- $"FF80 0086 FF00 008F FF88 0083 FF80 0086"
- $"FF00 008F FF88 0083 FF80 0086 FF00 008F"
- $"FF88 0083 FFAE 00E9 00A0 FF8A 00A0 FF8A"
- $"00A0 FF8A 00A0 FF8A 00A0 FF8A 00A0 FF8A"
- $"00A0 FF8A 00A0 FF8A 00A0 FF8A 00A0 FFE0"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF01"
- $"0000 83FF 8000 86FF 0000 98FF 0100 0083"
- $"FF80 0086 FF00 0098 FF01 0000 83FF 8000"
- $"86FF 0000 98FF 0100 0083 FF80 0086 FF00"
- $"0098 FF01 0000 83FF 8000 86FF 0000 98FF"
- $"0100 0083 FF80 0086 FF00 0098 FF01 0000"
- $"83FF 8000 86FF 0000 98FF 0100 0083 FF80"
- $"0086 FF00 0098 FF01 0000 83FF 8000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF00 0098"
- $"FF01 0000 83FF 8000 86FF 0000 98FF 0100"
- $"0083 FF80 0086 FF00 0098 FF01 0000 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 0000 8FFF 0100 0084 7B01 0000"
- $"83FF 8000 86FF 0000 8FFF 0100 0084 7B01"
- $"0000 83FF 8000 86FF 0000 8FFF 0100 0084"
- $"7B01 0000 83FF 8000 86FF 0000 8FFF 0100"
- $"0084 7B01 0000 83FF 8000 86FF 0000 8FFF"
- $"0100 0084 7B01 0000 83FF 8000 86FF 0000"
- $"8FFF 0100 0084 7B01 0000 83FF 8000 86FF"
- $"0000 8FFF 0100 0084 7B01 0000 83FF 8000"
- $"86FF 0000 8FFF 0100 0084 7B01 0000 83FF"
- $"8000 86FF 0000 8FFF 0100 0084 7B01 0000"
- $"83FF AE00 E900 A0FF 8A00 A0FF 8A00 A0FF"
- $"8A00 A0FF 8A00 A0FF 8A00 A0FF 8A00 A0FF"
- $"8A00 A0FF 8A00 A0FF 8A00 A0FF E000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF00 0098"
- $"FF01 0000 83FF 8000 86FF 0000 98FF 0100"
- $"0083 FF80 0086 FF00 0098 FF01 0000 83FF"
- $"8000 86FF 0000 98FF 0100 0083 FF80 0086"
- $"FF00 0098 FF01 0000 83FF 8000 86FF 0000"
- $"98FF 0100 0083 FF80 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF01"
- $"0000 83FF 8000 86FF 0000 98FF 0100 0083"
- $"FF80 0086 FF00 0098 FF01 0000 83FF 8000"
- $"86FF 0000 98FF 0100 0083 FF80 0086 FF00"
- $"0098 FF01 0000 83FF 8000 86FF 0000 98FF"
- $"0100 0083 FF80 0086 FF00 0098 FF01 0000"
- $"83FF 8000 86FF 0000 98FF 0100 0083 FF80"
- $"0086 FF00 0098 FF01 0000 83FF 8000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF00 0098"
- $"FF01 0000 83FF 8000 86FF 0000 98FF 0100"
- $"0083 FF80 0086 FF00 0098 FF01 0000 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF AE00 6838 6D6B 0000"
- $"0908 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF 6963 7323 0000 0048 F557 D001 700E"
- $"E024 9A9B 0175 9299 0162 923E 0001 9004"
- $"0000 9BBC 102C 8434 5AFD FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF 6963 7334 0000"
- $"0088 AA3F DDDD DDDD DDAE A333 0000 0000"
- $"0C3E 333A 0000 000C DBEC A333 0000 0CBC"
- $"2A00 EDDF DDDB D2CB ECFF D00D 00CD BBBA"
- $"B2D6 D00D 00B2 DDBB DCCB D00D 00D4 D2D2"
- $"CC2D D00D 00BD CCE5 3EEC D00D 0C00 0000"
- $"CBCB D00D 0000 0000 0D0D D00D 0000 0000"
- $"0D00 D00D ABAB ABAF 9F00 D00D 1111 11B8"
- $"9900 D00D 1111 1189 9F00 EDDA 8291 ABAF"
- $"9FDD 6963 7338 0000 0108 DEDC DBB3 F9FA"
- $"F9FA F9FA F9FA F9FA 8FFB DC23 23DB 0000"
- $"0000 0000 0000 0032 6A88 DB23 23DC 0000"
- $"0000 0000 F52B 3357 882B DC23 23DB 0000"
- $"0000 F608 3234 33AD F600 FCFA F9AC F9FA"
- $"F95D 0E5D 3457 8833 F1F2 FA00 00F9 0000"
- $"0733 825E 33AD 6432 33EF F900 00FA 0000"
- $"5D5E 5D33 825D 3332 2C57 FA00 00F9 0000"
- $"5739 5D64 5D33 3232 335C F900 00FA 00F5"
- $"5D57 F732 828E 8988 88F9 FA00 00F9 00F6"
- $"F600 0000 F5F6 4F5D F85D F900 00FA 0000"
- $"0000 0000 0000 00FA 0056 FA00 00FA 0000"
- $"0000 0000 0000 00F9 0000 F900 00F9 8359"
- $"8359 8359 ADD1 E8EA 0000 FA00 00FA 0505"
- $"0505 0505 5FE5 E6E8 0000 F900 00F9 0505"
- $"0505 0505 7DE6 E6D1 0000 ACF9 FAFC 8359"
- $"8359 8359 ADD1 E8E9 FAF9 6973 3332 0000"
- $"026C 0340 8080 4087 8005 5E51 80FF FF80"
- $"86FF 06AA B457 80FF FF80 83FF 09F1 E1C1"
- $"A94E D180 FFFF 8081 FF0B ECE6 DFBE BA4D"
- $"D1FF 4080 8040 8080 4FA6 DCAD B3BC 65B4"
- $"1900 80FF FF80 FFFF E9CF 87A7 B848 8FC6"
- $"B719 80FF FF80 FFFF B58B A0C9 7D8B CFD4"
- $"D89E 80FF FF80 FFFF ADAC A280 A5BE DBD4"
- $"C79A 80FF FF80 FFF2 8F8E C5B4 7655 516E"
- $"7A82 80FF FF80 FFD9 D880 FF09 F7DB C479"
- $"B280 80FF FF80 86FF 0680 FF9A 80FF FF80"
- $"86FF 0580 FFFF 80FF FF84 8000 4080 0005"
- $"FFFF 80FF FF80 83FF 0080 8000 05FF FF80"
- $"FFFF 8083 FF00 8080 0005 FFFF 4080 8040"
- $"8380 0040 8000 0180 8081 0087 8001 0151"
- $"8100 86FF 028B 0129 8100 83FF 05E2 D0B3"
- $"943A D181 0081 FF0B D9BA B19E 952F D1FF"
- $"4080 8040 8080 4F85 A369 8B98 378E 1900"
- $"80FF FF80 FFFF D491 417F 9326 4893 9219"
- $"80FF FF80 FFFF 774C 6C96 5E5A 94A0 A986"
- $"80FF FF80 FFFF 9D73 7346 6589 ABA3 9280"
- $"80FF FF80 FFED 6F7A BAA2 5028 253F 4A6A"
- $"80FF FF80 FFD9 D880 FF09 F5D2 B569 9E73"
- $"80FF FF80 86FF 0680 FF9A 80FF FF80 86FF"
- $"0580 FFFF 80FF FF84 8009 403E 3E1F FFFF"
- $"80FF FF80 83FF 0980 7B7B 3EFF FF80 FFFF"
- $"8083 FF09 807B 7B3E FFFF 4080 8040 8380"
- $"0540 3E3E 1F80 8081 0087 8001 1551 8100"
- $"86FF 0290 202D 8100 83FF 05D9 C97F 6039"
- $"D181 0081 FF0B CEA2 9759 4927 D1FF 4080"
- $"8040 8080 4F6F 8657 474C 2976 5980 80FF"
- $"FF80 FFFF C676 343F 4B1D 3977 7ED8 80FF"
- $"FF80 FFFF 6540 536B 4C4E 7B85 8D79 80FF"
- $"FF80 FFFF 8654 6638 5072 908A 7974 80FF"
- $"FF80 FFEA 5D63 BB9E 4A20 1F36 3E65 80FF"
- $"FF80 FFD9 D880 FF09 F4D0 B266 9B6F 80FF"
- $"FF80 86FF 0680 FF9A 80FF FF80 86FF 0680"
- $"FFFF 80FF FF80 8700 05FF FF80 FFFF 8087"
- $"0005 FFFF 80FF FF80 8700 05FF FF40 8080"
- $"4087 0001 8080 7338 6D6B 0000 0108 FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 6963"
- $"6D23 0000 0038 F24B D007 B028 5557 81B1"
- $"124A 8236 1005 8000 1ABD 8030 557D FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF 6963 6D34 0000 0068 A33F"
- $"CDCC DCCD CAAE A333 0000 0000 CDEE 333A"
- $"0000 CCCB 2E0D EDCE CDCD DB2B DB6F D00D"
- $"00C2 BBEA BCD5 D00D 00BD 2D2D CC2D D00D"
- $"0CDC CCDB BADC D00D 0000 0000 0DCE D00D"
- $"0000 0000 0D0D D00D B1BB 1BF9 FD0D D00D"
- $"1111 1199 8D0D ECDB BB1B B1F9 FECE 6963"
- $"6D38 0000 00C8 DDDA DADD F8F8 F8F8 F8F8"
- $"F8F8 F864 8EAC DB23 23DC 0000 0000 0000"
- $"0000 F85C 89FB DC23 23DB 0000 0000 F608"
- $"3234 5E82 2AFA FBF8 F8FB F8F8 5633 335D"
- $"3488 575D EFF1 F900 00FA 0000 2C63 5E34"
- $"FD64 5D2C 33AA FA00 00F9 0000 395E 5D5D"
- $"5733 0832 33F9 F900 00FA 00F6 F92C 2B32"
- $"5D88 8888 88F8 FA00 00F9 0000 0000 0000"
- $"0000 00FA F781 F900 00FA 0000 0000 0000"
- $"0000 00F9 00F9 FA00 00F9 3559 5335 5959"
- $"E9E7 E7FA 00FA F900 00FA 0505 0505 0505"
- $"E8E6 E6F9 00F9 FBF8 F8FB 592F 5959 2F59"
- $"E9E7 E7FB F8FB 6974 3332 0000 245A 0000"
- $"0000 FF00 FF00 FF00 FB00 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C5FF"
- $"818F 81EA 81AB 818E 8144 8500 95FF 8100"
- $"C5FF 818F 81EA 81AB 818E 8144 8500 95FF"
- $"8100 C5FF 818F 81EA 81AB 818E 8144 8500"
- $"95FF 8100 C5FF 818F 81EA 81AB 818E 8144"
- $"8500 95FF 8100 C1FF 815A 81BE 81AB 818E"
- $"8145 8144 8500 95FF 8100 C1FF 815A 81BE"
- $"81AB 818E 8145 8144 8500 95FF 8100 C1FF"
- $"815A 81BE 81AB 818E 8145 8144 8500 95FF"
- $"8100 C1FF 815A 81BE 81AB 818E 8145 8144"
- $"8500 95FF 8100 BDFF 8164 81FE 8191 8169"
- $"8145 8144 81FF 8500 95FF 8100 BDFF 8164"
- $"81FE 8191 8169 8145 8144 81FF 8500 95FF"
- $"8100 BDFF 8164 81FE 8191 8169 8145 8144"
- $"81FF 8500 95FF 8100 BDFF 8164 81FE 8191"
- $"8169 8145 8144 81FF 8500 95FF 8100 A9FF"
- $"81E2 81E1 81CB 81B8 81A1 81FE 81B1 8162"
- $"8145 8144 85FF 8500 95FF 8100 A9FF 81E2"
- $"81E1 81CB 81B8 81A1 81FE 81B1 8162 8145"
- $"8144 85FF 8500 95FF 8100 A9FF 81E2 81E1"
- $"81CB 81B8 81A1 81FE 81B1 8162 8145 8144"
- $"85FF 8500 95FF 8100 A9FF 81E2 81E1 81CB"
- $"81B8 81A1 81FE 81B1 8162 8145 8144 85FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"BD00 81D7 81E3 81DE 81BA 818F 81A2 81FE"
- $"81C6 8162 8145 81D0 8161 CD00 81D7 81E3"
- $"81DE 81BA 818F 81A2 81FE 81C6 8162 8145"
- $"81D0 8161 CD00 81D7 81E3 81DE 81BA 818F"
- $"81A2 81FE 81C6 8162 8145 81D0 8161 CD00"
- $"81D7 81E3 81DE 81BA 818F 81A2 81FE 81C6"
- $"8162 8145 81D0 8161 9500 95FF 8100 95FF"
- $"81DA 81E5 81D4 81B3 8167 819A 81FE 81C8"
- $"8162 8145 81A5 81C9 81D3 8161 9100 95FF"
- $"8100 95FF 81DA 81E5 81D4 81B3 8167 819A"
- $"81FE 81C8 8162 8145 81A5 81C9 81D3 8161"
- $"9100 95FF 8100 95FF 81DA 81E5 81D4 81B3"
- $"8167 819A 81FE 81C8 8162 8145 81A5 81C9"
- $"81D3 8161 9100 95FF 8100 95FF 81DA 81E5"
- $"81D4 81B3 8167 819A 81FE 81C8 8162 8145"
- $"81A5 81C9 81D3 8161 9100 95FF 8100 91FF"
- $"81DC 81E2 81D4 81A4 8169 819E 81F2 81C9"
- $"8162 8145 8179 819B 81C2 81D2 81D0 8161"
- $"8D00 95FF 8100 91FF 81DC 81E2 81D4 81A4"
- $"8169 819E 81F2 81C9 8162 8145 8179 819B"
- $"81C2 81D2 81D0 8161 8D00 95FF 8100 91FF"
- $"81DC 81E2 81D4 81A4 8169 819E 81F2 81C9"
- $"8162 8145 8179 819B 81C2 81D2 81D0 8161"
- $"8D00 95FF 8100 91FF 81DC 81E2 81D4 81A4"
- $"8169 819E 81F2 81C9 8162 8145 8179 819B"
- $"81C2 81D2 81D0 8161 8D00 95FF 8100 8DFF"
- $"81E8 81DD 81D2 81B3 816A 81A0 81F3 81C7"
- $"815C 811B 815D 8189 819C 81B5 81CD 81D5"
- $"81D3 8161 8900 95FF 8100 8DFF 81E8 81DD"
- $"81D2 81B3 816A 81A0 81F3 81C7 815C 811B"
- $"815D 8189 819C 81B5 81CD 81D5 81D3 8161"
- $"8900 95FF 8100 8DFF 81E8 81DD 81D2 81B3"
- $"816A 81A0 81F3 81C7 815C 811B 815D 8189"
- $"819C 81B5 81CD 81D5 81D3 8161 8900 95FF"
- $"8100 8DFF 81E8 81DD 81D2 81B3 816A 81A0"
- $"81F3 81C7 815C 811B 815D 8189 819C 81B5"
- $"81CD 81D5 81D3 8161 8900 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81DC 81C3 81A8 818D"
- $"8184 817B 8168 816D 815A 815E 818F 81AF"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81DC 81C3 81A8 818D 8184 817B 8168 816D"
- $"815A 815E 818F 81AF 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81DC 81C3 81A8 818D"
- $"8184 817B 8168 816D 815A 815E 818F 81AF"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81DC 81C3 81A8 818D 8184 817B 8168 816D"
- $"815A 815E 818F 81AF 8100 95FF 8100 C5FF"
- $"8100 85FF 8181 818F 81B5 8100 95FF 8100"
- $"C5FF 8100 85FF 8181 818F 81B5 8100 95FF"
- $"8100 C5FF 8100 85FF 8181 818F 81B5 8100"
- $"95FF 8100 C5FF 8100 85FF 8181 818F 81B5"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"FF00 FF00 FF00 FB00 FF00 FF00 FF00 FF00"
- $"9500 C9FF 8101 8100 8144 81FF A100 C9FF"
- $"8101 8100 8144 81FF A100 C9FF 8101 8100"
- $"8144 81FF A100 C9FF 8101 8100 8144 81FF"
- $"A100 C5FF 8109 8500 8101 8144 A100 C5FF"
- $"8109 8500 8101 8144 A100 C5FF 8109 8500"
- $"8101 8144 A100 C5FF 8109 8500 8101 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 BDFF 8166 81E4 819D 8171 8119 8144"
- $"81FF A100 BDFF 8166 81E4 819D 8171 8119"
- $"8144 81FF A100 BDFF 8166 81E4 819D 8171"
- $"8119 8144 81FF A100 BDFF 8166 81E4 819D"
- $"8171 8119 8144 81FF A100 A9FF 81C9 81BE"
- $"81A7 819B 8182 81E4 8189 8144 8119 8144"
- $"85FF A100 A9FF 81C9 81BE 81A7 819B 8182"
- $"81E4 8189 8144 8119 8144 85FF A100 A9FF"
- $"81C9 81BE 81A7 819B 8182 81E4 8189 8144"
- $"8119 8144 85FF A100 A9FF 81C9 81BE 81A7"
- $"819B 8182 81E4 8189 8144 8119 8144 85FF"
- $"A100 A1FF 81CF 81B6 81B9 81BB 819B 8179"
- $"81E4 8193 8144 8119 8144 89FF A100 A1FF"
- $"81CF 81B6 81B9 81BB 819B 8179 81E4 8193"
- $"8144 8119 8144 89FF A100 A1FF 81CF 81B6"
- $"81B9 81BB 819B 8179 81E4 8193 8144 8119"
- $"8144 89FF A100 A1FF 81CF 81B6 81B9 81BB"
- $"819B 8179 81E4 8193 8144 8119 8144 89FF"
- $"A100 9DFF 81B2 81AC 81B6 81B5 819B 817D"
- $"81E4 8197 8144 8119 8144 8DFF A100 9DFF"
- $"81B2 81AC 81B6 81B5 819B 817D 81E4 8197"
- $"8144 8119 8144 8DFF A100 9DFF 81B2 81AC"
- $"81B6 81B5 819B 817D 81E4 8197 8144 8119"
- $"8144 8DFF A100 9DFF 81B2 81AC 81B6 81B5"
- $"819B 817D 81E4 8197 8144 8119 8144 8DFF"
- $"BD00 85AF 81A0 816E 8151 8180 81E4 819A"
- $"8144 8119 819B 8162 CD00 85AF 81A0 816E"
- $"8151 8180 81E4 819A 8144 8119 819B 8162"
- $"CD00 85AF 81A0 816E 8151 8180 81E4 819A"
- $"8144 8119 819B 8162 CD00 85AF 81A0 816E"
- $"8151 8180 81E4 819A 8144 8119 819B 8162"
- $"9500 95FF 8100 95FF 81B2 81B3 8197 8168"
- $"812E 8176 81E4 819D 8144 8119 8163 8196"
- $"81A1 8162 9100 95FF 8100 95FF 81B2 81B3"
- $"8197 8168 812E 8176 81E4 819D 8144 8119"
- $"8163 8196 81A1 8162 9100 95FF 8100 95FF"
- $"81B2 81B3 8197 8168 812E 8176 81E4 819D"
- $"8144 8119 8163 8196 81A1 8162 9100 95FF"
- $"8100 95FF 81B2 81B3 8197 8168 812E 8176"
- $"81E4 819D 8144 8119 8163 8196 81A1 8162"
- $"9100 95FF 8100 91FF 81BE 81B0 8199 8153"
- $"8130 817E 81CF 819C 8146 8119 8134 8159"
- $"818B 81A6 819C 8162 8D00 95FF 8100 91FF"
- $"81BE 81B0 8199 8153 8130 817E 81CF 819C"
- $"8146 8119 8134 8159 818B 81A6 819C 8162"
- $"8D00 95FF 8100 91FF 81BE 81B0 8199 8153"
- $"8130 817E 81CF 819C 8146 8119 8134 8159"
- $"818B 81A6 819C 8162 8D00 95FF 8100 91FF"
- $"81BE 81B0 8199 8153 8130 817E 81CF 819C"
- $"8146 8119 8134 8159 818B 81A6 819C 8162"
- $"8D00 95FF 8100 8DFF 81E0 81B1 8191 8167"
- $"812E 817E 81D0 819A 8144 810E 812A 813C"
- $"8155 817B 81A0 81A8 81A2 8162 8900 95FF"
- $"8100 8DFF 81E0 81B1 8191 8167 812E 817E"
- $"81D0 819A 8144 810E 812A 813C 8155 817B"
- $"81A0 81A8 81A2 8162 8900 95FF 8100 8DFF"
- $"81E0 81B1 8191 8167 812E 817E 81D0 819A"
- $"8144 810E 812A 813C 8155 817B 81A0 81A8"
- $"81A2 8162 8900 95FF 8100 8DFF 81E0 81B1"
- $"8191 8167 812E 817E 81D0 819A 8144 810E"
- $"812A 813C 8155 817B 81A0 81A8 81A2 8162"
- $"8900 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 8172 812D 813A 817D"
- $"8186 8183 8199 8198 818C 8185 81A0 81B3"
- $"81B9 81AE 81A9 85AA 81A5 8168 817E 8100"
- $"95FF 8100 8DFF 8172 812D 813A 817D 8186"
- $"8183 8199 8198 818C 8185 81A0 81B3 81B9"
- $"81AE 81A9 85AA 81A5 8168 817E 8100 95FF"
- $"8100 8DFF 8172 812D 813A 817D 8186 8183"
- $"8199 8198 818C 8185 81A0 81B3 81B9 81AE"
- $"81A9 85AA 81A5 8168 817E 8100 95FF 8100"
- $"8DFF 8172 812D 813A 817D 8186 8183 8199"
- $"8198 818C 8185 81A0 81B3 81B9 81AE 81A9"
- $"85AA 81A5 8168 817E 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"816E 818B 8180 8144 8174 816B 8145 8522"
- $"812F 8130 812E 8142 815C 8155 8158 8160"
- $"8155 818E 819E 8100 95FF 8100 8DFF 816E"
- $"818B 8180 8144 8174 816B 8145 8522 812F"
- $"8130 812E 8142 815C 8155 8158 8160 8155"
- $"818E 819E 8100 95FF 8100 8DFF 816E 818B"
- $"8180 8144 8174 816B 8145 8522 812F 8130"
- $"812E 8142 815C 8155 8158 8160 8155 818E"
- $"819E 8100 95FF 8100 8DFF 816E 818B 8180"
- $"8144 8174 816B 8145 8522 812F 8130 812E"
- $"8142 815C 8155 8158 8160 8155 818E 819E"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81D6 81B6 8192 816F 8166 815B 8147 8149"
- $"8131 813B 818E 81A6 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81D6 81B6 8192 816F"
- $"8166 815B 8147 8149 8131 813B 818E 81A6"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81D6 81B6 8192 816F 8166 815B 8147 8149"
- $"8131 813B 818E 81A6 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81D6 81B6 8192 816F"
- $"8166 815B 8147 8149 8131 813B 818E 81A6"
- $"8100 95FF 8100 C5FF 8100 85FF 8172 818E"
- $"81AB 8100 95FF 8100 C5FF 8100 85FF 8172"
- $"818E 81AB 8100 95FF 8100 C5FF 8100 85FF"
- $"8172 818E 81AB 8100 95FF 8100 C5FF 8100"
- $"85FF 8172 818E 81AB 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF FF00 FF00 FF00 FB00"
- $"FF00 FF00 FF00 FF00 9500 C9FF 810F 8143"
- $"8144 81FF A100 C9FF 810F 8143 8144 81FF"
- $"A100 C9FF 810F 8143 8144 81FF A100 C9FF"
- $"810F 8143 8144 81FF A100 C5FF 8117 8143"
- $"8116 810F 8144 A100 C5FF 8117 8143 8116"
- $"810F 8144 A100 C5FF 8117 8143 8116 810F"
- $"8144 A100 C5FF 8117 8143 8116 810F 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 BDFF 8155 8167 81A7 816C 811A 8144"
- $"81FF A100 BDFF 8155 8167 81A7 816C 811A"
- $"8144 81FF A100 BDFF 8155 8167 81A7 816C"
- $"811A 8144 81FF A100 BDFF 8155 8167 81A7"
- $"816C 811A 8144 81FF A100 A9FF 81BC 81A9"
- $"8192 8193 813E 8167 814D 8123 811A 8144"
- $"85FF A100 A9FF 81BC 81A9 8192 8193 813E"
- $"8167 814D 8123 811A 8144 85FF A100 A9FF"
- $"81BC 81A9 8192 8193 813E 8167 814D 8123"
- $"811A 8144 85FF A100 A9FF 81BC 81A9 8192"
- $"8193 813E 8167 814D 8123 811A 8144 85FF"
- $"A100 A1FF 81C6 819A 8598 8193 8131 8167"
- $"814A 8123 811A 8144 89FF A100 A1FF 81C6"
- $"819A 8598 8193 8131 8167 814A 8123 811A"
- $"8144 89FF A100 A1FF 81C6 819A 8598 8193"
- $"8131 8167 814A 8123 811A 8144 89FF A100"
- $"A1FF 81C6 819A 8598 8193 8131 8167 814A"
- $"8123 811A 8144 89FF A100 9DFF 819C 818E"
- $"8199 8195 8193 8137 8167 814F 8123 811A"
- $"8144 8DFF A100 9DFF 819C 818E 8199 8195"
- $"8193 8137 8167 814F 8123 811A 8144 8DFF"
- $"A100 9DFF 819C 818E 8199 8195 8193 8137"
- $"8167 814F 8123 811A 8144 8DFF A100 9DFF"
- $"819C 818E 8199 8195 8193 8137 8167 814F"
- $"8123 811A 8144 8DFF BD00 8192 818F 8186"
- $"8157 8147 8139 8167 8152 8123 811A 817A"
- $"8161 CD00 8192 818F 8186 8157 8147 8139"
- $"8167 8152 8123 811A 817A 8161 CD00 8192"
- $"818F 8186 8157 8147 8139 8167 8152 8123"
- $"811A 817A 8161 CD00 8192 818F 8186 8157"
- $"8147 8139 8167 8152 8123 811A 817A 8161"
- $"9500 95FF 8100 95FF 8195 8191 817C 8151"
- $"812A 8132 8167 8153 8123 811A 814B 8178"
- $"8183 8161 89FF 8500 95FF 8100 95FF 8195"
- $"8191 817C 8151 812A 8132 8167 8153 8123"
- $"811A 814B 8178 8183 8161 89FF 8500 95FF"
- $"8100 95FF 8195 8191 817C 8151 812A 8132"
- $"8167 8153 8123 811A 814B 8178 8183 8161"
- $"89FF 8500 95FF 8100 95FF 8195 8191 817C"
- $"8151 812A 8132 8167 8153 8123 811A 814B"
- $"8178 8183 8161 89FF 8500 95FF 8100 91FF"
- $"81A9 818B 817D 8141 812C 8137 8163 8153"
- $"8124 811A 812C 8144 816D 818A 8180 8161"
- $"85FF 8500 95FF 8100 91FF 81A9 818B 817D"
- $"8141 812C 8137 8163 8153 8124 811A 812C"
- $"8144 816D 818A 8180 8161 85FF 8500 95FF"
- $"8100 91FF 81A9 818B 817D 8141 812C 8137"
- $"8163 8153 8124 811A 812C 8144 816D 818A"
- $"8180 8161 85FF 8500 95FF 8100 91FF 81A9"
- $"818B 817D 8141 812C 8137 8163 8153 8124"
- $"811A 812C 8144 816D 818A 8180 8161 85FF"
- $"8500 95FF 8100 8DFF 81DA 8192 8178 8154"
- $"8127 8137 8161 8151 8122 8111 8124 8132"
- $"813F 8160 8184 818D 8186 8161 81FF 8500"
- $"95FF 8100 8DFF 81DA 8192 8178 8154 8127"
- $"8137 8161 8151 8122 8111 8124 8132 813F"
- $"8160 8184 818D 8186 8161 81FF 8500 95FF"
- $"8100 8DFF 81DA 8192 8178 8154 8127 8137"
- $"8161 8151 8122 8111 8124 8132 813F 8160"
- $"8184 818D 8186 8161 81FF 8500 95FF 8100"
- $"8DFF 81DA 8192 8178 8154 8127 8137 8161"
- $"8151 8122 8111 8124 8132 813F 8160 8184"
- $"818D 8186 8161 81FF 8500 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"8161 8120 812F 816A 8576 8583 8178 8174"
- $"818C 819A 819D 8191 858E 818C 8188 8169"
- $"8155 8100 95FF 8100 8DFF 8161 8120 812F"
- $"816A 8576 8583 8178 8174 818C 819A 819D"
- $"8191 858E 818C 8188 8169 8155 8100 95FF"
- $"8100 8DFF 8161 8120 812F 816A 8576 8583"
- $"8178 8174 818C 819A 819D 8191 858E 818C"
- $"8188 8169 8155 8100 95FF 8100 8DFF 8161"
- $"8120 812F 816A 8576 8583 8178 8174 818C"
- $"819A 819D 8191 858E 818C 8188 8169 8155"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 8159 816A 8149 8122"
- $"8177 8168 813C 811A 811D 8928 8138 814D"
- $"8147 8148 814F 8147 818E 81FF 8100 95FF"
- $"8100 8DFF 8159 816A 8149 8122 8177 8168"
- $"813C 811A 811D 8928 8138 814D 8147 8148"
- $"814F 8147 818E 81FF 8100 95FF 8100 8DFF"
- $"8159 816A 8149 8122 8177 8168 813C 811A"
- $"811D 8928 8138 814D 8147 8148 814F 8147"
- $"818E 81FF 8100 95FF 8100 8DFF 8159 816A"
- $"8149 8122 8177 8168 813C 811A 811D 8928"
- $"8138 814D 8147 8148 814F 8147 818E 81FF"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 8165 819F 81C2 95FF"
- $"81D3 81B2 818E 8169 815F 8156 8142 8143"
- $"812B 8135 818E 819F 8100 95FF 8100 89FF"
- $"8165 819F 81C2 95FF 81D3 81B2 818E 8169"
- $"815F 8156 8142 8143 812B 8135 818E 819F"
- $"8100 95FF 8100 89FF 8165 819F 81C2 95FF"
- $"81D3 81B2 818E 8169 815F 8156 8142 8143"
- $"812B 8135 818E 819F 8100 95FF 8100 89FF"
- $"8165 819F 81C2 95FF 81D3 81B2 818E 8169"
- $"815F 8156 8142 8143 812B 8135 818E 819F"
- $"8100 95FF 8100 C5FF 8100 85FF 816B 818E"
- $"81A7 8100 95FF 8100 C5FF 8100 85FF 816B"
- $"818E 81A7 8100 95FF 8100 C5FF 8100 85FF"
- $"816B 818E 81A7 8100 95FF 8100 C5FF 8100"
- $"85FF 816B 818E 81A7 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF FF00 FF00 FF00 FB00"
- $"7438 6D6B 0000 4008 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF"
-};
-
-data 'ics#' (128, "Application Icon") {
- $"F557 D001 700E E024 9A9B 0175 9299 0162"
- $"923E 0001 9004 0000 9BBC 102C 8434 5AFD"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'ics4' (128, "Application Icon") {
- $"AA3F DDDD DDDD DDAE A333 0000 0000 0C3E"
- $"333A 0000 000C DBEC A333 0000 0CBC 2A00"
- $"EDDF DDDB D2CB ECFF D00D 00CD BBBA B2D6"
- $"D00D 00B2 DDBB DCCB D00D 00D4 D2D2 CC2D"
- $"D00D 00BD CCE5 3EEC D00D 0C00 0000 CBCB"
- $"D00D 0000 0000 0D0D D00D 0000 0000 0D00"
- $"D00D ABAB ABAF 9F00 D00D 1111 11B8 9900"
- $"D00D 1111 1189 9F00 EDDA 8291 ABAF 9FDD"
-};
-
-data 'ics8' (128, "Application Icon") {
- $"DEDC DBB3 F9FA F9FA F9FA F9FA F9FA 8FFB"
- $"DC23 23DB 0000 0000 0000 0000 0032 6A88"
- $"DB23 23DC 0000 0000 0000 F52B 3357 882B"
- $"DC23 23DB 0000 0000 F608 3234 33AD F600"
- $"FCFA F9AC F9FA F95D 0E5D 3457 8833 F1F2"
- $"FA00 00F9 0000 0733 825E 33AD 6432 33EF"
- $"F900 00FA 0000 5D5E 5D33 825D 3332 2C57"
- $"FA00 00F9 0000 5739 5D64 5D33 3232 335C"
- $"F900 00FA 00F5 5D57 F732 828E 8988 88F9"
- $"FA00 00F9 00F6 F600 0000 F5F6 4F5D F85D"
- $"F900 00FA 0000 0000 0000 0000 00FA 0056"
- $"FA00 00FA 0000 0000 0000 0000 00F9 0000"
- $"F900 00F9 8359 8359 8359 ADD1 E8EA 0000"
- $"FA00 00FA 0505 0505 0505 5FE5 E6E8 0000"
- $"F900 00F9 0505 0505 0505 7DE6 E6D1 0000"
- $"ACF9 FAFC 8359 8359 8359 ADD1 E8E9 FAF9"
-};
-
diff --git a/samples/docview/mondrian.xpm b/samples/docview/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/docview/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index fc0755b6ff..0bd71e6f1b 100644
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -36,9 +36,9 @@
#include "dragimag.h"
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-#include "mondrian.xpm"
-#include "dragicon.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
+ #include "dragicon.xpm"
#endif
// main program
@@ -327,7 +327,7 @@ MyFrame::MyFrame()
wxMenuBar *menu_bar = new wxMenuBar();
menu_bar->Append(file_menu, wxT("&File"));
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
SetMenuBar( menu_bar );
#if wxUSE_STATUSBAR
diff --git a/samples/dragimag/dragimag.rc b/samples/dragimag/dragimag.rc
index 754a072235..650de58339 100644
--- a/samples/dragimag/dragimag.rc
+++ b/samples/dragimag/dragimag.rc
@@ -1,5 +1,4 @@
-mondrian ICON "mondrian.ico"
+#include "../sample.rc"
+
dragicon ICON "dragicon.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/dragimag/mondrian.ico b/samples/dragimag/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/dragimag/mondrian.ico and /dev/null differ
diff --git a/samples/dragimag/mondrian.xpm b/samples/dragimag/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/dragimag/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 54c728b079..c064d4335e 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -47,9 +47,9 @@ DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
DRAWING_OBJECTS = \
+ $(__drawing___win32rc) \
$(__drawing_os2_lib_res) \
- drawing_drawing.o \
- $(__drawing___win32rc)
+ drawing_drawing.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__drawing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_sample_rc.o
@COND_PLATFORM_OS2_1@__drawing_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__drawing_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__drawing___win32rc = drawing_drawing_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)
@@ -186,12 +186,12 @@ data:
esac; \
done
+drawing_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
drawing_drawing.o: $(srcdir)/drawing.cpp
$(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $(srcdir)/drawing.cpp
-drawing_drawing_rc.o: $(srcdir)/drawing.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/drawing/drawing.bkl b/samples/drawing/drawing.bkl
index e2e383dafe..0ac1e066ec 100644
--- a/samples/drawing/drawing.bkl
+++ b/samples/drawing/drawing.bkl
@@ -7,7 +7,6 @@
drawing.cpp
core
base
- drawing.rc
diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index afebb30869..c3b3f4be52 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -45,8 +45,8 @@
// ----------------------------------------------------------------------------
// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
@@ -1694,7 +1694,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
{
// set the frame icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
wxMenu *menuFile = new wxMenu;
menuFile->Append(File_ShowDefault, wxT("&Default screen\tF1"));
diff --git a/samples/drawing/drawing.dsp b/samples/drawing/drawing.dsp
index 43a7ae287c..0ac675e905 100644
--- a/samples/drawing/drawing.dsp
+++ b/samples/drawing/drawing.dsp
@@ -256,7 +256,7 @@ SOURCE=.\drawing.cpp
# End Source File
# Begin Source File
-SOURCE=.\drawing.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/drawing/drawing.rc b/samples/drawing/drawing.rc
deleted file mode 100644
index 2b94a2b647..0000000000
--- a/samples/drawing/drawing.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "wx/msw/wx.rc"
-
-mondrian ICON "mondrian.ico"
diff --git a/samples/drawing/drawing_vc7.vcproj b/samples/drawing/drawing_vc7.vcproj
index b8ecf8a7b3..e9a16aef7d 100644
--- a/samples/drawing/drawing_vc7.vcproj
+++ b/samples/drawing/drawing_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/drawing/drawing_vc8.vcproj b/samples/drawing/drawing_vc8.vcproj
index 6873e41899..44e5820442 100644
--- a/samples/drawing/drawing_vc8.vcproj
+++ b/samples/drawing/drawing_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/drawing/drawing_vc9.vcproj b/samples/drawing/drawing_vc9.vcproj
index c1902b4f74..9b3e92eb70 100644
--- a/samples/drawing/drawing_vc9.vcproj
+++ b/samples/drawing/drawing_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc
index f59fb25956..8b0e7f1693 100644
--- a/samples/drawing/makefile.bcc
+++ b/samples/drawing/makefile.bcc
@@ -229,18 +229,18 @@ clean:
-if exist $(OBJS)\drawing.ilf del $(OBJS)\drawing.ilf
-if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils
-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
+$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(DRAWING_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_drawing.res
+ c0w32.obj $(DRAWING_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\drawing_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\drawing_drawing.obj: .\drawing.cpp
$(CXX) -q -c -P -o$@ $(DRAWING_CXXFLAGS) .\drawing.cpp
-$(OBJS)\drawing_drawing.res: .\drawing.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\drawing.rc
-
diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc
index 09b7850b9f..ddd59c4c0d 100644
--- a/samples/drawing/makefile.gcc
+++ b/samples/drawing/makefile.gcc
@@ -29,8 +29,8 @@ DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
DRAWING_OBJECTS = \
- $(OBJS)\drawing_drawing.o \
- $(OBJS)\drawing_drawing_rc.o
+ $(OBJS)\drawing_sample_rc.o \
+ $(OBJS)\drawing_drawing.o
### Conditionally set variables: ###
@@ -218,19 +218,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing_rc.o
+$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_sample_rc.o
$(CXX) -o $@ $(DRAWING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\drawing_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\drawing_drawing.o: ./drawing.cpp
$(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\drawing_drawing_rc.o: ./drawing.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc
index cca19ae5cc..f54e0d4dcc 100644
--- a/samples/drawing/makefile.vc
+++ b/samples/drawing/makefile.vc
@@ -32,7 +32,7 @@ DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
DRAWING_OBJECTS = \
$(OBJS)\drawing_drawing.obj
DRAWING_RESOURCES = \
- $(OBJS)\drawing_drawing.res
+ $(OBJS)\drawing_sample.res
### Conditionally set variables: ###
@@ -339,7 +339,7 @@ clean:
-if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk
-if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb
-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
+$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(DRAWING_OBJECTS) $(DRAWING_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -348,9 +348,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\drawing_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\drawing_drawing.obj: .\drawing.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp
-$(OBJS)\drawing_drawing.res: .\drawing.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\drawing.rc
-
diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat
index f0ee1bb83f..ffa658d720 100644
--- a/samples/drawing/makefile.wat
+++ b/samples/drawing/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
-$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
+$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_sample.res
@%create $(OBJS)\drawing.lbc
@%append $(OBJS)\drawing.lbc option quiet
@%append $(OBJS)\drawing.lbc name $^@
@@ -256,7 +256,7 @@ $(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res
@%append $(OBJS)\drawing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\drawing.lbc library %i
- @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res
+ @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_sample.res
@for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i
wlink @$(OBJS)\drawing.lbc
@@ -264,9 +264,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\drawing_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\drawing_drawing.obj : .AUTODEPEND .\drawing.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $<
-$(OBJS)\drawing_drawing.res : .AUTODEPEND .\drawing.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/drawing/mondrian.ico b/samples/drawing/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/drawing/mondrian.ico and /dev/null differ
diff --git a/samples/drawing/mondrian.xpm b/samples/drawing/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/drawing/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 02aab740db..37a879fb68 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -47,9 +47,9 @@ ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
ERASE_OBJECTS = \
+ $(__erase___win32rc) \
$(__erase_os2_lib_res) \
- erase_erase.o \
- $(__erase___win32rc)
+ erase_erase.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q
@COND_PLATFORM_OS2_1@__erase___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___erase___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__erase___win32rc = erase_sample_rc.o
@COND_PLATFORM_OS2_1@__erase_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__erase_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__erase___win32rc = erase_erase_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)
@@ -174,12 +174,12 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
@COND_PLATFORM_MACOSX_1@erase_bundle: $(____erase_BUNDLE_TGT_REF_DEP)
+erase_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
erase_erase.o: $(srcdir)/erase.cpp
$(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $(srcdir)/erase.cpp
-erase_erase_rc.o: $(srcdir)/erase.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/erase/erase.bkl b/samples/erase/erase.bkl
index 6239ede757..0c0dca9f7c 100644
--- a/samples/erase/erase.bkl
+++ b/samples/erase/erase.bkl
@@ -7,7 +7,6 @@
erase.cpp
core
base
- erase.rc
diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index d00ccf0de3..d603a93cef 100644
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -35,9 +35,10 @@
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
+
// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
@@ -169,7 +170,7 @@ MyFrame::MyFrame()
: wxFrame(NULL, wxID_ANY, "Erase sample",
wxPoint(50, 50), wxSize(450, 340))
{
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
menuFile->AppendCheckItem(Erase_Menu_UseBuffer, "&Use memory DC\tCtrl-M");
@@ -252,7 +253,7 @@ MyCanvas::MyCanvas(wxFrame *parent)
SetScrollbars( 10, 10, 40, 100, 0, 0 );
- m_bitmap = wxBitmap( wxICON(mondrian) );
+ m_bitmap = wxBitmap( wxICON(sample) );
new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );
diff --git a/samples/erase/erase.dsp b/samples/erase/erase.dsp
index b6b1a37b9d..1d17f1196f 100644
--- a/samples/erase/erase.dsp
+++ b/samples/erase/erase.dsp
@@ -256,7 +256,7 @@ SOURCE=.\erase.cpp
# End Source File
# Begin Source File
-SOURCE=.\erase.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/erase/erase.rc b/samples/erase/erase.rc
deleted file mode 100644
index 3bf71d6da0..0000000000
--- a/samples/erase/erase.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-#define MINIMAL_QUIT 1
-#define MINIMAL_ABOUT 102
-
diff --git a/samples/erase/erase.rc0 b/samples/erase/erase.rc0
deleted file mode 100644
index 42078bed50..0000000000
--- a/samples/erase/erase.rc0
+++ /dev/null
@@ -1,6 +0,0 @@
-ICON 1 PRELOAD "mondros2.ico"
-#include "..\\..\\include\wx\os2\wx.rc"
-
-#define MINIMAL_QUIT 1
-#define MINIMAL_ABOUT 102
-
diff --git a/samples/erase/erase.rc4 b/samples/erase/erase.rc4
deleted file mode 100644
index 695f7b0f76..0000000000
--- a/samples/erase/erase.rc4
+++ /dev/null
@@ -1,6 +0,0 @@
-ICON 1 PRELOAD "..\\samples\\erase\\mondros2.ico"
-#include "H:\DEV\WX22\WXWINDOWS\include\wx\os2\wx.rc"
-
-#define MINIMAL_QUIT 1
-#define MINIMAL_ABOUT 102
-
diff --git a/samples/erase/erase_vc7.vcproj b/samples/erase/erase_vc7.vcproj
index 9be66866a6..89acfced3f 100644
--- a/samples/erase/erase_vc7.vcproj
+++ b/samples/erase/erase_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/erase/erase_vc8.vcproj b/samples/erase/erase_vc8.vcproj
index 729cd96e25..877001decd 100644
--- a/samples/erase/erase_vc8.vcproj
+++ b/samples/erase/erase_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/erase/erase_vc9.vcproj b/samples/erase/erase_vc9.vcproj
index d65cf35314..48ee73ecd8 100644
--- a/samples/erase/erase_vc9.vcproj
+++ b/samples/erase/erase_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc
index a2739e5dd4..945a153d47 100644
--- a/samples/erase/makefile.bcc
+++ b/samples/erase/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\erase.ilf del $(OBJS)\erase.ilf
-if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils
-$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
+$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(ERASE_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_erase.res
+ c0w32.obj $(ERASE_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_sample.res
|
+$(OBJS)\erase_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\erase_erase.obj: .\erase.cpp
$(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) .\erase.cpp
-$(OBJS)\erase_erase.res: .\erase.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\erase.rc
-
diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc
index e641d9a068..37bfed6b38 100644
--- a/samples/erase/makefile.gcc
+++ b/samples/erase/makefile.gcc
@@ -29,8 +29,8 @@ ERASE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ERASE_OBJECTS = \
- $(OBJS)\erase_erase.o \
- $(OBJS)\erase_erase_rc.o
+ $(OBJS)\erase_sample_rc.o \
+ $(OBJS)\erase_erase.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
-$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase_rc.o
+$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_sample_rc.o
$(CXX) -o $@ $(ERASE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\erase_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\erase_erase.o: ./erase.cpp
$(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\erase_erase_rc.o: ./erase.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index 72b815f22d..116d7f1fbc 100644
--- a/samples/erase/makefile.vc
+++ b/samples/erase/makefile.vc
@@ -32,7 +32,7 @@ ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
ERASE_OBJECTS = \
$(OBJS)\erase_erase.obj
ERASE_RESOURCES = \
- $(OBJS)\erase_erase.res
+ $(OBJS)\erase_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk
-if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb
-$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
+$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ERASE_OBJECTS) $(ERASE_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\erase_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\erase_erase.obj: .\erase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp
-$(OBJS)\erase_erase.res: .\erase.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\erase.rc
-
diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat
index a7eb8220e1..74baca1f23 100644
--- a/samples/erase/makefile.wat
+++ b/samples/erase/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
-$(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
+$(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_sample.res
@%create $(OBJS)\erase.lbc
@%append $(OBJS)\erase.lbc option quiet
@%append $(OBJS)\erase.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res
@%append $(OBJS)\erase.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\erase.lbc library %i
- @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res
+ @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_sample.res
@for %i in () do @%append $(OBJS)\erase.lbc option stack=%i
wlink @$(OBJS)\erase.lbc
+$(OBJS)\erase_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\erase_erase.obj : .AUTODEPEND .\erase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $<
-$(OBJS)\erase_erase.res : .AUTODEPEND .\erase.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/erase/mondrian.ico b/samples/erase/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/erase/mondrian.ico and /dev/null differ
diff --git a/samples/erase/mondrian.xpm b/samples/erase/mondrian.xpm
deleted file mode 100644
index 18d5e76208..0000000000
--- a/samples/erase/mondrian.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 7 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-"a c None",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ +aaaaaaaaaaaaaaaa+ .... ",
-" ++++++ +aaaaaaaaaaaaaaaa+ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ +aaaaaaaaaaaaaaaa+ ",
-" ++++++ +aaaaaaaaaaaaaaaa+ ++++ ",
-" ++++++ +aaaaaaaaaaaaaaaa+ ++++ ",
-" ++++++ +aaaaaaaaaaaaaaaa+ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 98e0272752..d3604236a9 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -47,9 +47,9 @@ EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
EVENT_OBJECTS = \
+ $(__event___win32rc) \
$(__event_os2_lib_res) \
- event_event.o \
- $(__event___win32rc)
+ event_event.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___event___os2_emxbindcmd = $(NM) event$(EXEEXT) | if grep -q
@COND_PLATFORM_OS2_1@__event___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___event___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__event___win32rc = event_sample_rc.o
@COND_PLATFORM_OS2_1@__event_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__event_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__event___win32rc = event_event_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)
@@ -174,12 +174,12 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
@COND_PLATFORM_MACOSX_1@event_bundle: $(____event_BUNDLE_TGT_REF_DEP)
+event_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
event_event.o: $(srcdir)/event.cpp
$(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $(srcdir)/event.cpp
-event_event_rc.o: $(srcdir)/event.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/event/event.bkl b/samples/event/event.bkl
index 78b9436d64..e5b558fac3 100644
--- a/samples/event/event.bkl
+++ b/samples/event/event.bkl
@@ -7,7 +7,6 @@
event.cpp
core
base
- event.rc
diff --git a/samples/event/event.dsp b/samples/event/event.dsp
index 9a7eb7196d..06bc7fc0cf 100644
--- a/samples/event/event.dsp
+++ b/samples/event/event.dsp
@@ -256,7 +256,7 @@ SOURCE=.\event.cpp
# End Source File
# Begin Source File
-SOURCE=.\event.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/event/event.rc b/samples/event/event.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/event/event.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/event/event_vc7.vcproj b/samples/event/event_vc7.vcproj
index 88912c2015..1e7d45d87d 100644
--- a/samples/event/event_vc7.vcproj
+++ b/samples/event/event_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/event/event_vc8.vcproj b/samples/event/event_vc8.vcproj
index c894bb60dc..fff4f4ee1f 100644
--- a/samples/event/event_vc8.vcproj
+++ b/samples/event/event_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/event/event_vc9.vcproj b/samples/event/event_vc9.vcproj
index 61d383dfab..505652e5a8 100644
--- a/samples/event/event_vc9.vcproj
+++ b/samples/event/event_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc
index 9b01b55024..5a2b1d18ec 100644
--- a/samples/event/makefile.bcc
+++ b/samples/event/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\event.ilf del $(OBJS)\event.ilf
-if exist $(OBJS)\event.ils del $(OBJS)\event.ils
-$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res
+$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(EVENT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_event.res
+ c0w32.obj $(EVENT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_sample.res
|
+$(OBJS)\event_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\event_event.obj: .\event.cpp
$(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\event.cpp
-$(OBJS)\event_event.res: .\event.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\event.rc
-
diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc
index 350fb95cbf..1129cb54f3 100644
--- a/samples/event/makefile.gcc
+++ b/samples/event/makefile.gcc
@@ -29,8 +29,8 @@ EVENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
EVENT_OBJECTS = \
- $(OBJS)\event_event.o \
- $(OBJS)\event_event_rc.o
+ $(OBJS)\event_sample_rc.o \
+ $(OBJS)\event_event.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\event.exe del $(OBJS)\event.exe
-$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event_rc.o
+$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_sample_rc.o
$(CXX) -o $@ $(EVENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\event_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\event_event.o: ./event.cpp
$(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\event_event_rc.o: ./event.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc
index a33912989c..2eb79f0e4b 100644
--- a/samples/event/makefile.vc
+++ b/samples/event/makefile.vc
@@ -32,7 +32,7 @@ EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
EVENT_OBJECTS = \
$(OBJS)\event_event.obj
EVENT_RESOURCES = \
- $(OBJS)\event_event.res
+ $(OBJS)\event_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk
-if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb
-$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res
+$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(EVENT_OBJECTS) $(EVENT_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\event_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\event_event.obj: .\event.cpp
$(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp
-$(OBJS)\event_event.res: .\event.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\event.rc
-
diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat
index aca2c4bd49..8c5280eeec 100644
--- a/samples/event/makefile.wat
+++ b/samples/event/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\event.exe del $(OBJS)\event.exe
-$(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res
+$(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_sample.res
@%create $(OBJS)\event.lbc
@%append $(OBJS)\event.lbc option quiet
@%append $(OBJS)\event.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res
@%append $(OBJS)\event.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\event.lbc library %i
- @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res
+ @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_sample.res
@for %i in () do @%append $(OBJS)\event.lbc option stack=%i
wlink @$(OBJS)\event.lbc
+$(OBJS)\event_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\event_event.obj : .AUTODEPEND .\event.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $<
-$(OBJS)\event_event.res : .AUTODEPEND .\event.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 08e01bfab0..09f50fd878 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -47,9 +47,9 @@ FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
FONT_OBJECTS = \
+ $(__font___win32rc) \
$(__font_os2_lib_res) \
- font_font.o \
- $(__font___win32rc)
+ font_font.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \
@COND_PLATFORM_OS2_1@__font___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___font___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__font___win32rc = font_sample_rc.o
@COND_PLATFORM_OS2_1@__font_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__font_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__font___win32rc = font_font_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)
@@ -174,12 +174,12 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
@COND_PLATFORM_MACOSX_1@font_bundle: $(____font_BUNDLE_TGT_REF_DEP)
+font_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
font_font.o: $(srcdir)/font.cpp
$(CXXC) -c -o $@ $(FONT_CXXFLAGS) $(srcdir)/font.cpp
-font_font_rc.o: $(srcdir)/font.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/font/font.bkl b/samples/font/font.bkl
index 16ec889b76..cb88a72e12 100644
--- a/samples/font/font.bkl
+++ b/samples/font/font.bkl
@@ -7,7 +7,6 @@
font.cpp
core
base
- font.rc
diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index e2d4200e57..cb036de8b7 100644
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -302,7 +302,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
{
m_fontSize = wxNORMAL_FONT->GetPointSize();
- SetIcon(wxIcon(sample_xpm));
+ SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
diff --git a/samples/font/font.dsp b/samples/font/font.dsp
index 7c14346df4..3f9830634e 100644
--- a/samples/font/font.dsp
+++ b/samples/font/font.dsp
@@ -256,7 +256,7 @@ SOURCE=.\font.cpp
# End Source File
# Begin Source File
-SOURCE=.\font.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/font/font.rc b/samples/font/font.rc
deleted file mode 100644
index 55808f0e34..0000000000
--- a/samples/font/font.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-
diff --git a/samples/font/font_vc7.vcproj b/samples/font/font_vc7.vcproj
index cef6fe271b..fb5eb5079e 100644
--- a/samples/font/font_vc7.vcproj
+++ b/samples/font/font_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/font/font_vc8.vcproj b/samples/font/font_vc8.vcproj
index 4d6091ce51..84c88c6b0b 100644
--- a/samples/font/font_vc8.vcproj
+++ b/samples/font/font_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/font/font_vc9.vcproj b/samples/font/font_vc9.vcproj
index 4acf8568c0..a47e293f50 100644
--- a/samples/font/font_vc9.vcproj
+++ b/samples/font/font_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc
index af145bacfb..b5c7e313aa 100644
--- a/samples/font/makefile.bcc
+++ b/samples/font/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\font.ilf del $(OBJS)\font.ilf
-if exist $(OBJS)\font.ils del $(OBJS)\font.ils
-$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res
+$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(FONT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_font.res
+ c0w32.obj $(FONT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_sample.res
|
+$(OBJS)\font_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\font_font.obj: .\font.cpp
$(CXX) -q -c -P -o$@ $(FONT_CXXFLAGS) .\font.cpp
-$(OBJS)\font_font.res: .\font.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\font.rc
-
diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index 5b4ce7e7e3..b652a4e96d 100644
--- a/samples/font/makefile.gcc
+++ b/samples/font/makefile.gcc
@@ -28,8 +28,8 @@ FONT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
-Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
FONT_OBJECTS = \
- $(OBJS)\font_font.o \
- $(OBJS)\font_font_rc.o
+ $(OBJS)\font_sample_rc.o \
+ $(OBJS)\font_font.o
### Conditionally set variables: ###
@@ -217,15 +217,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\font.exe del $(OBJS)\font.exe
-$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o
+$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_sample_rc.o
$(CXX) -o $@ $(FONT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\font_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\font_font.o: ./font.cpp
$(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\font_font_rc.o: ./font.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc
index 4106543cee..ca10ef6340 100644
--- a/samples/font/makefile.vc
+++ b/samples/font/makefile.vc
@@ -32,7 +32,7 @@ FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
FONT_OBJECTS = \
$(OBJS)\font_font.obj
FONT_RESOURCES = \
- $(OBJS)\font_font.res
+ $(OBJS)\font_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk
-if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb
-$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res
+$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(FONT_OBJECTS) $(FONT_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\font_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\font_font.obj: .\font.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp
-$(OBJS)\font_font.res: .\font.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\font.rc
-
diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat
index ff59cf49c6..3cefec7c3f 100644
--- a/samples/font/makefile.wat
+++ b/samples/font/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\font.exe del $(OBJS)\font.exe
-$(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res
+$(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_sample.res
@%create $(OBJS)\font.lbc
@%append $(OBJS)\font.lbc option quiet
@%append $(OBJS)\font.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res
@%append $(OBJS)\font.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\font.lbc library %i
- @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res
+ @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_sample.res
@for %i in () do @%append $(OBJS)\font.lbc option stack=%i
wlink @$(OBJS)\font.lbc
+$(OBJS)\font_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\font_font.obj : .AUTODEPEND .\font.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $<
-$(OBJS)\font_font.res : .AUTODEPEND .\font.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/font/mondrian.ico b/samples/font/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/font/mondrian.ico and /dev/null differ
diff --git a/samples/grid/griddemo.rc b/samples/grid/griddemo.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/grid/griddemo.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 176c6781c8..dd958b89a9 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -49,9 +49,9 @@ HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
HELP_OBJECTS = \
+ $(__help___win32rc) \
$(__help_os2_lib_res) \
- help_demo.o \
- $(__help___win32rc)
+ help_demo.o
### Conditionally set variables: ###
@@ -88,6 +88,7 @@ COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \
@COND_PLATFORM_OS2_1@__help___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___help___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__help___win32rc = help_sample_rc.o
@COND_PLATFORM_OS2_1@__help_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__help_app_Contents_PkgInfo___depname \
@@ -115,7 +116,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__help___win32rc = help_demo_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)
@@ -207,12 +207,12 @@ data_doc:
esac; \
done
+help_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
help_demo.o: $(srcdir)/demo.cpp
$(CXXC) -c -o $@ $(HELP_CXXFLAGS) $(srcdir)/demo.cpp
-help_demo_rc.o: $(srcdir)/demo.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 5935d59b1f..505574ad6a 100644
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -79,8 +79,8 @@
// ressources
// ----------------------------------------------------------------------------
// the application icon
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
@@ -396,7 +396,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
#endif
{
// set the frame icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
diff --git a/samples/help/demo.rc b/samples/help/demo.rc
deleted file mode 100644
index 74b8e3f417..0000000000
--- a/samples/help/demo.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index 5a50aad189..50af7881c2 100644
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -10,7 +10,6 @@
adv
core
base
- demo.rc
diff --git a/samples/help/help.dsp b/samples/help/help.dsp
index 7a61119cfa..1010aa4315 100644
--- a/samples/help/help.dsp
+++ b/samples/help/help.dsp
@@ -256,7 +256,7 @@ SOURCE=.\demo.cpp
# End Source File
# Begin Source File
-SOURCE=.\demo.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj
index 30c239ba50..50418f2da7 100644
--- a/samples/help/help_vc7.vcproj
+++ b/samples/help/help_vc7.vcproj
@@ -558,7 +558,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj
index 5889047887..c4d03ff988 100644
--- a/samples/help/help_vc8.vcproj
+++ b/samples/help/help_vc8.vcproj
@@ -824,7 +824,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/help/help_vc9.vcproj b/samples/help/help_vc9.vcproj
index aa4225b191..761b4feaba 100644
--- a/samples/help/help_vc9.vcproj
+++ b/samples/help/help_vc9.vcproj
@@ -796,7 +796,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index d4041f4e96..19fb55ee55 100644
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -237,9 +237,9 @@ clean:
-if exist $(OBJS)\help.ilf del $(OBJS)\help.ilf
-if exist $(OBJS)\help.ils del $(OBJS)\help.ils
-$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res
+$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_demo.res
+ c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_sample.res
|
data:
@@ -250,9 +250,9 @@ data_doc:
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+$(OBJS)\help_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\help_demo.obj: .\demo.cpp
$(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) .\demo.cpp
-$(OBJS)\help_demo.res: .\demo.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\demo.rc
-
diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index c10ecdabee..862ca6f951 100644
--- a/samples/help/makefile.gcc
+++ b/samples/help/makefile.gcc
@@ -28,8 +28,8 @@ HELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
-Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
HELP_OBJECTS = \
- $(OBJS)\help_demo.o \
- $(OBJS)\help_demo_rc.o
+ $(OBJS)\help_sample_rc.o \
+ $(OBJS)\help_demo.o
### Conditionally set variables: ###
@@ -225,7 +225,7 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\help.exe del $(OBJS)\help.exe
-$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o
+$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_sample_rc.o
$(CXX) -o $@ $(HELP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
@@ -236,12 +236,12 @@ data_doc:
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc
+$(OBJS)\help_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\help_demo.o: ./demo.cpp
$(CXX) -c -o $@ $(HELP_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\help_demo_rc.o: ./demo.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean data data_doc
diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index 278ef96eff..e811f1fa51 100644
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -32,7 +32,7 @@ HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
HELP_OBJECTS = \
$(OBJS)\help_demo.obj
HELP_RESOURCES = \
- $(OBJS)\help_demo.res
+ $(OBJS)\help_sample.res
### Conditionally set variables: ###
@@ -347,7 +347,7 @@ clean:
-if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk
-if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb
-$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res
+$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(HELP_OBJECTS) $(HELP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib
<<
@@ -360,9 +360,9 @@ data_doc:
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+$(OBJS)\help_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\help_demo.obj: .\demo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp
-$(OBJS)\help_demo.res: .\demo.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\demo.rc
-
diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat
index 4566799699..08180aca8f 100644
--- a/samples/help/makefile.wat
+++ b/samples/help/makefile.wat
@@ -258,7 +258,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\help.exe del $(OBJS)\help.exe
-$(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res
+$(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_sample.res
@%create $(OBJS)\help.lbc
@%append $(OBJS)\help.lbc option quiet
@%append $(OBJS)\help.lbc name $^@
@@ -266,7 +266,7 @@ $(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res
@%append $(OBJS)\help.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i
@for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\help.lbc library %i
- @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res
+ @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_sample.res
@for %i in () do @%append $(OBJS)\help.lbc option stack=%i
wlink @$(OBJS)\help.lbc
@@ -278,9 +278,9 @@ data_doc : .SYMBOLIC
if not exist $(OBJS)\doc mkdir $(OBJS)\doc
for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+$(OBJS)\help_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $<
-$(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/help/mondrian.ico b/samples/help/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/help/mondrian.ico and /dev/null differ
diff --git a/samples/help/mondrian.xpm b/samples/help/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/help/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index db1eaba74d..c2dd8e7697 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -48,9 +48,9 @@ HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
HTLBOX_OBJECTS = \
+ $(__htlbox___win32rc) \
$(__htlbox_os2_lib_res) \
- htlbox_htlbox.o \
- $(__htlbox___win32rc)
+ htlbox_htlbox.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__htlbox___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_sample_rc.o
@COND_PLATFORM_OS2_1@__htlbox_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__htlbox_app_Contents_PkgInfo___depname \
@@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__htlbox___win32rc = htlbox_htlbox_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)
@@ -178,12 +178,12 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
@COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP)
+htlbox_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
htlbox_htlbox.o: $(srcdir)/htlbox.cpp
$(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $(srcdir)/htlbox.cpp
-htlbox_htlbox_rc.o: $(srcdir)/htlbox.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/htlbox/htlbox.bkl b/samples/htlbox/htlbox.bkl
index 3105bc4d6b..6374eecbdc 100644
--- a/samples/htlbox/htlbox.bkl
+++ b/samples/htlbox/htlbox.bkl
@@ -8,7 +8,6 @@
html
core
base
- htlbox.rc
diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index af34173fa0..091a1d77aa 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -241,7 +241,7 @@ MyFrame::MyFrame()
wxDefaultPosition, wxSize(500, 500))
{
// set the frame icon
- SetIcon(wxIcon(sample_xpm));
+ SetIcon(wxICON(sample));
#if wxUSE_MENUS
// create a menu bar
diff --git a/samples/htlbox/htlbox.dsp b/samples/htlbox/htlbox.dsp
index 9fd1c3b37e..2d32fd46e2 100644
--- a/samples/htlbox/htlbox.dsp
+++ b/samples/htlbox/htlbox.dsp
@@ -256,7 +256,7 @@ SOURCE=.\htlbox.cpp
# End Source File
# Begin Source File
-SOURCE=.\htlbox.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/htlbox/htlbox.rc b/samples/htlbox/htlbox.rc
deleted file mode 100644
index 74b8e3f417..0000000000
--- a/samples/htlbox/htlbox.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
diff --git a/samples/htlbox/htlbox_vc7.vcproj b/samples/htlbox/htlbox_vc7.vcproj
index 4cd4b7ba2c..2922968fa9 100644
--- a/samples/htlbox/htlbox_vc7.vcproj
+++ b/samples/htlbox/htlbox_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/htlbox/htlbox_vc8.vcproj b/samples/htlbox/htlbox_vc8.vcproj
index cb83bcfb6e..4ece7a197e 100644
--- a/samples/htlbox/htlbox_vc8.vcproj
+++ b/samples/htlbox/htlbox_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/htlbox/htlbox_vc9.vcproj b/samples/htlbox/htlbox_vc9.vcproj
index 8381557834..6f6e1e2da7 100644
--- a/samples/htlbox/htlbox_vc9.vcproj
+++ b/samples/htlbox/htlbox_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc
index 5b3c815e65..55a89e9cde 100644
--- a/samples/htlbox/makefile.bcc
+++ b/samples/htlbox/makefile.bcc
@@ -233,14 +233,14 @@ clean:
-if exist $(OBJS)\htlbox.ilf del $(OBJS)\htlbox.ilf
-if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils
-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
+$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_htlbox.res
+ c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_sample.res
|
+$(OBJS)\htlbox_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp
$(CXX) -q -c -P -o$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp
-$(OBJS)\htlbox_htlbox.res: .\htlbox.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\htlbox.rc
-
diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc
index 346341964d..92ac3978b5 100644
--- a/samples/htlbox/makefile.gcc
+++ b/samples/htlbox/makefile.gcc
@@ -29,8 +29,8 @@ HTLBOX_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
HTLBOX_OBJECTS = \
- $(OBJS)\htlbox_htlbox.o \
- $(OBJS)\htlbox_htlbox_rc.o
+ $(OBJS)\htlbox_sample_rc.o \
+ $(OBJS)\htlbox_htlbox.o
### Conditionally set variables: ###
@@ -222,15 +222,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox_rc.o
+$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample_rc.o
$(CXX) -o $@ $(HTLBOX_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\htlbox_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\htlbox_htlbox.o: ./htlbox.cpp
$(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\htlbox_htlbox_rc.o: ./htlbox.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index 3a375352cc..bc63ae4ed8 100644
--- a/samples/htlbox/makefile.vc
+++ b/samples/htlbox/makefile.vc
@@ -32,7 +32,7 @@ HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
HTLBOX_OBJECTS = \
$(OBJS)\htlbox_htlbox.obj
HTLBOX_RESOURCES = \
- $(OBJS)\htlbox_htlbox.res
+ $(OBJS)\htlbox_sample.res
### Conditionally set variables: ###
@@ -343,14 +343,14 @@ clean:
-if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk
-if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb
-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
+$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(HTLBOX_OBJECTS) $(HTLBOX_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\htlbox_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\htlbox_htlbox.obj: .\htlbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp
-$(OBJS)\htlbox_htlbox.res: .\htlbox.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\htlbox.rc
-
diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat
index f4a16b2e45..0d0790e570 100644
--- a/samples/htlbox/makefile.wat
+++ b/samples/htlbox/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
-$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
+$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample.res
@%create $(OBJS)\htlbox.lbc
@%append $(OBJS)\htlbox.lbc option quiet
@%append $(OBJS)\htlbox.lbc name $^@
@@ -261,13 +261,13 @@ $(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res
@%append $(OBJS)\htlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\htlbox.lbc library %i
- @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res
+ @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_sample.res
@for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i
wlink @$(OBJS)\htlbox.lbc
+$(OBJS)\htlbox_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\htlbox_htlbox.obj : .AUTODEPEND .\htlbox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $<
-$(OBJS)\htlbox_htlbox.res : .AUTODEPEND .\htlbox.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/htlbox/mondrian.ico b/samples/htlbox/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/htlbox/mondrian.ico and /dev/null differ
diff --git a/samples/htlbox/mondrian.xpm b/samples/htlbox/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/htlbox/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 519eff4f5b..4c4f680a3c 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -48,9 +48,9 @@ ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
ABOUT_OBJECTS = \
+ $(__about___win32rc) \
$(__about_os2_lib_res) \
- about_about.o \
- $(__about___win32rc)
+ about_about.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q
@COND_PLATFORM_OS2_1@__about___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___about___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__about___win32rc = about_sample_rc.o
@COND_PLATFORM_OS2_1@__about_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__about_app_Contents_PkgInfo___depname \
@@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__about___win32rc = about_about_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)
@@ -190,12 +190,12 @@ data_files:
esac; \
done
+about_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
about_about.o: $(srcdir)/about.cpp
$(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $(srcdir)/about.cpp
-about_about_rc.o: $(srcdir)/about.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/about/about.bkl b/samples/html/about/about.bkl
index 473530efee..bcb634caa8 100644
--- a/samples/html/about/about.bkl
+++ b/samples/html/about/about.bkl
@@ -10,7 +10,6 @@
html
core
base
- about.rc
diff --git a/samples/html/about/about.dsp b/samples/html/about/about.dsp
index 8758d1cebf..3a33cc0b4c 100644
--- a/samples/html/about/about.dsp
+++ b/samples/html/about/about.dsp
@@ -256,7 +256,7 @@ SOURCE=.\about.cpp
# End Source File
# Begin Source File
-SOURCE=.\about.rc
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/html/about/about.rc b/samples/html/about/about.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/html/about/about.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/html/about/about_vc7.vcproj b/samples/html/about/about_vc7.vcproj
index 5832fdc942..759a133554 100644
--- a/samples/html/about/about_vc7.vcproj
+++ b/samples/html/about/about_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/about/about_vc8.vcproj b/samples/html/about/about_vc8.vcproj
index 2167a7c857..96e86bd274 100644
--- a/samples/html/about/about_vc8.vcproj
+++ b/samples/html/about/about_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/about/about_vc9.vcproj b/samples/html/about/about_vc9.vcproj
index c82f1638c8..070ef27273 100644
--- a/samples/html/about/about_vc9.vcproj
+++ b/samples/html/about/about_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc
index b881589482..89deacc020 100644
--- a/samples/html/about/makefile.bcc
+++ b/samples/html/about/makefile.bcc
@@ -233,18 +233,18 @@ clean:
-if exist $(OBJS)\about.ilf del $(OBJS)\about.ilf
-if exist $(OBJS)\about.ils del $(OBJS)\about.ils
-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res
+$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(ABOUT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_about.res
+ c0w32.obj $(ABOUT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_sample.res
|
data_files:
if not exist $(OBJS)\data mkdir $(OBJS)\data
for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data
+$(OBJS)\about_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\about_about.obj: .\about.cpp
$(CXX) -q -c -P -o$@ $(ABOUT_CXXFLAGS) .\about.cpp
-$(OBJS)\about_about.res: .\about.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\about.rc
-
diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index 0f9da36d90..b5bc6bc24f 100644
--- a/samples/html/about/makefile.gcc
+++ b/samples/html/about/makefile.gcc
@@ -29,8 +29,8 @@ ABOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ABOUT_OBJECTS = \
- $(OBJS)\about_about.o \
- $(OBJS)\about_about_rc.o
+ $(OBJS)\about_sample_rc.o \
+ $(OBJS)\about_about.o
### Conditionally set variables: ###
@@ -222,19 +222,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\about.exe del $(OBJS)\about.exe
-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o
+$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample_rc.o
$(CXX) -o $@ $(ABOUT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data_files:
if not exist $(OBJS)\data mkdir $(OBJS)\data
for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data
+$(OBJS)\about_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\about_about.o: ./about.cpp
$(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\about_about_rc.o: ./about.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data_files
diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc
index cf468eb250..016f1e0148 100644
--- a/samples/html/about/makefile.vc
+++ b/samples/html/about/makefile.vc
@@ -32,7 +32,7 @@ ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
ABOUT_OBJECTS = \
$(OBJS)\about_about.obj
ABOUT_RESOURCES = \
- $(OBJS)\about_about.res
+ $(OBJS)\about_sample.res
### Conditionally set variables: ###
@@ -343,7 +343,7 @@ clean:
-if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk
-if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb
-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res
+$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ABOUT_OBJECTS) $(ABOUT_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -352,9 +352,9 @@ data_files:
if not exist $(OBJS)\data mkdir $(OBJS)\data
for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data
+$(OBJS)\about_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\about_about.obj: .\about.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp
-$(OBJS)\about_about.res: .\about.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\about.rc
-
diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
index a09ac1c118..59e5ac8293 100644
--- a/samples/html/about/makefile.wat
+++ b/samples/html/about/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\about.exe del $(OBJS)\about.exe
-$(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res
+$(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_sample.res
@%create $(OBJS)\about.lbc
@%append $(OBJS)\about.lbc option quiet
@%append $(OBJS)\about.lbc name $^@
@@ -261,7 +261,7 @@ $(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res
@%append $(OBJS)\about.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\about.lbc library %i
- @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res
+ @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_sample.res
@for %i in () do @%append $(OBJS)\about.lbc option stack=%i
wlink @$(OBJS)\about.lbc
@@ -269,9 +269,9 @@ data_files : .SYMBOLIC
if not exist $(OBJS)\data mkdir $(OBJS)\data
for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data
+$(OBJS)\about_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\about_about.obj : .AUTODEPEND .\about.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $<
-$(OBJS)\about_about.res : .AUTODEPEND .\about.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index e036696bb6..ea35b9801a 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -48,9 +48,9 @@ HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
HTMLHELP_OBJECTS = \
+ $(__htmlhelp___win32rc) \
$(__htmlhelp_os2_lib_res) \
- htmlhelp_help.o \
- $(__htmlhelp___win32rc)
+ htmlhelp_help.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__htmlhelp___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__htmlhelp___win32rc = htmlhelp_sample_rc.o
@COND_PLATFORM_OS2_1@__htmlhelp_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__htmlhelp_app_Contents_PkgInfo___depname \
@@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__htmlhelp___win32rc = htmlhelp_help_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)
@@ -190,12 +190,12 @@ data:
esac; \
done
+htmlhelp_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
htmlhelp_help.o: $(srcdir)/help.cpp
$(CXXC) -c -o $@ $(HTMLHELP_CXXFLAGS) $(srcdir)/help.cpp
-htmlhelp_help_rc.o: $(srcdir)/help.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/help/help.bkl b/samples/html/help/help.bkl
index f6b883e124..58d6bab169 100644
--- a/samples/html/help/help.bkl
+++ b/samples/html/help/help.bkl
@@ -10,7 +10,6 @@
html
core
base
- help.rc
diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp
index ae10a2f892..0325b87dcc 100644
--- a/samples/html/help/help.dsp
+++ b/samples/html/help/help.dsp
@@ -256,7 +256,7 @@ SOURCE=.\help.cpp
# End Source File
# Begin Source File
-SOURCE=.\help.rc
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/html/help/help.rc b/samples/html/help/help.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/samples/html/help/help.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/samples/html/help/help_vc7.vcproj b/samples/html/help/help_vc7.vcproj
index 560e8257ad..7182f54d4c 100644
--- a/samples/html/help/help_vc7.vcproj
+++ b/samples/html/help/help_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/help/help_vc8.vcproj b/samples/html/help/help_vc8.vcproj
index e8e9d43020..bd5bdecc8e 100644
--- a/samples/html/help/help_vc8.vcproj
+++ b/samples/html/help/help_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/help/help_vc9.vcproj b/samples/html/help/help_vc9.vcproj
index d62b57a62d..d364101997 100644
--- a/samples/html/help/help_vc9.vcproj
+++ b/samples/html/help/help_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc
index fa29ed6fce..5f48fc9036 100644
--- a/samples/html/help/makefile.bcc
+++ b/samples/html/help/makefile.bcc
@@ -233,18 +233,18 @@ clean:
-if exist $(OBJS)\htmlhelp.ilf del $(OBJS)\htmlhelp.ilf
-if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils
-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
+$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_help.res
+ c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_sample.res
|
data:
if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles
+$(OBJS)\htmlhelp_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\htmlhelp_help.obj: .\help.cpp
$(CXX) -q -c -P -o$@ $(HTMLHELP_CXXFLAGS) .\help.cpp
-$(OBJS)\htmlhelp_help.res: .\help.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\help.rc
-
diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc
index 426cf49755..d7b9f6dd96 100644
--- a/samples/html/help/makefile.gcc
+++ b/samples/html/help/makefile.gcc
@@ -29,8 +29,8 @@ HTMLHELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
HTMLHELP_OBJECTS = \
- $(OBJS)\htmlhelp_help.o \
- $(OBJS)\htmlhelp_help_rc.o
+ $(OBJS)\htmlhelp_sample_rc.o \
+ $(OBJS)\htmlhelp_help.o
### Conditionally set variables: ###
@@ -222,19 +222,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help_rc.o
+$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample_rc.o
$(CXX) -o $@ $(HTMLHELP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
for %%f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%%f copy .\helpfiles\%%f $(OBJS)\helpfiles
+$(OBJS)\htmlhelp_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\htmlhelp_help.o: ./help.cpp
$(CXX) -c -o $@ $(HTMLHELP_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\htmlhelp_help_rc.o: ./help.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc
index a6f4f58181..af26d05a35 100644
--- a/samples/html/help/makefile.vc
+++ b/samples/html/help/makefile.vc
@@ -32,7 +32,7 @@ HTMLHELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
HTMLHELP_OBJECTS = \
$(OBJS)\htmlhelp_help.obj
HTMLHELP_RESOURCES = \
- $(OBJS)\htmlhelp_help.res
+ $(OBJS)\htmlhelp_sample.res
### Conditionally set variables: ###
@@ -343,7 +343,7 @@ clean:
-if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk
-if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb
-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
+$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(HTMLHELP_OBJECTS) $(HTMLHELP_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -352,9 +352,9 @@ data:
if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles
+$(OBJS)\htmlhelp_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\htmlhelp_help.obj: .\help.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp
-$(OBJS)\htmlhelp_help.res: .\help.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\help.rc
-
diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat
index 6f75a1ae7d..b65c2ed398 100644
--- a/samples/html/help/makefile.wat
+++ b/samples/html/help/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
-$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
+$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample.res
@%create $(OBJS)\htmlhelp.lbc
@%append $(OBJS)\htmlhelp.lbc option quiet
@%append $(OBJS)\htmlhelp.lbc name $^@
@@ -261,7 +261,7 @@ $(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res
@%append $(OBJS)\htmlhelp.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\htmlhelp.lbc library %i
- @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res
+ @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_sample.res
@for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i
wlink @$(OBJS)\htmlhelp.lbc
@@ -269,9 +269,9 @@ data : .SYMBOLIC
if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles
+$(OBJS)\htmlhelp_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\htmlhelp_help.obj : .AUTODEPEND .\help.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $<
-$(OBJS)\htmlhelp_help.res : .AUTODEPEND .\help.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 5b85c947a9..cccfc89ce4 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -48,9 +48,9 @@ HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
HELPVIEW_OBJECTS = \
+ $(__helpview___win32rc) \
$(__helpview_os2_lib_res) \
- helpview_helpview.o \
- $(__helpview___win32rc)
+ helpview_helpview.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_sample_rc.o
@COND_PLATFORM_OS2_1@__helpview_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \
@@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__helpview___win32rc = helpview_helpview_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)
@@ -190,12 +190,12 @@ data:
esac; \
done
+helpview_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
helpview_helpview.o: $(srcdir)/helpview.cpp
$(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $(srcdir)/helpview.cpp
-helpview_helpview_rc.o: $(srcdir)/helpview.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/helpview/helpview.bkl b/samples/html/helpview/helpview.bkl
index a04699656e..8803081849 100644
--- a/samples/html/helpview/helpview.bkl
+++ b/samples/html/helpview/helpview.bkl
@@ -10,7 +10,6 @@
html
core
base
- helpview.rc
diff --git a/samples/html/helpview/helpview.dsp b/samples/html/helpview/helpview.dsp
index c9d0401359..abc50e11f7 100644
--- a/samples/html/helpview/helpview.dsp
+++ b/samples/html/helpview/helpview.dsp
@@ -256,7 +256,7 @@ SOURCE=.\helpview.cpp
# End Source File
# Begin Source File
-SOURCE=.\helpview.rc
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/html/helpview/helpview.ico b/samples/html/helpview/helpview.ico
deleted file mode 100644
index cbf2223372..0000000000
Binary files a/samples/html/helpview/helpview.ico and /dev/null differ
diff --git a/samples/html/helpview/helpview.rc b/samples/html/helpview/helpview.rc
deleted file mode 100644
index d43931e596..0000000000
--- a/samples/html/helpview/helpview.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-/* We need this to get the right default icon. */
-aaaaaa ICON "helpview.ico"
-helpview ICON "helpview.ico"
-
-#include "wx/msw/wx.rc"
diff --git a/samples/html/helpview/helpview_vc7.vcproj b/samples/html/helpview/helpview_vc7.vcproj
index 5906e06514..82fe528857 100644
--- a/samples/html/helpview/helpview_vc7.vcproj
+++ b/samples/html/helpview/helpview_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/helpview/helpview_vc8.vcproj b/samples/html/helpview/helpview_vc8.vcproj
index 6020078bef..23c9122c09 100644
--- a/samples/html/helpview/helpview_vc8.vcproj
+++ b/samples/html/helpview/helpview_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/helpview/helpview_vc9.vcproj b/samples/html/helpview/helpview_vc9.vcproj
index 632cb7a94e..ba66e08c80 100644
--- a/samples/html/helpview/helpview_vc9.vcproj
+++ b/samples/html/helpview/helpview_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc
index 77d62e8ec2..181850c3f8 100644
--- a/samples/html/helpview/makefile.bcc
+++ b/samples/html/helpview/makefile.bcc
@@ -233,18 +233,18 @@ clean:
-if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf
-if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
+ c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\helpview_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\helpview_helpview.obj: .\helpview.cpp
$(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
-$(OBJS)\helpview_helpview.res: .\helpview.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\helpview.rc
-
diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index 58aa8395cf..9207ed4345 100644
--- a/samples/html/helpview/makefile.gcc
+++ b/samples/html/helpview/makefile.gcc
@@ -29,8 +29,8 @@ HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
HELPVIEW_OBJECTS = \
- $(OBJS)\helpview_helpview.o \
- $(OBJS)\helpview_helpview_rc.o
+ $(OBJS)\helpview_sample_rc.o \
+ $(OBJS)\helpview_helpview.o
### Conditionally set variables: ###
@@ -222,19 +222,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample_rc.o
$(CXX) -o $@ $(HELPVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\helpview_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\helpview_helpview.o: ./helpview.cpp
$(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\helpview_helpview_rc.o: ./helpview.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index 80c08510a6..e8aa323360 100644
--- a/samples/html/helpview/makefile.vc
+++ b/samples/html/helpview/makefile.vc
@@ -32,7 +32,7 @@ HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
HELPVIEW_OBJECTS = \
$(OBJS)\helpview_helpview.obj
HELPVIEW_RESOURCES = \
- $(OBJS)\helpview_helpview.res
+ $(OBJS)\helpview_sample.res
### Conditionally set variables: ###
@@ -343,7 +343,7 @@ clean:
-if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk
-if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb
-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -352,9 +352,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\helpview_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\helpview_helpview.obj: .\helpview.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp
-$(OBJS)\helpview_helpview.res: .\helpview.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc
-
diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
index bce8d72a02..6acac408df 100644
--- a/samples/html/helpview/makefile.wat
+++ b/samples/html/helpview/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
-$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
+$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res
@%create $(OBJS)\helpview.lbc
@%append $(OBJS)\helpview.lbc option quiet
@%append $(OBJS)\helpview.lbc name $^@
@@ -261,7 +261,7 @@ $(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
@%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\helpview.lbc library %i
- @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res
+ @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_sample.res
@for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i
wlink @$(OBJS)\helpview.lbc
@@ -269,9 +269,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\helpview_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<
-$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/helpview/mondrian.ico b/samples/html/helpview/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/html/helpview/mondrian.ico and /dev/null differ
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 200d419fc2..118c30525f 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -48,9 +48,9 @@ HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
HTMLPRINTING_OBJECTS = \
+ $(__htmlprinting___win32rc) \
$(__htmlprinting_os2_lib_res) \
- htmlprinting_printing.o \
- $(__htmlprinting___win32rc)
+ htmlprinting_printing.o
### Conditionally set variables: ###
@@ -87,6 +87,7 @@ COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd = $(NM) \
@COND_PLATFORM_OS2_1@__htmlprinting___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__htmlprinting___win32rc = htmlprinting_sample_rc.o
@COND_PLATFORM_OS2_1@__htmlprinting_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__htmlprinting_app_Contents_PkgInfo___depname \
@@ -115,8 +116,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__htmlprinting___win32rc = \
-@COND_PLATFORM_WIN32_1@ htmlprinting_printing_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)
@@ -196,12 +195,12 @@ data:
esac; \
done
+htmlprinting_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
htmlprinting_printing.o: $(srcdir)/printing.cpp
$(CXXC) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(srcdir)/printing.cpp
-htmlprinting_printing_rc.o: $(srcdir)/printing.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc
index 95ae48b9ab..fae2dc47fe 100644
--- a/samples/html/printing/makefile.bcc
+++ b/samples/html/printing/makefile.bcc
@@ -233,18 +233,18 @@ clean:
-if exist $(OBJS)\htmlprinting.ilf del $(OBJS)\htmlprinting.ilf
-if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils
-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res
+$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_printing.res
+ c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\htmlprinting_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\htmlprinting_printing.obj: .\printing.cpp
$(CXX) -q -c -P -o$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp
-$(OBJS)\htmlprinting_printing.res: .\printing.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\printing.rc
-
diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc
index 4c8cd67f4a..6e3eec196b 100644
--- a/samples/html/printing/makefile.gcc
+++ b/samples/html/printing/makefile.gcc
@@ -29,8 +29,8 @@ HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
HTMLPRINTING_OBJECTS = \
- $(OBJS)\htmlprinting_printing.o \
- $(OBJS)\htmlprinting_printing_rc.o
+ $(OBJS)\htmlprinting_sample_rc.o \
+ $(OBJS)\htmlprinting_printing.o
### Conditionally set variables: ###
@@ -222,19 +222,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o
+$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_sample_rc.o
$(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\htmlprinting_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\htmlprinting_printing.o: ./printing.cpp
$(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\htmlprinting_printing_rc.o: ./printing.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc
index e1805e759e..852d6679c6 100644
--- a/samples/html/printing/makefile.vc
+++ b/samples/html/printing/makefile.vc
@@ -32,7 +32,7 @@ HTMLPRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
HTMLPRINTING_OBJECTS = \
$(OBJS)\htmlprinting_printing.obj
HTMLPRINTING_RESOURCES = \
- $(OBJS)\htmlprinting_printing.res
+ $(OBJS)\htmlprinting_sample.res
### Conditionally set variables: ###
@@ -343,7 +343,7 @@ clean:
-if exist $(OBJS)\htmlprinting.ilk del $(OBJS)\htmlprinting.ilk
-if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb
-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res
+$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(HTMLPRINTING_OBJECTS) $(HTMLPRINTING_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -352,9 +352,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\htmlprinting_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\htmlprinting_printing.obj: .\printing.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp
-$(OBJS)\htmlprinting_printing.res: .\printing.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\printing.rc
-
diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat
index fbfbbd9875..eb2acb3904 100644
--- a/samples/html/printing/makefile.wat
+++ b/samples/html/printing/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
-$(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res
+$(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_sample.res
@%create $(OBJS)\htmlprinting.lbc
@%append $(OBJS)\htmlprinting.lbc option quiet
@%append $(OBJS)\htmlprinting.lbc name $^@
@@ -261,7 +261,7 @@ $(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printin
@%append $(OBJS)\htmlprinting.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\htmlprinting.lbc library %i
- @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res
+ @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_sample.res
@for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i
wlink @$(OBJS)\htmlprinting.lbc
@@ -269,9 +269,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\htmlprinting_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\htmlprinting_printing.obj : .AUTODEPEND .\printing.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $<
-$(OBJS)\htmlprinting_printing.res : .AUTODEPEND .\printing.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/printing/mondrian.ico b/samples/html/printing/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/html/printing/mondrian.ico and /dev/null differ
diff --git a/samples/html/printing/printing.bkl b/samples/html/printing/printing.bkl
index 4da52afcc8..b9233ff4ef 100644
--- a/samples/html/printing/printing.bkl
+++ b/samples/html/printing/printing.bkl
@@ -10,7 +10,6 @@
html
core
base
- printing.rc
diff --git a/samples/html/printing/printing.dsp b/samples/html/printing/printing.dsp
index ac1337c951..8089a9b766 100644
--- a/samples/html/printing/printing.dsp
+++ b/samples/html/printing/printing.dsp
@@ -256,7 +256,7 @@ SOURCE=.\printing.cpp
# End Source File
# Begin Source File
-SOURCE=.\printing.rc
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/html/printing/printing.rc b/samples/html/printing/printing.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/html/printing/printing.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/html/printing/printing_vc7.vcproj b/samples/html/printing/printing_vc7.vcproj
index 77620359ab..a185b8ec42 100644
--- a/samples/html/printing/printing_vc7.vcproj
+++ b/samples/html/printing/printing_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/printing/printing_vc8.vcproj b/samples/html/printing/printing_vc8.vcproj
index 3240c0de1f..d02b675317 100644
--- a/samples/html/printing/printing_vc8.vcproj
+++ b/samples/html/printing/printing_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/printing/printing_vc9.vcproj b/samples/html/printing/printing_vc9.vcproj
index 7d9005e41b..832b88d477 100644
--- a/samples/html/printing/printing_vc9.vcproj
+++ b/samples/html/printing/printing_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 69f9b1e16f..8ea0a59387 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -48,9 +48,9 @@ TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
TEST_OBJECTS = \
+ $(__test___win32rc) \
$(__test_os2_lib_res) \
- test_test.o \
- $(__test___win32rc)
+ test_test.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
@COND_PLATFORM_OS2_1@__test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o
@COND_PLATFORM_OS2_1@__test_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \
@@ -113,7 +114,6 @@ COND_MONOLITHIC_0___WXLIB_NET_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@__test___win32rc = test_test_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)
@@ -193,12 +193,12 @@ data:
esac; \
done
+test_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
test_test.o: $(srcdir)/test.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
-test_test_rc.o: $(srcdir)/test.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc
index ec111dd02f..c5bd9f08f3 100644
--- a/samples/html/test/makefile.bcc
+++ b/samples/html/test/makefile.bcc
@@ -237,18 +237,18 @@ clean:
-if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
-if exist $(OBJS)\test.ils del $(OBJS)\test.ils
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
+$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_test.res
+ c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\test_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\test_test.obj: .\test.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp
-$(OBJS)\test_test.res: .\test.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\test.rc
-
diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc
index ae1aafe880..62a4c85f00 100644
--- a/samples/html/test/makefile.gcc
+++ b/samples/html/test/makefile.gcc
@@ -28,8 +28,8 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
-Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
TEST_OBJECTS = \
- $(OBJS)\test_test.o \
- $(OBJS)\test_test_rc.o
+ $(OBJS)\test_sample_rc.o \
+ $(OBJS)\test_test.o
### Conditionally set variables: ###
@@ -225,19 +225,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o
+$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample_rc.o
$(CXX) -o $@ $(TEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\test_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\test_test.o: ./test.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\test_test_rc.o: ./test.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc
index 824cbc765b..8d289e5a57 100644
--- a/samples/html/test/makefile.vc
+++ b/samples/html/test/makefile.vc
@@ -32,7 +32,7 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
TEST_OBJECTS = \
$(OBJS)\test_test.obj
TEST_RESOURCES = \
- $(OBJS)\test_test.res
+ $(OBJS)\test_sample.res
### Conditionally set variables: ###
@@ -347,7 +347,7 @@ clean:
-if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
-if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
+$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(TEST_OBJECTS) $(TEST_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_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 wininet.lib
<<
@@ -356,9 +356,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\test_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\test_test.obj: .\test.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp
-$(OBJS)\test_test.res: .\test.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\test.rc
-
diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat
index 6f8ac24bd5..9c5bbb8ac8 100644
--- a/samples/html/test/makefile.wat
+++ b/samples/html/test/makefile.wat
@@ -258,7 +258,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res
+$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_sample.res
@%create $(OBJS)\test.lbc
@%append $(OBJS)\test.lbc option quiet
@%append $(OBJS)\test.lbc name $^@
@@ -266,7 +266,7 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res
@%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
@for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\test.lbc library %i
- @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res
+ @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res
@for %i in () do @%append $(OBJS)\test.lbc option stack=%i
wlink @$(OBJS)\test.lbc
@@ -274,9 +274,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\test_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_test.res : .AUTODEPEND .\test.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/test/test.bkl b/samples/html/test/test.bkl
index c3fc72713b..66807e9797 100644
--- a/samples/html/test/test.bkl
+++ b/samples/html/test/test.bkl
@@ -11,7 +11,6 @@
core
net
base
- test.rc
diff --git a/samples/html/test/test.dsp b/samples/html/test/test.dsp
index e291f1d14a..e293cdc62b 100644
--- a/samples/html/test/test.dsp
+++ b/samples/html/test/test.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\test.cpp
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\test.rc
+SOURCE=.\test.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/html/test/test.rc b/samples/html/test/test.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/html/test/test.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/html/test/test_vc7.vcproj b/samples/html/test/test_vc7.vcproj
index 89a80e121b..5c0ca912fc 100644
--- a/samples/html/test/test_vc7.vcproj
+++ b/samples/html/test/test_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/test/test_vc8.vcproj b/samples/html/test/test_vc8.vcproj
index a780b5b7e6..0430a3faa5 100644
--- a/samples/html/test/test_vc8.vcproj
+++ b/samples/html/test/test_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/test/test_vc9.vcproj b/samples/html/test/test_vc9.vcproj
index 7b0073565a..f0ee711268 100644
--- a/samples/html/test/test_vc9.vcproj
+++ b/samples/html/test/test_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 34b2ca0f3a..86d6df926e 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -48,9 +48,9 @@ VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
VIRTUAL_OBJECTS = \
+ $(__virtual___win32rc) \
$(__virtual_os2_lib_res) \
- virtual_virtual.o \
- $(__virtual___win32rc)
+ virtual_virtual.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__virtual___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_sample_rc.o
@COND_PLATFORM_OS2_1@__virtual_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__virtual_app_Contents_PkgInfo___depname \
@@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__virtual___win32rc = virtual_virtual_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)
@@ -190,12 +190,12 @@ data:
esac; \
done
+virtual_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
virtual_virtual.o: $(srcdir)/virtual.cpp
$(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $(srcdir)/virtual.cpp
-virtual_virtual_rc.o: $(srcdir)/virtual.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc
index c612334eea..67597b2911 100644
--- a/samples/html/virtual/makefile.bcc
+++ b/samples/html/virtual/makefile.bcc
@@ -233,18 +233,18 @@ clean:
-if exist $(OBJS)\virtual.ilf del $(OBJS)\virtual.ilf
-if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils
-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
+$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_virtual.res
+ c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\virtual_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\virtual_virtual.obj: .\virtual.cpp
$(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp
-$(OBJS)\virtual_virtual.res: .\virtual.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\virtual.rc
-
diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc
index 874f4b5850..5f23ea8d0c 100644
--- a/samples/html/virtual/makefile.gcc
+++ b/samples/html/virtual/makefile.gcc
@@ -29,8 +29,8 @@ VIRTUAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
VIRTUAL_OBJECTS = \
- $(OBJS)\virtual_virtual.o \
- $(OBJS)\virtual_virtual_rc.o
+ $(OBJS)\virtual_sample_rc.o \
+ $(OBJS)\virtual_virtual.o
### Conditionally set variables: ###
@@ -222,19 +222,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o
+$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample_rc.o
$(CXX) -o $@ $(VIRTUAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\virtual_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\virtual_virtual.o: ./virtual.cpp
$(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\virtual_virtual_rc.o: ./virtual.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc
index e6b1eab61c..07b3f6c3fb 100644
--- a/samples/html/virtual/makefile.vc
+++ b/samples/html/virtual/makefile.vc
@@ -32,7 +32,7 @@ VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
VIRTUAL_OBJECTS = \
$(OBJS)\virtual_virtual.obj
VIRTUAL_RESOURCES = \
- $(OBJS)\virtual_virtual.res
+ $(OBJS)\virtual_sample.res
### Conditionally set variables: ###
@@ -343,7 +343,7 @@ clean:
-if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk
-if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb
-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
+$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(VIRTUAL_OBJECTS) $(VIRTUAL_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -352,9 +352,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\virtual_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\virtual_virtual.obj: .\virtual.cpp
$(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp
-$(OBJS)\virtual_virtual.res: .\virtual.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\virtual.rc
-
diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat
index 2666fec756..56ba609202 100644
--- a/samples/html/virtual/makefile.wat
+++ b/samples/html/virtual/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
-$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
+$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample.res
@%create $(OBJS)\virtual.lbc
@%append $(OBJS)\virtual.lbc option quiet
@%append $(OBJS)\virtual.lbc name $^@
@@ -261,7 +261,7 @@ $(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res
@%append $(OBJS)\virtual.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\virtual.lbc library %i
- @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res
+ @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_sample.res
@for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i
wlink @$(OBJS)\virtual.lbc
@@ -269,9 +269,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\virtual_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\virtual_virtual.obj : .AUTODEPEND .\virtual.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $<
-$(OBJS)\virtual_virtual.res : .AUTODEPEND .\virtual.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/virtual/virtual.bkl b/samples/html/virtual/virtual.bkl
index 10c045e6a6..c4ea69452a 100644
--- a/samples/html/virtual/virtual.bkl
+++ b/samples/html/virtual/virtual.bkl
@@ -10,7 +10,6 @@
html
core
base
- virtual.rc
diff --git a/samples/html/virtual/virtual.dsp b/samples/html/virtual/virtual.dsp
index b15b61eff5..d40518babc 100644
--- a/samples/html/virtual/virtual.dsp
+++ b/samples/html/virtual/virtual.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\virtual.cpp
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\virtual.rc
+SOURCE=.\virtual.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/html/virtual/virtual.rc b/samples/html/virtual/virtual.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/html/virtual/virtual.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/html/virtual/virtual_vc7.vcproj b/samples/html/virtual/virtual_vc7.vcproj
index 85b21b9f96..534819d8bd 100644
--- a/samples/html/virtual/virtual_vc7.vcproj
+++ b/samples/html/virtual/virtual_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/virtual/virtual_vc8.vcproj b/samples/html/virtual/virtual_vc8.vcproj
index dcb547723b..3e30647dd0 100644
--- a/samples/html/virtual/virtual_vc8.vcproj
+++ b/samples/html/virtual/virtual_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/virtual/virtual_vc9.vcproj b/samples/html/virtual/virtual_vc9.vcproj
index 88a2a42933..8a766bae79 100644
--- a/samples/html/virtual/virtual_vc9.vcproj
+++ b/samples/html/virtual/virtual_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 8677c5983e..3b351797c0 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -48,9 +48,9 @@ WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
WIDGET_OBJECTS = \
+ $(__widget___win32rc) \
$(__widget_os2_lib_res) \
- widget_widget.o \
- $(__widget___win32rc)
+ widget_widget.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__widget___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widget___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__widget___win32rc = widget_sample_rc.o
@COND_PLATFORM_OS2_1@__widget_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__widget_app_Contents_PkgInfo___depname \
@@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__widget___win32rc = widget_widget_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)
@@ -190,12 +190,12 @@ data:
esac; \
done
+widget_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
widget_widget.o: $(srcdir)/widget.cpp
$(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $(srcdir)/widget.cpp
-widget_widget_rc.o: $(srcdir)/widget.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc
index c23716f3e5..a2ff875143 100644
--- a/samples/html/widget/makefile.bcc
+++ b/samples/html/widget/makefile.bcc
@@ -233,18 +233,18 @@ clean:
-if exist $(OBJS)\widget.ilf del $(OBJS)\widget.ilf
-if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils
-$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
+$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(WIDGET_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_widget.res
+ c0w32.obj $(WIDGET_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\widget_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\widget_widget.obj: .\widget.cpp
$(CXX) -q -c -P -o$@ $(WIDGET_CXXFLAGS) .\widget.cpp
-$(OBJS)\widget_widget.res: .\widget.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\widget.rc
-
diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc
index 26dfed954d..abac600b5a 100644
--- a/samples/html/widget/makefile.gcc
+++ b/samples/html/widget/makefile.gcc
@@ -29,8 +29,8 @@ WIDGET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
WIDGET_OBJECTS = \
- $(OBJS)\widget_widget.o \
- $(OBJS)\widget_widget_rc.o
+ $(OBJS)\widget_sample_rc.o \
+ $(OBJS)\widget_widget.o
### Conditionally set variables: ###
@@ -222,19 +222,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
-$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget_rc.o
+$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample_rc.o
$(CXX) -o $@ $(WIDGET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\widget_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\widget_widget.o: ./widget.cpp
$(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\widget_widget_rc.o: ./widget.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc
index 20511cd18c..9fa57087bf 100644
--- a/samples/html/widget/makefile.vc
+++ b/samples/html/widget/makefile.vc
@@ -32,7 +32,7 @@ WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
WIDGET_OBJECTS = \
$(OBJS)\widget_widget.obj
WIDGET_RESOURCES = \
- $(OBJS)\widget_widget.res
+ $(OBJS)\widget_sample.res
### Conditionally set variables: ###
@@ -343,7 +343,7 @@ clean:
-if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk
-if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb
-$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
+$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(WIDGET_OBJECTS) $(WIDGET_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -352,9 +352,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\widget_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\widget_widget.obj: .\widget.cpp
$(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp
-$(OBJS)\widget_widget.res: .\widget.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\widget.rc
-
diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat
index 143142993b..33ecfd3494 100644
--- a/samples/html/widget/makefile.wat
+++ b/samples/html/widget/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
-$(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
+$(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res
@%create $(OBJS)\widget.lbc
@%append $(OBJS)\widget.lbc option quiet
@%append $(OBJS)\widget.lbc name $^@
@@ -261,7 +261,7 @@ $(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res
@%append $(OBJS)\widget.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\widget.lbc library %i
- @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res
+ @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_sample.res
@for %i in () do @%append $(OBJS)\widget.lbc option stack=%i
wlink @$(OBJS)\widget.lbc
@@ -269,9 +269,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\widget_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\widget_widget.obj : .AUTODEPEND .\widget.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $<
-$(OBJS)\widget_widget.res : .AUTODEPEND .\widget.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/widget/widget.bkl b/samples/html/widget/widget.bkl
index 82e8e709ca..0abefd62df 100644
--- a/samples/html/widget/widget.bkl
+++ b/samples/html/widget/widget.bkl
@@ -10,7 +10,6 @@
html
core
base
- widget.rc
diff --git a/samples/html/widget/widget.dsp b/samples/html/widget/widget.dsp
index 44eb98ca13..050767a390 100644
--- a/samples/html/widget/widget.dsp
+++ b/samples/html/widget/widget.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\widget.cpp
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\widget.rc
+SOURCE=.\widget.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/html/widget/widget.rc b/samples/html/widget/widget.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/html/widget/widget.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/html/widget/widget_vc7.vcproj b/samples/html/widget/widget_vc7.vcproj
index e2af16f7e9..2ddf0be4d4 100644
--- a/samples/html/widget/widget_vc7.vcproj
+++ b/samples/html/widget/widget_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/widget/widget_vc8.vcproj b/samples/html/widget/widget_vc8.vcproj
index 2e1b4e8d4f..0184ca70f5 100644
--- a/samples/html/widget/widget_vc8.vcproj
+++ b/samples/html/widget/widget_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/widget/widget_vc9.vcproj b/samples/html/widget/widget_vc9.vcproj
index 8128a50b78..4f745ae7e6 100644
--- a/samples/html/widget/widget_vc9.vcproj
+++ b/samples/html/widget/widget_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 296e281aff..f18a1fb52a 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -48,9 +48,9 @@ ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
ZIP_OBJECTS = \
+ $(__zip___win32rc) \
$(__zip_os2_lib_res) \
- zip_zip.o \
- $(__zip___win32rc)
+ zip_zip.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \
@COND_PLATFORM_OS2_1@__zip___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___zip___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__zip___win32rc = zip_sample_rc.o
@COND_PLATFORM_OS2_1@__zip_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__zip_app_Contents_PkgInfo___depname \
@@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__zip___win32rc = zip_zip_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)
@@ -190,12 +190,12 @@ data:
esac; \
done
+zip_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
zip_zip.o: $(srcdir)/zip.cpp
$(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $(srcdir)/zip.cpp
-zip_zip_rc.o: $(srcdir)/zip.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc
index f47ab00a65..4f29b4dae1 100644
--- a/samples/html/zip/makefile.bcc
+++ b/samples/html/zip/makefile.bcc
@@ -233,18 +233,18 @@ clean:
-if exist $(OBJS)\zip.ilf del $(OBJS)\zip.ilf
-if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils
-$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
+$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(ZIP_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_zip.res
+ c0w32.obj $(ZIP_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\zip_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\zip_zip.obj: .\zip.cpp
$(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) .\zip.cpp
-$(OBJS)\zip_zip.res: .\zip.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\zip.rc
-
diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc
index 99a8adb888..35c0468a17 100644
--- a/samples/html/zip/makefile.gcc
+++ b/samples/html/zip/makefile.gcc
@@ -28,8 +28,8 @@ ZIP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
-Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
ZIP_OBJECTS = \
- $(OBJS)\zip_zip.o \
- $(OBJS)\zip_zip_rc.o
+ $(OBJS)\zip_sample_rc.o \
+ $(OBJS)\zip_zip.o
### Conditionally set variables: ###
@@ -221,19 +221,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
-$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip_rc.o
+$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_sample_rc.o
$(CXX) -o $@ $(ZIP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (pages.zip start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\zip_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\zip_zip.o: ./zip.cpp
$(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\zip_zip_rc.o: ./zip.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc
index 7f8e9efe83..2cdc74f8e5 100644
--- a/samples/html/zip/makefile.vc
+++ b/samples/html/zip/makefile.vc
@@ -32,7 +32,7 @@ ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
ZIP_OBJECTS = \
$(OBJS)\zip_zip.obj
ZIP_RESOURCES = \
- $(OBJS)\zip_zip.res
+ $(OBJS)\zip_sample.res
### Conditionally set variables: ###
@@ -343,7 +343,7 @@ clean:
-if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk
-if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb
-$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
+$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(ZIP_OBJECTS) $(ZIP_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -352,9 +352,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\zip_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\zip_zip.obj: .\zip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp
-$(OBJS)\zip_zip.res: .\zip.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\zip.rc
-
diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat
index 60af87d3d3..9883257bae 100644
--- a/samples/html/zip/makefile.wat
+++ b/samples/html/zip/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
-$(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
+$(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_sample.res
@%create $(OBJS)\zip.lbc
@%append $(OBJS)\zip.lbc option quiet
@%append $(OBJS)\zip.lbc name $^@
@@ -261,7 +261,7 @@ $(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res
@%append $(OBJS)\zip.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\zip.lbc library %i
- @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res
+ @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_sample.res
@for %i in () do @%append $(OBJS)\zip.lbc option stack=%i
wlink @$(OBJS)\zip.lbc
@@ -269,9 +269,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\zip_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\zip_zip.obj : .AUTODEPEND .\zip.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $<
-$(OBJS)\zip_zip.res : .AUTODEPEND .\zip.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/html/zip/zip.bkl b/samples/html/zip/zip.bkl
index dbf4125afd..1383c4ca13 100644
--- a/samples/html/zip/zip.bkl
+++ b/samples/html/zip/zip.bkl
@@ -10,7 +10,6 @@
html
core
base
- zip.rc
diff --git a/samples/html/zip/zip.dsp b/samples/html/zip/zip.dsp
index 6b1b782dd3..010074d790 100644
--- a/samples/html/zip/zip.dsp
+++ b/samples/html/zip/zip.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\zip.cpp
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\zip.rc
+SOURCE=.\zip.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/html/zip/zip.rc b/samples/html/zip/zip.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/html/zip/zip.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/html/zip/zip_vc7.vcproj b/samples/html/zip/zip_vc7.vcproj
index 037f696a83..9cc3d74a9a 100644
--- a/samples/html/zip/zip_vc7.vcproj
+++ b/samples/html/zip/zip_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/html/zip/zip_vc8.vcproj b/samples/html/zip/zip_vc8.vcproj
index 5b697ddb26..4ce5f4247d 100644
--- a/samples/html/zip/zip_vc8.vcproj
+++ b/samples/html/zip/zip_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/html/zip/zip_vc9.vcproj b/samples/html/zip/zip_vc9.vcproj
index 0f94c0027b..3eab2e3007 100644
--- a/samples/html/zip/zip_vc9.vcproj
+++ b/samples/html/zip/zip_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 0cf34cf63c..e11a0489b1 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -47,10 +47,10 @@ IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
IMAGE_OBJECTS = \
+ $(__image___win32rc) \
$(__image_os2_lib_res) \
image_image.o \
- image_canvas.o \
- $(__image___win32rc)
+ image_canvas.o
### Conditionally set variables: ###
@@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q
@COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__image___win32rc = image_sample_rc.o
@COND_PLATFORM_OS2_1@__image_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \
@@ -107,7 +108,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__image___win32rc = image_image_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)
@@ -187,15 +187,15 @@ data:
esac; \
done
+image_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
image_image.o: $(srcdir)/image.cpp
$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/image.cpp
image_canvas.o: $(srcdir)/canvas.cpp
$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/canvas.cpp
-image_image_rc.o: $(srcdir)/image.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/image/image.bkl b/samples/image/image.bkl
index b2218036e7..3762421268 100644
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -10,7 +10,6 @@
canvas.h
core
base
- image.rc
diff --git a/samples/image/image.dsp b/samples/image/image.dsp
index cd8e7b2017..ec02e8cda6 100644
--- a/samples/image/image.dsp
+++ b/samples/image/image.dsp
@@ -260,7 +260,7 @@ SOURCE=.\image.cpp
# End Source File
# Begin Source File
-SOURCE=.\image.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/image/image.rc b/samples/image/image.rc
deleted file mode 100644
index 626b82f58a..0000000000
--- a/samples/image/image.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
diff --git a/samples/image/image.rco b/samples/image/image.rco
deleted file mode 100644
index be4e15f5e6..0000000000
--- a/samples/image/image.rco
+++ /dev/null
@@ -1,2 +0,0 @@
-RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc
-
diff --git a/samples/image/image_vc7.vcproj b/samples/image/image_vc7.vcproj
index 8e0014b607..0133336c7f 100644
--- a/samples/image/image_vc7.vcproj
+++ b/samples/image/image_vc7.vcproj
@@ -561,7 +561,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj
index 9ae1ab0849..67155308b0 100644
--- a/samples/image/image_vc8.vcproj
+++ b/samples/image/image_vc8.vcproj
@@ -828,7 +828,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/image/image_vc9.vcproj b/samples/image/image_vc9.vcproj
index 918674ff52..63cd0c7e4d 100644
--- a/samples/image/image_vc9.vcproj
+++ b/samples/image/image_vc9.vcproj
@@ -800,7 +800,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index b165f8f48d..a4297123c4 100644
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -230,21 +230,21 @@ clean:
-if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf
-if exist $(OBJS)\image.ils del $(OBJS)\image.ils
-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(IMAGE_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res
+ c0w32.obj $(IMAGE_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\image_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\image_image.obj: .\image.cpp
$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp
$(OBJS)\image_canvas.obj: .\canvas.cpp
$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
-$(OBJS)\image_image.res: .\image.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc
-
diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc
index aa10455e55..4c201f184d 100644
--- a/samples/image/makefile.gcc
+++ b/samples/image/makefile.gcc
@@ -29,9 +29,9 @@ IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
IMAGE_OBJECTS = \
+ $(OBJS)\image_sample_rc.o \
$(OBJS)\image_image.o \
- $(OBJS)\image_canvas.o \
- $(OBJS)\image_image_rc.o
+ $(OBJS)\image_canvas.o
### Conditionally set variables: ###
@@ -219,22 +219,22 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\image.exe del $(OBJS)\image.exe
-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample_rc.o
$(CXX) -o $@ $(IMAGE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\image_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\image_image.o: ./image.cpp
$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\image_canvas.o: ./canvas.cpp
$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\image_image_rc.o: ./image.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index 63a16ad115..e30ef131cb 100644
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -33,7 +33,7 @@ IMAGE_OBJECTS = \
$(OBJS)\image_image.obj \
$(OBJS)\image_canvas.obj
IMAGE_RESOURCES = \
- $(OBJS)\image_image.res
+ $(OBJS)\image_sample.res
### Conditionally set variables: ###
@@ -340,7 +340,7 @@ clean:
-if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk
-if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb
-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(IMAGE_OBJECTS) $(IMAGE_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -349,12 +349,12 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\image_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\image_image.obj: .\image.cpp
$(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp
$(OBJS)\image_canvas.obj: .\canvas.cpp
$(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
-$(OBJS)\image_image.res: .\image.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc
-
diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat
index 195cbe900f..d7c4f0fa12 100644
--- a/samples/image/makefile.wat
+++ b/samples/image/makefile.wat
@@ -249,7 +249,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\image.exe del $(OBJS)\image.exe
-$(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res
+$(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_sample.res
@%create $(OBJS)\image.lbc
@%append $(OBJS)\image.lbc option quiet
@%append $(OBJS)\image.lbc name $^@
@@ -257,7 +257,7 @@ $(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res
@%append $(OBJS)\image.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\image.lbc library %i
- @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res
+ @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_sample.res
@for %i in () do @%append $(OBJS)\image.lbc option stack=%i
wlink @$(OBJS)\image.lbc
@@ -265,12 +265,12 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\image_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\image_image.obj : .AUTODEPEND .\image.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
$(OBJS)\image_canvas.obj : .AUTODEPEND .\canvas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
-$(OBJS)\image_image.res : .AUTODEPEND .\image.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 40c98b0e7b..5c603795cf 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -47,9 +47,9 @@ INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
INTERNAT_OBJECTS = \
+ $(__internat___win32rc) \
$(__internat_os2_lib_res) \
- internat_internat.o \
- $(__internat___win32rc)
+ internat_internat.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__internat___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___internat___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__internat___win32rc = internat_sample_rc.o
@COND_PLATFORM_OS2_1@__internat_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__internat_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__internat___win32rc = internat_internat_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)
@@ -318,12 +318,12 @@ ja_JP.EUC-JP:
esac; \
done
+internat_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
internat_internat.o: $(srcdir)/internat.cpp
$(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $(srcdir)/internat.cpp
-internat_internat_rc.o: $(srcdir)/internat.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/internat/internat.bkl b/samples/internat/internat.bkl
index bb29f446d0..33e0c06f58 100644
--- a/samples/internat/internat.bkl
+++ b/samples/internat/internat.bkl
@@ -7,7 +7,6 @@
internat.cpp
core
base
- internat.rc
diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index c2fa8fcb36..223cb01fb4 100644
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -37,8 +37,8 @@
#include "wx/log.h"
#include "wx/cmdline.h"
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
@@ -287,7 +287,7 @@ MyFrame::MyFrame(wxLocale& locale)
_("International wxWidgets App")),
m_locale(locale)
{
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
diff --git a/samples/internat/internat.dsp b/samples/internat/internat.dsp
index ff0e5045fb..ed77c62e25 100644
--- a/samples/internat/internat.dsp
+++ b/samples/internat/internat.dsp
@@ -256,7 +256,7 @@ SOURCE=.\internat.cpp
# End Source File
# Begin Source File
-SOURCE=.\internat.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/internat/internat.rc b/samples/internat/internat.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/internat/internat.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/internat/internat_vc7.vcproj b/samples/internat/internat_vc7.vcproj
index ef8cb8b3c0..cbe639fad5 100644
--- a/samples/internat/internat_vc7.vcproj
+++ b/samples/internat/internat_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/internat/internat_vc8.vcproj b/samples/internat/internat_vc8.vcproj
index 6241e46039..a830b15fa3 100644
--- a/samples/internat/internat_vc8.vcproj
+++ b/samples/internat/internat_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/internat/internat_vc9.vcproj b/samples/internat/internat_vc9.vcproj
index 7096174a2b..100cedfb1f 100644
--- a/samples/internat/internat_vc9.vcproj
+++ b/samples/internat/internat_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc
index b3c24c6628..a6e65ef881 100644
--- a/samples/internat/makefile.bcc
+++ b/samples/internat/makefile.bcc
@@ -229,9 +229,9 @@ clean:
-if exist $(OBJS)\internat.ilf del $(OBJS)\internat.ilf
-if exist $(OBJS)\internat.ils del $(OBJS)\internat.ils
-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
+$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_internat.res
+ c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_sample.res
|
ar:
@@ -282,9 +282,9 @@ ja_JP.EUC-JP:
if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP
+$(OBJS)\internat_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\internat_internat.obj: .\internat.cpp
$(CXX) -q -c -P -o$@ $(INTERNAT_CXXFLAGS) .\internat.cpp
-$(OBJS)\internat_internat.res: .\internat.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\internat.rc
-
diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc
index c00c96a59f..fd2f4f4982 100644
--- a/samples/internat/makefile.gcc
+++ b/samples/internat/makefile.gcc
@@ -29,8 +29,8 @@ INTERNAT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
INTERNAT_OBJECTS = \
- $(OBJS)\internat_internat.o \
- $(OBJS)\internat_internat_rc.o
+ $(OBJS)\internat_sample_rc.o \
+ $(OBJS)\internat_internat.o
### Conditionally set variables: ###
@@ -218,7 +218,7 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat_rc.o
+$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_sample_rc.o
$(CXX) -o $@ $(INTERNAT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
ar:
@@ -269,12 +269,12 @@ ja_JP.EUC-JP:
if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
for %%f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%%f copy .\ja_JP.EUC-JP\%%f $(OBJS)\ja_JP.EUC-JP
+$(OBJS)\internat_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\internat_internat.o: ./internat.cpp
$(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\internat_internat_rc.o: ./internat.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP
diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc
index 624b2b6fcf..7677451c54 100644
--- a/samples/internat/makefile.vc
+++ b/samples/internat/makefile.vc
@@ -32,7 +32,7 @@ INTERNAT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
INTERNAT_OBJECTS = \
$(OBJS)\internat_internat.obj
INTERNAT_RESOURCES = \
- $(OBJS)\internat_internat.res
+ $(OBJS)\internat_sample.res
### Conditionally set variables: ###
@@ -339,7 +339,7 @@ clean:
-if exist $(OBJS)\internat.ilk del $(OBJS)\internat.ilk
-if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb
-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
+$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(INTERNAT_OBJECTS) $(INTERNAT_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -392,9 +392,9 @@ ja_JP.EUC-JP:
if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP
+$(OBJS)\internat_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\internat_internat.obj: .\internat.cpp
$(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) .\internat.cpp
-$(OBJS)\internat_internat.res: .\internat.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\internat.rc
-
diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat
index eaa032795d..d1a88a1321 100644
--- a/samples/internat/makefile.wat
+++ b/samples/internat/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
-$(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
+$(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_sample.res
@%create $(OBJS)\internat.lbc
@%append $(OBJS)\internat.lbc option quiet
@%append $(OBJS)\internat.lbc name $^@
@@ -256,7 +256,7 @@ $(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res
@%append $(OBJS)\internat.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\internat.lbc library %i
- @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res
+ @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_sample.res
@for %i in () do @%append $(OBJS)\internat.lbc option stack=%i
wlink @$(OBJS)\internat.lbc
@@ -308,9 +308,9 @@ ja_JP.EUC-JP : .SYMBOLIC
if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP
for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP
+$(OBJS)\internat_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\internat_internat.obj : .AUTODEPEND .\internat.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $<
-$(OBJS)\internat_internat.res : .AUTODEPEND .\internat.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/internat/mondrian.ico b/samples/internat/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/internat/mondrian.ico and /dev/null differ
diff --git a/samples/internat/mondrian.xpm b/samples/internat/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/internat/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 36c9d4552d..99f160aaef 100644
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -32,13 +32,13 @@
// we're using TCP/IP or real DDE.
#include "ipcsetup.h"
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#include "mondrian.xpm"
-#endif
-
#include "wx/datetime.h"
#include "client.h"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
+#endif
+
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
: wxFrame(frame, wxID_ANY, title, wxDefaultPosition, wxSize(400, 300))
{
// Give it an icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
diff --git a/samples/ipc/client.rc b/samples/ipc/client.rc
deleted file mode 100644
index 74b8e3f417..0000000000
--- a/samples/ipc/client.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
diff --git a/samples/ipc/mondrian.ico b/samples/ipc/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/ipc/mondrian.ico and /dev/null differ
diff --git a/samples/ipc/mondrian.xpm b/samples/ipc/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/ipc/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/ipc/server.rc b/samples/ipc/server.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/ipc/server.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/joytest/chart.ico b/samples/joytest/chart.ico
deleted file mode 100644
index c0777b91e4..0000000000
Binary files a/samples/joytest/chart.ico and /dev/null differ
diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 2f77ae74c2..e5abd60f97 100644
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -67,13 +67,7 @@ bool MyApp::OnInit()
frame = new MyFrame(NULL, wxT("Joystick Demo"), wxDefaultPosition,
wxSize(500, 400), wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
- // Give it an icon (this is ignored in MDI mode: uses resources)
-#ifdef __WXMSW__
- frame->SetIcon(wxIcon(wxT("joyicon")));
-#endif
-#ifdef __X__
- frame->SetIcon(wxIcon(wxT("joyicon.xbm")));
-#endif
+ frame->SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
diff --git a/samples/joytest/joytest.ico b/samples/joytest/joytest.ico
deleted file mode 100644
index 7d0eceb586..0000000000
Binary files a/samples/joytest/joytest.ico and /dev/null differ
diff --git a/samples/joytest/joytest.rc b/samples/joytest/joytest.rc
deleted file mode 100644
index 8138605789..0000000000
--- a/samples/joytest/joytest.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-aaaa ICON "mondrian.ico"
-joyicon ICON "mondrian.ico"
-
-#include "wx/msw/wx.rc"
-
diff --git a/samples/joytest/mondrian.ico b/samples/joytest/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/joytest/mondrian.ico and /dev/null differ
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index a0c177731b..cd02c96028 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -47,9 +47,9 @@ KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
KEYBOARD_OBJECTS = \
+ $(__keyboard___win32rc) \
$(__keyboard_os2_lib_res) \
- keyboard_keyboard.o \
- $(__keyboard___win32rc)
+ keyboard_keyboard.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__keyboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_sample_rc.o
@COND_PLATFORM_OS2_1@__keyboard_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__keyboard_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__keyboard___win32rc = keyboard_keyboard_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)
@@ -174,12 +174,12 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
@COND_PLATFORM_MACOSX_1@keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP)
+keyboard_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
keyboard_keyboard.o: $(srcdir)/keyboard.cpp
$(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $(srcdir)/keyboard.cpp
-keyboard_keyboard_rc.o: $(srcdir)/keyboard.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/keyboard/keyboard.bkl b/samples/keyboard/keyboard.bkl
index d0ef3a6946..f01d014af3 100644
--- a/samples/keyboard/keyboard.bkl
+++ b/samples/keyboard/keyboard.bkl
@@ -7,7 +7,6 @@
keyboard.cpp
core
base
- keyboard.rc
diff --git a/samples/keyboard/keyboard.dsp b/samples/keyboard/keyboard.dsp
index c0fcb6ac97..2a602713bf 100644
--- a/samples/keyboard/keyboard.dsp
+++ b/samples/keyboard/keyboard.dsp
@@ -256,7 +256,7 @@ SOURCE=.\keyboard.cpp
# End Source File
# Begin Source File
-SOURCE=.\keyboard.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/keyboard/keyboard.rc b/samples/keyboard/keyboard.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/samples/keyboard/keyboard.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/samples/keyboard/keyboard_vc7.vcproj b/samples/keyboard/keyboard_vc7.vcproj
index 871dca6a45..ddc98f1eba 100644
--- a/samples/keyboard/keyboard_vc7.vcproj
+++ b/samples/keyboard/keyboard_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/keyboard/keyboard_vc8.vcproj b/samples/keyboard/keyboard_vc8.vcproj
index 5c998399d4..8bf92fd3ae 100644
--- a/samples/keyboard/keyboard_vc8.vcproj
+++ b/samples/keyboard/keyboard_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/keyboard/keyboard_vc9.vcproj b/samples/keyboard/keyboard_vc9.vcproj
index 87da044d7b..b9b3df2163 100644
--- a/samples/keyboard/keyboard_vc9.vcproj
+++ b/samples/keyboard/keyboard_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc
index 9efe73b465..8584f51093 100644
--- a/samples/keyboard/makefile.bcc
+++ b/samples/keyboard/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\keyboard.ilf del $(OBJS)\keyboard.ilf
-if exist $(OBJS)\keyboard.ils del $(OBJS)\keyboard.ils
-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
+$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\keyboard_keyboard.res
+ c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\keyboard_sample.res
|
+$(OBJS)\keyboard_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp
$(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp
-$(OBJS)\keyboard_keyboard.res: .\keyboard.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\keyboard.rc
-
diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index f366dff4e4..7968341b56 100644
--- a/samples/keyboard/makefile.gcc
+++ b/samples/keyboard/makefile.gcc
@@ -29,8 +29,8 @@ KEYBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
KEYBOARD_OBJECTS = \
- $(OBJS)\keyboard_keyboard.o \
- $(OBJS)\keyboard_keyboard_rc.o
+ $(OBJS)\keyboard_sample_rc.o \
+ $(OBJS)\keyboard_keyboard.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard_rc.o
+$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample_rc.o
$(CXX) -o $@ $(KEYBOARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\keyboard_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\keyboard_keyboard.o: ./keyboard.cpp
$(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\keyboard_keyboard_rc.o: ./keyboard.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc
index 52627f4644..e57b3d0a87 100644
--- a/samples/keyboard/makefile.vc
+++ b/samples/keyboard/makefile.vc
@@ -32,7 +32,7 @@ KEYBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
KEYBOARD_OBJECTS = \
$(OBJS)\keyboard_keyboard.obj
KEYBOARD_RESOURCES = \
- $(OBJS)\keyboard_keyboard.res
+ $(OBJS)\keyboard_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\keyboard.ilk del $(OBJS)\keyboard.ilk
-if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb
-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
+$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(KEYBOARD_OBJECTS) $(KEYBOARD_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\keyboard_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\keyboard_keyboard.obj: .\keyboard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp
-$(OBJS)\keyboard_keyboard.res: .\keyboard.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\keyboard.rc
-
diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat
index 42a28d0791..4b587380bc 100644
--- a/samples/keyboard/makefile.wat
+++ b/samples/keyboard/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
-$(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
+$(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample.res
@%create $(OBJS)\keyboard.lbc
@%append $(OBJS)\keyboard.lbc option quiet
@%append $(OBJS)\keyboard.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
@%append $(OBJS)\keyboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\keyboard.lbc library %i
- @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res
+ @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_sample.res
@for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i
wlink @$(OBJS)\keyboard.lbc
+$(OBJS)\keyboard_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\keyboard_keyboard.obj : .AUTODEPEND .\keyboard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $<
-$(OBJS)\keyboard_keyboard.res : .AUTODEPEND .\keyboard.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index dcaa3c5886..fc3ad56f37 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -47,9 +47,9 @@ LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
LAYOUT_OBJECTS = \
+ $(__layout___win32rc) \
$(__layout_os2_lib_res) \
- layout_layout.o \
- $(__layout___win32rc)
+ layout_layout.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__layout___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___layout___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__layout___win32rc = layout_sample_rc.o
@COND_PLATFORM_OS2_1@__layout_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__layout_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__layout___win32rc = layout_layout_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)
@@ -174,12 +174,12 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
@COND_PLATFORM_MACOSX_1@layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP)
+layout_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
layout_layout.o: $(srcdir)/layout.cpp
$(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $(srcdir)/layout.cpp
-layout_layout_rc.o: $(srcdir)/layout.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/layout/layout.bkl b/samples/layout/layout.bkl
index 349f58c4c1..ab3d16d2cd 100644
--- a/samples/layout/layout.bkl
+++ b/samples/layout/layout.bkl
@@ -8,7 +8,6 @@
layout.h
core
base
- layout.rc
diff --git a/samples/layout/layout.dsp b/samples/layout/layout.dsp
index 857e860086..4241d58b3e 100644
--- a/samples/layout/layout.dsp
+++ b/samples/layout/layout.dsp
@@ -256,7 +256,7 @@ SOURCE=.\layout.cpp
# End Source File
# Begin Source File
-SOURCE=.\layout.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/layout/layout.rc b/samples/layout/layout.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/samples/layout/layout.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/samples/layout/layout_vc7.vcproj b/samples/layout/layout_vc7.vcproj
index 12ec6a6c74..ce69e24774 100644
--- a/samples/layout/layout_vc7.vcproj
+++ b/samples/layout/layout_vc7.vcproj
@@ -558,7 +558,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/layout/layout_vc8.vcproj b/samples/layout/layout_vc8.vcproj
index e33c468d4f..bb3e8c071a 100644
--- a/samples/layout/layout_vc8.vcproj
+++ b/samples/layout/layout_vc8.vcproj
@@ -824,7 +824,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/layout/layout_vc9.vcproj b/samples/layout/layout_vc9.vcproj
index 62736678c2..55ca20da1a 100644
--- a/samples/layout/layout_vc9.vcproj
+++ b/samples/layout/layout_vc9.vcproj
@@ -796,7 +796,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc
index 402cf6ea33..1cfa9f81de 100644
--- a/samples/layout/makefile.bcc
+++ b/samples/layout/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\layout.ilf del $(OBJS)\layout.ilf
-if exist $(OBJS)\layout.ils del $(OBJS)\layout.ils
-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
+$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\layout_layout.res
+ c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\layout_sample.res
|
+$(OBJS)\layout_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\layout_layout.obj: .\layout.cpp
$(CXX) -q -c -P -o$@ $(LAYOUT_CXXFLAGS) .\layout.cpp
-$(OBJS)\layout_layout.res: .\layout.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\layout.rc
-
diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index 07c15565b3..99eb457e78 100644
--- a/samples/layout/makefile.gcc
+++ b/samples/layout/makefile.gcc
@@ -29,8 +29,8 @@ LAYOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
LAYOUT_OBJECTS = \
- $(OBJS)\layout_layout.o \
- $(OBJS)\layout_layout_rc.o
+ $(OBJS)\layout_sample_rc.o \
+ $(OBJS)\layout_layout.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout_rc.o
+$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_sample_rc.o
$(CXX) -o $@ $(LAYOUT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\layout_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\layout_layout.o: ./layout.cpp
$(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\layout_layout_rc.o: ./layout.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc
index b828b30ed3..03d0e8c678 100644
--- a/samples/layout/makefile.vc
+++ b/samples/layout/makefile.vc
@@ -32,7 +32,7 @@ LAYOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
LAYOUT_OBJECTS = \
$(OBJS)\layout_layout.obj
LAYOUT_RESOURCES = \
- $(OBJS)\layout_layout.res
+ $(OBJS)\layout_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\layout.ilk del $(OBJS)\layout.ilk
-if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb
-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
+$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(LAYOUT_OBJECTS) $(LAYOUT_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\layout_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\layout_layout.obj: .\layout.cpp
$(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) .\layout.cpp
-$(OBJS)\layout_layout.res: .\layout.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\layout.rc
-
diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index d793a4fbd7..76de468966 100644
--- a/samples/layout/makefile.wat
+++ b/samples/layout/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
-$(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
+$(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_sample.res
@%create $(OBJS)\layout.lbc
@%append $(OBJS)\layout.lbc option quiet
@%append $(OBJS)\layout.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
@%append $(OBJS)\layout.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\layout.lbc library %i
- @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res
+ @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_sample.res
@for %i in () do @%append $(OBJS)\layout.lbc option stack=%i
wlink @$(OBJS)\layout.lbc
+$(OBJS)\layout_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\layout_layout.obj : .AUTODEPEND .\layout.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<
-$(OBJS)\layout_layout.res : .AUTODEPEND .\layout.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 4cf75b2406..aee4619954 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -21,7 +21,7 @@
#endif
#if !defined(__WXMSW__) && !defined(__WXPM__)
- #include "mondrian.xpm"
+ #include "../sample.xpm"
#endif
#ifndef __WXMSW__
@@ -173,7 +173,7 @@ MyFrame::MyFrame(const wxChar *title)
m_numListItems = 10;
// Give it an icon
- SetIcon( wxICON(mondrian) );
+ SetIcon(wxICON(sample));
// Make an image list containing large icons
m_imageListNormal = new wxImageList(32, 32, true);
diff --git a/samples/listctrl/listtest.rc b/samples/listctrl/listtest.rc
index 8b6cecfef9..f413e2ff0e 100644
--- a/samples/listctrl/listtest.rc
+++ b/samples/listctrl/listtest.rc
@@ -1,6 +1,4 @@
-aaaa ICON "mondrian.ico"
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
+#include "../sample.rc"
icon1 ICON "bitmaps/toolbrai.ico"
icon2 ICON "bitmaps/toolchar.ico"
diff --git a/samples/listctrl/mondrian.ico b/samples/listctrl/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/listctrl/mondrian.ico and /dev/null differ
diff --git a/samples/listctrl/mondrian.xpm b/samples/listctrl/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/listctrl/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index fc4ba65e21..e5ed720455 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -47,9 +47,9 @@ MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
MEMCHECK_OBJECTS = \
+ $(__memcheck___win32rc) \
$(__memcheck_os2_lib_res) \
- memcheck_memcheck.o \
- $(__memcheck___win32rc)
+ memcheck_memcheck.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd = $(NM) memcheck$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__memcheck___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_sample_rc.o
@COND_PLATFORM_OS2_1@__memcheck_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__memcheck_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__memcheck___win32rc = memcheck_memcheck_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)
@@ -174,12 +174,12 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
@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_2) $(__DEBUG_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
+
memcheck_memcheck.o: $(srcdir)/memcheck.cpp
$(CXXC) -c -o $@ $(MEMCHECK_CXXFLAGS) $(srcdir)/memcheck.cpp
-memcheck_memcheck_rc.o: $(srcdir)/memcheck.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc
index 94f72ac453..a27e060a79 100644
--- a/samples/memcheck/makefile.bcc
+++ b/samples/memcheck/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\memcheck.ilf del $(OBJS)\memcheck.ilf
-if exist $(OBJS)\memcheck.ils del $(OBJS)\memcheck.ils
-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
+$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\memcheck_memcheck.res
+ c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\memcheck_sample.res
|
+$(OBJS)\memcheck_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp
$(CXX) -q -c -P -o$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp
-$(OBJS)\memcheck_memcheck.res: .\memcheck.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\memcheck.rc
-
diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc
index 46fb082f22..d3e5f78893 100644
--- a/samples/memcheck/makefile.gcc
+++ b/samples/memcheck/makefile.gcc
@@ -29,8 +29,8 @@ MEMCHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
MEMCHECK_OBJECTS = \
- $(OBJS)\memcheck_memcheck.o \
- $(OBJS)\memcheck_memcheck_rc.o
+ $(OBJS)\memcheck_sample_rc.o \
+ $(OBJS)\memcheck_memcheck.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck_rc.o
+$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_sample_rc.o
$(CXX) -o $@ $(MEMCHECK_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\memcheck_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\memcheck_memcheck.o: ./memcheck.cpp
$(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\memcheck_memcheck_rc.o: ./memcheck.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc
index 32cef59151..ed6ba5c216 100644
--- a/samples/memcheck/makefile.vc
+++ b/samples/memcheck/makefile.vc
@@ -32,7 +32,7 @@ MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
MEMCHECK_OBJECTS = \
$(OBJS)\memcheck_memcheck.obj
MEMCHECK_RESOURCES = \
- $(OBJS)\memcheck_memcheck.res
+ $(OBJS)\memcheck_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-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_memcheck.res
+$(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) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(MEMCHECK_OBJECTS) $(MEMCHECK_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\memcheck_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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
-$(OBJS)\memcheck_memcheck.res: .\memcheck.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\memcheck.rc
-
diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat
index 60554039dc..d12d069a6f 100644
--- a/samples/memcheck/makefile.wat
+++ b/samples/memcheck/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
-$(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
+$(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_sample.res
@%create $(OBJS)\memcheck.lbc
@%append $(OBJS)\memcheck.lbc option quiet
@%append $(OBJS)\memcheck.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res
@%append $(OBJS)\memcheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\memcheck.lbc library %i
- @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res
+ @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_sample.res
@for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i
wlink @$(OBJS)\memcheck.lbc
+$(OBJS)\memcheck_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\memcheck_memcheck.obj : .AUTODEPEND .\memcheck.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $<
-$(OBJS)\memcheck_memcheck.res : .AUTODEPEND .\memcheck.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/memcheck/memcheck.bkl b/samples/memcheck/memcheck.bkl
index 5029c09bca..1363745558 100644
--- a/samples/memcheck/memcheck.bkl
+++ b/samples/memcheck/memcheck.bkl
@@ -7,7 +7,6 @@
memcheck.cpp
core
base
- memcheck.rc
diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index a637d6a0a7..6468754414 100644
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -22,8 +22,8 @@
#include "wx/datetime.h"
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
#ifndef __WXDEBUG__
@@ -57,13 +57,13 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit(void)
{
if ( !wxApp::OnInit() )
- return false;
+ return false;
// Create the main frame window
MyFrame *frame = new MyFrame((wxFrame *) NULL);
// Give it an icon
- frame->SetIcon(wxICON(mondrian));
+ frame->SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
diff --git a/samples/memcheck/memcheck.dsp b/samples/memcheck/memcheck.dsp
index 5e3799def5..dfae39805a 100644
--- a/samples/memcheck/memcheck.dsp
+++ b/samples/memcheck/memcheck.dsp
@@ -256,7 +256,7 @@ SOURCE=.\memcheck.cpp
# End Source File
# Begin Source File
-SOURCE=.\memcheck.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/memcheck/memcheck.rc b/samples/memcheck/memcheck.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/memcheck/memcheck.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/memcheck/memcheck_vc7.vcproj b/samples/memcheck/memcheck_vc7.vcproj
index 95a2633f2f..e0475dabca 100644
--- a/samples/memcheck/memcheck_vc7.vcproj
+++ b/samples/memcheck/memcheck_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/memcheck/memcheck_vc8.vcproj b/samples/memcheck/memcheck_vc8.vcproj
index a64c0abac6..70e9ba61fc 100644
--- a/samples/memcheck/memcheck_vc8.vcproj
+++ b/samples/memcheck/memcheck_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/memcheck/memcheck_vc9.vcproj b/samples/memcheck/memcheck_vc9.vcproj
index c0290c3dfb..1c3a2ba7d4 100644
--- a/samples/memcheck/memcheck_vc9.vcproj
+++ b/samples/memcheck/memcheck_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/memcheck/mondrian.ico b/samples/memcheck/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/memcheck/mondrian.ico and /dev/null differ
diff --git a/samples/memcheck/mondrian.xpm b/samples/memcheck/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/memcheck/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/menu/MENU.RCO b/samples/menu/MENU.RCO
deleted file mode 100644
index 1554583b3d..0000000000
--- a/samples/menu/MENU.RCO
+++ /dev/null
@@ -1,3 +0,0 @@
-ICON 1 PRELOAD "mondros2.ico"
-#include "..\\..\\include\wx\os2\wx.rc"
-
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 9d78b468a0..35c64aec25 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -47,9 +47,9 @@ MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
MENU_OBJECTS = \
+ $(__menu___win32rc) \
$(__menu_os2_lib_res) \
- menu_menu.o \
- $(__menu___win32rc)
+ menu_menu.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \
@COND_PLATFORM_OS2_1@__menu___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___menu___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__menu___win32rc = menu_sample_rc.o
@COND_PLATFORM_OS2_1@__menu_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__menu_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__menu___win32rc = menu_menu_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)
@@ -174,12 +174,12 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
@COND_PLATFORM_MACOSX_1@menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP)
+menu_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
menu_menu.o: $(srcdir)/menu.cpp
$(CXXC) -c -o $@ $(MENU_CXXFLAGS) $(srcdir)/menu.cpp
-menu_menu_rc.o: $(srcdir)/menu.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc
index fb35883a3a..60a688930b 100644
--- a/samples/menu/makefile.bcc
+++ b/samples/menu/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\menu.ilf del $(OBJS)\menu.ilf
-if exist $(OBJS)\menu.ils del $(OBJS)\menu.ils
-$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res
+$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(MENU_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\menu_menu.res
+ c0w32.obj $(MENU_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\menu_sample.res
|
+$(OBJS)\menu_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\menu_menu.obj: .\menu.cpp
$(CXX) -q -c -P -o$@ $(MENU_CXXFLAGS) .\menu.cpp
-$(OBJS)\menu_menu.res: .\menu.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\menu.rc
-
diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc
index 32fb82e64c..066306d482 100644
--- a/samples/menu/makefile.gcc
+++ b/samples/menu/makefile.gcc
@@ -28,8 +28,8 @@ MENU_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
-Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
MENU_OBJECTS = \
- $(OBJS)\menu_menu.o \
- $(OBJS)\menu_menu_rc.o
+ $(OBJS)\menu_sample_rc.o \
+ $(OBJS)\menu_menu.o
### Conditionally set variables: ###
@@ -217,15 +217,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
-$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu_rc.o
+$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_sample_rc.o
$(CXX) -o $@ $(MENU_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\menu_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\menu_menu.o: ./menu.cpp
$(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\menu_menu_rc.o: ./menu.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc
index 7ade6d00c1..56069aa5dd 100644
--- a/samples/menu/makefile.vc
+++ b/samples/menu/makefile.vc
@@ -32,7 +32,7 @@ MENU_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
MENU_OBJECTS = \
$(OBJS)\menu_menu.obj
MENU_RESOURCES = \
- $(OBJS)\menu_menu.res
+ $(OBJS)\menu_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\menu.ilk del $(OBJS)\menu.ilk
-if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb
-$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res
+$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(MENU_OBJECTS) $(MENU_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\menu_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\menu_menu.obj: .\menu.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) .\menu.cpp
-$(OBJS)\menu_menu.res: .\menu.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\menu.rc
-
diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat
index ccf682bd85..547dd7676c 100644
--- a/samples/menu/makefile.wat
+++ b/samples/menu/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
-$(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_menu.res
+$(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_sample.res
@%create $(OBJS)\menu.lbc
@%append $(OBJS)\menu.lbc option quiet
@%append $(OBJS)\menu.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_menu.res
@%append $(OBJS)\menu.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\menu.lbc library %i
- @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res
+ @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_sample.res
@for %i in () do @%append $(OBJS)\menu.lbc option stack=%i
wlink @$(OBJS)\menu.lbc
+$(OBJS)\menu_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\menu_menu.obj : .AUTODEPEND .\menu.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $<
-$(OBJS)\menu_menu.res : .AUTODEPEND .\menu.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/menu/menu.bkl b/samples/menu/menu.bkl
index 3e519fe983..030e9f07a5 100644
--- a/samples/menu/menu.bkl
+++ b/samples/menu/menu.bkl
@@ -7,7 +7,6 @@
menu.cpp
core
base
- menu.rc
diff --git a/samples/menu/menu.dsp b/samples/menu/menu.dsp
index cd81c2638e..06ae47fbf4 100644
--- a/samples/menu/menu.dsp
+++ b/samples/menu/menu.dsp
@@ -256,7 +256,7 @@ SOURCE=.\menu.cpp
# End Source File
# Begin Source File
-SOURCE=.\menu.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/menu/menu.rc b/samples/menu/menu.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/samples/menu/menu.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/samples/menu/menu_vc7.vcproj b/samples/menu/menu_vc7.vcproj
index 58ce4df180..20ba0160a1 100644
--- a/samples/menu/menu_vc7.vcproj
+++ b/samples/menu/menu_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/menu/menu_vc8.vcproj b/samples/menu/menu_vc8.vcproj
index e97ec8eae5..7542c7fed6 100644
--- a/samples/menu/menu_vc8.vcproj
+++ b/samples/menu/menu_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/menu/menu_vc9.vcproj b/samples/menu/menu_vc9.vcproj
index 2caa7c7350..019f651f0e 100644
--- a/samples/menu/menu_vc9.vcproj
+++ b/samples/menu/menu_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/menu/mondros2.ico b/samples/menu/mondros2.ico
deleted file mode 100644
index 8b0e58c0d7..0000000000
Binary files a/samples/menu/mondros2.ico and /dev/null differ
diff --git a/samples/minimal/minimal.plc b/samples/minimal/minimal.plc
index 8a742b4540..e2117132b2 100644
--- a/samples/minimal/minimal.plc
+++ b/samples/minimal/minimal.plc
@@ -21,7 +21,7 @@ plist
key "CFBundleSignature" value string __OUTPUT_CREATOR__
key "CFBundleExecutable" value string __OUTPUT_FILENAME__
key "CFBundleVersion" value string "1.0"
- key "CFBundleIconFile" value string "mondrian"
+ key "CFBundleIconFile" value string "sample"
key "CFBundleDevelopmentRegion" value string "English"
key "CFBundleInfoDictionaryVersion" value string "6.0"
@@ -36,4 +36,4 @@ localize "English"
key "CFBundleName" value string __OUTPUT_FILENAME__
key "CFBundleGetInfoString" value string kBundleGetInfo
key "CFBundleShortVersionString" value string kBundleShortVersion
-}
\ No newline at end of file
+}
diff --git a/samples/minimal/minimal.rc b/samples/minimal/minimal.rc
deleted file mode 100644
index b862bd2de8..0000000000
--- a/samples/minimal/minimal.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "sample.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/minimal/minimal.rc4 b/samples/minimal/minimal.rc4
deleted file mode 100644
index fc50aa7d7f..0000000000
--- a/samples/minimal/minimal.rc4
+++ /dev/null
@@ -1,6 +0,0 @@
-ICON 1 PRELOAD "..\\samples\\minimal\\mondros2.ico"
-#include "H:\DEV\WX22\WXWINDOWS\include\wx\os2\wx.rc"
-
-#define MINIMAL_QUIT 1
-#define MINIMAL_ABOUT 102
-
diff --git a/samples/minimal/minimal.rcO b/samples/minimal/minimal.rcO
deleted file mode 100644
index 412a762880..0000000000
--- a/samples/minimal/minimal.rcO
+++ /dev/null
@@ -1,6 +0,0 @@
-ICON 1 PRELOAD "mondros2.ico"
-RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc
-
-#define MINIMAL_QUIT 1
-#define MINIMAL_ABOUT 102
-
diff --git a/samples/minimal/mondrian.r b/samples/minimal/mondrian.r
deleted file mode 100755
index e7c39a882c..0000000000
--- a/samples/minimal/mondrian.r
+++ /dev/null
@@ -1,2675 +0,0 @@
-data 'vers' (2) {
-$"0100 2000 0000 0531 2E30 6430 0531 2E30"
-$"6430"} ;
-
-data 'vers' (1) {
-$"0100 2000 0000 0531 2E30 6430 0531 2E30"
-$"6430"} ;
-
-data 'ICN#' (-16455, "Item Icon") {
- $"FFFF FFFF F700 001D BB00 002B D700 0057"
- $"ED00 009D BB00 0539 DD00 1261 F700 A4E1"
- $"FFFE 539F 8100 A52F 8102 AED7 8105 4BAB"
- $"8103 BD12 810E 4A65 8105 2492 8102 F926"
- $"810B 5FA9 8114 0B7E 8108 05AC 8100 0021"
- $"8100 0027 8100 0021 8100 0021 8100 0021"
- $"81FF FFE1 8100 0FE1 8122 0AE1 8108 2FA1"
- $"8141 0DE1 8104 0B61 8100 9DA1 FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icl4' (-16455, "Item Icon") {
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"F333 333F 0000 0000 0000 0000 0003 3E0F"
- $"F333 333F 0000 0000 0000 0000 00A4 3AEF"
- $"F333 333F 0000 0000 0000 0000 0DCA 3EEF"
- $"F333 333F 0000 0000 0000 0000 E1C5 FE0F"
- $"F333 333F 0000 0000 000C CDCB 1DEA E00F"
- $"F333 333F 0000 0000 0CCC 1CB1 C3FD 000F"
- $"F333 333F 0000 0000 D02C CB1D A9E0 000F"
- $"FFFF FFFF FFFF FFFC C2C3 BCD3 EDDF FFFF"
- $"F000 000F 0000 00CC 2DAB 02BF 2DDD 666F"
- $"F000 000F 0000 0C1D BBB1 BEAB BDCB D66F"
- $"F000 000F 0000 CCD4 E2CB BAEE B42C CD6F"
- $"F000 000F 0000 C2BA BD2E FF3B DCC2 DCDD"
- $"F000 000F 0000 D3BD D2CC 2DCD 02D0 DCEB"
- $"F000 000F 0000 0EAC CDB2 CCCC 20D2 CDDB"
- $"F000 000F 0000 CBBB 3AAE E2D2 CC2C C2DC"
- $"F000 000F 0000 BC2E DD4A EEAE EBBB BBCD"
- $"F000 000F 000C DEDD 00CD DAEA AAEF 35DC"
- $"F000 000F 000B D000 0000 CCD4 DEBE EADC"
- $"F000 000F 0000 0000 0000 0000 00F0 0BCD"
- $"F000 000F 0000 0000 0000 0000 00F0 0FEE"
- $"F000 000F 0000 0000 0000 0000 00F0 000F"
- $"F000 000F 0000 0000 0000 0000 00F0 000F"
- $"F000 000F 0000 0000 0000 0000 00F0 000F"
- $"F000 000F FFFF FFFF FFFF FFFF FFF0 000F"
- $"F000 000F 1111 1111 1111 F999 99F0 000F"
- $"F000 000F 1111 1111 1111 F898 99F0 000F"
- $"F000 000F 1111 1111 1111 F999 98F0 000F"
- $"F000 000F 1111 1111 1111 F989 99F0 000F"
- $"F000 000F 1111 1111 1111 F899 89F0 000F"
- $"F000 000F 1111 1111 1111 F989 98F0 000F"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icl8' (-16455, "Item Icon") {
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 00DB 22FC 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 DB21 6BDB FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0081 2BDA 6BB2 FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 FB03 5581 FDFB 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0007 2C32 325E 0358 88DE FC00 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"002B 0832 0832 5803 3988 ADFB 0000 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"3208 3208 5658 0934 88AD FC00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF32"
- $"0833 3964 5809 3388 AD32 FBFF FFFF FFFF"
- $"FF00 0000 0000 00FF 0000 0000 0000 3208"
- $"3339 8858 0934 82DF 3933 3281 D2D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 002C 0833"
- $"6488 5E09 3388 B35E 6433 3233 81D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F608 395D"
- $"8858 0934 82E0 8888 5E39 332C 3281 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F739 5E8E"
- $"820F 5788 FFFD 645E 3357 0E32 3332 81F9"
- $"FF00 0000 0000 00FF 0000 0000 3965 8833"
- $"3933 3332 3357 320E 2C0E 322C 0E2D 815D"
- $"FF00 0000 0000 00FF 0000 0000 F5FC 8808"
- $"325D 5D34 320E 082C 0E2C 3233 3232 FA58"
- $"FF00 0000 0000 00FF 0000 0000 2B58 3464"
- $"88DE 8988 885E 5D33 3232 3332 335E F954"
- $"FF00 0000 0000 00FF 0000 0000 5D33 5D82"
- $"FA5D 8789 8EAC 89AC 885E 645E 5D64 5654"
- $"FF00 0000 0000 00FF 0000 002C 8187 5756"
- $"0000 F632 8189 B2DE 89B2 88AC 8888 F9F8"
- $"FF00 0000 0000 00FF 0000 0081 562B 0000"
- $"0000 0000 F6F7 325D 815E FB88 88FC 5656"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 005D 57F8"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 00FD AB88"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E5 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E5 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E5E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E5E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E6 E6E6 FF00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icm#' (-16455, "Item Icon") {
- $"F24B D007 B028 5557 81B1 124A 8236 1005"
- $"8000 1ABD 8030 557D FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'icm4' (-16455, "Item Icon") {
- $"A33F CDCC DCCD CAAE A333 0000 0000 CDEE"
- $"333A 0000 CCCB 2E0D EDCE CDCD DB2B DB6F"
- $"D00D 00C2 BBEA BCD5 D00D 00BD 2D2D CC2D"
- $"D00D 0CDC CCDB BADC D00D 0000 0000 0DCE"
- $"D00D 0000 0000 0D0D D00D B1BB 1BF9 FD0D"
- $"D00D 1111 1199 8D0D ECDB BB1B B1F9 FECE"
-};
-
-data 'icm8' (-16455, "Item Icon") {
- $"DDDA DADD F8F8 F8F8 F8F8 F8F8 F864 8EAC"
- $"DB23 23DC 0000 0000 0000 0000 F85C 89FB"
- $"DC23 23DB 0000 0000 F608 3234 5E82 2AFA"
- $"FBF8 F8FB F8F8 5633 335D 3488 575D EFF1"
- $"F900 00FA 0000 2C63 5E34 FD64 5D2C 33AA"
- $"FA00 00F9 0000 395E 5D5D 5733 0832 33F9"
- $"F900 00FA 00F6 F92C 2B32 5D88 8888 88F8"
- $"FA00 00F9 0000 0000 0000 0000 00FA F781"
- $"F900 00FA 0000 0000 0000 0000 00F9 00F9"
- $"FA00 00F9 3559 5335 5959 E9E7 E7FA 00FA"
- $"F900 00FA 0505 0505 0505 E8E6 E6F9 00F9"
- $"FBF8 F8FB 592F 5959 2F59 E9E7 E7FB F8FB"
-};
-
-data 'icns' (-16455, "Item Icon") {
- $"6963 6E73 0000 9AB8 4943 4E23 0000 0108"
- $"FFFF FFFF F700 001D BB00 002B D700 0057"
- $"ED00 009D BB00 0539 DD00 1261 F700 A4E1"
- $"FFFE 539F 8100 A52F 8102 AED7 8105 4BAB"
- $"8103 BD12 810E 4A65 8105 2492 8102 F926"
- $"810B 5FA9 8114 0B7E 8108 05AC 8100 0021"
- $"8100 0027 8100 0021 8100 0021 8100 0021"
- $"81FF FFE1 8100 0FE1 8122 0AE1 8108 2FA1"
- $"8141 0DE1 8104 0B61 8100 9DA1 FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"6963 6C34 0000 0208 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF F333 333F 0000 0000"
- $"0000 0000 0003 3E0F F333 333F 0000 0000"
- $"0000 0000 00A4 3AEF F333 333F 0000 0000"
- $"0000 0000 0DCA 3EEF F333 333F 0000 0000"
- $"0000 0000 E1C5 FE0F F333 333F 0000 0000"
- $"000C CDCB 1DEA E00F F333 333F 0000 0000"
- $"0CCC 1CB1 C3FD 000F F333 333F 0000 0000"
- $"D02C CB1D A9E0 000F FFFF FFFF FFFF FFFC"
- $"C2C3 BCD3 EDDF FFFF F000 000F 0000 00CC"
- $"2DAB 02BF 2DDD 666F F000 000F 0000 0C1D"
- $"BBB1 BEAB BDCB D66F F000 000F 0000 CCD4"
- $"E2CB BAEE B42C CD6F F000 000F 0000 C2BA"
- $"BD2E FF3B DCC2 DCDD F000 000F 0000 D3BD"
- $"D2CC 2DCD 02D0 DCEB F000 000F 0000 0EAC"
- $"CDB2 CCCC 20D2 CDDB F000 000F 0000 CBBB"
- $"3AAE E2D2 CC2C C2DC F000 000F 0000 BC2E"
- $"DD4A EEAE EBBB BBCD F000 000F 000C DEDD"
- $"00CD DAEA AAEF 35DC F000 000F 000B D000"
- $"0000 CCD4 DEBE EADC F000 000F 0000 0000"
- $"0000 0000 00F0 0BCD F000 000F 0000 0000"
- $"0000 0000 00F0 0FEE F000 000F 0000 0000"
- $"0000 0000 00F0 000F F000 000F 0000 0000"
- $"0000 0000 00F0 000F F000 000F 0000 0000"
- $"0000 0000 00F0 000F F000 000F FFFF FFFF"
- $"FFFF FFFF FFF0 000F F000 000F 1111 1111"
- $"1111 F999 99F0 000F F000 000F 1111 1111"
- $"1111 F898 99F0 000F F000 000F 1111 1111"
- $"1111 F999 98F0 000F F000 000F 1111 1111"
- $"1111 F989 99F0 000F F000 000F 1111 1111"
- $"1111 F899 89F0 000F F000 000F 1111 1111"
- $"1111 F989 98F0 000F FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF 6963 6C38 0000 0408"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 00DB 22FC 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 DB21 6BDB FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0081 2BDA 6BB2 FCFF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 FB03 5581 FDFB 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"0000 0007 2C32 325E 0358 88DE FC00 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"002B 0832 0832 5803 3988 ADFB 0000 00FF"
- $"FF23 2323 2323 23FF 0000 0000 0000 0000"
- $"3208 3208 5658 0934 88AD FC00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF32"
- $"0833 3964 5809 3388 AD32 FBFF FFFF FFFF"
- $"FF00 0000 0000 00FF 0000 0000 0000 3208"
- $"3339 8858 0934 82DF 3933 3281 D2D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 002C 0833"
- $"6488 5E09 3388 B35E 6433 3233 81D2 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F608 395D"
- $"8858 0934 82E0 8888 5E39 332C 3281 D2FF"
- $"FF00 0000 0000 00FF 0000 0000 F739 5E8E"
- $"820F 5788 FFFD 645E 3357 0E32 3332 81F9"
- $"FF00 0000 0000 00FF 0000 0000 3965 8833"
- $"3933 3332 3357 320E 2C0E 322C 0E2D 815D"
- $"FF00 0000 0000 00FF 0000 0000 F5FC 8808"
- $"325D 5D34 320E 082C 0E2C 3233 3232 FA58"
- $"FF00 0000 0000 00FF 0000 0000 2B58 3464"
- $"88DE 8988 885E 5D33 3232 3332 335E F954"
- $"FF00 0000 0000 00FF 0000 0000 5D33 5D82"
- $"FA5D 8789 8EAC 89AC 885E 645E 5D64 5654"
- $"FF00 0000 0000 00FF 0000 002C 8187 5756"
- $"0000 F632 8189 B2DE 89B2 88AC 8888 F9F8"
- $"FF00 0000 0000 00FF 0000 0081 562B 0000"
- $"0000 0000 F6F7 325D 815E FB88 88FC 5656"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 005D 57F8"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 00FD AB88"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 FF00 0000 00FF"
- $"FF00 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E5 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E6E5 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E5E6 E6E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE6 E6E6 E5E6 FF00 0000 00FF"
- $"FF00 0000 0000 00FF 0505 0505 0505 0505"
- $"0505 0505 FFE5 E6E6 E6E6 FF00 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"696C 3332 0000 0670 9E00 83FF 0000 90FF"
- $"058E EA44 FF00 0083 FF00 008F FF06 8FEA"
- $"AB8E 4400 0083 FF00 008E FF07 5ABE AB8E"
- $"4544 0000 83FF 0000 8DFF 0864 FE91 6945"
- $"44FF 0000 83FF 0000 88FF 0DE2 E1CB B8A1"
- $"FEB1 6245 44FF FF00 0083 FF00 0086 FF0A"
- $"E2E6 E9EF B89F FEC1 6245 4480 FF01 0000"
- $"83FF 0000 85FF 0AD9 E4E9 EBB8 9FFE C362"
- $"4544 81FF 8D00 0BD7 E3DE BA8F A2FE C662"
- $"45D0 6183 0083 FF00 0083 FF0D DAE5 D4B3"
- $"679A FEC8 6245 A5C9 D361 8200 83FF 0000"
- $"82FF 0FDC E2D4 A469 9EF2 C962 4579 9BC2"
- $"D2D0 6181 0083 FF00 0081 FF11 E8DD D2B3"
- $"6AA0 F3C7 5C1B 5D89 9CB5 CDD5 D361 8000"
- $"83FF 0000 81FF 14DF C29C 657A DEB3 6A0D"
- $"2082 ADBD C3D1 D5D7 D069 8800 83FF 0000"
- $"81FF 14AE 8170 B9C5 C1CE C7B2 AFDA E7EA"
- $"E1D9 D8D9 D469 8600 83FF 0000 81FF 14EE"
- $"5C75 EBD4 9FB3 C4DE E7EC EBE3 E4DD D6CE"
- $"C672 9C00 83FF 0000 81FF 14C6 A2C7 886F"
- $"4D61 6F7F 9094 C1DB CCC1 C0B7 AB82 A200"
- $"83FF 0000 81FF 1499 BFAE 5C8A 856D 504E"
- $"5A5B 556C 8F8B 8C95 888F A400 83FF 0000"
- $"80FF 15CA 667C 8C9F FFFF DCB5 8251 4A43"
- $"3F4B 535E 6860 8FA6 0083 FF00 0080 FF02"
- $"669F C283 FF0C DCC3 A88D 847B 686D 5A5E"
- $"8FAF 0083 FF00 008F FF06 00FF FF81 8FB5"
- $"0083 FF00 008F FF06 00FF FF22 4444 0083"
- $"FF00 008F FF00 0081 FF01 0000 83FF 0000"
- $"8FFF 0000 81FF 0100 0083 FF00 008F FF00"
- $"0081 FF01 0000 83FF 9100 81FF 0100 0083"
- $"FF00 0089 FF84 0081 FF01 0000 83FF 0000"
- $"89FF 8400 81FF 0100 0083 FF00 0089 FF84"
- $"0081 FF01 0000 83FF 0000 89FF 8400 81FF"
- $"0100 0083 FF00 0089 FF84 0081 FF01 0000"
- $"83FF 0000 89FF 8400 81FF 9E00 A500 90FF"
- $"0301 0044 FF86 008F FF04 0900 0001 4486"
- $"008E FF05 67BC 0001 1944 8600 8DFF 0666"
- $"E49D 7119 44FF 8600 88FF 0BC9 BEA7 9B82"
- $"E489 4419 44FF FF86 0086 FF0A CFB6 B9BB"
- $"9B79 E493 4419 4480 FF86 0085 FF0A B2AC"
- $"B6B5 9B7D E497 4419 4481 FF8D 000B AFAF"
- $"A06E 5180 E49A 4419 9B62 8300 83FF 0000"
- $"83FF 0DB2 B397 682E 76E4 9D44 1963 96A1"
- $"6282 0083 FF00 0082 FF0F BEB0 9953 307E"
- $"CF9C 4619 3459 8BA6 9C62 8100 83FF 0000"
- $"81FF 11E0 B191 672E 7ED0 9A44 0E2A 3C55"
- $"7BA0 A8A2 6280 0083 FF00 0081 FF14 C576"
- $"4B2D 51B5 864F 040E 3461 818A 9FA8 A7A1"
- $"687C 0083 FF00 0081 FF14 722D 3A7D 8683"
- $"9998 8C85 A0B3 B9AE A9AA AAA5 687E 0083"
- $"FF00 0081 FF14 E844 38B3 A962 6F7D 9DB2"
- $"BEBC B5B7 AFA5 9B95 7392 0083 FF00 0081"
- $"FF14 C283 9A44 3D1E 2934 4455 5C8E AC9A"
- $"8B89 7D75 829A 0083 FF00 0081 FF14 6E8B"
- $"8044 746B 4522 222F 302E 425C 5558 6055"
- $"8E9E 0083 FF00 0080 FF15 B466 5A81 9FFF"
- $"FFD6 9F5B 231B 1310 202B 333C 378E A000"
- $"83FF 0000 80FF 0266 9FC2 83FF 0CD6 B692"
- $"6F66 5B47 4931 3B8E A600 83FF 0000 8FFF"
- $"0600 FFFF 728E AB00 83FF 0000 8FFF 0600"
- $"FFFF 2244 4400 83FF 0000 8FFF 0000 81FF"
- $"0100 0083 FF00 008F FF00 0081 FF01 0000"
- $"83FF 0000 8FFF 0000 81FF 0100 0083 FF91"
- $"0081 FF01 0000 83FF 0000 89FF 0000 827B"
- $"0000 81FF 0100 0083 FF00 0089 FF00 0082"
- $"7B00 0081 FF01 0000 83FF 0000 89FF 0000"
- $"827B 0000 81FF 0100 0083 FF00 0089 FF00"
- $"0082 7B00 0081 FF01 0000 83FF 0000 89FF"
- $"0000 827B 0000 81FF 0100 0083 FF00 0089"
- $"FF00 0082 7B00 0081 FF9E 00A5 0090 FF03"
- $"0F43 44FF 8600 8FFF 0417 4316 0F44 8600"
- $"8EFF 0565 C416 0F1A 4486 008D FF06 5567"
- $"A76C 1A44 FF86 0088 FF0B BCA9 9293 3E67"
- $"4D23 1A44 FFFF 8600 86FF 0AC6 9A98 9893"
- $"3167 4A23 1A44 80FF 8600 85FF 0A9C 8E99"
- $"9593 3767 4F23 1A44 81FF 8D00 0B92 8F86"
- $"5747 3967 5223 1A7A 6183 0083 FF00 0083"
- $"FF0D 9591 7C51 2A32 6753 231A 4B78 8361"
- $"80FF 0100 0083 FF00 0082 FF13 A98B 7D41"
- $"2C37 6353 241A 2C44 6D8A 8061 FFFF 0000"
- $"83FF 0000 81FF 14DA 9278 5427 3761 5122"
- $"1124 323F 6084 8D86 61FF 0000 83FF 0000"
- $"81FF 14B7 5B3C 2730 5956 2A0A 0C2C 4F65"
- $"6C85 8D89 8869 8800 83FF 0000 81FF 1461"
- $"202F 6A76 7683 8378 748C 9A9D 918E 8E8C"
- $"8869 5500 83FF 0000 81FF 14E7 2230 9694"
- $"5354 5F80 95A2 9E9A 9D94 8881 7A73 4400"
- $"83FF 0000 81FF 14C6 4651 3538 191F 2A36"
- $"444A 7591 8173 7268 6081 FF00 83FF 0000"
- $"81FF 0859 6A49 2277 683C 1A1D 8028 0838"
- $"4D47 484F 478E FF00 83FF 0000 80FF 15A8"
- $"654A 7F9F FFFF D39A 551C 140E 0B1B 262B"
- $"3330 8E9A 0083 FF00 0080 FF02 659F C283"
- $"FF0C D3B2 8E69 5F56 4243 2B35 8E9F 0083"
- $"FF00 008F FF06 00FF FF6B 8EA7 0083 FF00"
- $"008F FF06 00FF FF22 4444 0083 FF00 008F"
- $"FF00 0081 FF01 0000 83FF 0000 8FFF 0000"
- $"81FF 0100 0083 FF00 008F FF00 0081 FF01"
- $"0000 83FF 9100 81FF 0100 0083 FF91 0081"
- $"FF01 0000 83FF 9100 81FF 0100 0083 FF91"
- $"0081 FF01 0000 83FF 9100 81FF 0100 0083"
- $"FF91 0081 FF01 0000 83FF 9100 81FF 9E00"
- $"6C38 6D6B 0000 0408 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF 6963 6823 0000 0248"
- $"FFFF FFFF FFFF FFFF FFFF FFFF F770 0000"
- $"0001 EEB0 0000 0001 F5D0 0000 0001 EF70"
- $"0000 0001 DBB0 0000 0001 F570 0000 0001"
- $"FED0 0000 0001 D5B0 0000 0001 EF70 0000"
- $"0001 FAD0 0000 0001 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF C010 0000 01FF C010 0000 01FF"
- $"C010 0000 01EF C010 0000 01FF C010 0000"
- $"01FB C010 0000 01DF C010 0000 01FF C010"
- $"0000 01FF C010 0000 01FF C010 0000 0181"
- $"C010 0000 0181 C010 0000 0181 C010 0000"
- $"0181 C010 0000 0181 C010 0000 0181 C010"
- $"0000 0181 C010 0000 0181 C010 0000 0181"
- $"C010 0000 0181 C010 0000 0181 C010 0000"
- $"0181 C010 0000 0181 C01F FFFF FF81 C01F"
- $"FFFF FF81 C010 0003 FF81 C011 1113 D581"
- $"C010 4443 6F81 C012 000B BB81 C010 8883"
- $"DD81 C014 2203 6B81 C011 004B BD81 C010"
- $"1103 F781 C014 0423 5B81 FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"6963 6834 0000 0488 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FF33 3333 333F 0000"
- $"0000 0000 0000 0000 0000 0000 0000 000F"
- $"FF33 3333 333F 0000 0000 0000 0000 0000"
- $"0000 0000 0000 000F FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F666 666F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F666 666F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F666 666F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F666 666F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F FFFF FFFF FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F FFFF FFFF"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F 0000"
- $"0000 0000 0000 0000 0000 000F F000 000F"
- $"FF00 0000 000F 0000 0000 0000 0000 0000"
- $"0000 000F F000 000F FF00 0000 000F FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF F000 000F"
- $"FF00 0000 000F FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 9999 999F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"9989 898F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 8998 999F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"9899 989F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 9989 998F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"8999 899F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 9899 989F F000 000F"
- $"FF00 0000 000F 1111 1111 1111 1111 11FF"
- $"9999 899F F000 000F FF00 0000 000F 1111"
- $"1111 1111 1111 11FF 8989 989F F000 000F"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF 6963 6838 0000 0908"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF 2323 2323 2323 2323 23FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0000 0000"
- $"0000 0000 0000 0000 0000 0000 0000 0000"
- $"0000 0000 0000 00FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E6 E6E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E5E6 E5E6 E5FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E5E6 E6E6 E6E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E5 E6E5 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E5 E6E6 E6E6 E5FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E6 E5E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E5E6 E6E6 E6E5 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E6 E6E5 E6E6 E6FF FF00 0000 0000 00FF"
- $"FFFF 0000 0000 0000 0000 00FF 0505 0505"
- $"0505 0505 0505 0505 0505 0505 0505 FFFF"
- $"E6E5 E6E6 E5E6 E6FF FF00 0000 0000 00FF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"6968 3332 0000 052A DF00 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF"
- $"8000 86FF 0000 A0FF E000 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 8800 86FF 0000 98FF"
- $"8800 86FF 0000 98FF 0100 0083 FF80 0086"
- $"FF00 0098 FF01 0000 83FF 8000 86FF 0000"
- $"98FF 0100 0083 FF80 0086 FF00 0098 FF01"
- $"0000 83FF 8000 86FF 0000 98FF 0100 0083"
- $"FF80 0086 FF00 0098 FF01 0000 83FF 8000"
- $"86FF 0000 98FF 0100 0083 FF80 0086 FF00"
- $"0098 FF01 0000 83FF 8000 86FF 0000 98FF"
- $"0100 0083 FF80 0086 FF00 0098 FF01 0000"
- $"83FF 8000 86FF 0000 98FF 0100 0083 FF80"
- $"0086 FF00 0098 FF01 0000 83FF 8000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF9B 0083"
- $"FF80 0086 FF9B 0083 FF80 0086 FF00 008F"
- $"FF88 0083 FF80 0086 FF00 008F FF88 0083"
- $"FF80 0086 FF00 008F FF88 0083 FF80 0086"
- $"FF00 008F FF88 0083 FF80 0086 FF00 008F"
- $"FF88 0083 FF80 0086 FF00 008F FF88 0083"
- $"FF80 0086 FF00 008F FF88 0083 FF80 0086"
- $"FF00 008F FF88 0083 FF80 0086 FF00 008F"
- $"FF88 0083 FFAE 00E9 00A0 FF8A 00A0 FF8A"
- $"00A0 FF8A 00A0 FF8A 00A0 FF8A 00A0 FF8A"
- $"00A0 FF8A 00A0 FF8A 00A0 FF8A 00A0 FFE0"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF01"
- $"0000 83FF 8000 86FF 0000 98FF 0100 0083"
- $"FF80 0086 FF00 0098 FF01 0000 83FF 8000"
- $"86FF 0000 98FF 0100 0083 FF80 0086 FF00"
- $"0098 FF01 0000 83FF 8000 86FF 0000 98FF"
- $"0100 0083 FF80 0086 FF00 0098 FF01 0000"
- $"83FF 8000 86FF 0000 98FF 0100 0083 FF80"
- $"0086 FF00 0098 FF01 0000 83FF 8000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF00 0098"
- $"FF01 0000 83FF 8000 86FF 0000 98FF 0100"
- $"0083 FF80 0086 FF00 0098 FF01 0000 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 0000 8FFF 0100 0084 7B01 0000"
- $"83FF 8000 86FF 0000 8FFF 0100 0084 7B01"
- $"0000 83FF 8000 86FF 0000 8FFF 0100 0084"
- $"7B01 0000 83FF 8000 86FF 0000 8FFF 0100"
- $"0084 7B01 0000 83FF 8000 86FF 0000 8FFF"
- $"0100 0084 7B01 0000 83FF 8000 86FF 0000"
- $"8FFF 0100 0084 7B01 0000 83FF 8000 86FF"
- $"0000 8FFF 0100 0084 7B01 0000 83FF 8000"
- $"86FF 0000 8FFF 0100 0084 7B01 0000 83FF"
- $"8000 86FF 0000 8FFF 0100 0084 7B01 0000"
- $"83FF AE00 E900 A0FF 8A00 A0FF 8A00 A0FF"
- $"8A00 A0FF 8A00 A0FF 8A00 A0FF 8A00 A0FF"
- $"8A00 A0FF 8A00 A0FF 8A00 A0FF E000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF00 0098"
- $"FF01 0000 83FF 8000 86FF 0000 98FF 0100"
- $"0083 FF80 0086 FF00 0098 FF01 0000 83FF"
- $"8000 86FF 0000 98FF 0100 0083 FF80 0086"
- $"FF00 0098 FF01 0000 83FF 8000 86FF 0000"
- $"98FF 0100 0083 FF80 0086 FF00 0098 FF88"
- $"0086 FF00 0098 FF88 0086 FF00 0098 FF01"
- $"0000 83FF 8000 86FF 0000 98FF 0100 0083"
- $"FF80 0086 FF00 0098 FF01 0000 83FF 8000"
- $"86FF 0000 98FF 0100 0083 FF80 0086 FF00"
- $"0098 FF01 0000 83FF 8000 86FF 0000 98FF"
- $"0100 0083 FF80 0086 FF00 0098 FF01 0000"
- $"83FF 8000 86FF 0000 98FF 0100 0083 FF80"
- $"0086 FF00 0098 FF01 0000 83FF 8000 86FF"
- $"0000 98FF 0100 0083 FF80 0086 FF00 0098"
- $"FF01 0000 83FF 8000 86FF 0000 98FF 0100"
- $"0083 FF80 0086 FF00 0098 FF01 0000 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF"
- $"8000 86FF 9B00 83FF AE00 6838 6D6B 0000"
- $"0908 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF 6963 7323 0000 0048 F557 D001 700E"
- $"E024 9A9B 0175 9299 0162 923E 0001 9004"
- $"0000 9BBC 102C 8434 5AFD FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF 6963 7334 0000"
- $"0088 AA3F DDDD DDDD DDAE A333 0000 0000"
- $"0C3E 333A 0000 000C DBEC A333 0000 0CBC"
- $"2A00 EDDF DDDB D2CB ECFF D00D 00CD BBBA"
- $"B2D6 D00D 00B2 DDBB DCCB D00D 00D4 D2D2"
- $"CC2D D00D 00BD CCE5 3EEC D00D 0C00 0000"
- $"CBCB D00D 0000 0000 0D0D D00D 0000 0000"
- $"0D00 D00D ABAB ABAF 9F00 D00D 1111 11B8"
- $"9900 D00D 1111 1189 9F00 EDDA 8291 ABAF"
- $"9FDD 6963 7338 0000 0108 DEDC DBB3 F9FA"
- $"F9FA F9FA F9FA F9FA 8FFB DC23 23DB 0000"
- $"0000 0000 0000 0032 6A88 DB23 23DC 0000"
- $"0000 0000 F52B 3357 882B DC23 23DB 0000"
- $"0000 F608 3234 33AD F600 FCFA F9AC F9FA"
- $"F95D 0E5D 3457 8833 F1F2 FA00 00F9 0000"
- $"0733 825E 33AD 6432 33EF F900 00FA 0000"
- $"5D5E 5D33 825D 3332 2C57 FA00 00F9 0000"
- $"5739 5D64 5D33 3232 335C F900 00FA 00F5"
- $"5D57 F732 828E 8988 88F9 FA00 00F9 00F6"
- $"F600 0000 F5F6 4F5D F85D F900 00FA 0000"
- $"0000 0000 0000 00FA 0056 FA00 00FA 0000"
- $"0000 0000 0000 00F9 0000 F900 00F9 8359"
- $"8359 8359 ADD1 E8EA 0000 FA00 00FA 0505"
- $"0505 0505 5FE5 E6E8 0000 F900 00F9 0505"
- $"0505 0505 7DE6 E6D1 0000 ACF9 FAFC 8359"
- $"8359 8359 ADD1 E8E9 FAF9 6973 3332 0000"
- $"026C 0340 8080 4087 8005 5E51 80FF FF80"
- $"86FF 06AA B457 80FF FF80 83FF 09F1 E1C1"
- $"A94E D180 FFFF 8081 FF0B ECE6 DFBE BA4D"
- $"D1FF 4080 8040 8080 4FA6 DCAD B3BC 65B4"
- $"1900 80FF FF80 FFFF E9CF 87A7 B848 8FC6"
- $"B719 80FF FF80 FFFF B58B A0C9 7D8B CFD4"
- $"D89E 80FF FF80 FFFF ADAC A280 A5BE DBD4"
- $"C79A 80FF FF80 FFF2 8F8E C5B4 7655 516E"
- $"7A82 80FF FF80 FFD9 D880 FF09 F7DB C479"
- $"B280 80FF FF80 86FF 0680 FF9A 80FF FF80"
- $"86FF 0580 FFFF 80FF FF84 8000 4080 0005"
- $"FFFF 80FF FF80 83FF 0080 8000 05FF FF80"
- $"FFFF 8083 FF00 8080 0005 FFFF 4080 8040"
- $"8380 0040 8000 0180 8081 0087 8001 0151"
- $"8100 86FF 028B 0129 8100 83FF 05E2 D0B3"
- $"943A D181 0081 FF0B D9BA B19E 952F D1FF"
- $"4080 8040 8080 4F85 A369 8B98 378E 1900"
- $"80FF FF80 FFFF D491 417F 9326 4893 9219"
- $"80FF FF80 FFFF 774C 6C96 5E5A 94A0 A986"
- $"80FF FF80 FFFF 9D73 7346 6589 ABA3 9280"
- $"80FF FF80 FFED 6F7A BAA2 5028 253F 4A6A"
- $"80FF FF80 FFD9 D880 FF09 F5D2 B569 9E73"
- $"80FF FF80 86FF 0680 FF9A 80FF FF80 86FF"
- $"0580 FFFF 80FF FF84 8009 403E 3E1F FFFF"
- $"80FF FF80 83FF 0980 7B7B 3EFF FF80 FFFF"
- $"8083 FF09 807B 7B3E FFFF 4080 8040 8380"
- $"0540 3E3E 1F80 8081 0087 8001 1551 8100"
- $"86FF 0290 202D 8100 83FF 05D9 C97F 6039"
- $"D181 0081 FF0B CEA2 9759 4927 D1FF 4080"
- $"8040 8080 4F6F 8657 474C 2976 5980 80FF"
- $"FF80 FFFF C676 343F 4B1D 3977 7ED8 80FF"
- $"FF80 FFFF 6540 536B 4C4E 7B85 8D79 80FF"
- $"FF80 FFFF 8654 6638 5072 908A 7974 80FF"
- $"FF80 FFEA 5D63 BB9E 4A20 1F36 3E65 80FF"
- $"FF80 FFD9 D880 FF09 F4D0 B266 9B6F 80FF"
- $"FF80 86FF 0680 FF9A 80FF FF80 86FF 0680"
- $"FFFF 80FF FF80 8700 05FF FF80 FFFF 8087"
- $"0005 FFFF 80FF FF80 8700 05FF FF40 8080"
- $"4087 0001 8080 7338 6D6B 0000 0108 FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 6963"
- $"6D23 0000 0038 F24B D007 B028 5557 81B1"
- $"124A 8236 1005 8000 1ABD 8030 557D FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF 6963 6D34 0000 0068 A33F"
- $"CDCC DCCD CAAE A333 0000 0000 CDEE 333A"
- $"0000 CCCB 2E0D EDCE CDCD DB2B DB6F D00D"
- $"00C2 BBEA BCD5 D00D 00BD 2D2D CC2D D00D"
- $"0CDC CCDB BADC D00D 0000 0000 0DCE D00D"
- $"0000 0000 0D0D D00D B1BB 1BF9 FD0D D00D"
- $"1111 1199 8D0D ECDB BB1B B1F9 FECE 6963"
- $"6D38 0000 00C8 DDDA DADD F8F8 F8F8 F8F8"
- $"F8F8 F864 8EAC DB23 23DC 0000 0000 0000"
- $"0000 F85C 89FB DC23 23DB 0000 0000 F608"
- $"3234 5E82 2AFA FBF8 F8FB F8F8 5633 335D"
- $"3488 575D EFF1 F900 00FA 0000 2C63 5E34"
- $"FD64 5D2C 33AA FA00 00F9 0000 395E 5D5D"
- $"5733 0832 33F9 F900 00FA 00F6 F92C 2B32"
- $"5D88 8888 88F8 FA00 00F9 0000 0000 0000"
- $"0000 00FA F781 F900 00FA 0000 0000 0000"
- $"0000 00F9 00F9 FA00 00F9 3559 5335 5959"
- $"E9E7 E7FA 00FA F900 00FA 0505 0505 0505"
- $"E8E6 E6F9 00F9 FBF8 F8FB 592F 5959 2F59"
- $"E9E7 E7FB F8FB 6974 3332 0000 245A 0000"
- $"0000 FF00 FF00 FF00 FB00 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF"
- $"818E 81EA 8144 81FF 8500 95FF 8100 C5FF"
- $"818F 81EA 81AB 818E 8144 8500 95FF 8100"
- $"C5FF 818F 81EA 81AB 818E 8144 8500 95FF"
- $"8100 C5FF 818F 81EA 81AB 818E 8144 8500"
- $"95FF 8100 C5FF 818F 81EA 81AB 818E 8144"
- $"8500 95FF 8100 C1FF 815A 81BE 81AB 818E"
- $"8145 8144 8500 95FF 8100 C1FF 815A 81BE"
- $"81AB 818E 8145 8144 8500 95FF 8100 C1FF"
- $"815A 81BE 81AB 818E 8145 8144 8500 95FF"
- $"8100 C1FF 815A 81BE 81AB 818E 8145 8144"
- $"8500 95FF 8100 BDFF 8164 81FE 8191 8169"
- $"8145 8144 81FF 8500 95FF 8100 BDFF 8164"
- $"81FE 8191 8169 8145 8144 81FF 8500 95FF"
- $"8100 BDFF 8164 81FE 8191 8169 8145 8144"
- $"81FF 8500 95FF 8100 BDFF 8164 81FE 8191"
- $"8169 8145 8144 81FF 8500 95FF 8100 A9FF"
- $"81E2 81E1 81CB 81B8 81A1 81FE 81B1 8162"
- $"8145 8144 85FF 8500 95FF 8100 A9FF 81E2"
- $"81E1 81CB 81B8 81A1 81FE 81B1 8162 8145"
- $"8144 85FF 8500 95FF 8100 A9FF 81E2 81E1"
- $"81CB 81B8 81A1 81FE 81B1 8162 8145 8144"
- $"85FF 8500 95FF 8100 A9FF 81E2 81E1 81CB"
- $"81B8 81A1 81FE 81B1 8162 8145 8144 85FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF"
- $"81B8 819F 81FE 81C1 8162 8145 8144 89FF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB"
- $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF"
- $"BD00 81D7 81E3 81DE 81BA 818F 81A2 81FE"
- $"81C6 8162 8145 81D0 8161 CD00 81D7 81E3"
- $"81DE 81BA 818F 81A2 81FE 81C6 8162 8145"
- $"81D0 8161 CD00 81D7 81E3 81DE 81BA 818F"
- $"81A2 81FE 81C6 8162 8145 81D0 8161 CD00"
- $"81D7 81E3 81DE 81BA 818F 81A2 81FE 81C6"
- $"8162 8145 81D0 8161 9500 95FF 8100 95FF"
- $"81DA 81E5 81D4 81B3 8167 819A 81FE 81C8"
- $"8162 8145 81A5 81C9 81D3 8161 9100 95FF"
- $"8100 95FF 81DA 81E5 81D4 81B3 8167 819A"
- $"81FE 81C8 8162 8145 81A5 81C9 81D3 8161"
- $"9100 95FF 8100 95FF 81DA 81E5 81D4 81B3"
- $"8167 819A 81FE 81C8 8162 8145 81A5 81C9"
- $"81D3 8161 9100 95FF 8100 95FF 81DA 81E5"
- $"81D4 81B3 8167 819A 81FE 81C8 8162 8145"
- $"81A5 81C9 81D3 8161 9100 95FF 8100 91FF"
- $"81DC 81E2 81D4 81A4 8169 819E 81F2 81C9"
- $"8162 8145 8179 819B 81C2 81D2 81D0 8161"
- $"8D00 95FF 8100 91FF 81DC 81E2 81D4 81A4"
- $"8169 819E 81F2 81C9 8162 8145 8179 819B"
- $"81C2 81D2 81D0 8161 8D00 95FF 8100 91FF"
- $"81DC 81E2 81D4 81A4 8169 819E 81F2 81C9"
- $"8162 8145 8179 819B 81C2 81D2 81D0 8161"
- $"8D00 95FF 8100 91FF 81DC 81E2 81D4 81A4"
- $"8169 819E 81F2 81C9 8162 8145 8179 819B"
- $"81C2 81D2 81D0 8161 8D00 95FF 8100 8DFF"
- $"81E8 81DD 81D2 81B3 816A 81A0 81F3 81C7"
- $"815C 811B 815D 8189 819C 81B5 81CD 81D5"
- $"81D3 8161 8900 95FF 8100 8DFF 81E8 81DD"
- $"81D2 81B3 816A 81A0 81F3 81C7 815C 811B"
- $"815D 8189 819C 81B5 81CD 81D5 81D3 8161"
- $"8900 95FF 8100 8DFF 81E8 81DD 81D2 81B3"
- $"816A 81A0 81F3 81C7 815C 811B 815D 8189"
- $"819C 81B5 81CD 81D5 81D3 8161 8900 95FF"
- $"8100 8DFF 81E8 81DD 81D2 81B3 816A 81A0"
- $"81F3 81C7 815C 811B 815D 8189 819C 81B5"
- $"81CD 81D5 81D3 8161 8900 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81DF 81C2 819C 8165 817A 81DE 81B3 816A"
- $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5"
- $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7"
- $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8"
- $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4"
- $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6"
- $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"81C6 81A2 81C7 8188 816F 814D 8161 816F"
- $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0"
- $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 8DFF"
- $"8199 81BF 81AE 815C 818A 8185 816D 8150"
- $"814E 815A 815B 8155 816C 818F 818B 818C"
- $"8195 8188 818F 81A4 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"81CA 8166 817C 818C 819F 85FF 81DC 81B5"
- $"8182 8151 814A 8143 813F 814B 8153 815E"
- $"8168 8160 818F 81A6 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81DC 81C3 81A8 818D"
- $"8184 817B 8168 816D 815A 815E 818F 81AF"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81DC 81C3 81A8 818D 8184 817B 8168 816D"
- $"815A 815E 818F 81AF 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81DC 81C3 81A8 818D"
- $"8184 817B 8168 816D 815A 815E 818F 81AF"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81DC 81C3 81A8 818D 8184 817B 8168 816D"
- $"815A 815E 818F 81AF 8100 95FF 8100 C5FF"
- $"8100 85FF 8181 818F 81B5 8100 95FF 8100"
- $"C5FF 8100 85FF 8181 818F 81B5 8100 95FF"
- $"8100 C5FF 8100 85FF 8181 818F 81B5 8100"
- $"95FF 8100 C5FF 8100 85FF 8181 818F 81B5"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 85FF 8122 8544"
- $"8100 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF"
- $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF"
- $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF"
- $"FF00 FF00 FF00 FB00 FF00 FF00 FF00 FF00"
- $"9500 C9FF 8101 8100 8144 81FF A100 C9FF"
- $"8101 8100 8144 81FF A100 C9FF 8101 8100"
- $"8144 81FF A100 C9FF 8101 8100 8144 81FF"
- $"A100 C5FF 8109 8500 8101 8144 A100 C5FF"
- $"8109 8500 8101 8144 A100 C5FF 8109 8500"
- $"8101 8144 A100 C5FF 8109 8500 8101 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 C1FF 8167 81BC 8100 8101 8119 8144"
- $"A100 BDFF 8166 81E4 819D 8171 8119 8144"
- $"81FF A100 BDFF 8166 81E4 819D 8171 8119"
- $"8144 81FF A100 BDFF 8166 81E4 819D 8171"
- $"8119 8144 81FF A100 BDFF 8166 81E4 819D"
- $"8171 8119 8144 81FF A100 A9FF 81C9 81BE"
- $"81A7 819B 8182 81E4 8189 8144 8119 8144"
- $"85FF A100 A9FF 81C9 81BE 81A7 819B 8182"
- $"81E4 8189 8144 8119 8144 85FF A100 A9FF"
- $"81C9 81BE 81A7 819B 8182 81E4 8189 8144"
- $"8119 8144 85FF A100 A9FF 81C9 81BE 81A7"
- $"819B 8182 81E4 8189 8144 8119 8144 85FF"
- $"A100 A1FF 81CF 81B6 81B9 81BB 819B 8179"
- $"81E4 8193 8144 8119 8144 89FF A100 A1FF"
- $"81CF 81B6 81B9 81BB 819B 8179 81E4 8193"
- $"8144 8119 8144 89FF A100 A1FF 81CF 81B6"
- $"81B9 81BB 819B 8179 81E4 8193 8144 8119"
- $"8144 89FF A100 A1FF 81CF 81B6 81B9 81BB"
- $"819B 8179 81E4 8193 8144 8119 8144 89FF"
- $"A100 9DFF 81B2 81AC 81B6 81B5 819B 817D"
- $"81E4 8197 8144 8119 8144 8DFF A100 9DFF"
- $"81B2 81AC 81B6 81B5 819B 817D 81E4 8197"
- $"8144 8119 8144 8DFF A100 9DFF 81B2 81AC"
- $"81B6 81B5 819B 817D 81E4 8197 8144 8119"
- $"8144 8DFF A100 9DFF 81B2 81AC 81B6 81B5"
- $"819B 817D 81E4 8197 8144 8119 8144 8DFF"
- $"BD00 85AF 81A0 816E 8151 8180 81E4 819A"
- $"8144 8119 819B 8162 CD00 85AF 81A0 816E"
- $"8151 8180 81E4 819A 8144 8119 819B 8162"
- $"CD00 85AF 81A0 816E 8151 8180 81E4 819A"
- $"8144 8119 819B 8162 CD00 85AF 81A0 816E"
- $"8151 8180 81E4 819A 8144 8119 819B 8162"
- $"9500 95FF 8100 95FF 81B2 81B3 8197 8168"
- $"812E 8176 81E4 819D 8144 8119 8163 8196"
- $"81A1 8162 9100 95FF 8100 95FF 81B2 81B3"
- $"8197 8168 812E 8176 81E4 819D 8144 8119"
- $"8163 8196 81A1 8162 9100 95FF 8100 95FF"
- $"81B2 81B3 8197 8168 812E 8176 81E4 819D"
- $"8144 8119 8163 8196 81A1 8162 9100 95FF"
- $"8100 95FF 81B2 81B3 8197 8168 812E 8176"
- $"81E4 819D 8144 8119 8163 8196 81A1 8162"
- $"9100 95FF 8100 91FF 81BE 81B0 8199 8153"
- $"8130 817E 81CF 819C 8146 8119 8134 8159"
- $"818B 81A6 819C 8162 8D00 95FF 8100 91FF"
- $"81BE 81B0 8199 8153 8130 817E 81CF 819C"
- $"8146 8119 8134 8159 818B 81A6 819C 8162"
- $"8D00 95FF 8100 91FF 81BE 81B0 8199 8153"
- $"8130 817E 81CF 819C 8146 8119 8134 8159"
- $"818B 81A6 819C 8162 8D00 95FF 8100 91FF"
- $"81BE 81B0 8199 8153 8130 817E 81CF 819C"
- $"8146 8119 8134 8159 818B 81A6 819C 8162"
- $"8D00 95FF 8100 8DFF 81E0 81B1 8191 8167"
- $"812E 817E 81D0 819A 8144 810E 812A 813C"
- $"8155 817B 81A0 81A8 81A2 8162 8900 95FF"
- $"8100 8DFF 81E0 81B1 8191 8167 812E 817E"
- $"81D0 819A 8144 810E 812A 813C 8155 817B"
- $"81A0 81A8 81A2 8162 8900 95FF 8100 8DFF"
- $"81E0 81B1 8191 8167 812E 817E 81D0 819A"
- $"8144 810E 812A 813C 8155 817B 81A0 81A8"
- $"81A2 8162 8900 95FF 8100 8DFF 81E0 81B1"
- $"8191 8167 812E 817E 81D0 819A 8144 810E"
- $"812A 813C 8155 817B 81A0 81A8 81A2 8162"
- $"8900 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 81C5 8176 814B 812D"
- $"8151 81B5 8186 814F 8104 810E 8134 8161"
- $"8181 818A 819F 81A8 81A7 81A1 8168 817C"
- $"8100 95FF 8100 8DFF 8172 812D 813A 817D"
- $"8186 8183 8199 8198 818C 8185 81A0 81B3"
- $"81B9 81AE 81A9 85AA 81A5 8168 817E 8100"
- $"95FF 8100 8DFF 8172 812D 813A 817D 8186"
- $"8183 8199 8198 818C 8185 81A0 81B3 81B9"
- $"81AE 81A9 85AA 81A5 8168 817E 8100 95FF"
- $"8100 8DFF 8172 812D 813A 817D 8186 8183"
- $"8199 8198 818C 8185 81A0 81B3 81B9 81AE"
- $"81A9 85AA 81A5 8168 817E 8100 95FF 8100"
- $"8DFF 8172 812D 813A 817D 8186 8183 8199"
- $"8198 818C 8185 81A0 81B3 81B9 81AE 81A9"
- $"85AA 81A5 8168 817E 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81E8 8144 8138 81B3 81A9 8162 816F 817D"
- $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5"
- $"819B 8195 8173 8192 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"81C2 8183 819A 8144 813D 811E 8129 8134"
- $"8144 8155 815C 818E 81AC 819A 818B 8189"
- $"817D 8175 8182 819A 8100 95FF 8100 8DFF"
- $"816E 818B 8180 8144 8174 816B 8145 8522"
- $"812F 8130 812E 8142 815C 8155 8158 8160"
- $"8155 818E 819E 8100 95FF 8100 8DFF 816E"
- $"818B 8180 8144 8174 816B 8145 8522 812F"
- $"8130 812E 8142 815C 8155 8158 8160 8155"
- $"818E 819E 8100 95FF 8100 8DFF 816E 818B"
- $"8180 8144 8174 816B 8145 8522 812F 8130"
- $"812E 8142 815C 8155 8158 8160 8155 818E"
- $"819E 8100 95FF 8100 8DFF 816E 818B 8180"
- $"8144 8174 816B 8145 8522 812F 8130 812E"
- $"8142 815C 8155 8158 8160 8155 818E 819E"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 81B4 8166 815A 8181"
- $"819F 85FF 81D6 819F 815B 8123 811B 8113"
- $"8110 8120 812B 8133 813C 8137 818E 81A0"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81D6 81B6 8192 816F 8166 815B 8147 8149"
- $"8131 813B 818E 81A6 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81D6 81B6 8192 816F"
- $"8166 815B 8147 8149 8131 813B 818E 81A6"
- $"8100 95FF 8100 89FF 8166 819F 81C2 95FF"
- $"81D6 81B6 8192 816F 8166 815B 8147 8149"
- $"8131 813B 818E 81A6 8100 95FF 8100 89FF"
- $"8166 819F 81C2 95FF 81D6 81B6 8192 816F"
- $"8166 815B 8147 8149 8131 813B 818E 81A6"
- $"8100 95FF 8100 C5FF 8100 85FF 8172 818E"
- $"81AB 8100 95FF 8100 C5FF 8100 85FF 8172"
- $"818E 81AB 8100 95FF 8100 C5FF 8100 85FF"
- $"8172 818E 81AB 8100 95FF 8100 C5FF 8100"
- $"85FF 8172 818E 81AB 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF"
- $"8100 917B 8100 8DFF FF00 FF00 FF00 FB00"
- $"FF00 FF00 FF00 FF00 9500 C9FF 810F 8143"
- $"8144 81FF A100 C9FF 810F 8143 8144 81FF"
- $"A100 C9FF 810F 8143 8144 81FF A100 C9FF"
- $"810F 8143 8144 81FF A100 C5FF 8117 8143"
- $"8116 810F 8144 A100 C5FF 8117 8143 8116"
- $"810F 8144 A100 C5FF 8117 8143 8116 810F"
- $"8144 A100 C5FF 8117 8143 8116 810F 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 C1FF 8165 81C4 8116 810F 811A 8144"
- $"A100 BDFF 8155 8167 81A7 816C 811A 8144"
- $"81FF A100 BDFF 8155 8167 81A7 816C 811A"
- $"8144 81FF A100 BDFF 8155 8167 81A7 816C"
- $"811A 8144 81FF A100 BDFF 8155 8167 81A7"
- $"816C 811A 8144 81FF A100 A9FF 81BC 81A9"
- $"8192 8193 813E 8167 814D 8123 811A 8144"
- $"85FF A100 A9FF 81BC 81A9 8192 8193 813E"
- $"8167 814D 8123 811A 8144 85FF A100 A9FF"
- $"81BC 81A9 8192 8193 813E 8167 814D 8123"
- $"811A 8144 85FF A100 A9FF 81BC 81A9 8192"
- $"8193 813E 8167 814D 8123 811A 8144 85FF"
- $"A100 A1FF 81C6 819A 8598 8193 8131 8167"
- $"814A 8123 811A 8144 89FF A100 A1FF 81C6"
- $"819A 8598 8193 8131 8167 814A 8123 811A"
- $"8144 89FF A100 A1FF 81C6 819A 8598 8193"
- $"8131 8167 814A 8123 811A 8144 89FF A100"
- $"A1FF 81C6 819A 8598 8193 8131 8167 814A"
- $"8123 811A 8144 89FF A100 9DFF 819C 818E"
- $"8199 8195 8193 8137 8167 814F 8123 811A"
- $"8144 8DFF A100 9DFF 819C 818E 8199 8195"
- $"8193 8137 8167 814F 8123 811A 8144 8DFF"
- $"A100 9DFF 819C 818E 8199 8195 8193 8137"
- $"8167 814F 8123 811A 8144 8DFF A100 9DFF"
- $"819C 818E 8199 8195 8193 8137 8167 814F"
- $"8123 811A 8144 8DFF BD00 8192 818F 8186"
- $"8157 8147 8139 8167 8152 8123 811A 817A"
- $"8161 CD00 8192 818F 8186 8157 8147 8139"
- $"8167 8152 8123 811A 817A 8161 CD00 8192"
- $"818F 8186 8157 8147 8139 8167 8152 8123"
- $"811A 817A 8161 CD00 8192 818F 8186 8157"
- $"8147 8139 8167 8152 8123 811A 817A 8161"
- $"9500 95FF 8100 95FF 8195 8191 817C 8151"
- $"812A 8132 8167 8153 8123 811A 814B 8178"
- $"8183 8161 89FF 8500 95FF 8100 95FF 8195"
- $"8191 817C 8151 812A 8132 8167 8153 8123"
- $"811A 814B 8178 8183 8161 89FF 8500 95FF"
- $"8100 95FF 8195 8191 817C 8151 812A 8132"
- $"8167 8153 8123 811A 814B 8178 8183 8161"
- $"89FF 8500 95FF 8100 95FF 8195 8191 817C"
- $"8151 812A 8132 8167 8153 8123 811A 814B"
- $"8178 8183 8161 89FF 8500 95FF 8100 91FF"
- $"81A9 818B 817D 8141 812C 8137 8163 8153"
- $"8124 811A 812C 8144 816D 818A 8180 8161"
- $"85FF 8500 95FF 8100 91FF 81A9 818B 817D"
- $"8141 812C 8137 8163 8153 8124 811A 812C"
- $"8144 816D 818A 8180 8161 85FF 8500 95FF"
- $"8100 91FF 81A9 818B 817D 8141 812C 8137"
- $"8163 8153 8124 811A 812C 8144 816D 818A"
- $"8180 8161 85FF 8500 95FF 8100 91FF 81A9"
- $"818B 817D 8141 812C 8137 8163 8153 8124"
- $"811A 812C 8144 816D 818A 8180 8161 85FF"
- $"8500 95FF 8100 8DFF 81DA 8192 8178 8154"
- $"8127 8137 8161 8151 8122 8111 8124 8132"
- $"813F 8160 8184 818D 8186 8161 81FF 8500"
- $"95FF 8100 8DFF 81DA 8192 8178 8154 8127"
- $"8137 8161 8151 8122 8111 8124 8132 813F"
- $"8160 8184 818D 8186 8161 81FF 8500 95FF"
- $"8100 8DFF 81DA 8192 8178 8154 8127 8137"
- $"8161 8151 8122 8111 8124 8132 813F 8160"
- $"8184 818D 8186 8161 81FF 8500 95FF 8100"
- $"8DFF 81DA 8192 8178 8154 8127 8137 8161"
- $"8151 8122 8111 8124 8132 813F 8160 8184"
- $"818D 8186 8161 81FF 8500 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"81B7 815B 813C 8127 8130 8159 8156 812A"
- $"810A 810C 812C 814F 8165 816C 8185 818D"
- $"8189 8188 8169 8188 8100 95FF 8100 8DFF"
- $"8161 8120 812F 816A 8576 8583 8178 8174"
- $"818C 819A 819D 8191 858E 818C 8188 8169"
- $"8155 8100 95FF 8100 8DFF 8161 8120 812F"
- $"816A 8576 8583 8178 8174 818C 819A 819D"
- $"8191 858E 818C 8188 8169 8155 8100 95FF"
- $"8100 8DFF 8161 8120 812F 816A 8576 8583"
- $"8178 8174 818C 819A 819D 8191 858E 818C"
- $"8188 8169 8155 8100 95FF 8100 8DFF 8161"
- $"8120 812F 816A 8576 8583 8178 8174 818C"
- $"819A 819D 8191 858E 818C 8188 8169 8155"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81E7 8122 8130 8196"
- $"8194 8153 8154 815F 8180 8195 81A2 819E"
- $"819A 819D 8194 8188 8181 817A 8173 8144"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 81C6 8146 8151 8135"
- $"8138 8119 811F 812A 8136 8144 814A 8175"
- $"8191 8181 8173 8172 8168 8160 8181 81FF"
- $"8100 95FF 8100 8DFF 8159 816A 8149 8122"
- $"8177 8168 813C 811A 811D 8928 8138 814D"
- $"8147 8148 814F 8147 818E 81FF 8100 95FF"
- $"8100 8DFF 8159 816A 8149 8122 8177 8168"
- $"813C 811A 811D 8928 8138 814D 8147 8148"
- $"814F 8147 818E 81FF 8100 95FF 8100 8DFF"
- $"8159 816A 8149 8122 8177 8168 813C 811A"
- $"811D 8928 8138 814D 8147 8148 814F 8147"
- $"818E 81FF 8100 95FF 8100 8DFF 8159 816A"
- $"8149 8122 8177 8168 813C 811A 811D 8928"
- $"8138 814D 8147 8148 814F 8147 818E 81FF"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 81A8 8165 814A 817F"
- $"819F 85FF 81D3 819A 8155 811C 8114 810E"
- $"810B 811B 8126 812B 8133 8130 818E 819A"
- $"8100 95FF 8100 89FF 8165 819F 81C2 95FF"
- $"81D3 81B2 818E 8169 815F 8156 8142 8143"
- $"812B 8135 818E 819F 8100 95FF 8100 89FF"
- $"8165 819F 81C2 95FF 81D3 81B2 818E 8169"
- $"815F 8156 8142 8143 812B 8135 818E 819F"
- $"8100 95FF 8100 89FF 8165 819F 81C2 95FF"
- $"81D3 81B2 818E 8169 815F 8156 8142 8143"
- $"812B 8135 818E 819F 8100 95FF 8100 89FF"
- $"8165 819F 81C2 95FF 81D3 81B2 818E 8169"
- $"815F 8156 8142 8143 812B 8135 818E 819F"
- $"8100 95FF 8100 C5FF 8100 85FF 816B 818E"
- $"81A7 8100 95FF 8100 C5FF 8100 85FF 816B"
- $"818E 81A7 8100 95FF 8100 C5FF 8100 85FF"
- $"816B 818E 81A7 8100 95FF 8100 C5FF 8100"
- $"85FF 816B 818E 81A7 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 85FF 8122 8544 8100 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF"
- $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF"
- $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF"
- $"8100 C5FF 8100 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF"
- $"8500 95FF CD00 8DFF FF00 FF00 FF00 FB00"
- $"7438 6D6B 0000 4008 FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF"
-};
-
-data 'ics#' (-16455, "Item Icon") {
- $"F557 D001 700E E024 9A9B 0175 9299 0162"
- $"923E 0001 9004 0000 9BBC 102C 8434 5AFD"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
- $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-data 'ics4' (-16455, "Item Icon") {
- $"AA3F DDDD DDDD DDAE A333 0000 0000 0C3E"
- $"333A 0000 000C DBEC A333 0000 0CBC 2A00"
- $"EDDF DDDB D2CB ECFF D00D 00CD BBBA B2D6"
- $"D00D 00B2 DDBB DCCB D00D 00D4 D2D2 CC2D"
- $"D00D 00BD CCE5 3EEC D00D 0C00 0000 CBCB"
- $"D00D 0000 0000 0D0D D00D 0000 0000 0D00"
- $"D00D ABAB ABAF 9F00 D00D 1111 11B8 9900"
- $"D00D 1111 1189 9F00 EDDA 8291 ABAF 9FDD"
-};
-
-data 'ics8' (-16455, "Item Icon") {
- $"DEDC DBB3 F9FA F9FA F9FA F9FA F9FA 8FFB"
- $"DC23 23DB 0000 0000 0000 0000 0032 6A88"
- $"DB23 23DC 0000 0000 0000 F52B 3357 882B"
- $"DC23 23DB 0000 0000 F608 3234 33AD F600"
- $"FCFA F9AC F9FA F95D 0E5D 3457 8833 F1F2"
- $"FA00 00F9 0000 0733 825E 33AD 6432 33EF"
- $"F900 00FA 0000 5D5E 5D33 825D 3332 2C57"
- $"FA00 00F9 0000 5739 5D64 5D33 3232 335C"
- $"F900 00FA 00F5 5D57 F732 828E 8988 88F9"
- $"FA00 00F9 00F6 F600 0000 F5F6 4F5D F85D"
- $"F900 00FA 0000 0000 0000 0000 00FA 0056"
- $"FA00 00FA 0000 0000 0000 0000 00F9 0000"
- $"F900 00F9 8359 8359 8359 ADD1 E8EA 0000"
- $"FA00 00FA 0505 0505 0505 5FE5 E6E8 0000"
- $"F900 00F9 0505 0505 0505 7DE6 E6D1 0000"
- $"ACF9 FAFC 8359 8359 8359 ADD1 E8E9 FAF9"
-};
-
diff --git a/samples/minimal/mondros2.ico b/samples/minimal/mondros2.ico
deleted file mode 100644
index 8b0e58c0d7..0000000000
Binary files a/samples/minimal/mondros2.ico and /dev/null differ
diff --git a/samples/minimal/mondrian.icns b/samples/minimal/sample.icns
similarity index 100%
rename from samples/minimal/mondrian.icns
rename to samples/minimal/sample.icns
diff --git a/samples/nativdlg/nativdlg.rc b/samples/nativdlg/nativdlg.rc
index db18d163f2..0e6c1a3d1b 100644
--- a/samples/nativdlg/nativdlg.rc
+++ b/samples/nativdlg/nativdlg.rc
@@ -1,4 +1,4 @@
-#include "wx/msw/wx.rc"
+#include "../sample.rc"
#include "dialog1.rc"
diff --git a/samples/notebook/mondrian.ico b/samples/notebook/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/notebook/mondrian.ico and /dev/null differ
diff --git a/samples/notebook/mondros2.ico b/samples/notebook/mondros2.ico
deleted file mode 100644
index 8b0e58c0d7..0000000000
Binary files a/samples/notebook/mondros2.ico and /dev/null differ
diff --git a/samples/notebook/notebook.rcO b/samples/notebook/notebook.rcO
deleted file mode 100644
index 62b693ce9e..0000000000
--- a/samples/notebook/notebook.rcO
+++ /dev/null
@@ -1,4 +0,0 @@
-ICON 1 PRELOAD "mondros2.ico"
-
-RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc
-
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index f630c1c079..f45d84a765 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -47,9 +47,9 @@ OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
OLEAUTO_OBJECTS = \
+ $(__oleauto___win32rc) \
$(__oleauto_os2_lib_res) \
- oleauto_oleauto.o \
- $(__oleauto___win32rc)
+ oleauto_oleauto.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__oleauto___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_sample_rc.o
@COND_PLATFORM_OS2_1@__oleauto_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__oleauto_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__oleauto___win32rc = oleauto_oleauto_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)
@@ -174,12 +174,12 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
@COND_PLATFORM_MACOSX_1@oleauto_bundle: $(____oleauto_BUNDLE_TGT_REF_DEP)
+oleauto_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
oleauto_oleauto.o: $(srcdir)/oleauto.cpp
$(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $(srcdir)/oleauto.cpp
-oleauto_oleauto_rc.o: $(srcdir)/oleauto.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc
index 225183a3d1..8efc18f8cb 100644
--- a/samples/oleauto/makefile.bcc
+++ b/samples/oleauto/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\oleauto.ilf del $(OBJS)\oleauto.ilf
-if exist $(OBJS)\oleauto.ils del $(OBJS)\oleauto.ils
-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
+$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\oleauto_oleauto.res
+ c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\oleauto_sample.res
|
+$(OBJS)\oleauto_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp
$(CXX) -q -c -P -o$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp
-$(OBJS)\oleauto_oleauto.res: .\oleauto.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\oleauto.rc
-
diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index c87c88eec6..83c919b84e 100644
--- a/samples/oleauto/makefile.gcc
+++ b/samples/oleauto/makefile.gcc
@@ -29,8 +29,8 @@ OLEAUTO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
OLEAUTO_OBJECTS = \
- $(OBJS)\oleauto_oleauto.o \
- $(OBJS)\oleauto_oleauto_rc.o
+ $(OBJS)\oleauto_sample_rc.o \
+ $(OBJS)\oleauto_oleauto.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto_rc.o
+$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_sample_rc.o
$(CXX) -o $@ $(OLEAUTO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\oleauto_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\oleauto_oleauto.o: ./oleauto.cpp
$(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\oleauto_oleauto_rc.o: ./oleauto.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc
index fe0d0f2514..33c54f757a 100644
--- a/samples/oleauto/makefile.vc
+++ b/samples/oleauto/makefile.vc
@@ -32,7 +32,7 @@ OLEAUTO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
OLEAUTO_OBJECTS = \
$(OBJS)\oleauto_oleauto.obj
OLEAUTO_RESOURCES = \
- $(OBJS)\oleauto_oleauto.res
+ $(OBJS)\oleauto_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\oleauto.ilk del $(OBJS)\oleauto.ilk
-if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb
-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
+$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(OLEAUTO_OBJECTS) $(OLEAUTO_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\oleauto_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\oleauto_oleauto.obj: .\oleauto.cpp
$(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp
-$(OBJS)\oleauto_oleauto.res: .\oleauto.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\oleauto.rc
-
diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat
index 72e76bbbca..85726abb87 100644
--- a/samples/oleauto/makefile.wat
+++ b/samples/oleauto/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
-$(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
+$(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_sample.res
@%create $(OBJS)\oleauto.lbc
@%append $(OBJS)\oleauto.lbc option quiet
@%append $(OBJS)\oleauto.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res
@%append $(OBJS)\oleauto.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\oleauto.lbc library %i
- @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res
+ @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_sample.res
@for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i
wlink @$(OBJS)\oleauto.lbc
+$(OBJS)\oleauto_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\oleauto_oleauto.obj : .AUTODEPEND .\oleauto.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $<
-$(OBJS)\oleauto_oleauto.res : .AUTODEPEND .\oleauto.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/oleauto/mondrian.ico b/samples/oleauto/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/oleauto/mondrian.ico and /dev/null differ
diff --git a/samples/oleauto/mondrian.xpm b/samples/oleauto/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/oleauto/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/oleauto/oleauto.bkl b/samples/oleauto/oleauto.bkl
index 9558e0340a..4f15b31e05 100644
--- a/samples/oleauto/oleauto.bkl
+++ b/samples/oleauto/oleauto.bkl
@@ -7,7 +7,6 @@
oleauto.cpp
core
base
- oleauto.rc
diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 383ef4d012..18a83c8359 100644
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -40,8 +40,8 @@
// ressources
// ----------------------------------------------------------------------------
// the application icon
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
@@ -152,7 +152,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
// set the frame icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
diff --git a/samples/oleauto/oleauto.dsp b/samples/oleauto/oleauto.dsp
index 40a5827441..0e99908112 100644
--- a/samples/oleauto/oleauto.dsp
+++ b/samples/oleauto/oleauto.dsp
@@ -256,7 +256,7 @@ SOURCE=.\oleauto.cpp
# End Source File
# Begin Source File
-SOURCE=.\oleauto.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# End Target
diff --git a/samples/oleauto/oleauto.rc b/samples/oleauto/oleauto.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/oleauto/oleauto.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/oleauto/oleauto_vc7.vcproj b/samples/oleauto/oleauto_vc7.vcproj
index 911465d883..c5533008a7 100644
--- a/samples/oleauto/oleauto_vc7.vcproj
+++ b/samples/oleauto/oleauto_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/oleauto/oleauto_vc8.vcproj b/samples/oleauto/oleauto_vc8.vcproj
index 511e07d29b..b5679cdf17 100644
--- a/samples/oleauto/oleauto_vc8.vcproj
+++ b/samples/oleauto/oleauto_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/oleauto/oleauto_vc9.vcproj b/samples/oleauto/oleauto_vc9.vcproj
index caa5f45ae9..5013b5c091 100644
--- a/samples/oleauto/oleauto_vc9.vcproj
+++ b/samples/oleauto/oleauto_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index d0afbfe4c5..abce6a1e47 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -48,9 +48,9 @@ CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
CUBE_OBJECTS = \
+ $(__cube___win32rc) \
$(__cube_os2_lib_res) \
- cube_cube.o \
- $(__cube___win32rc)
+ cube_cube.o
### Conditionally set variables: ###
@@ -87,6 +87,7 @@ COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \
@COND_PLATFORM_OS2_1@__cube___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___cube___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__cube___win32rc = cube_sample_rc.o
@COND_PLATFORM_OS2_1@__cube_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_app_Contents_PkgInfo___depname \
@@ -108,7 +109,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__cube___win32rc = cube_cube_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)
@@ -176,12 +176,12 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)
+cube_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
cube_cube.o: $(srcdir)/cube.cpp
$(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $(srcdir)/cube.cpp
-cube_cube_rc.o: $(srcdir)/cube.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/opengl/cube/cube.bkl b/samples/opengl/cube/cube.bkl
index 50b4b5c5c4..0de7e9cbc9 100644
--- a/samples/opengl/cube/cube.bkl
+++ b/samples/opengl/cube/cube.bkl
@@ -15,7 +15,6 @@
gl
core
base
- cube.rc
diff --git a/samples/opengl/cube/cube.dsp b/samples/opengl/cube/cube.dsp
index 155f319ede..78ac8966c3 100644
--- a/samples/opengl/cube/cube.dsp
+++ b/samples/opengl/cube/cube.dsp
@@ -256,7 +256,7 @@ SOURCE=.\cube.cpp
# End Source File
# Begin Source File
-SOURCE=.\cube.rc
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/opengl/cube/cube.rc b/samples/opengl/cube/cube.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/opengl/cube/cube.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/opengl/cube/cube_vc7.vcproj b/samples/opengl/cube/cube_vc7.vcproj
index c9a5cd1eee..0085da0d34 100644
--- a/samples/opengl/cube/cube_vc7.vcproj
+++ b/samples/opengl/cube/cube_vc7.vcproj
@@ -558,7 +558,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/opengl/cube/cube_vc8.vcproj b/samples/opengl/cube/cube_vc8.vcproj
index 1ab259e226..c16dcb3b17 100644
--- a/samples/opengl/cube/cube_vc8.vcproj
+++ b/samples/opengl/cube/cube_vc8.vcproj
@@ -824,7 +824,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/opengl/cube/cube_vc9.vcproj b/samples/opengl/cube/cube_vc9.vcproj
index 609d12e9ed..a15cab7ff8 100644
--- a/samples/opengl/cube/cube_vc9.vcproj
+++ b/samples/opengl/cube/cube_vc9.vcproj
@@ -796,7 +796,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc
index 4caa499bce..8502597ddc 100644
--- a/samples/opengl/cube/makefile.bcc
+++ b/samples/opengl/cube/makefile.bcc
@@ -233,15 +233,15 @@ clean:
-if exist $(OBJS)\cube.ils del $(OBJS)\cube.ils
!if "$(USE_OPENGL)" == "1"
-$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
+$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\cube_cube.res
+ c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\cube_sample.res
|
!endif
+$(OBJS)\cube_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\cube_cube.obj: .\cube.cpp
$(CXX) -q -c -P -o$@ $(CUBE_CXXFLAGS) .\cube.cpp
-$(OBJS)\cube_cube.res: .\cube.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\cube.rc
-
diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc
index 81d124b9eb..b06af8983d 100644
--- a/samples/opengl/cube/makefile.gcc
+++ b/samples/opengl/cube/makefile.gcc
@@ -28,8 +28,8 @@ CUBE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
-Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CUBE_OBJECTS = \
- $(OBJS)\cube_cube.o \
- $(OBJS)\cube_cube_rc.o
+ $(OBJS)\cube_sample_rc.o \
+ $(OBJS)\cube_cube.o
### Conditionally set variables: ###
@@ -221,16 +221,16 @@ clean:
-if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
ifeq ($(USE_OPENGL),1)
-$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o
+$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_sample_rc.o
$(CXX) -o $@ $(CUBE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
endif
+$(OBJS)\cube_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\cube_cube.o: ./cube.cpp
$(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\cube_cube_rc.o: ./cube.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc
index bebcf9390c..4d820d0775 100644
--- a/samples/opengl/cube/makefile.vc
+++ b/samples/opengl/cube/makefile.vc
@@ -32,7 +32,7 @@ CUBE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
CUBE_OBJECTS = \
$(OBJS)\cube_cube.obj
CUBE_RESOURCES = \
- $(OBJS)\cube_cube.res
+ $(OBJS)\cube_sample.res
### Conditionally set variables: ###
@@ -343,15 +343,15 @@ clean:
-if exist $(OBJS)\cube.pdb del $(OBJS)\cube.pdb
!if "$(USE_OPENGL)" == "1"
-$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
+$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(CUBE_OBJECTS) $(CUBE_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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) $(__CAIRO_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 wininet.lib
<<
!endif
+$(OBJS)\cube_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\cube_cube.obj: .\cube.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) .\cube.cpp
-$(OBJS)\cube_cube.res: .\cube.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\cube.rc
-
diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat
index 78c44ed486..81cdc52b90 100644
--- a/samples/opengl/cube/makefile.wat
+++ b/samples/opengl/cube/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
!ifeq USE_OPENGL 1
-$(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
+$(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_sample.res
@%create $(OBJS)\cube.lbc
@%append $(OBJS)\cube.lbc option quiet
@%append $(OBJS)\cube.lbc name $^@
@@ -261,14 +261,14 @@ $(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
@%append $(OBJS)\cube.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\cube.lbc library %i
- @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res
+ @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_sample.res
@for %i in () do @%append $(OBJS)\cube.lbc option stack=%i
wlink @$(OBJS)\cube.lbc
!endif
+$(OBJS)\cube_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\cube_cube.obj : .AUTODEPEND .\cube.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $<
-$(OBJS)\cube_cube.res : .AUTODEPEND .\cube.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/opengl/cube/mondrian.ico b/samples/opengl/cube/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/opengl/cube/mondrian.ico and /dev/null differ
diff --git a/samples/opengl/isosurf/mondrian.ico b/samples/opengl/isosurf/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/opengl/isosurf/mondrian.ico and /dev/null differ
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index deafc30eec..d940600879 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -54,11 +54,11 @@ PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
PENGUIN_OBJECTS = \
+ $(__penguin___win32rc) \
$(__penguin_os2_lib_res) \
penguin_penguin.o \
penguin_dxfrenderer.o \
- penguin_trackball.o \
- $(__penguin___win32rc)
+ penguin_trackball.o
### Conditionally set variables: ###
@@ -97,6 +97,7 @@ COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__penguin___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_sample_rc.o
@COND_PLATFORM_OS2_1@__penguin_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_app_Contents_PkgInfo___depname \
@@ -119,7 +120,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__penguin___win32rc = penguin_penguin_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)
@@ -199,6 +199,9 @@ data:
esac; \
done
+penguin_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
penguin_penguin.o: $(srcdir)/penguin.cpp
$(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $(srcdir)/penguin.cpp
@@ -208,9 +211,6 @@ penguin_dxfrenderer.o: $(srcdir)/dxfrenderer.cpp
penguin_trackball.o: $(srcdir)/trackball.c
$(CCC) -c -o $@ $(PENGUIN_CFLAGS) $(srcdir)/trackball.c
-penguin_penguin_rc.o: $(srcdir)/penguin.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc
index c5e56f95ff..b9d557c27f 100644
--- a/samples/opengl/penguin/makefile.bcc
+++ b/samples/opengl/penguin/makefile.bcc
@@ -242,9 +242,9 @@ clean:
-if exist $(OBJS)\penguin.ils del $(OBJS)\penguin.ils
!if "$(USE_OPENGL)" == "1"
-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
+$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_penguin.res
+ c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_sample.res
|
!endif
@@ -252,6 +252,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\penguin_sample.res: .\..\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc
+
$(OBJS)\penguin_penguin.obj: .\penguin.cpp
$(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp
@@ -261,6 +264,3 @@ $(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp
$(OBJS)\penguin_trackball.obj: .\trackball.c
$(CC) -q -c -P- -o$@ $(PENGUIN_CFLAGS) .\trackball.c
-$(OBJS)\penguin_penguin.res: .\penguin.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\penguin.rc
-
diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc
index 093c2137e2..397b3c6599 100644
--- a/samples/opengl/penguin/makefile.gcc
+++ b/samples/opengl/penguin/makefile.gcc
@@ -36,10 +36,10 @@ PENGUIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
PENGUIN_OBJECTS = \
+ $(OBJS)\penguin_sample_rc.o \
$(OBJS)\penguin_penguin.o \
$(OBJS)\penguin_dxfrenderer.o \
- $(OBJS)\penguin_trackball.o \
- $(OBJS)\penguin_penguin_rc.o
+ $(OBJS)\penguin_trackball.o
### Conditionally set variables: ###
@@ -231,7 +231,7 @@ clean:
-if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe
ifeq ($(USE_OPENGL),1)
-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o
+$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_sample_rc.o
$(CXX) -o $@ $(PENGUIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
endif
@@ -239,6 +239,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (penguin.dxf.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\penguin_sample_rc.o: ./../../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
+
$(OBJS)\penguin_penguin.o: ./penguin.cpp
$(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<
@@ -248,9 +251,6 @@ $(OBJS)\penguin_dxfrenderer.o: ./dxfrenderer.cpp
$(OBJS)\penguin_trackball.o: ./trackball.c
$(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $<
-$(OBJS)\penguin_penguin_rc.o: ./penguin.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc
index 36d06e1960..d1810924d8 100644
--- a/samples/opengl/penguin/makefile.vc
+++ b/samples/opengl/penguin/makefile.vc
@@ -42,7 +42,7 @@ PENGUIN_OBJECTS = \
$(OBJS)\penguin_dxfrenderer.obj \
$(OBJS)\penguin_trackball.obj
PENGUIN_RESOURCES = \
- $(OBJS)\penguin_penguin.res
+ $(OBJS)\penguin_sample.res
### Conditionally set variables: ###
@@ -353,7 +353,7 @@ clean:
-if exist $(OBJS)\penguin.pdb del $(OBJS)\penguin.pdb
!if "$(USE_OPENGL)" == "1"
-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
+$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(PENGUIN_OBJECTS) $(PENGUIN_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -363,6 +363,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\penguin_sample.res: .\..\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\penguin_penguin.obj: .\penguin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp
@@ -372,6 +375,3 @@ $(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp
$(OBJS)\penguin_trackball.obj: .\trackball.c
$(CC) /c /nologo /TC /Fo$@ $(PENGUIN_CFLAGS) .\trackball.c
-$(OBJS)\penguin_penguin.res: .\penguin.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\penguin.rc
-
diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat
index 9dd84ef6ed..0e8366fbc2 100644
--- a/samples/opengl/penguin/makefile.wat
+++ b/samples/opengl/penguin/makefile.wat
@@ -262,7 +262,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe
!ifeq USE_OPENGL 1
-$(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
+$(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_sample.res
@%create $(OBJS)\penguin.lbc
@%append $(OBJS)\penguin.lbc option quiet
@%append $(OBJS)\penguin.lbc name $^@
@@ -270,7 +270,7 @@ $(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
@%append $(OBJS)\penguin.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\penguin.lbc library %i
- @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res
+ @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_sample.res
@for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i
wlink @$(OBJS)\penguin.lbc
!endif
@@ -279,6 +279,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\penguin_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+
$(OBJS)\penguin_penguin.obj : .AUTODEPEND .\penguin.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
@@ -288,6 +291,3 @@ $(OBJS)\penguin_dxfrenderer.obj : .AUTODEPEND .\dxfrenderer.cpp
$(OBJS)\penguin_trackball.obj : .AUTODEPEND .\trackball.c
$(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $<
-$(OBJS)\penguin_penguin.res : .AUTODEPEND .\penguin.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
-
diff --git a/samples/opengl/penguin/penguin.bkl b/samples/opengl/penguin/penguin.bkl
index 53a93afe21..97bef7dc8c 100644
--- a/samples/opengl/penguin/penguin.bkl
+++ b/samples/opengl/penguin/penguin.bkl
@@ -23,7 +23,6 @@
gl
core
base
- penguin.rc
diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index e18cb95adc..aa01dc0ccb 100644
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -78,7 +78,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
const wxSize& size, long style)
: wxFrame(frame, wxID_ANY, title, pos, size, style)
{
- SetIcon(wxIcon(sample_xpm));
+ SetIcon(wxICON(sample));
// Make the "File" menu
wxMenu *fileMenu = new wxMenu;
diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp
index 67838a956e..0bcfa76980 100644
--- a/samples/opengl/penguin/penguin.dsp
+++ b/samples/opengl/penguin/penguin.dsp
@@ -260,7 +260,7 @@ SOURCE=.\penguin.cpp
# End Source File
# Begin Source File
-SOURCE=.\penguin.rc
+SOURCE=.\..\..\..\samples\sample.rc
# End Source File
# Begin Source File
diff --git a/samples/opengl/penguin/penguin.rc b/samples/opengl/penguin/penguin.rc
deleted file mode 100644
index f3accc6acf..0000000000
--- a/samples/opengl/penguin/penguin.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-// #include "wx/msw/wx.rc"
-#include "../../sample.rc"
-
diff --git a/samples/opengl/penguin/penguin_vc7.vcproj b/samples/opengl/penguin/penguin_vc7.vcproj
index 8806cf0abd..e095eab989 100644
--- a/samples/opengl/penguin/penguin_vc7.vcproj
+++ b/samples/opengl/penguin/penguin_vc7.vcproj
@@ -570,7 +570,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\..\samples\sample.rc">
diff --git a/samples/opengl/penguin/penguin_vc8.vcproj b/samples/opengl/penguin/penguin_vc8.vcproj
index 5e6ae8043e..377044bab6 100644
--- a/samples/opengl/penguin/penguin_vc8.vcproj
+++ b/samples/opengl/penguin/penguin_vc8.vcproj
@@ -840,7 +840,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/opengl/penguin/penguin_vc9.vcproj b/samples/opengl/penguin/penguin_vc9.vcproj
index 7c99895895..8860894cce 100644
--- a/samples/opengl/penguin/penguin_vc9.vcproj
+++ b/samples/opengl/penguin/penguin_vc9.vcproj
@@ -812,7 +812,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/ownerdrw/mondrian.ico b/samples/ownerdrw/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/ownerdrw/mondrian.ico and /dev/null differ
diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index b42ed4761e..dd01cedc1b 100644
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -265,7 +265,7 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, const wxChar *title,
: wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
{
// set the icon
- SetIcon(wxIcon(wxT("mondrian")));
+ SetIcon(wxICON(sample));
// create the menu
InitMenu();
diff --git a/samples/ownerdrw/ownerdrw.rc b/samples/ownerdrw/ownerdrw.rc
index 86df22581e..0adec0b9a3 100644
--- a/samples/ownerdrw/ownerdrw.rc
+++ b/samples/ownerdrw/ownerdrw.rc
@@ -1,9 +1,8 @@
-mondrian ICON "mondrian.ico"
+#include "../sample.rc"
+
bell BITMAP "bell.bmp"
sound BITMAP "sound.bmp"
nosound BITMAP "nosound.bmp"
info BITMAP "info.bmp"
info_mono BITMAP "info_mono.bmp"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index 94b5c3ca24..118e381402 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -47,9 +47,9 @@ PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
PRINTING_OBJECTS = \
+ $(__printing___win32rc) \
$(__printing_os2_lib_res) \
- printing_printing.o \
- $(__printing___win32rc)
+ printing_printing.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__printing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___printing___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__printing___win32rc = printing_sample_rc.o
@COND_PLATFORM_OS2_1@__printing_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__printing_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__printing___win32rc = printing_printing_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)
@@ -174,12 +174,12 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
@COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP)
+printing_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
printing_printing.o: $(srcdir)/printing.cpp
$(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $(srcdir)/printing.cpp
-printing_printing_rc.o: $(srcdir)/printing.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc
index dafb59b2a0..84174a24d3 100644
--- a/samples/printing/makefile.bcc
+++ b/samples/printing/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\printing.ilf del $(OBJS)\printing.ilf
-if exist $(OBJS)\printing.ils del $(OBJS)\printing.ils
-$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
+$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(PRINTING_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\printing_printing.res
+ c0w32.obj $(PRINTING_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\printing_sample.res
|
+$(OBJS)\printing_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\printing_printing.obj: .\printing.cpp
$(CXX) -q -c -P -o$@ $(PRINTING_CXXFLAGS) .\printing.cpp
-$(OBJS)\printing_printing.res: .\printing.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\printing.rc
-
diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc
index f37a9dc803..e62c47fd68 100644
--- a/samples/printing/makefile.gcc
+++ b/samples/printing/makefile.gcc
@@ -29,8 +29,8 @@ PRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
PRINTING_OBJECTS = \
- $(OBJS)\printing_printing.o \
- $(OBJS)\printing_printing_rc.o
+ $(OBJS)\printing_sample_rc.o \
+ $(OBJS)\printing_printing.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
-$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing_rc.o
+$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_sample_rc.o
$(CXX) -o $@ $(PRINTING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\printing_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\printing_printing.o: ./printing.cpp
$(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\printing_printing_rc.o: ./printing.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index 492dc3fbf0..5534993dca 100644
--- a/samples/printing/makefile.vc
+++ b/samples/printing/makefile.vc
@@ -32,7 +32,7 @@ PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
PRINTING_OBJECTS = \
$(OBJS)\printing_printing.obj
PRINTING_RESOURCES = \
- $(OBJS)\printing_printing.res
+ $(OBJS)\printing_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\printing.ilk del $(OBJS)\printing.ilk
-if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb
-$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
+$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(PRINTING_OBJECTS) $(PRINTING_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\printing_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\printing_printing.obj: .\printing.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) .\printing.cpp
-$(OBJS)\printing_printing.res: .\printing.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\printing.rc
-
diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat
index 16cf399f72..d90c7b71c6 100644
--- a/samples/printing/makefile.wat
+++ b/samples/printing/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
-$(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
+$(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_sample.res
@%create $(OBJS)\printing.lbc
@%append $(OBJS)\printing.lbc option quiet
@%append $(OBJS)\printing.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
@%append $(OBJS)\printing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\printing.lbc library %i
- @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res
+ @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_sample.res
@for %i in () do @%append $(OBJS)\printing.lbc option stack=%i
wlink @$(OBJS)\printing.lbc
+$(OBJS)\printing_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\printing_printing.obj : .AUTODEPEND .\printing.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $<
-$(OBJS)\printing_printing.res : .AUTODEPEND .\printing.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/printing/mondrian.ico b/samples/printing/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/printing/mondrian.ico and /dev/null differ
diff --git a/samples/printing/mondrian.xpm b/samples/printing/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/printing/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/printing/printing.bkl b/samples/printing/printing.bkl
index 0829d7b60d..5bb3d56c81 100644
--- a/samples/printing/printing.bkl
+++ b/samples/printing/printing.bkl
@@ -8,7 +8,6 @@
printing.h
core
base
- printing.rc
diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 61fcb8d06a..205caee637 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -51,8 +51,8 @@
#include "printing.h"
-#ifndef __WXMSW__
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
// Global print data, to remember settings during the session
@@ -212,7 +212,7 @@ void MyApp::Draw(wxDC&dc)
str.Printf( wxT("---- Text at angle %d ----"), i );
dc.DrawRotatedText( str, 100, 300, i );
- wxIcon my_icon = wxICON(mondrian);
+ wxIcon my_icon = wxICON(sample);
dc.DrawIcon( my_icon, 100, 100);
@@ -303,7 +303,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, const wxPoint&pos, const
#endif // wxUSE_STATUSBAR
// Load icon and bitmap
- SetIcon( wxICON( mondrian) );
+ SetIcon( wxICON( sample) );
// Make a menubar
wxMenu *file_menu = new wxMenu;
diff --git a/samples/printing/printing.dsp b/samples/printing/printing.dsp
index 8bbb712ed9..dbe2d48c6f 100644
--- a/samples/printing/printing.dsp
+++ b/samples/printing/printing.dsp
@@ -256,7 +256,7 @@ SOURCE=.\printing.cpp
# End Source File
# Begin Source File
-SOURCE=.\printing.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/printing/printing.rc b/samples/printing/printing.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/printing/printing.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/printing/printing_vc7.vcproj b/samples/printing/printing_vc7.vcproj
index 42f7b9cb8c..4afe5d3352 100644
--- a/samples/printing/printing_vc7.vcproj
+++ b/samples/printing/printing_vc7.vcproj
@@ -558,7 +558,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/printing/printing_vc8.vcproj b/samples/printing/printing_vc8.vcproj
index ea2e71aa8f..6c6ab26f20 100644
--- a/samples/printing/printing_vc8.vcproj
+++ b/samples/printing/printing_vc8.vcproj
@@ -824,7 +824,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/printing/printing_vc9.vcproj b/samples/printing/printing_vc9.vcproj
index a03e70bac2..389309c8d7 100644
--- a/samples/printing/printing_vc9.vcproj
+++ b/samples/printing/printing_vc9.vcproj
@@ -796,7 +796,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/regtest/regtest.rc b/samples/regtest/regtest.rc
index 8d688bba6f..e8d9832066 100644
--- a/samples/regtest/regtest.rc
+++ b/samples/regtest/regtest.rc
@@ -1,4 +1,4 @@
-#include "wx/msw/wx.rc"
+#include "../sample.rc"
app_icon ICON "registry.ico"
icon_key1 ICON "key1.ico"
diff --git a/samples/sample.rc4 b/samples/sample.rc4
new file mode 100644
index 0000000000..2f8fff43c7
--- /dev/null
+++ b/samples/sample.rc4
@@ -0,0 +1,2 @@
+ICON 1 PRELOAD "..\\sample_os2.ico"
+RCINCLUDE "..\\..\\include\\wx\\os2\\wx.rc"
diff --git a/samples/sample.rcO b/samples/sample.rcO
new file mode 100644
index 0000000000..2f8fff43c7
--- /dev/null
+++ b/samples/sample.rcO
@@ -0,0 +1,2 @@
+ICON 1 PRELOAD "..\\sample_os2.ico"
+RCINCLUDE "..\\..\\include\\wx\\os2\\wx.rc"
diff --git a/samples/erase/mondros2.ico b/samples/sample_os2.ico
similarity index 100%
rename from samples/erase/mondros2.ico
rename to samples/sample_os2.ico
diff --git a/samples/sashtest/sashtest.rc b/samples/sashtest/sashtest.rc
index 3719f5af81..ea837631a9 100644
--- a/samples/sashtest/sashtest.rc
+++ b/samples/sashtest/sashtest.rc
@@ -1,9 +1,7 @@
-aaaa ICON "sashtest.ico"
+#include "../sample.rc"
wxSTD_MDIPARENTFRAME ICON "sashtest.ico"
wxSTD_MDICHILDFRAME ICON "sashtest.ico"
sashtest_icn ICON "sashtest.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 10af270e51..5a4e37427f 100644
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -47,9 +47,9 @@ SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
SCROLL_OBJECTS = \
+ $(__scroll___win32rc) \
$(__scroll_os2_lib_res) \
- scroll_scroll.o \
- $(__scroll___win32rc)
+ scroll_scroll.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd = $(NM) scroll$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__scroll___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_sample_rc.o
@COND_PLATFORM_OS2_1@__scroll_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__scroll_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__scroll___win32rc = scroll_scroll_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)
@@ -174,12 +174,12 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
@COND_PLATFORM_MACOSX_1@scroll_bundle: $(____scroll_BUNDLE_TGT_REF_DEP)
+scroll_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
scroll_scroll.o: $(srcdir)/scroll.cpp
$(CXXC) -c -o $@ $(SCROLL_CXXFLAGS) $(srcdir)/scroll.cpp
-scroll_scroll_rc.o: $(srcdir)/scroll.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc
index ff28afb609..b22f2d826f 100644
--- a/samples/scroll/makefile.bcc
+++ b/samples/scroll/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\scroll.ilf del $(OBJS)\scroll.ilf
-if exist $(OBJS)\scroll.ils del $(OBJS)\scroll.ils
-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
+$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(SCROLL_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scroll_scroll.res
+ c0w32.obj $(SCROLL_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scroll_sample.res
|
+$(OBJS)\scroll_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\scroll_scroll.obj: .\scroll.cpp
$(CXX) -q -c -P -o$@ $(SCROLL_CXXFLAGS) .\scroll.cpp
-$(OBJS)\scroll_scroll.res: .\scroll.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\scroll.rc
-
diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc
index 38cc406207..224fda3e6a 100644
--- a/samples/scroll/makefile.gcc
+++ b/samples/scroll/makefile.gcc
@@ -29,8 +29,8 @@ SCROLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
SCROLL_OBJECTS = \
- $(OBJS)\scroll_scroll.o \
- $(OBJS)\scroll_scroll_rc.o
+ $(OBJS)\scroll_sample_rc.o \
+ $(OBJS)\scroll_scroll.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll_rc.o
+$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_sample_rc.o
$(CXX) -o $@ $(SCROLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\scroll_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\scroll_scroll.o: ./scroll.cpp
$(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\scroll_scroll_rc.o: ./scroll.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc
index ee803ada25..9098682c8d 100644
--- a/samples/scroll/makefile.vc
+++ b/samples/scroll/makefile.vc
@@ -32,7 +32,7 @@ SCROLL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
SCROLL_OBJECTS = \
$(OBJS)\scroll_scroll.obj
SCROLL_RESOURCES = \
- $(OBJS)\scroll_scroll.res
+ $(OBJS)\scroll_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\scroll.ilk del $(OBJS)\scroll.ilk
-if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb
-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
+$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(SCROLL_OBJECTS) $(SCROLL_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\scroll_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\scroll_scroll.obj: .\scroll.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) .\scroll.cpp
-$(OBJS)\scroll_scroll.res: .\scroll.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\scroll.rc
-
diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat
index 4fc5a3d1df..8afee141f4 100644
--- a/samples/scroll/makefile.wat
+++ b/samples/scroll/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
-$(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
+$(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_sample.res
@%create $(OBJS)\scroll.lbc
@%append $(OBJS)\scroll.lbc option quiet
@%append $(OBJS)\scroll.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res
@%append $(OBJS)\scroll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\scroll.lbc library %i
- @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res
+ @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_sample.res
@for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i
wlink @$(OBJS)\scroll.lbc
+$(OBJS)\scroll_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\scroll_scroll.obj : .AUTODEPEND .\scroll.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $<
-$(OBJS)\scroll_scroll.res : .AUTODEPEND .\scroll.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/scroll/mondros2.ico b/samples/scroll/mondros2.ico
deleted file mode 100644
index 8b0e58c0d7..0000000000
Binary files a/samples/scroll/mondros2.ico and /dev/null differ
diff --git a/samples/scroll/scroll.bkl b/samples/scroll/scroll.bkl
index 58658b5c74..35f30cc60d 100644
--- a/samples/scroll/scroll.bkl
+++ b/samples/scroll/scroll.bkl
@@ -7,7 +7,6 @@
scroll.cpp
core
base
- scroll.rc
diff --git a/samples/scroll/scroll.dsp b/samples/scroll/scroll.dsp
index ece9c56819..e130c8f38d 100644
--- a/samples/scroll/scroll.dsp
+++ b/samples/scroll/scroll.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\scroll.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\scroll.rc
+SOURCE=.\scroll.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/scroll/scroll.rc b/samples/scroll/scroll.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/scroll/scroll.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/scroll/scroll_vc7.vcproj b/samples/scroll/scroll_vc7.vcproj
index ed47f1d89e..724e5f93ae 100644
--- a/samples/scroll/scroll_vc7.vcproj
+++ b/samples/scroll/scroll_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/scroll/scroll_vc8.vcproj b/samples/scroll/scroll_vc8.vcproj
index 1f4ba96dd2..6baf7306dd 100644
--- a/samples/scroll/scroll_vc8.vcproj
+++ b/samples/scroll/scroll_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/scroll/scroll_vc9.vcproj b/samples/scroll/scroll_vc9.vcproj
index b2f281b21c..e4b7e383a2 100644
--- a/samples/scroll/scroll_vc9.vcproj
+++ b/samples/scroll/scroll_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 98f7d65fa7..82ad8d4b0f 100644
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -47,9 +47,9 @@ SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
SHAPED_OBJECTS = \
+ $(__shaped___win32rc) \
$(__shaped_os2_lib_res) \
- shaped_shaped.o \
- $(__shaped___win32rc)
+ shaped_shaped.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_sample_rc.o
@COND_PLATFORM_OS2_1@__shaped_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__shaped_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__shaped___win32rc = shaped_shaped_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)
@@ -186,12 +186,12 @@ data:
esac; \
done
+shaped_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
shaped_shaped.o: $(srcdir)/shaped.cpp
$(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $(srcdir)/shaped.cpp
-shaped_shaped_rc.o: $(srcdir)/shaped.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc
index ea98585d6f..f3aff6d619 100644
--- a/samples/shaped/makefile.bcc
+++ b/samples/shaped/makefile.bcc
@@ -229,18 +229,18 @@ clean:
-if exist $(OBJS)\shaped.ilf del $(OBJS)\shaped.ilf
-if exist $(OBJS)\shaped.ils del $(OBJS)\shaped.ils
-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
+$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(SHAPED_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\shaped_shaped.res
+ c0w32.obj $(SHAPED_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\shaped_sample.res
|
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\shaped_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\shaped_shaped.obj: .\shaped.cpp
$(CXX) -q -c -P -o$@ $(SHAPED_CXXFLAGS) .\shaped.cpp
-$(OBJS)\shaped_shaped.res: .\shaped.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\shaped.rc
-
diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index 323933995f..32929d712c 100644
--- a/samples/shaped/makefile.gcc
+++ b/samples/shaped/makefile.gcc
@@ -29,8 +29,8 @@ SHAPED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
SHAPED_OBJECTS = \
- $(OBJS)\shaped_shaped.o \
- $(OBJS)\shaped_shaped_rc.o
+ $(OBJS)\shaped_sample_rc.o \
+ $(OBJS)\shaped_shaped.o
### Conditionally set variables: ###
@@ -218,19 +218,19 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped_rc.o
+$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_sample_rc.o
$(CXX) -o $@ $(SHAPED_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (star.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\shaped_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\shaped_shaped.o: ./shaped.cpp
$(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\shaped_shaped_rc.o: ./shaped.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc
index 27598d97dd..5961123da5 100644
--- a/samples/shaped/makefile.vc
+++ b/samples/shaped/makefile.vc
@@ -32,7 +32,7 @@ SHAPED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
SHAPED_OBJECTS = \
$(OBJS)\shaped_shaped.obj
SHAPED_RESOURCES = \
- $(OBJS)\shaped_shaped.res
+ $(OBJS)\shaped_sample.res
### Conditionally set variables: ###
@@ -339,7 +339,7 @@ clean:
-if exist $(OBJS)\shaped.ilk del $(OBJS)\shaped.ilk
-if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb
-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
+$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(SHAPED_OBJECTS) $(SHAPED_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
@@ -348,9 +348,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\shaped_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\shaped_shaped.obj: .\shaped.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) .\shaped.cpp
-$(OBJS)\shaped_shaped.res: .\shaped.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\shaped.rc
-
diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat
index 58a7bacd33..68f3106918 100644
--- a/samples/shaped/makefile.wat
+++ b/samples/shaped/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
-$(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
+$(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_sample.res
@%create $(OBJS)\shaped.lbc
@%append $(OBJS)\shaped.lbc option quiet
@%append $(OBJS)\shaped.lbc name $^@
@@ -256,7 +256,7 @@ $(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res
@%append $(OBJS)\shaped.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\shaped.lbc library %i
- @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res
+ @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_sample.res
@for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i
wlink @$(OBJS)\shaped.lbc
@@ -264,9 +264,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\shaped_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\shaped_shaped.obj : .AUTODEPEND .\shaped.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $<
-$(OBJS)\shaped_shaped.res : .AUTODEPEND .\shaped.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/shaped/shaped.bkl b/samples/shaped/shaped.bkl
index 49f1189814..477705c15f 100644
--- a/samples/shaped/shaped.bkl
+++ b/samples/shaped/shaped.bkl
@@ -7,9 +7,8 @@
shaped.cpp
core
base
- shaped.rc
-
+
star.png
diff --git a/samples/shaped/shaped.dsp b/samples/shaped/shaped.dsp
index 329571cd3b..b84fb7f300 100644
--- a/samples/shaped/shaped.dsp
+++ b/samples/shaped/shaped.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\shaped.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\shaped.rc
+SOURCE=.\shaped.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/shaped/shaped.rc b/samples/shaped/shaped.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/shaped/shaped.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/shaped/shaped_vc7.vcproj b/samples/shaped/shaped_vc7.vcproj
index 0c24827b24..0608d8268b 100644
--- a/samples/shaped/shaped_vc7.vcproj
+++ b/samples/shaped/shaped_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/shaped/shaped_vc8.vcproj b/samples/shaped/shaped_vc8.vcproj
index 5e076534ab..e536b24ea8 100644
--- a/samples/shaped/shaped_vc8.vcproj
+++ b/samples/shaped/shaped_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/shaped/shaped_vc9.vcproj b/samples/shaped/shaped_vc9.vcproj
index 32ccd08b6f..81210e8ece 100644
--- a/samples/shaped/shaped_vc9.vcproj
+++ b/samples/shaped/shaped_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 0ea35e48e1..9b33b775c0 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -47,17 +47,17 @@ CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
CLIENT_OBJECTS = \
+ $(__client___win32rc) \
$(os2_lib_res) \
- client_client.o \
- $(__client___win32rc)
+ client_client.o
SERVER_CXXFLAGS = -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 $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
SERVER_OBJECTS = \
+ $(__server___win32rc) \
$(os2_lib_res) \
- server_server.o \
- $(__server___win32rc)
+ server_server.o
BASECLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) \
@@ -92,6 +92,7 @@ BASESERVER_OBJECTS = \
COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \
-q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd)
+@COND_PLATFORM_WIN32_1@__client___win32rc = client_sample_rc.o
@COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_app_Contents_PkgInfo___depname \
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = client.app/Contents/PkgInfo
@COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_bundle___depname = client_bundle
@@ -105,7 +106,6 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
@COND_TOOLKIT_OSX_COCOA@ = $(__client_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_OSX_IPHONE@____client_BUNDLE_TGT_REF_DEP \
@COND_TOOLKIT_OSX_IPHONE@ = $(__client_app_Contents_PkgInfo___depname)
-@COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o
@COND_USE_GUI_1@__server___depname = server$(EXEEXT)
@COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true
@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \
@@ -113,6 +113,7 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
-q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd)
+@COND_PLATFORM_WIN32_1@__server___win32rc = server_sample_rc.o
@COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_app_Contents_PkgInfo___depname \
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ = server.app/Contents/PkgInfo
@COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_bundle___depname = server_bundle
@@ -126,7 +127,6 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
@COND_TOOLKIT_OSX_COCOA@ = $(__server_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_OSX_IPHONE@____server_BUNDLE_TGT_REF_DEP \
@COND_TOOLKIT_OSX_IPHONE@ = $(__server_app_Contents_PkgInfo___depname)
-@COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o
@COND_PLATFORM_MAC_0@__baseclient___mac_setfilecmd = @true
@COND_PLATFORM_MAC_1@__baseclient___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL baseclient$(EXEEXT)
@@ -266,18 +266,18 @@ baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
$(__baseserver___mac_setfilecmd)
+client_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
client_client.o: $(srcdir)/client.cpp
$(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $(srcdir)/client.cpp
-client_client_rc.o: $(srcdir)/client.rc
+server_sample_rc.o: $(srcdir)/../../samples/sample.rc
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
server_server.o: $(srcdir)/server.cpp
$(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $(srcdir)/server.cpp
-server_server_rc.o: $(srcdir)/server.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
baseclient_baseclient.o: $(srcdir)/baseclient.cpp
$(CXXC) -c -o $@ $(BASECLIENT_CXXFLAGS) $(srcdir)/baseclient.cpp
diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index c435c1e9cc..b45ccb3f09 100644
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -39,7 +39,9 @@
// --------------------------------------------------------------------------
// the application icon
-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
+#endif
// --------------------------------------------------------------------------
// classes
@@ -206,7 +208,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
wxDefaultPosition, wxSize(300, 200))
{
// Give the frame an icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// Make menus
m_menuFile = new wxMenu();
diff --git a/samples/sockets/client.rc b/samples/sockets/client.rc
deleted file mode 100644
index f1579f657d..0000000000
--- a/samples/sockets/client.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON mondrian.ico
-conn_icn ICON connect.ico
-#include "wx/msw/wx.rc"
diff --git a/samples/sockets/connect.ico b/samples/sockets/connect.ico
deleted file mode 100644
index 7844dfd2bc..0000000000
Binary files a/samples/sockets/connect.ico and /dev/null differ
diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc
index 293090a23f..7e617d6688 100644
--- a/samples/sockets/makefile.bcc
+++ b/samples/sockets/makefile.bcc
@@ -285,16 +285,16 @@ clean:
-if exist $(OBJS)\baseserver.ils del $(OBJS)\baseserver.ils
!if "$(USE_GUI)" == "1"
-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res
+$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_client.res
+ c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_sample.res
|
!endif
!if "$(USE_GUI)" == "1"
-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res
+$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
- c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_server.res
+ c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_sample.res
|
!endif
@@ -308,18 +308,18 @@ $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
c0x32.obj $(BASESERVER_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
|
+$(OBJS)\client_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\client_client.obj: .\client.cpp
$(CXX) -q -c -P -o$@ $(CLIENT_CXXFLAGS) .\client.cpp
-$(OBJS)\client_client.res: .\client.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\client.rc
+$(OBJS)\server_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\server_server.obj: .\server.cpp
$(CXX) -q -c -P -o$@ $(SERVER_CXXFLAGS) .\server.cpp
-$(OBJS)\server_server.res: .\server.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) -i. $(__DLLFLAG_p_0) -i.\..\..\samples -dNOPCH .\server.rc
-
$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp
$(CXX) -q -c -P -o$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp
diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index de3a0495ef..6d6c1d9c4c 100644
--- a/samples/sockets/makefile.gcc
+++ b/samples/sockets/makefile.gcc
@@ -28,8 +28,8 @@ CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
-I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
CLIENT_OBJECTS = \
- $(OBJS)\client_client.o \
- $(OBJS)\client_client_rc.o
+ $(OBJS)\client_sample_rc.o \
+ $(OBJS)\client_client.o
SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -38,8 +38,8 @@ SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
-I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
SERVER_OBJECTS = \
- $(OBJS)\server_server.o \
- $(OBJS)\server_server_rc.o
+ $(OBJS)\server_sample_rc.o \
+ $(OBJS)\server_server.o
BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -261,12 +261,12 @@ clean:
-if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe
ifeq ($(USE_GUI),1)
-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o
+$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample_rc.o
$(CXX) -o $@ $(CLIENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
endif
ifeq ($(USE_GUI),1)
-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o
+$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample_rc.o
$(CXX) -o $@ $(SERVER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
endif
@@ -276,18 +276,18 @@ $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
$(CXX) -o $@ $(BASESERVER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\client_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\client_client.o: ./client.cpp
$(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\client_client_rc.o: ./client.rc
+$(OBJS)\server_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
$(OBJS)\server_server.o: ./server.cpp
$(CXX) -c -o $@ $(SERVER_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\server_server_rc.o: ./server.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
-
$(OBJS)\baseclient_baseclient.o: ./baseclient.cpp
$(CXX) -c -o $@ $(BASECLIENT_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index a8915ad0e4..50d9fdf6b4 100644
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -31,7 +31,7 @@ CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
CLIENT_OBJECTS = \
$(OBJS)\client_client.obj
CLIENT_RESOURCES = \
- $(OBJS)\client_client.res
+ $(OBJS)\client_sample.res
SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
$(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
@@ -43,7 +43,7 @@ SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \
SERVER_OBJECTS = \
$(OBJS)\server_server.obj
SERVER_RESOURCES = \
- $(OBJS)\server_server.res
+ $(OBJS)\server_sample.res
BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(____DEBUGRUNTIME) \
$(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -444,14 +444,14 @@ clean:
-if exist $(OBJS)\baseserver.pdb del $(OBJS)\baseserver.pdb
!if "$(USE_GUI)" == "1"
-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res
+$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(CLIENT_OBJECTS) $(CLIENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_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 wininet.lib
<<
!endif
!if "$(USE_GUI)" == "1"
-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res
+$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(SERVER_OBJECTS) $(SERVER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_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 wininet.lib
<<
@@ -467,18 +467,18 @@ $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
$(BASESERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\client_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
$(OBJS)\client_client.obj: .\client.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) .\client.cpp
-$(OBJS)\client_client.res: .\client.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\client.rc
+$(OBJS)\server_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
$(OBJS)\server_server.obj: .\server.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) .\server.cpp
-$(OBJS)\server_server.res: .\server.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_0) /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\server.rc
-
$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp
diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat
index c51cfdfca2..fd8ce84653 100644
--- a/samples/sockets/makefile.wat
+++ b/samples/sockets/makefile.wat
@@ -292,7 +292,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe
!ifeq USE_GUI 1
-$(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res
+$(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
@%create $(OBJS)\client.lbc
@%append $(OBJS)\client.lbc option quiet
@%append $(OBJS)\client.lbc name $^@
@@ -300,13 +300,13 @@ $(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res
@%append $(OBJS)\client.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)
@for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\client.lbc library %i
- @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res
+ @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_sample.res
@for %i in () do @%append $(OBJS)\client.lbc option stack=%i
wlink @$(OBJS)\client.lbc
!endif
!ifeq USE_GUI 1
-$(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res
+$(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_sample.res
@%create $(OBJS)\server.lbc
@%append $(OBJS)\server.lbc option quiet
@%append $(OBJS)\server.lbc name $^@
@@ -314,7 +314,7 @@ $(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res
@%append $(OBJS)\server.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)
@for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i
@for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\server.lbc library %i
- @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res
+ @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_sample.res
@for %i in () do @%append $(OBJS)\server.lbc option stack=%i
wlink @$(OBJS)\server.lbc
!endif
@@ -343,18 +343,18 @@ $(OBJS)\baseserver.exe : $(BASESERVER_OBJECTS)
@for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i
wlink @$(OBJS)\baseserver.lbc
+$(OBJS)\client_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\client_client.obj : .AUTODEPEND .\client.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<
-$(OBJS)\client_client.res : .AUTODEPEND .\client.rc
+$(OBJS)\server_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\server_server.obj : .AUTODEPEND .\server.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $<
-$(OBJS)\server_server.res : .AUTODEPEND .\server.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
$(OBJS)\baseclient_baseclient.obj : .AUTODEPEND .\baseclient.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $<
diff --git a/samples/sockets/mondrian.ico b/samples/sockets/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/sockets/mondrian.ico and /dev/null differ
diff --git a/samples/sockets/mondrian.xpm b/samples/sockets/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/sockets/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 6dcc04eb23..4187191cee 100644
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -45,7 +45,9 @@
// --------------------------------------------------------------------------
// the application icon
-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
+#endif
// --------------------------------------------------------------------------
// classes
@@ -179,7 +181,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
wxDefaultPosition, wxSize(300, 200))
{
// Give the frame an icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// Make menus
m_menuFile = new wxMenu();
diff --git a/samples/sockets/server.rc b/samples/sockets/server.rc
deleted file mode 100644
index b289ec6ad9..0000000000
--- a/samples/sockets/server.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-mondrian ICON "mondrian.ico"
-conn_icn ICON "connect.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/sockets/sockets.bkl b/samples/sockets/sockets.bkl
index 0e9b60e45e..76c543168d 100644
--- a/samples/sockets/sockets.bkl
+++ b/samples/sockets/sockets.bkl
@@ -16,7 +16,6 @@
core
net
base
- client.rc
@@ -24,7 +23,6 @@
core
net
base
- server.rc
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/sockets/sockets_vc7_server.vcproj b/samples/sockets/sockets_vc7_server.vcproj
index efa7b9daf4..0d7a20fdde 100644
--- a/samples/sockets/sockets_vc7_server.vcproj
+++ b/samples/sockets/sockets_vc7_server.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/sockets/sockets_vc8_client.vcproj b/samples/sockets/sockets_vc8_client.vcproj
index caa2e3ec76..366579c168 100644
--- a/samples/sockets/sockets_vc8_client.vcproj
+++ b/samples/sockets/sockets_vc8_client.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/sockets/sockets_vc8_server.vcproj b/samples/sockets/sockets_vc8_server.vcproj
index 55d35d3bb0..b8670d7a48 100644
--- a/samples/sockets/sockets_vc8_server.vcproj
+++ b/samples/sockets/sockets_vc8_server.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/sockets/sockets_vc9_client.vcproj b/samples/sockets/sockets_vc9_client.vcproj
index aaf74dd928..cb9667204f 100644
--- a/samples/sockets/sockets_vc9_client.vcproj
+++ b/samples/sockets/sockets_vc9_client.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/sockets/sockets_vc9_server.vcproj b/samples/sockets/sockets_vc9_server.vcproj
index 1ce0ba4361..a64e3a5eda 100644
--- a/samples/sockets/sockets_vc9_server.vcproj
+++ b/samples/sockets/sockets_vc9_server.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index ec4c9d50e1..9b9f7b3e7e 100644
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -47,9 +47,9 @@ SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
SPLITTER_OBJECTS = \
+ $(__splitter___win32rc) \
$(__splitter_os2_lib_res) \
- splitter_splitter.o \
- $(__splitter___win32rc)
+ splitter_splitter.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__splitter___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_sample_rc.o
@COND_PLATFORM_OS2_1@__splitter_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__splitter_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__splitter___win32rc = splitter_splitter_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)
@@ -174,12 +174,12 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
@COND_PLATFORM_MACOSX_1@splitter_bundle: $(____splitter_BUNDLE_TGT_REF_DEP)
+splitter_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
splitter_splitter.o: $(srcdir)/splitter.cpp
$(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $(srcdir)/splitter.cpp
-splitter_splitter_rc.o: $(srcdir)/splitter.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc
index b1074a0806..a4804fe18c 100644
--- a/samples/splitter/makefile.bcc
+++ b/samples/splitter/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\splitter.ilf del $(OBJS)\splitter.ilf
-if exist $(OBJS)\splitter.ils del $(OBJS)\splitter.ils
-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
+$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splitter_splitter.res
+ c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splitter_sample.res
|
+$(OBJS)\splitter_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\splitter_splitter.obj: .\splitter.cpp
$(CXX) -q -c -P -o$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp
-$(OBJS)\splitter_splitter.res: .\splitter.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\splitter.rc
-
diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc
index 3cb3831110..72013e9703 100644
--- a/samples/splitter/makefile.gcc
+++ b/samples/splitter/makefile.gcc
@@ -29,8 +29,8 @@ SPLITTER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
SPLITTER_OBJECTS = \
- $(OBJS)\splitter_splitter.o \
- $(OBJS)\splitter_splitter_rc.o
+ $(OBJS)\splitter_sample_rc.o \
+ $(OBJS)\splitter_splitter.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter_rc.o
+$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_sample_rc.o
$(CXX) -o $@ $(SPLITTER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\splitter_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\splitter_splitter.o: ./splitter.cpp
$(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\splitter_splitter_rc.o: ./splitter.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc
index c82f445887..3f9d9ed656 100644
--- a/samples/splitter/makefile.vc
+++ b/samples/splitter/makefile.vc
@@ -32,7 +32,7 @@ SPLITTER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
SPLITTER_OBJECTS = \
$(OBJS)\splitter_splitter.obj
SPLITTER_RESOURCES = \
- $(OBJS)\splitter_splitter.res
+ $(OBJS)\splitter_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\splitter.ilk del $(OBJS)\splitter.ilk
-if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb
-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
+$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(SPLITTER_OBJECTS) $(SPLITTER_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\splitter_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\splitter_splitter.obj: .\splitter.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp
-$(OBJS)\splitter_splitter.res: .\splitter.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\splitter.rc
-
diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat
index ea70852f98..b2fc26c9d7 100644
--- a/samples/splitter/makefile.wat
+++ b/samples/splitter/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
-$(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
+$(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_sample.res
@%create $(OBJS)\splitter.lbc
@%append $(OBJS)\splitter.lbc option quiet
@%append $(OBJS)\splitter.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res
@%append $(OBJS)\splitter.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\splitter.lbc library %i
- @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res
+ @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_sample.res
@for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i
wlink @$(OBJS)\splitter.lbc
+$(OBJS)\splitter_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\splitter_splitter.obj : .AUTODEPEND .\splitter.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $<
-$(OBJS)\splitter_splitter.res : .AUTODEPEND .\splitter.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/splitter/mondrian.ico b/samples/splitter/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/splitter/mondrian.ico and /dev/null differ
diff --git a/samples/splitter/splitter.bkl b/samples/splitter/splitter.bkl
index 0b62172f5c..2dce3f0cba 100644
--- a/samples/splitter/splitter.bkl
+++ b/samples/splitter/splitter.bkl
@@ -7,7 +7,6 @@
splitter.cpp
core
base
- splitter.rc
diff --git a/samples/splitter/splitter.dsp b/samples/splitter/splitter.dsp
index d544c1406e..11aca2c864 100644
--- a/samples/splitter/splitter.dsp
+++ b/samples/splitter/splitter.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\splitter.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\splitter.rc
+SOURCE=.\splitter.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/splitter/splitter.rc b/samples/splitter/splitter.rc
deleted file mode 100644
index d5ffa41211..0000000000
--- a/samples/splitter/splitter.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-mondrian ICON "mondrian.ico"
-
-#define wxUSE_NO_MANIFEST 0
-
-#include "wx/msw/wx.rc"
-
diff --git a/samples/splitter/splitter_vc7.vcproj b/samples/splitter/splitter_vc7.vcproj
index a3c48946ad..6ce5873f65 100644
--- a/samples/splitter/splitter_vc7.vcproj
+++ b/samples/splitter/splitter_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/splitter/splitter_vc8.vcproj b/samples/splitter/splitter_vc8.vcproj
index 0ab6da45ad..b0ba26ebd8 100644
--- a/samples/splitter/splitter_vc8.vcproj
+++ b/samples/splitter/splitter_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/splitter/splitter_vc9.vcproj b/samples/splitter/splitter_vc9.vcproj
index 0f91849199..8ba38efb00 100644
--- a/samples/splitter/splitter_vc9.vcproj
+++ b/samples/splitter/splitter_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 9a276e57a8..8a0e25945d 100644
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -47,9 +47,9 @@ STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
STATBAR_OBJECTS = \
+ $(__statbar___win32rc) \
$(__statbar_os2_lib_res) \
- statbar_statbar.o \
- $(__statbar___win32rc)
+ statbar_statbar.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__statbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_sample_rc.o
@COND_PLATFORM_OS2_1@__statbar_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__statbar_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__statbar___win32rc = statbar_statbar_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)
@@ -174,12 +174,12 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
@COND_PLATFORM_MACOSX_1@statbar_bundle: $(____statbar_BUNDLE_TGT_REF_DEP)
+statbar_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
statbar_statbar.o: $(srcdir)/statbar.cpp
$(CXXC) -c -o $@ $(STATBAR_CXXFLAGS) $(srcdir)/statbar.cpp
-statbar_statbar_rc.o: $(srcdir)/statbar.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc
index 35271a4618..ceb6f5e4c9 100644
--- a/samples/statbar/makefile.bcc
+++ b/samples/statbar/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\statbar.ilf del $(OBJS)\statbar.ilf
-if exist $(OBJS)\statbar.ils del $(OBJS)\statbar.ils
-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
+$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(STATBAR_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\statbar_statbar.res
+ c0w32.obj $(STATBAR_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\statbar_sample.res
|
+$(OBJS)\statbar_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\statbar_statbar.obj: .\statbar.cpp
$(CXX) -q -c -P -o$@ $(STATBAR_CXXFLAGS) .\statbar.cpp
-$(OBJS)\statbar_statbar.res: .\statbar.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\statbar.rc
-
diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc
index dfebcec016..008f8ba422 100644
--- a/samples/statbar/makefile.gcc
+++ b/samples/statbar/makefile.gcc
@@ -29,8 +29,8 @@ STATBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
STATBAR_OBJECTS = \
- $(OBJS)\statbar_statbar.o \
- $(OBJS)\statbar_statbar_rc.o
+ $(OBJS)\statbar_sample_rc.o \
+ $(OBJS)\statbar_statbar.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar_rc.o
+$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_sample_rc.o
$(CXX) -o $@ $(STATBAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\statbar_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\statbar_statbar.o: ./statbar.cpp
$(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\statbar_statbar_rc.o: ./statbar.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc
index c8e6f9ffe2..90c76717e3 100644
--- a/samples/statbar/makefile.vc
+++ b/samples/statbar/makefile.vc
@@ -32,7 +32,7 @@ STATBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
STATBAR_OBJECTS = \
$(OBJS)\statbar_statbar.obj
STATBAR_RESOURCES = \
- $(OBJS)\statbar_statbar.res
+ $(OBJS)\statbar_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\statbar.ilk del $(OBJS)\statbar.ilk
-if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb
-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
+$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(STATBAR_OBJECTS) $(STATBAR_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\statbar_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\statbar_statbar.obj: .\statbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) .\statbar.cpp
-$(OBJS)\statbar_statbar.res: .\statbar.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\statbar.rc
-
diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat
index aa4ee60472..2aaf5f97ec 100644
--- a/samples/statbar/makefile.wat
+++ b/samples/statbar/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
-$(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
+$(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_sample.res
@%create $(OBJS)\statbar.lbc
@%append $(OBJS)\statbar.lbc option quiet
@%append $(OBJS)\statbar.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res
@%append $(OBJS)\statbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\statbar.lbc library %i
- @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res
+ @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_sample.res
@for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i
wlink @$(OBJS)\statbar.lbc
+$(OBJS)\statbar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\statbar_statbar.obj : .AUTODEPEND .\statbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $<
-$(OBJS)\statbar_statbar.res : .AUTODEPEND .\statbar.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/statbar/statbar.bkl b/samples/statbar/statbar.bkl
index 82d7904b6b..a8fe53a826 100644
--- a/samples/statbar/statbar.bkl
+++ b/samples/statbar/statbar.bkl
@@ -7,7 +7,6 @@
statbar.cpp
core
base
- statbar.rc
diff --git a/samples/statbar/statbar.dsp b/samples/statbar/statbar.dsp
index 55de1489a4..27a690051b 100644
--- a/samples/statbar/statbar.dsp
+++ b/samples/statbar/statbar.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\statbar.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\statbar.rc
+SOURCE=.\statbar.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/statbar/statbar.rc b/samples/statbar/statbar.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/samples/statbar/statbar.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/samples/statbar/statbar_vc7.vcproj b/samples/statbar/statbar_vc7.vcproj
index 32d309fbc3..5e008238b0 100644
--- a/samples/statbar/statbar_vc7.vcproj
+++ b/samples/statbar/statbar_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/statbar/statbar_vc8.vcproj b/samples/statbar/statbar_vc8.vcproj
index 6f2dc5c9c9..4e0bab5c00 100644
--- a/samples/statbar/statbar_vc8.vcproj
+++ b/samples/statbar/statbar_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/statbar/statbar_vc9.vcproj b/samples/statbar/statbar_vc9.vcproj
index e318e73142..85dd2f5036 100644
--- a/samples/statbar/statbar_vc9.vcproj
+++ b/samples/statbar/statbar_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index ea629a017f..708b0bddd6 100644
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -47,11 +47,11 @@ STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
STCTEST_OBJECTS = \
+ $(__stctest___win32rc) \
$(__stctest_os2_lib_res) \
stctest_stctest.o \
stctest_edit.o \
- stctest_prefs.o \
- $(__stctest___win32rc)
+ stctest_prefs.o
### Conditionally set variables: ###
@@ -87,6 +87,7 @@ COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__stctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o
@COND_PLATFORM_OS2_1@__stctest_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__stctest_app_Contents_PkgInfo___depname \
@@ -111,7 +112,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__stctest___win32rc = stctest_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)
@@ -191,6 +191,9 @@ data:
esac; \
done
+stctest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
stctest_stctest.o: $(srcdir)/stctest.cpp
$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/stctest.cpp
@@ -200,9 +203,6 @@ stctest_edit.o: $(srcdir)/edit.cpp
stctest_prefs.o: $(srcdir)/prefs.cpp
$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/prefs.cpp
-stctest_sample_rc.o: $(srcdir)/../sample.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc
index baf4eabdc5..b214aa46f9 100644
--- a/samples/stc/makefile.bcc
+++ b/samples/stc/makefile.bcc
@@ -244,6 +244,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\stctest_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\stctest_stctest.obj: .\stctest.cpp
$(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\stctest.cpp
@@ -253,6 +256,3 @@ $(OBJS)\stctest_edit.obj: .\edit.cpp
$(OBJS)\stctest_prefs.obj: .\prefs.cpp
$(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\prefs.cpp
-$(OBJS)\stctest_sample.res: .\..\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc
-
diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 1ddcd8c3cf..244a6f3f41 100644
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -29,10 +29,10 @@ STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
STCTEST_OBJECTS = \
+ $(OBJS)\stctest_sample_rc.o \
$(OBJS)\stctest_stctest.o \
$(OBJS)\stctest_edit.o \
- $(OBJS)\stctest_prefs.o \
- $(OBJS)\stctest_sample_rc.o
+ $(OBJS)\stctest_prefs.o
### Conditionally set variables: ###
@@ -231,6 +231,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+$(OBJS)\stctest_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\stctest_stctest.o: ./stctest.cpp
$(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
@@ -240,9 +243,6 @@ $(OBJS)\stctest_edit.o: ./edit.cpp
$(OBJS)\stctest_prefs.o: ./prefs.cpp
$(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\stctest_sample_rc.o: ./../sample.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index 3c03f0a73d..69ca0c3bed 100644
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -354,6 +354,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\stctest_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\stctest_stctest.obj: .\stctest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\stctest.cpp
@@ -363,6 +366,3 @@ $(OBJS)\stctest_edit.obj: .\edit.cpp
$(OBJS)\stctest_prefs.obj: .\prefs.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\prefs.cpp
-$(OBJS)\stctest_sample.res: .\..\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-
diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index 5639e9bb57..0607840dd3 100644
--- a/samples/stc/makefile.wat
+++ b/samples/stc/makefile.wat
@@ -271,6 +271,9 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\stctest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\stctest_stctest.obj : .AUTODEPEND .\stctest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
@@ -280,6 +283,3 @@ $(OBJS)\stctest_edit.obj : .AUTODEPEND .\edit.cpp
$(OBJS)\stctest_prefs.obj : .AUTODEPEND .\prefs.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
-$(OBJS)\stctest_sample.res : .AUTODEPEND .\..\sample.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/stc/mondrian.ico b/samples/stc/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/stc/mondrian.ico and /dev/null differ
diff --git a/samples/stc/mondrian.xpm b/samples/stc/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/stc/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/stc/stctest.bkl b/samples/stc/stctest.bkl
index 03cdd5498b..6bb0a0b47d 100644
--- a/samples/stc/stctest.bkl
+++ b/samples/stc/stctest.bkl
@@ -21,8 +21,6 @@
$(LIB_SCINTILLA)
-
- ../sample.rc
diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index a8961ae5c8..4b5a4658a2 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -48,8 +48,8 @@
//----------------------------------------------------------------------------
// the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
- #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
//============================================================================
@@ -316,12 +316,11 @@ AppFrame::AppFrame (const wxString &title)
{
SetIcon(wxICON(sample));
- // intitialize important variables
+ // initialize important variables
m_edit = NULL;
// set icon and background
SetTitle (*g_appname);
- SetIcon (wxICON (mondrian));
SetBackgroundColour (wxT("WHITE"));
// about box shown for 1 seconds
@@ -656,7 +655,7 @@ AppAbout::AppAbout (wxWindow *parent,
// about icontitle//info
wxBoxSizer *aboutpane = new wxBoxSizer (wxHORIZONTAL);
- wxBitmap bitmap = wxBitmap(wxICON (mondrian));
+ wxBitmap bitmap = wxBitmap(wxICON (sample));
aboutpane->Add (new wxStaticBitmap (this, wxID_ANY, bitmap),
0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 20);
aboutpane->Add (aboutinfo, 1, wxEXPAND);
diff --git a/samples/stc/stctest.dsp b/samples/stc/stctest.dsp
index 9d778317f5..6741b06e57 100644
--- a/samples/stc/stctest.dsp
+++ b/samples/stc/stctest.dsp
@@ -260,7 +260,7 @@ SOURCE=.\prefs.cpp
# End Source File
# Begin Source File
-SOURCE=.\..\sample.rc
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
diff --git a/samples/stc/stctest.rc b/samples/stc/stctest.rc
deleted file mode 100644
index 55808f0e34..0000000000
--- a/samples/stc/stctest.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-
diff --git a/samples/stc/stctest_vc7.vcproj b/samples/stc/stctest_vc7.vcproj
index 1a6d1da3a2..ad59c96c80 100644
--- a/samples/stc/stctest_vc7.vcproj
+++ b/samples/stc/stctest_vc7.vcproj
@@ -570,7 +570,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/stc/stctest_vc8.vcproj b/samples/stc/stctest_vc8.vcproj
index b6b8f98f59..a5752cc13d 100644
--- a/samples/stc/stctest_vc8.vcproj
+++ b/samples/stc/stctest_vc8.vcproj
@@ -840,7 +840,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/stc/stctest_vc9.vcproj b/samples/stc/stctest_vc9.vcproj
index bd6129339b..e3b89ce343 100644
--- a/samples/stc/stctest_vc9.vcproj
+++ b/samples/stc/stctest_vc9.vcproj
@@ -812,7 +812,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/svg/mondrian.ico b/samples/svg/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/svg/mondrian.ico and /dev/null differ
diff --git a/samples/svg/mondrian.xpm b/samples/svg/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/svg/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 0cf0c134ca..26f712730f 100644
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -31,13 +31,15 @@
#include "wx/dcsvg.h"
#include "wx/vector.h"
-#include "mondrian.xpm"
-
#include "bitmaps/new.xpm"
#include "bitmaps/save.xpm"
#include "bitmaps/help.xpm"
#include "SVGlogo24.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
+#endif
+
class MyChild;
class MyCanvas;
@@ -175,7 +177,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
{
m_nWinCreated = 0;
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
@@ -228,7 +230,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
// Give it a title and icon
subframe->SetTitle(title);
- subframe->SetIcon(wxICON(mondrian));
+ subframe->SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
@@ -486,7 +488,7 @@ void MyCanvas::OnDraw(wxDC& dc)
break;
case 6:
- dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
+ dc.DrawIcon( wxICON(sample), 10, 10 );
dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
#if wxUSE_STATUSBAR
s = wxT("Icon and Bitmap ");
diff --git a/samples/svg/svgtest.rc b/samples/svg/svgtest.rc
index 6df320751a..bbd7b79939 100644
--- a/samples/svg/svgtest.rc
+++ b/samples/svg/svgtest.rc
@@ -1,11 +1,3 @@
-aaaa ICON "mondrian.ico"
-
-/* Useful if PROVIDE_DEFAULT_ICONS is set in wx_setup.h */
-#define IHaveMDIParentIcon
-#define IHaveMDIChildIcon
-
-mondrian ICON "mondrian.ico"
-
-#include "wx/msw/wx.rc"
+#include "../sample.rc"
svgbitmap BITMAP "SVGlogo24.bmp"
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index ec493cee60..33c0e3c053 100644
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -47,9 +47,9 @@ TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
TEXT_OBJECTS = \
+ $(__text___win32rc) \
$(__text_os2_lib_res) \
- text_text.o \
- $(__text___win32rc)
+ text_text.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \
@COND_PLATFORM_OS2_1@__text___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___text___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__text___win32rc = text_sample_rc.o
@COND_PLATFORM_OS2_1@__text_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__text_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__text___win32rc = text_text_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)
@@ -174,12 +174,12 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
@COND_PLATFORM_MACOSX_1@text_bundle: $(____text_BUNDLE_TGT_REF_DEP)
+text_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
text_text.o: $(srcdir)/text.cpp
$(CXXC) -c -o $@ $(TEXT_CXXFLAGS) $(srcdir)/text.cpp
-text_text_rc.o: $(srcdir)/text.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc
index 7cc905b1f5..52eae796c1 100644
--- a/samples/text/makefile.bcc
+++ b/samples/text/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\text.ilf del $(OBJS)\text.ilf
-if exist $(OBJS)\text.ils del $(OBJS)\text.ils
-$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res
+$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(TEXT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\text_text.res
+ c0w32.obj $(TEXT_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\text_sample.res
|
+$(OBJS)\text_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\text_text.obj: .\text.cpp
$(CXX) -q -c -P -o$@ $(TEXT_CXXFLAGS) .\text.cpp
-$(OBJS)\text_text.res: .\text.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\text.rc
-
diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc
index 4b57b71e27..eb91532a5c 100644
--- a/samples/text/makefile.gcc
+++ b/samples/text/makefile.gcc
@@ -28,8 +28,8 @@ TEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
-Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
TEXT_OBJECTS = \
- $(OBJS)\text_text.o \
- $(OBJS)\text_text_rc.o
+ $(OBJS)\text_sample_rc.o \
+ $(OBJS)\text_text.o
### Conditionally set variables: ###
@@ -217,15 +217,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\text.exe del $(OBJS)\text.exe
-$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text_rc.o
+$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_sample_rc.o
$(CXX) -o $@ $(TEXT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\text_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\text_text.o: ./text.cpp
$(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\text_text_rc.o: ./text.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc
index 6c88d589b8..68ca91e5a5 100644
--- a/samples/text/makefile.vc
+++ b/samples/text/makefile.vc
@@ -32,7 +32,7 @@ TEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
TEXT_OBJECTS = \
$(OBJS)\text_text.obj
TEXT_RESOURCES = \
- $(OBJS)\text_text.res
+ $(OBJS)\text_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\text.ilk del $(OBJS)\text.ilk
-if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb
-$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res
+$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(TEXT_OBJECTS) $(TEXT_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\text_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\text_text.obj: .\text.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) .\text.cpp
-$(OBJS)\text_text.res: .\text.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\text.rc
-
diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat
index 4a61e59ab0..3bd35c3b4e 100644
--- a/samples/text/makefile.wat
+++ b/samples/text/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\text.exe del $(OBJS)\text.exe
-$(OBJS)\text.exe : $(TEXT_OBJECTS) $(OBJS)\text_text.res
+$(OBJS)\text.exe : $(TEXT_OBJECTS) $(OBJS)\text_sample.res
@%create $(OBJS)\text.lbc
@%append $(OBJS)\text.lbc option quiet
@%append $(OBJS)\text.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\text.exe : $(TEXT_OBJECTS) $(OBJS)\text_text.res
@%append $(OBJS)\text.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\text.lbc library %i
- @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res
+ @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_sample.res
@for %i in () do @%append $(OBJS)\text.lbc option stack=%i
wlink @$(OBJS)\text.lbc
+$(OBJS)\text_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\text_text.obj : .AUTODEPEND .\text.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $<
-$(OBJS)\text_text.res : .AUTODEPEND .\text.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/text/mondrian.ico b/samples/text/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/text/mondrian.ico and /dev/null differ
diff --git a/samples/text/mondrian.xpm b/samples/text/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/text/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/text/text.bkl b/samples/text/text.bkl
index a9b023c48a..ae4aba1deb 100644
--- a/samples/text/text.bkl
+++ b/samples/text/text.bkl
@@ -7,7 +7,6 @@
text.cpp
core
base
- text.rc
diff --git a/samples/text/text.dsp b/samples/text/text.dsp
index 9ce2d9b6bf..a59ed54d10 100644
--- a/samples/text/text.dsp
+++ b/samples/text/text.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\text.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\text.rc
+SOURCE=.\text.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/text/text.rc b/samples/text/text.rc
deleted file mode 100644
index 94d24028d7..0000000000
--- a/samples/text/text.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-
-#include "wx/msw/wx.rc"
diff --git a/samples/text/text_vc7.vcproj b/samples/text/text_vc7.vcproj
index 997b08a738..59a33b91d9 100644
--- a/samples/text/text_vc7.vcproj
+++ b/samples/text/text_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/text/text_vc8.vcproj b/samples/text/text_vc8.vcproj
index b7ee4fb923..f8f7d0c5ee 100644
--- a/samples/text/text_vc8.vcproj
+++ b/samples/text/text_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/text/text_vc9.vcproj b/samples/text/text_vc9.vcproj
index e21d010685..403d33f1db 100644
--- a/samples/text/text_vc9.vcproj
+++ b/samples/text/text_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 3d0d4c227c..1b4b224e28 100644
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -47,9 +47,9 @@ THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
THREAD_OBJECTS = \
+ $(__thread___win32rc) \
$(__thread_os2_lib_res) \
- thread_thread.o \
- $(__thread___win32rc)
+ thread_thread.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__thread___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___thread___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__thread___win32rc = thread_sample_rc.o
@COND_PLATFORM_OS2_1@__thread_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__thread_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__thread___win32rc = thread_thread_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)
@@ -174,12 +174,12 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
@COND_PLATFORM_MACOSX_1@thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP)
+thread_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
thread_thread.o: $(srcdir)/thread.cpp
$(CXXC) -c -o $@ $(THREAD_CXXFLAGS) $(srcdir)/thread.cpp
-thread_thread_rc.o: $(srcdir)/thread.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc
index 88a680e7eb..a04300fbe1 100644
--- a/samples/thread/makefile.bcc
+++ b/samples/thread/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\thread.ilf del $(OBJS)\thread.ilf
-if exist $(OBJS)\thread.ils del $(OBJS)\thread.ils
-$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res
+$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(THREAD_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\thread_thread.res
+ c0w32.obj $(THREAD_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\thread_sample.res
|
+$(OBJS)\thread_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\thread_thread.obj: .\thread.cpp
$(CXX) -q -c -P -o$@ $(THREAD_CXXFLAGS) .\thread.cpp
-$(OBJS)\thread_thread.res: .\thread.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\thread.rc
-
diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc
index 755ebcffa2..f1310dbbfd 100644
--- a/samples/thread/makefile.gcc
+++ b/samples/thread/makefile.gcc
@@ -29,8 +29,8 @@ THREAD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
THREAD_OBJECTS = \
- $(OBJS)\thread_thread.o \
- $(OBJS)\thread_thread_rc.o
+ $(OBJS)\thread_sample_rc.o \
+ $(OBJS)\thread_thread.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
-$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread_rc.o
+$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_sample_rc.o
$(CXX) -o $@ $(THREAD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\thread_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\thread_thread.o: ./thread.cpp
$(CXX) -c -o $@ $(THREAD_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\thread_thread_rc.o: ./thread.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc
index db718d5db4..56f24a2ed8 100644
--- a/samples/thread/makefile.vc
+++ b/samples/thread/makefile.vc
@@ -32,7 +32,7 @@ THREAD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
THREAD_OBJECTS = \
$(OBJS)\thread_thread.obj
THREAD_RESOURCES = \
- $(OBJS)\thread_thread.res
+ $(OBJS)\thread_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\thread.ilk del $(OBJS)\thread.ilk
-if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb
-$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res
+$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(THREAD_OBJECTS) $(THREAD_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\thread_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\thread_thread.obj: .\thread.cpp
$(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) .\thread.cpp
-$(OBJS)\thread_thread.res: .\thread.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\thread.rc
-
diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat
index e87ac4c1d7..a8b8ed1959 100644
--- a/samples/thread/makefile.wat
+++ b/samples/thread/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
-$(OBJS)\thread.exe : $(THREAD_OBJECTS) $(OBJS)\thread_thread.res
+$(OBJS)\thread.exe : $(THREAD_OBJECTS) $(OBJS)\thread_sample.res
@%create $(OBJS)\thread.lbc
@%append $(OBJS)\thread.lbc option quiet
@%append $(OBJS)\thread.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\thread.exe : $(THREAD_OBJECTS) $(OBJS)\thread_thread.res
@%append $(OBJS)\thread.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\thread.lbc library %i
- @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res
+ @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_sample.res
@for %i in () do @%append $(OBJS)\thread.lbc option stack=%i
wlink @$(OBJS)\thread.lbc
+$(OBJS)\thread_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\thread_thread.obj : .AUTODEPEND .\thread.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $<
-$(OBJS)\thread_thread.res : .AUTODEPEND .\thread.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/thread/thread.bkl b/samples/thread/thread.bkl
index a864b6ccbd..c2102a8b20 100644
--- a/samples/thread/thread.bkl
+++ b/samples/thread/thread.bkl
@@ -7,7 +7,6 @@
thread.cpp
core
base
- thread.rc
diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index da8acbdc54..132795efa1 100644
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -351,7 +351,7 @@ MyFrame::MyFrame(const wxString& title)
{
m_oldLogger = wxLog::GetActiveTarget();
- SetIcon(wxIcon(sample_xpm));
+ SetIcon(wxICON(sample));
// Make a menubar
wxMenuBar *menuBar = new wxMenuBar;
diff --git a/samples/thread/thread.dsp b/samples/thread/thread.dsp
index 04aaffba8c..499eb36980 100644
--- a/samples/thread/thread.dsp
+++ b/samples/thread/thread.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\thread.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\thread.rc
+SOURCE=.\thread.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/thread/thread.rc b/samples/thread/thread.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/samples/thread/thread.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/samples/thread/thread_vc7.vcproj b/samples/thread/thread_vc7.vcproj
index 928553b738..ac16dd91c6 100644
--- a/samples/thread/thread_vc7.vcproj
+++ b/samples/thread/thread_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/thread/thread_vc8.vcproj b/samples/thread/thread_vc8.vcproj
index fceb181eea..810b4b2b31 100644
--- a/samples/thread/thread_vc8.vcproj
+++ b/samples/thread/thread_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/thread/thread_vc9.vcproj b/samples/thread/thread_vc9.vcproj
index ff0e45cd76..4708ef4b63 100644
--- a/samples/thread/thread_vc9.vcproj
+++ b/samples/thread/thread_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/toolbar/mondrian.ico b/samples/toolbar/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/toolbar/mondrian.ico and /dev/null differ
diff --git a/samples/toolbar/mondrian.xpm b/samples/toolbar/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/toolbar/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/toolbar/mondros2.ico b/samples/toolbar/mondros2.ico
deleted file mode 100644
index 8b0e58c0d7..0000000000
Binary files a/samples/toolbar/mondros2.ico and /dev/null differ
diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 7d0a678acd..7e5558a1b3 100644
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -61,7 +61,7 @@
// ----------------------------------------------------------------------------
#if !defined(__WXMSW__) && !defined(__WXPM__)
- #include "mondrian.xpm"
+ #include "../sample.xpm"
#endif
#if USE_XPM_BITMAPS
@@ -543,7 +543,7 @@ MyFrame::MyFrame(wxFrame* parent,
#endif
// Give it an icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
// Make a menubar
wxMenu *tbarMenu = new wxMenu;
diff --git a/samples/toolbar/toolbar.rc b/samples/toolbar/toolbar.rc
index 42bb7cb984..3a4920cf6c 100644
--- a/samples/toolbar/toolbar.rc
+++ b/samples/toolbar/toolbar.rc
@@ -1,5 +1,4 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
+#include "../sample.rc"
new BITMAP "bitmaps/new.bmp"
open BITMAP "bitmaps/open.bmp"
diff --git a/samples/toolbar/toolbar.rco b/samples/toolbar/toolbar.rco
deleted file mode 100644
index 21e4973f49..0000000000
--- a/samples/toolbar/toolbar.rco
+++ /dev/null
@@ -1,13 +0,0 @@
-ICON 1 PRELOAD "mondros2.ico"
-
-BITMAP 2000 LOADONCALL "bitmaps\\new.bmp"
-BITMAP 2001 LOADONCALL "bitmaps\\open.bmp"
-BITMAP 2002 LOADONCALL "bitmaps\\save.bmp"
-BITMAP 2003 LOADONCALL "bitmaps\\copy.bmp"
-BITMAP 2004 LOADONCALL "bitmaps\\cut.bmp"
-BITMAP 2005 LOADONCALL "bitmaps\\paste.bmp"
-BITMAP 2006 LOADONCALL "bitmaps\\print.bmp"
-BITMAP 2007 LOADONCALL "bitmaps\\help.bmp"
-
-RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc
-
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index b02c69ddbb..864dc05a65 100644
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -47,9 +47,9 @@ TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
TYPETEST_OBJECTS = \
+ $(__typetest___win32rc) \
$(__typetest_os2_lib_res) \
- typetest_typetest.o \
- $(__typetest___win32rc)
+ typetest_typetest.o
### Conditionally set variables: ###
@@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__typetest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_sample_rc.o
@COND_PLATFORM_OS2_1@__typetest_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__typetest_app_Contents_PkgInfo___depname \
@@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__typetest___win32rc = typetest_typetest_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)
@@ -174,12 +174,12 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
@COND_PLATFORM_MACOSX_1@typetest_bundle: $(____typetest_BUNDLE_TGT_REF_DEP)
+typetest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
typetest_typetest.o: $(srcdir)/typetest.cpp
$(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $(srcdir)/typetest.cpp
-typetest_typetest_rc.o: $(srcdir)/typetest.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc
index 94d78d93b2..c3928590a5 100644
--- a/samples/typetest/makefile.bcc
+++ b/samples/typetest/makefile.bcc
@@ -229,14 +229,14 @@ clean:
-if exist $(OBJS)\typetest.ilf del $(OBJS)\typetest.ilf
-if exist $(OBJS)\typetest.ils del $(OBJS)\typetest.ils
-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res
+$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_typetest.res
+ c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_sample.res
|
+$(OBJS)\typetest_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\typetest_typetest.obj: .\typetest.cpp
$(CXX) -q -c -P -o$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp
-$(OBJS)\typetest_typetest.res: .\typetest.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\typetest.rc
-
diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc
index 17fdb8c8c1..89e629574d 100644
--- a/samples/typetest/makefile.gcc
+++ b/samples/typetest/makefile.gcc
@@ -29,8 +29,8 @@ TYPETEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
TYPETEST_OBJECTS = \
- $(OBJS)\typetest_typetest.o \
- $(OBJS)\typetest_typetest_rc.o
+ $(OBJS)\typetest_sample_rc.o \
+ $(OBJS)\typetest_typetest.o
### Conditionally set variables: ###
@@ -218,15 +218,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe
-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest_rc.o
+$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_sample_rc.o
$(CXX) -o $@ $(TYPETEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\typetest_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\typetest_typetest.o: ./typetest.cpp
$(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\typetest_typetest_rc.o: ./typetest.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc
index 63097d3655..d32982bed5 100644
--- a/samples/typetest/makefile.vc
+++ b/samples/typetest/makefile.vc
@@ -32,7 +32,7 @@ TYPETEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
TYPETEST_OBJECTS = \
$(OBJS)\typetest_typetest.obj
TYPETEST_RESOURCES = \
- $(OBJS)\typetest_typetest.res
+ $(OBJS)\typetest_sample.res
### Conditionally set variables: ###
@@ -339,14 +339,14 @@ clean:
-if exist $(OBJS)\typetest.ilk del $(OBJS)\typetest.ilk
-if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb
-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res
+$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(TYPETEST_OBJECTS) $(TYPETEST_RESOURCES) $(__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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\typetest_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\typetest_typetest.obj: .\typetest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp
-$(OBJS)\typetest_typetest.res: .\typetest.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\typetest.rc
-
diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat
index e344017351..bcb63ef97b 100644
--- a/samples/typetest/makefile.wat
+++ b/samples/typetest/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe
-$(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res
+$(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_sample.res
@%create $(OBJS)\typetest.lbc
@%append $(OBJS)\typetest.lbc option quiet
@%append $(OBJS)\typetest.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res
@%append $(OBJS)\typetest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i
@for %i in ( $(__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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\typetest.lbc library %i
- @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res
+ @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_sample.res
@for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i
wlink @$(OBJS)\typetest.lbc
+$(OBJS)\typetest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\typetest_typetest.obj : .AUTODEPEND .\typetest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $<
-$(OBJS)\typetest_typetest.res : .AUTODEPEND .\typetest.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/typetest/mondrian.ico b/samples/typetest/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/typetest/mondrian.ico and /dev/null differ
diff --git a/samples/typetest/mondrian.xpm b/samples/typetest/mondrian.xpm
deleted file mode 100644
index cc52c7de61..0000000000
--- a/samples/typetest/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/samples/typetest/typetest.bkl b/samples/typetest/typetest.bkl
index ae9e27cba6..f146e9685d 100644
--- a/samples/typetest/typetest.bkl
+++ b/samples/typetest/typetest.bkl
@@ -8,7 +8,6 @@
typetest.h
core
base
- typetest.rc
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index b71edda8e5..e3a20a94f3 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -25,8 +25,8 @@
#include "typetest.h"
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
#endif
#ifdef new
@@ -80,7 +80,7 @@ bool MyApp::OnInit()
wxPoint(50, 50), wxSize(450, 340));
// Give it an icon
- frame->SetIcon(wxICON(mondrian));
+ frame->SetIcon(wxICON(sample));
// Make a menubar
wxMenu *file_menu = new wxMenu;
diff --git a/samples/typetest/typetest.dsp b/samples/typetest/typetest.dsp
index ad4a7a42e7..76d6e36827 100644
--- a/samples/typetest/typetest.dsp
+++ b/samples/typetest/typetest.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\typetest.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\typetest.rc
+SOURCE=.\typetest.cpp
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/typetest/typetest.rc b/samples/typetest/typetest.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/typetest/typetest.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/typetest/typetest_vc7.vcproj b/samples/typetest/typetest_vc7.vcproj
index 3c3925a8e6..01b1f578a5 100644
--- a/samples/typetest/typetest_vc7.vcproj
+++ b/samples/typetest/typetest_vc7.vcproj
@@ -558,7 +558,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/typetest/typetest_vc8.vcproj b/samples/typetest/typetest_vc8.vcproj
index e30852c370..aa6e53b95a 100644
--- a/samples/typetest/typetest_vc8.vcproj
+++ b/samples/typetest/typetest_vc8.vcproj
@@ -824,7 +824,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/typetest/typetest_vc9.vcproj b/samples/typetest/typetest_vc9.vcproj
index b3e5c68efd..b6adb061a7 100644
--- a/samples/typetest/typetest_vc9.vcproj
+++ b/samples/typetest/typetest_vc9.vcproj
@@ -796,7 +796,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 2cc6ffce7c..bc73fdea2e 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -48,9 +48,9 @@ WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
WIZARD_OBJECTS = \
+ $(__wizard___win32rc) \
$(__wizard_os2_lib_res) \
- wizard_wizard.o \
- $(__wizard___win32rc)
+ wizard_wizard.o
### Conditionally set variables: ###
@@ -87,6 +87,7 @@ COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd = $(NM) wizard$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__wizard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__wizard___win32rc = wizard_sample_rc.o
@COND_PLATFORM_OS2_1@__wizard_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__wizard_app_Contents_PkgInfo___depname \
@@ -111,7 +112,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_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@__wizard___win32rc = wizard_wizard_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)
@@ -179,12 +179,12 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
@COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP)
+wizard_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
wizard_wizard.o: $(srcdir)/wizard.cpp
$(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $(srcdir)/wizard.cpp
-wizard_wizard_rc.o: $(srcdir)/wizard.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc
index 55a81dda04..54c712310c 100644
--- a/samples/wizard/makefile.bcc
+++ b/samples/wizard/makefile.bcc
@@ -233,14 +233,14 @@ clean:
-if exist $(OBJS)\wizard.ilf del $(OBJS)\wizard.ilf
-if exist $(OBJS)\wizard.ils del $(OBJS)\wizard.ils
-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res
+$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wizard_wizard.res
+ c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wizard_sample.res
|
+$(OBJS)\wizard_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
$(OBJS)\wizard_wizard.obj: .\wizard.cpp
$(CXX) -q -c -P -o$@ $(WIZARD_CXXFLAGS) .\wizard.cpp
-$(OBJS)\wizard_wizard.res: .\wizard.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wizard.rc
-
diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc
index ac23d0b7b8..c82eecaeba 100644
--- a/samples/wizard/makefile.gcc
+++ b/samples/wizard/makefile.gcc
@@ -29,8 +29,8 @@ WIZARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
WIZARD_OBJECTS = \
- $(OBJS)\wizard_wizard.o \
- $(OBJS)\wizard_wizard_rc.o
+ $(OBJS)\wizard_sample_rc.o \
+ $(OBJS)\wizard_wizard.o
### Conditionally set variables: ###
@@ -222,15 +222,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe
-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard_rc.o
+$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_sample_rc.o
$(CXX) -o $@ $(WIZARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+$(OBJS)\wizard_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
$(OBJS)\wizard_wizard.o: ./wizard.cpp
$(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\wizard_wizard_rc.o: ./wizard.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean
diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc
index 8b344128e1..ff59126ef3 100644
--- a/samples/wizard/makefile.vc
+++ b/samples/wizard/makefile.vc
@@ -32,7 +32,7 @@ WIZARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
WIZARD_OBJECTS = \
$(OBJS)\wizard_wizard.obj
WIZARD_RESOURCES = \
- $(OBJS)\wizard_wizard.res
+ $(OBJS)\wizard_sample.res
### Conditionally set variables: ###
@@ -343,14 +343,14 @@ clean:
-if exist $(OBJS)\wizard.ilk del $(OBJS)\wizard.ilk
-if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb
-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res
+$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(WIZARD_OBJECTS) $(WIZARD_RESOURCES) $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib
<<
+$(OBJS)\wizard_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\wizard_wizard.obj: .\wizard.cpp
$(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) .\wizard.cpp
-$(OBJS)\wizard_wizard.res: .\wizard.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wizard.rc
-
diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat
index ee5a323342..9f17ba8645 100644
--- a/samples/wizard/makefile.wat
+++ b/samples/wizard/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe
-$(OBJS)\wizard.exe : $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res
+$(OBJS)\wizard.exe : $(WIZARD_OBJECTS) $(OBJS)\wizard_sample.res
@%create $(OBJS)\wizard.lbc
@%append $(OBJS)\wizard.lbc option quiet
@%append $(OBJS)\wizard.lbc name $^@
@@ -261,13 +261,13 @@ $(OBJS)\wizard.exe : $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res
@%append $(OBJS)\wizard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i
@for %i in ( $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\wizard.lbc library %i
- @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res
+ @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_sample.res
@for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i
wlink @$(OBJS)\wizard.lbc
+$(OBJS)\wizard_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
$(OBJS)\wizard_wizard.obj : .AUTODEPEND .\wizard.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $<
-$(OBJS)\wizard_wizard.res : .AUTODEPEND .\wizard.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/wizard/wizard.bkl b/samples/wizard/wizard.bkl
index 05c16bdfab..9603bc23ad 100644
--- a/samples/wizard/wizard.bkl
+++ b/samples/wizard/wizard.bkl
@@ -8,7 +8,6 @@
adv
core
base
- wizard.rc
diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 1d9427753d..94c95c0820 100644
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -389,7 +389,7 @@ MyWizard::MyWizard(wxFrame *frame, bool useSizer)
Create(frame,wxID_ANY,wxT("Absolutely Useless Wizard"),
wxBitmap(wiztest_xpm),wxDefaultPosition,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
- SetIcon(wxIcon(sample_xpm));
+ SetIcon(wxICON(sample));
// Allow the bitmap to be expanded to fit the page height
if (frame->GetMenuBar()->IsChecked(Wizard_ExpandBitmap))
diff --git a/samples/wizard/wizard.dsp b/samples/wizard/wizard.dsp
index f2864c4118..7c75720518 100644
--- a/samples/wizard/wizard.dsp
+++ b/samples/wizard/wizard.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\wizard.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\wizard.rc
+SOURCE=.\wizard.cpp
# End Source File
# End Group
# End Target
diff --git a/samples/wizard/wizard.rc b/samples/wizard/wizard.rc
deleted file mode 100644
index 4bd72d7ea3..0000000000
--- a/samples/wizard/wizard.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "../sample.ico"
-
-#include "wx/msw/wx.rc"
diff --git a/samples/wizard/wizard_vc7.vcproj b/samples/wizard/wizard_vc7.vcproj
index 4c29a296fd..a5a9b77c33 100644
--- a/samples/wizard/wizard_vc7.vcproj
+++ b/samples/wizard/wizard_vc7.vcproj
@@ -550,7 +550,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/wizard/wizard_vc8.vcproj b/samples/wizard/wizard_vc8.vcproj
index 68623650b1..0c6809ee55 100644
--- a/samples/wizard/wizard_vc8.vcproj
+++ b/samples/wizard/wizard_vc8.vcproj
@@ -814,7 +814,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/wizard/wizard_vc9.vcproj b/samples/wizard/wizard_vc9.vcproj
index be0037f5e3..35f23776ce 100644
--- a/samples/wizard/wizard_vc9.vcproj
+++ b/samples/wizard/wizard_vc9.vcproj
@@ -786,7 +786,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 7ea3abec3a..4347831552 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -50,12 +50,12 @@ XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
XRCDEMO_OBJECTS = \
+ $(__xrcdemo___win32rc) \
$(__xrcdemo_os2_lib_res) \
xrcdemo_xrcdemo.o \
xrcdemo_myframe.o \
xrcdemo_derivdlg.o \
- xrcdemo_custclas.o \
- $(__xrcdemo___win32rc)
+ xrcdemo_custclas.o
### Conditionally set variables: ###
@@ -92,6 +92,7 @@ COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \
@COND_PLATFORM_OS2_1@__xrcdemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_sample_rc.o
@COND_PLATFORM_OS2_1@__xrcdemo_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__xrcdemo_app_Contents_PkgInfo___depname \
@@ -125,7 +126,6 @@ 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@__xrcdemo___win32rc = xrcdemo_xrcdemo_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)
@@ -195,7 +195,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
data:
@mkdir -p ./rc
- @for f in appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm; do \
+ @for f in artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm; do \
if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \
then x=yep ; \
else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \
@@ -205,6 +205,9 @@ data:
esac; \
done
+xrcdemo_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
+
xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp
$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/xrcdemo.cpp
@@ -217,9 +220,6 @@ xrcdemo_derivdlg.o: $(srcdir)/derivdlg.cpp
xrcdemo_custclas.o: $(srcdir)/custclas.cpp
$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/custclas.cpp
-xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_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
diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index 73e9da221f..6139b7a092 100644
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -248,14 +248,17 @@ clean:
-if exist $(OBJS)\xrcdemo.ilf del $(OBJS)\xrcdemo.ilf
-if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils
-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
+$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
- c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_xrcdemo.res
+ c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_sample.res
|
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
$(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp
@@ -269,6 +272,3 @@ $(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp
$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp
$(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp
-$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\xrcdemo.rc
-
diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index de00019127..d3a21e3299 100644
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -29,11 +29,11 @@ XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
XRCDEMO_OBJECTS = \
+ $(OBJS)\xrcdemo_sample_rc.o \
$(OBJS)\xrcdemo_xrcdemo.o \
$(OBJS)\xrcdemo_myframe.o \
$(OBJS)\xrcdemo_derivdlg.o \
- $(OBJS)\xrcdemo_custclas.o \
- $(OBJS)\xrcdemo_xrcdemo_rc.o
+ $(OBJS)\xrcdemo_custclas.o
### Conditionally set variables: ###
@@ -237,12 +237,15 @@ clean:
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o
+$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
+ for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
$(OBJS)\xrcdemo_xrcdemo.o: ./xrcdemo.cpp
$(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
@@ -256,9 +259,6 @@ $(OBJS)\xrcdemo_derivdlg.o: ./derivdlg.cpp
$(OBJS)\xrcdemo_custclas.o: ./custclas.cpp
$(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\xrcdemo_xrcdemo_rc.o: ./xrcdemo.rc
- windres --use-temp-file -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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
.PHONY: all clean data
diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index 44ad80e67d..5aefe6bb9c 100644
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -35,7 +35,7 @@ XRCDEMO_OBJECTS = \
$(OBJS)\xrcdemo_derivdlg.obj \
$(OBJS)\xrcdemo_custclas.obj
XRCDEMO_RESOURCES = \
- $(OBJS)\xrcdemo_xrcdemo.res
+ $(OBJS)\xrcdemo_sample.res
### Conditionally set variables: ###
@@ -358,14 +358,17 @@ clean:
-if exist $(OBJS)\xrcdemo.ilk del $(OBJS)\xrcdemo.ilk
-if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb
-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
+$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(XRCDEMO_OBJECTS) $(XRCDEMO_RESOURCES) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib
<<
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_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)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp
@@ -379,6 +382,3 @@ $(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp
$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp
-$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_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) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\xrcdemo.rc
-
diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat
index aed6fffb1a..9b3f37fe49 100644
--- a/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@ -271,7 +271,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
-$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
+$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
@%create $(OBJS)\xrcdemo.lbc
@%append $(OBJS)\xrcdemo.lbc option quiet
@%append $(OBJS)\xrcdemo.lbc name $^@
@@ -279,13 +279,16 @@ $(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
@%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i
@for %i in ( $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_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) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\xrcdemo.lbc library %i
- @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res
+ @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_sample.res
@for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i
wlink @$(OBJS)\xrcdemo.lbc
data : .SYMBOLIC
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+
+$(OBJS)\xrcdemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
$(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
@@ -299,6 +302,3 @@ $(OBJS)\xrcdemo_derivdlg.obj : .AUTODEPEND .\derivdlg.cpp
$(OBJS)\xrcdemo_custclas.obj : .AUTODEPEND .\custclas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
-$(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 0e8e1f6049..fe36c8acfa 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -109,7 +109,7 @@ MyFrame::MyFrame(wxWindow* parent)
wxXmlResource::Get()->LoadFrame(this, parent, wxT("main_frame"));
// Set the icon for the frame.
- SetIcon(wxICON(appicon));
+ SetIcon(wxICON(sample));
// Load the menubar from XRC and set this frame's menubar to it.
SetMenuBar(wxXmlResource::Get()->LoadMenuBar(wxT("main_menu")));
diff --git a/samples/xrc/rc/appicon.ico b/samples/xrc/rc/appicon.ico
deleted file mode 100644
index f3ef7918d2..0000000000
Binary files a/samples/xrc/rc/appicon.ico and /dev/null differ
diff --git a/samples/xrc/rc/appicon.xpm b/samples/xrc/rc/appicon.xpm
deleted file mode 100644
index bafbf53276..0000000000
--- a/samples/xrc/rc/appicon.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static const char *const appicon_xpm[] = {
-"32 32 17 1",
-" c None",
-". c #000000",
-"+ c #800000",
-"@ c #008000",
-"# c #808000",
-"$ c #000080",
-"% c #800080",
-"& c #008080",
-"* c #C0C0C0",
-"= c #808080",
-"- c #FF0000",
-"; c #00FF00",
-"> c #FFFF00",
-", c #0000FF",
-"' c #FF00FF",
-") c #00FFFF",
-"! c #FFFFFF",
-" ",
-"===============================.",
-"=*****************************=.",
-"=*$$$$$$$$$$$$$$$$$$$$$$$$$$$$=.",
-"=*$$$$$$$$$$$$$$$$$$$**.**.**.=.",
-"=*$$$$$$$$$$$$$$$$$$$**.**.**.=.",
-"=*$$$$$$$$$$$$$$$$$$$.........=.",
-"=*****************************=.",
-"=*=============================.",
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",
-"=*=!!!!!!!,!!!!!!!!!!!,!!!!!!*=.",
-"=*=!!!!!!,,!!!!!!!!!!!,,!!!!!*=.",
-"=*=!!!!!,,!!!!!!!!!!!!!,,!!!!*=.",
-"=*=!!!!,,!!...........!!,,!!!*=.",
-"=*=!!!,,!!!.$$$$$$!!!.!!!,,!!*=.",
-"=*=!!,,!!!!.$$$$$$!!!.!!!!,,!*=.",
-"=*=!!,,!!!!.$$$$$$!!!.!!!!,,!*=.",
-"=*=!!!,,!!!.$$$$$$!!!.!!!,,!!*=.",
-"=*=!!!!,,!!...........!!,,!!!*=.",
-"=*=!!!!!,,!!!!!!!!!!!!!,,!!!!*=.",
-"=*=!!!!!!,,!!!!!!!!!!!,,!!!!!*=.",
-"=*=!!!!!!!,!!!!!!!!!!!,!!!!!!*=.",
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",
-"=*****************************=.",
-"===============================.",
-"................................",
-" ",
-" "};
diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index 9c646c5718..c4d734d65e 100644
--- a/samples/xrc/xrcdemo.bkl
+++ b/samples/xrc/xrcdemo.bkl
@@ -22,14 +22,13 @@
core
xml
base
- xrcdemo.rc
$(BUILDDIR)/rc
$(SRCDIR)/rc
- appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm
+ artprov.xpm artprov.xrc basicdlg.xpm
basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc
derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc
fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif
diff --git a/samples/xrc/xrcdemo.dsp b/samples/xrc/xrcdemo.dsp
index ba63c093d8..f0bdd10e94 100644
--- a/samples/xrc/xrcdemo.dsp
+++ b/samples/xrc/xrcdemo.dsp
@@ -264,11 +264,11 @@ SOURCE=.\myframe.cpp
# End Source File
# Begin Source File
-SOURCE=.\xrcdemo.cpp
+SOURCE=.\..\..\samples\sample.rc
# End Source File
# Begin Source File
-SOURCE=.\xrcdemo.rc
+SOURCE=.\xrcdemo.cpp
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/samples/xrc/xrcdemo.rc b/samples/xrc/xrcdemo.rc
deleted file mode 100644
index a5b2ce34e2..0000000000
--- a/samples/xrc/xrcdemo.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-appicon ICON "rc/appicon.ico"
-#include "wx/msw/wx.rc"
diff --git a/samples/xrc/xrcdemo_vc7.vcproj b/samples/xrc/xrcdemo_vc7.vcproj
index d1d2ca9832..530a7de652 100644
--- a/samples/xrc/xrcdemo_vc7.vcproj
+++ b/samples/xrc/xrcdemo_vc7.vcproj
@@ -576,7 +576,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ RelativePath="..\..\samples\sample.rc">
diff --git a/samples/xrc/xrcdemo_vc8.vcproj b/samples/xrc/xrcdemo_vc8.vcproj
index 0cd46cdfcf..3019d06193 100644
--- a/samples/xrc/xrcdemo_vc8.vcproj
+++ b/samples/xrc/xrcdemo_vc8.vcproj
@@ -848,7 +848,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
diff --git a/samples/xrc/xrcdemo_vc9.vcproj b/samples/xrc/xrcdemo_vc9.vcproj
index 2b1fbb18ac..418d5915ef 100644
--- a/samples/xrc/xrcdemo_vc9.vcproj
+++ b/samples/xrc/xrcdemo_vc9.vcproj
@@ -820,7 +820,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>