Remove unnecessary mondrian.{ico,xpm} files from samples directory.

Standardize on using sample.rc and sample icon in all the samples, it was
confusing that some of them used it and other didn't, without any apparent
logic.

Remove the now unnecessary icon files, including the dialogs sample icon which
seemed to be corrupted (this closes #11146).

Also replace multiple OS/2 resource files with a single one in the sample
directory. The OS/2 projects/makefiles would need to be updated to use them.

Remove dialogs sample icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h
index 0b9f20d5b9c9ba183915edf6c62d9d72fc3b8867..1d755e15c4e82fe4edd7c62869d84b4e52d80bf3 100644 (file)
--- 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
 run-time.
 
 @code

-#include "mondrian.xpm"
+#include "sample.xpm"

 @endcode
 
 Sometimes you wish to use a .ico resource on Windows, and XPMs on other
 @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
 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__)
 
 // The above line is equivalent to this:
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)

-    wxIcon icon(mondrian_xpm);
+    wxIcon icon(sample_xpm);

 #endif
 
 #if defined(__WXMSW__)
 #endif
 
 #if defined(__WXMSW__)

-    wxIcon icon("mondrian");
+    wxIcon icon("sample");

 #endif
 @endcode
 
 #endif
 @endcode
 

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 3679ccbe1b3e972e7f500076e68d6824a4a72e78..588e27ce81540f88a4d7e9a92b178e9723df9deb 100644 (file)
--- 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
 
 Using this way, a make file for the minimal sample would look
 like this
 

-CC = gcc
+CXX = g++

 
 minimal: minimal.o
 
 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
 
 clean:
        rm -f *.o minimal

diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt
index adf60c38ac91e8b844c5e1e18f97cd7274b112fe..8afa4e38b63c3b24e5e894ffc743a4f71ee5bfde 100644 (file)
--- 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
 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
 
 
 * Using configure to build MS-DOS version

diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index b8fc8d22fd6e88edb1d1db42c587cb29008245c4..262521885302ab7e7e2eefd5abc1cf58eb8660a5 100644 (file)
--- 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: 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
 
     $(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
 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 fc5c65575e77b18e07be65022eb3b6860dd219fe..9a5cd5da1ad5e48505eb1a5bce7067f3642c739f 100644 (file)
--- 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
 
 Using this way, a make file for the minimal sample would look
 like this
 

-CC = g++
+CXX = g++

 
 minimal: minimal.o
 
 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
 
 clean: 
     rm -f *.o minimal

diff --git a/docs/x11/install.txt b/docs/x11/install.txt
index ada821077db58614c012edea5ff9c8f76815d49f..ee1a011bb67c2a899c126f58bf2625fbc7adfe8e 100644 (file)
--- 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: 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: 
     $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
 
 clean: 

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index a72fc76e272f0d86a33e3dd240e4928b38db9ebc..154c6652c42f7a079a9f938419d5045a41966e62 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -160,12 +160,12 @@ enum wxStockCursor
 
 /* Useful macro for creating icons portably, for example:
 
 
 /* Useful macro for creating icons portably, for example:
 

-    wxIcon *icon = new wxICON(mondrian);
+    wxIcon *icon = new wxICON(sample);

 
   expands into:
 
 
   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__
  */
 
 #ifdef __WXMSW__

diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index 80a40419da9cc580d460a0fbd6859df3bb17633b..4937fdae5f4faee4aa26c72dee822c8cd4bf1ca5 100644 (file)
--- 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
         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__)
 
         // Equivalent to:
         #if defined(__WXGTK__) || defined(__WXMOTIF__)

-        wxIcon icon(mondrian_xpm);
+        wxIcon icon(sample_xpm);

         #endif
 
         #if defined(__WXMSW__)
         #endif
 
         #if defined(__WXMSW__)

-        wxIcon icon("mondrian");
+        wxIcon icon("sample");

         #endif
         @endcode
 
         #endif
         @endcode
 

diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index ea44030db0a7328881b074991c84699235c02b7d..479e54e7a813762dfe54ea9c95c241b7bebb1014 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 ACCESSTEST_OBJECTS =  \

+       $(__accesstest___win32rc) \

        $(__accesstest_os2_lib_res) \
        $(__accesstest_os2_lib_res) \

-       accesstest_accesstest.o \
-       $(__accesstest___win32rc)
+       accesstest_accesstest.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/access/access.bkl b/samples/access/access.bkl
index 8e8cdf4d64b75c69aebc3e457e7da1fb5d868b67..57ee8816087637bb7cfaa08ca28dd9df930dbca1 100644 (file)
--- a/samples/access/access.bkl
+++ b/samples/access/access.bkl
@@ -7,7 +7,6 @@
         <sources>accesstest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>accesstest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>accesstest.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/access/access.dsp b/samples/access/access.dsp
index ac8b68f86ec9cf48b24b890fbb7a616de0a35fd6..96502c00e574e28e15e58c5b3187ef32263652fc 100644 (file)
--- a/samples/access/access.dsp
+++ b/samples/access/access.dsp
@@ -256,7 +256,7 @@ SOURCE=.\accesstest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\accesstest.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/access/access_vc7.vcproj b/samples/access/access_vc7.vcproj
index 1db883ce315161b75e8ecf94293df8b709ffd9a3..adb7b031fbff23fc93edaa7958fd056035d020e7 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\accesstest.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/access/access_vc8.vcproj b/samples/access/access_vc8.vcproj
index 56054e7bed46f401f8378e01978ece540ff112d9..7cec0a19a6291e29a8155e9ec68a1591359b1608 100644 (file)
--- a/samples/access/access_vc8.vcproj
+++ b/samples/access/access_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\accesstest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/access/access_vc9.vcproj b/samples/access/access_vc9.vcproj
index 3eaf1ac018b29dd4d83fb8c0e93db4839b19b5fc..bf03379c25aa6e6a71a3891cd5c1a0a942d1e22c 100644 (file)
--- a/samples/access/access_vc9.vcproj
+++ b/samples/access/access_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\accesstest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp
index 47653bdabdca22b9368346fc3b091ecce280cf40..b8db737d81892c501ecfecb80b6a4476588d34ae 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // 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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -329,7 +329,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     SetAccessible(new FrameAccessible(this));
 
     // set the frame icon
     SetAccessible(new FrameAccessible(this));
 
     // set the frame icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
 #if wxUSE_MENUS
     // create a menu bar
 
 #if wxUSE_MENUS
     // create a menu bar

diff --git a/samples/access/accesstest.rc b/samples/access/accesstest.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 9544274b7da2194052ea29be4aab57c084eefeb1..e6a734b5245ebad8554e4f03784a8c006cdc05c3 100644 (file)
--- a/samples/access/makefile.bcc
+++ b/samples/access/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\accesstest.ilf del $(OBJS)\accesstest.ilf\r
        -if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils\r
 \r
        -if exist $(OBJS)\accesstest.ilf del $(OBJS)\accesstest.ilf\r
        -if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils\r
 \r

-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS)  $(OBJS)\accesstest_accesstest.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp\r
 \r
 $(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp\r
        $(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp\r
 \r

-$(OBJS)\accesstest_accesstest.res: .\accesstest.rc\r
-       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\r
-\r

diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index dccaaadc2fdc748d4ce223c86513b595c76b2165..3143e4973bb2f4f589de5705305214c98b908d07 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ACCESSTEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ACCESSTEST_OBJECTS =  \\r

-       $(OBJS)\accesstest_accesstest.o \\r
-       $(OBJS)\accesstest_accesstest_rc.o\r
+       $(OBJS)\accesstest_sample_rc.o \
+       $(OBJS)\accesstest_accesstest.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
 \r

-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\accesstest_accesstest.o: ./accesstest.cpp\r
        $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\accesstest_accesstest_rc.o: ./accesstest.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc
index 8f29013459ab071f7fa2b2ad60c790dc2be89e43..3aa7d451709a3bcb202781925450bc9976291d07 100644 (file)
--- 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 =  \\r
        $(OBJS)\accesstest_accesstest.obj\r
 ACCESSTEST_RESOURCES =  \\r
 ACCESSTEST_OBJECTS =  \\r
        $(OBJS)\accesstest_accesstest.obj\r
 ACCESSTEST_RESOURCES =  \\r

-       $(OBJS)\accesstest_accesstest.res\r
+       $(OBJS)\accesstest_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk\r
        -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb\r
 \r
        -if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk\r
        -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb\r
 \r

-$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp\r
 \r
 $(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp\r
 \r

-$(OBJS)\accesstest_accesstest.res: .\accesstest.rc\r
-       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\r
-\r

diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat
index 31715d0b68aa07236034c5f98ae15e6fff609e01..39720a44e18864333b22a01341c0e8a0705e5cf0 100644 (file)
--- a/samples/access/makefile.wat
+++ b/samples/access/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe\r
 \r

-$(OBJS)\accesstest.exe :  $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res\r
+$(OBJS)\accesstest.exe :  $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res

        @%create $(OBJS)\accesstest.lbc\r
        @%append $(OBJS)\accesstest.lbc option quiet\r
        @%append $(OBJS)\accesstest.lbc name $^@\r
        @%create $(OBJS)\accesstest.lbc\r
        @%append $(OBJS)\accesstest.lbc option quiet\r
        @%append $(OBJS)\accesstest.lbc name $^@\r


@@ -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)\r
        @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i\r
        @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\r
        @%append $(OBJS)\accesstest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i\r
        @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\r

-       @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res\r
+       @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_sample.res

        @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i\r
        wlink @$(OBJS)\accesstest.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i\r
        wlink @$(OBJS)\accesstest.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\accesstest_accesstest.obj :  .AUTODEPEND .\accesstest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<\r
 \r

-$(OBJS)\accesstest_accesstest.res :  .AUTODEPEND .\accesstest.rc\r
-       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 $<\r
-\r

diff --git a/samples/access/mondrian.ico b/samples/access/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/access/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index 6d4a4ecb00183074779edf299dbba96d9cd0479a..13d00db097422149d7e8c28e893313b24df41c02 100644 (file)
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #ifndef __WXMSW__
 #endif
 
 #ifndef __WXMSW__

-    #include "sample.xpm"
+    #include "../sample.xpm"

 #endif
 
 #include "wx/aboutdlg.h"
 #endif
 
 #include "wx/aboutdlg.h"

diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index b642478d1dc7635e677c305a280970ac92c92993..f81daacd456e77c4ebf05bbce80537612fc691d5 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 ARTTEST_OBJECTS =  \

+       $(__arttest___win32rc) \

        $(__arttest_os2_lib_res) \
        arttest_arttest.o \
        $(__arttest_os2_lib_res) \
        arttest_arttest.o \

-       arttest_artbrows.o \
-       $(__arttest___win32rc)
+       arttest_artbrows.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/artprov/artprov.bkl b/samples/artprov/artprov.bkl
index 4930e8e634e35debfdeca4d0a22de61bc0421cee..9a3885a57a2b6528f7bad231c8dfbcda6357ef8e 100644 (file)
--- a/samples/artprov/artprov.bkl
+++ b/samples/artprov/artprov.bkl
@@ -8,7 +8,6 @@
         <headers>artbrows.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <headers>artbrows.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>arttest.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/artprov/artprov.dsp b/samples/artprov/artprov.dsp
index d7f4f5ebf6b2ea3609afcf7cbc127840927208cb..066239e83f0a744190c8a3f3c9949696ba26d2dc 100644 (file)
--- a/samples/artprov/artprov.dsp
+++ b/samples/artprov/artprov.dsp
@@ -260,7 +260,7 @@ SOURCE=.\arttest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\arttest.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj
index e021ebe7623183cd7fb503c45320ad23d90d5476..b7c55ee625af3de5677f1933c3c6b6f505e646b6 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\arttest.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj
index f0a445c0d1b5a6c3b9e61256498f3ba3c87dfaf4..9aac78950f630ad5123a0f0f8228370da0c6e8d6 100644 (file)
--- a/samples/artprov/artprov_vc8.vcproj
+++ b/samples/artprov/artprov_vc8.vcproj
@@ -828,7 +828,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\arttest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/artprov/artprov_vc9.vcproj b/samples/artprov/artprov_vc9.vcproj
index 1848d01362908cad7d0566826402c5ea32ddcc11..8af3faae080e01af35139a16057685db402f7814 100644 (file)
--- a/samples/artprov/artprov_vc9.vcproj
+++ b/samples/artprov/artprov_vc9.vcproj
@@ -800,7 +800,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\arttest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp
index 464bf3a27daf3df8a0f55b945521988683271540..1c40be4ea30611264010c798ff277e119ca4885b 100644 (file)
--- a/samples/artprov/arttest.cpp
+++ b/samples/artprov/arttest.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)
 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)

-    #include "mondrian.xpm"
+    #include "../sample.xpm"

 #endif
 
 #include "wx/artprov.h"
 #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)
 {
 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;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

diff --git a/samples/artprov/arttest.rc b/samples/artprov/arttest.rc
deleted file mode 100644 (file)
index 755ae7b..0000000
--- 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 4a107f3fa07a133c41a746664f77a098a8d8898d..8eaec228c1bc7a071b65857ddbbf0e237e46dab6 100644 (file)
--- a/samples/artprov/makefile.bcc
+++ b/samples/artprov/makefile.bcc
@@ -230,17 +230,17 @@ clean:
        -if exist $(OBJS)\arttest.ilf del $(OBJS)\arttest.ilf\r
        -if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils\r
 \r
        -if exist $(OBJS)\arttest.ilf del $(OBJS)\arttest.ilf\r
        -if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils\r
 \r

-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS)  $(OBJS)\arttest_arttest.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp\r
 \r
 $(OBJS)\arttest_artbrows.obj: .\artbrows.cpp\r
        $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp\r
 \r
 $(OBJS)\arttest_arttest.obj: .\arttest.cpp\r
        $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp\r
 \r
 $(OBJS)\arttest_artbrows.obj: .\artbrows.cpp\r
        $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp\r
 \r

-$(OBJS)\arttest_arttest.res: .\arttest.rc\r
-       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\r
-\r

diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index f5b444413ec139c187778c8ee295e5d5a1f314a2..e5a8e37ba19fd86bd35d74d08cf3189e19aca29b 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ARTTEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ARTTEST_OBJECTS =  \\r

+       $(OBJS)\arttest_sample_rc.o \

        $(OBJS)\arttest_arttest.o \\r
        $(OBJS)\arttest_arttest.o \\r

-       $(OBJS)\arttest_artbrows.o \\r
-       $(OBJS)\arttest_arttest_rc.o\r
+       $(OBJS)\arttest_artbrows.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -219,18 +219,18 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
 \r

-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\arttest_artbrows.o: ./artbrows.cpp\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\arttest_arttest.o: ./arttest.cpp\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\arttest_artbrows.o: ./artbrows.cpp\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\arttest_arttest_rc.o: ./arttest.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc
index 2b3e39f4117833284f5af8e12d335b56b33a16be..5a841a392d804d9c8a37cb990eb54ad0766187b4 100644 (file)
--- a/samples/artprov/makefile.vc
+++ b/samples/artprov/makefile.vc
@@ -33,7 +33,7 @@ ARTTEST_OBJECTS =  \
        $(OBJS)\arttest_arttest.obj \\r
        $(OBJS)\arttest_artbrows.obj\r
 ARTTEST_RESOURCES =  \\r
        $(OBJS)\arttest_arttest.obj \\r
        $(OBJS)\arttest_artbrows.obj\r
 ARTTEST_RESOURCES =  \\r

-       $(OBJS)\arttest_arttest.res\r
+       $(OBJS)\arttest_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -340,17 +340,17 @@ clean:
        -if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk\r
        -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb\r
 \r
        -if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk\r
        -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb\r
 \r

-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp\r
 \r
 $(OBJS)\arttest_artbrows.obj: .\artbrows.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp\r
 \r
 $(OBJS)\arttest_arttest.obj: .\arttest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp\r
 \r
 $(OBJS)\arttest_artbrows.obj: .\artbrows.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp\r
 \r

-$(OBJS)\arttest_arttest.res: .\arttest.rc\r
-       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\r
-\r

diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat
index fe8633ebc700c0c59587a21cf42f34d953602953..c7275b7a6ea89a44c580f51a3da9148468cd1fbc 100644 (file)
--- a/samples/artprov/makefile.wat
+++ b/samples/artprov/makefile.wat
@@ -249,7 +249,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
 \r

-$(OBJS)\arttest.exe :  $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res\r
+$(OBJS)\arttest.exe :  $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res

        @%create $(OBJS)\arttest.lbc\r
        @%append $(OBJS)\arttest.lbc option quiet\r
        @%append $(OBJS)\arttest.lbc name $^@\r
        @%create $(OBJS)\arttest.lbc\r
        @%append $(OBJS)\arttest.lbc option quiet\r
        @%append $(OBJS)\arttest.lbc name $^@\r


@@ -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)\r
        @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i\r
        @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\r
        @%append $(OBJS)\arttest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i\r
        @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\r

-       @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res\r
+       @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_sample.res

        @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i\r
        wlink @$(OBJS)\arttest.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i\r
        wlink @$(OBJS)\arttest.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\arttest_artbrows.obj :  .AUTODEPEND .\artbrows.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\arttest_arttest.obj :  .AUTODEPEND .\arttest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\arttest_artbrows.obj :  .AUTODEPEND .\artbrows.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $<\r
 \r

-$(OBJS)\arttest_arttest.res :  .AUTODEPEND .\arttest.rc\r
-       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 $<\r
-\r

diff --git a/samples/artprov/mondrian.ico b/samples/artprov/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/artprov/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index e8f6b9e2202c42ccd0c6ded67a3e61ff9d1ec6de..bd06c9ec97aa8971164959060e99da56deed84b6 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 CALENDAR_OBJECTS =  \

+       $(__calendar___win32rc) \

        $(__calendar_os2_lib_res) \
        $(__calendar_os2_lib_res) \

-       calendar_calendar.o \
-       $(__calendar___win32rc)
+       calendar_calendar.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/calendar/calendar.bkl b/samples/calendar/calendar.bkl
index b1b6309a05bcf81251993984d8f0a3303512d53c..6d0f8aea5a63262629d0377453b3b5d54a6f65fe 100644 (file)
--- a/samples/calendar/calendar.bkl
+++ b/samples/calendar/calendar.bkl
@@ -8,7 +8,6 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>calendar.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index a6c6007c51f0ae800aaead0ff99a736936fe0728..74963223326f6e3fc7b4b0e08df983f3b2532160 100644 (file)
--- 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
        : 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;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

diff --git a/samples/calendar/calendar.dsp b/samples/calendar/calendar.dsp
index 98f404e265244028f74dc54d2ebbe47ece4e7737..29769af8c80ac92890542df78c256a10ce4bd796 100644 (file)
--- a/samples/calendar/calendar.dsp
+++ b/samples/calendar/calendar.dsp
@@ -256,7 +256,7 @@ SOURCE=.\calendar.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\calendar.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj
index 5fef18f2555fae0deca53ec5ca72125fd4738597..d5ef839a3a474797084e281db65054e125a29255 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\calendar.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/calendar/calendar_vc8.vcproj b/samples/calendar/calendar_vc8.vcproj
index a0291743dc000efb035f4e9126266c15364608a2..5f03e7c11c3ebe43e7db12ae2c414bc6425941ad 100644 (file)
--- a/samples/calendar/calendar_vc8.vcproj
+++ b/samples/calendar/calendar_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\calendar.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/calendar/calendar_vc9.vcproj b/samples/calendar/calendar_vc9.vcproj
index e5fe0fe6315248880822533341fc64c4179f8840..ab824c91713ac7d1dba969d1dc98ab0456a13c07 100644 (file)
--- a/samples/calendar/calendar_vc9.vcproj
+++ b/samples/calendar/calendar_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\calendar.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc
index b19b0864c8e17a6640c0354be3403dc2aa7cbd11..ace97b885cdf3de25cfba98fd04fe6ac3a75a0f1 100644 (file)
--- a/samples/calendar/makefile.bcc
+++ b/samples/calendar/makefile.bcc
@@ -233,14 +233,14 @@ clean:
        -if exist $(OBJS)\calendar.ilf del $(OBJS)\calendar.ilf\r
        -if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils\r
 \r
        -if exist $(OBJS)\calendar.ilf del $(OBJS)\calendar.ilf\r
        -if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils\r
 \r

-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS)  $(OBJS)\calendar_calendar.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp\r
 \r
 $(OBJS)\calendar_calendar.obj: .\calendar.cpp\r
        $(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp\r
 \r

-$(OBJS)\calendar_calendar.res: .\calendar.rc\r
-       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\r
-\r

diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc
index 42a42f37e4884ce7ad72cf8ac708888d7f978733..dbfd81dcf09caf812629a52555c873da8eea0e01 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CALENDAR_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CALENDAR_OBJECTS =  \\r

-       $(OBJS)\calendar_calendar.o \\r
-       $(OBJS)\calendar_calendar_rc.o\r
+       $(OBJS)\calendar_sample_rc.o \
+       $(OBJS)\calendar_calendar.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,15 +222,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
 \r

-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\calendar_calendar.o: ./calendar.cpp\r
        $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\calendar_calendar_rc.o: ./calendar.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc
index 2a6351a437c0e0c1e253d1f65f66a3756e512590..16f421b4f52115fae32d9e5287aeee385c053acf 100644 (file)
--- 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 =  \\r
        $(OBJS)\calendar_calendar.obj\r
 CALENDAR_RESOURCES =  \\r
 CALENDAR_OBJECTS =  \\r
        $(OBJS)\calendar_calendar.obj\r
 CALENDAR_RESOURCES =  \\r

-       $(OBJS)\calendar_calendar.res\r
+       $(OBJS)\calendar_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,14 +343,14 @@ clean:
        -if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk\r
        -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb\r
 \r
        -if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk\r
        -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb\r
 \r

-$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp\r
 \r
 $(OBJS)\calendar_calendar.obj: .\calendar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp\r
 \r

-$(OBJS)\calendar_calendar.res: .\calendar.rc\r
-       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\r
-\r

diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat
index 9167125da6cb04d95eebc8868078789bc05286c8..c926834ed58f7cbcd2335e373bbd573b09027564 100644 (file)
--- a/samples/calendar/makefile.wat
+++ b/samples/calendar/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe\r
 \r

-$(OBJS)\calendar.exe :  $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res\r
+$(OBJS)\calendar.exe :  $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res

        @%create $(OBJS)\calendar.lbc\r
        @%append $(OBJS)\calendar.lbc option quiet\r
        @%append $(OBJS)\calendar.lbc name $^@\r
        @%create $(OBJS)\calendar.lbc\r
        @%append $(OBJS)\calendar.lbc option quiet\r
        @%append $(OBJS)\calendar.lbc name $^@\r


@@ -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)\r
        @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i\r
        @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\r
        @%append $(OBJS)\calendar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i\r
        @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\r

-       @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res\r
+       @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_sample.res

        @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i\r
        wlink @$(OBJS)\calendar.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i\r
        wlink @$(OBJS)\calendar.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $<\r
 \r
 $(OBJS)\calendar_calendar.obj :  .AUTODEPEND .\calendar.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $<\r
 \r

-$(OBJS)\calendar_calendar.res :  .AUTODEPEND .\calendar.rc\r
-       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 $<\r
-\r

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 0b35b0123a9a808403b849640fb1d0e554696584..5daa47027c57d74ab99a8be48aaaf1fbe034df95 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 CARET_OBJECTS =  \

+       $(__caret___win32rc) \

        $(__caret_os2_lib_res) \
        $(__caret_os2_lib_res) \

-       caret_caret.o \
-       $(__caret___win32rc)
+       caret_caret.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/caret/caret.bkl b/samples/caret/caret.bkl
index 6836d07cb134b2aadc1ea823bcf513d8f20c377e..a12ede36598b804a8d46c488eda5dabd7682413a 100644 (file)
--- a/samples/caret/caret.bkl
+++ b/samples/caret/caret.bkl
@@ -7,7 +7,6 @@
         <sources>caret.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>caret.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>caret.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 596fa4b653a1e2e0b063c85160a3baccd1c0bb78..91c7fb83ef680d44f11d77b52cb642563ff9d881 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -27,11 +27,12 @@
 #include "wx/numdlg.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/numdlg.h"
 
 // ----------------------------------------------------------------------------

-// ressources
+// resources

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

+

 // the application icon
 // 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
 
 // ----------------------------------------------------------------------------
 #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
        : 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;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

diff --git a/samples/caret/caret.dsp b/samples/caret/caret.dsp
index f4a7fb15741b45ab08306a5b1a300054b881fe1f..c347abe6821cdf91459aeae8e47b538fcc37b262 100644 (file)
--- a/samples/caret/caret.dsp
+++ b/samples/caret/caret.dsp
@@ -256,7 +256,7 @@ SOURCE=.\caret.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\caret.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/caret/caret.rc b/samples/caret/caret.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 49c660b50adaff53b8e3fbeaaa0449691d29fac0..094d0cec7267d48d8dfdf59e986f8f1c8e9cb782 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\caret.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/caret/caret_vc8.vcproj b/samples/caret/caret_vc8.vcproj
index 2c303f2c6f2816d4ba271e87619dd2d1f9fdfc47..0cd89621c99048b14ef67ed12b52d10279162bf4 100644 (file)
--- a/samples/caret/caret_vc8.vcproj
+++ b/samples/caret/caret_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\caret.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/caret/caret_vc9.vcproj b/samples/caret/caret_vc9.vcproj
index 83855ddcc27e95bbb17b776f155210c930eea3ec..ebc8540ef1e464dcaf1d9171d33e7a803a5d7058 100644 (file)
--- a/samples/caret/caret_vc9.vcproj
+++ b/samples/caret/caret_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\caret.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc
index def3d5d7857752b566b5a56f9be744d44cfdc0b1..95d244d3160477529406ea3cc45ff1a3bbd3e792 100644 (file)
--- a/samples/caret/makefile.bcc
+++ b/samples/caret/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\caret.ilf del $(OBJS)\caret.ilf\r
        -if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils\r
 \r
        -if exist $(OBJS)\caret.ilf del $(OBJS)\caret.ilf\r
        -if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils\r
 \r

-$(OBJS)\caret.exe: $(CARET_OBJECTS)  $(OBJS)\caret_caret.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp\r
 \r
 $(OBJS)\caret_caret.obj: .\caret.cpp\r
        $(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp\r
 \r

-$(OBJS)\caret_caret.res: .\caret.rc\r
-       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\r
-\r

diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc
index a55dd11dcbe073feced75fba57063082922d1c27..bcb5c5a0a5c6e299a11830d02afb47cadb3ed7bd 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CARET_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CARET_OBJECTS =  \\r

-       $(OBJS)\caret_caret.o \\r
-       $(OBJS)\caret_caret_rc.o\r
+       $(OBJS)\caret_sample_rc.o \
+       $(OBJS)\caret_caret.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
 \r

-$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\caret_caret.o: ./caret.cpp\r
        $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\caret_caret_rc.o: ./caret.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc
index 1ce2adc8575c31c23127f562313d1d0acbb0ebc1..6eb5902164f91289d63b817a854384b2f657d3db 100644 (file)
--- 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 =  \\r
        $(OBJS)\caret_caret.obj\r
 CARET_RESOURCES =  \\r
 CARET_OBJECTS =  \\r
        $(OBJS)\caret_caret.obj\r
 CARET_RESOURCES =  \\r

-       $(OBJS)\caret_caret.res\r
+       $(OBJS)\caret_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk\r
        -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb\r
 \r
        -if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk\r
        -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb\r
 \r

-$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp\r
 \r
 $(OBJS)\caret_caret.obj: .\caret.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp\r
 \r

-$(OBJS)\caret_caret.res: .\caret.rc\r
-       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\r
-\r

diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat
index e14d2bf1f2b3a91cb4aa4fc068618d5f36b1bedb..e90b59b502a9d0d19644571062a63c06012d8d36 100644 (file)
--- a/samples/caret/makefile.wat
+++ b/samples/caret/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe\r
 \r

-$(OBJS)\caret.exe :  $(CARET_OBJECTS) $(OBJS)\caret_caret.res\r
+$(OBJS)\caret.exe :  $(CARET_OBJECTS) $(OBJS)\caret_sample.res

        @%create $(OBJS)\caret.lbc\r
        @%append $(OBJS)\caret.lbc option quiet\r
        @%append $(OBJS)\caret.lbc name $^@\r
        @%create $(OBJS)\caret.lbc\r
        @%append $(OBJS)\caret.lbc option quiet\r
        @%append $(OBJS)\caret.lbc name $^@\r


@@ -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)\r
        @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i\r
        @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\r
        @%append $(OBJS)\caret.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i\r
        @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\r

-       @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res\r
+       @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_sample.res

        @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i\r
        wlink @$(OBJS)\caret.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i\r
        wlink @$(OBJS)\caret.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $<\r
 \r
 $(OBJS)\caret_caret.obj :  .AUTODEPEND .\caret.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $<\r
 \r

-$(OBJS)\caret_caret.res :  .AUTODEPEND .\caret.rc\r
-       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 $<\r
-\r

diff --git a/samples/caret/mondrian.xpm b/samples/caret/mondrian.xpm
deleted file mode 100644 (file)
index cc52c7d..0000000
--- a/samples/caret/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index d00d3c021b36bf28f4c0c5f74e581d0f7a4d8da7..e8d69862d5ecfb32f78179364db86b5c38a41e7e 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 CLIPBOARD_OBJECTS =  \

+       $(__clipboard___win32rc) \

        $(__clipboard_os2_lib_res) \
        $(__clipboard_os2_lib_res) \

-       clipboard_clipboard.o \
-       $(__clipboard___win32rc)
+       clipboard_clipboard.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/clipboard/clipboard.bkl b/samples/clipboard/clipboard.bkl
index a8b13933062f16861733269206e603bcc9497c27..ad528666969dcbd4cbd48e48dcc7a8a64d5f043b 100644 (file)
--- a/samples/clipboard/clipboard.bkl
+++ b/samples/clipboard/clipboard.bkl
@@ -7,7 +7,6 @@
         <sources>clipboard.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>clipboard.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>clipboard.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/clipboard/clipboard.dsp b/samples/clipboard/clipboard.dsp
index 3edafe249859ccebb74f547d5982a2fe65968d42..66b17da7b852593cc70972701bae6795ba6b4295 100644 (file)
--- a/samples/clipboard/clipboard.dsp
+++ b/samples/clipboard/clipboard.dsp
@@ -256,7 +256,7 @@ SOURCE=.\clipboard.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\clipboard.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/clipboard/clipboard.rc b/samples/clipboard/clipboard.rc
deleted file mode 100644 (file)
index bb8c713..0000000
--- 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 64c9652797464b1a4600e6b0f7517e04d4f6a2cb..6c518c582f4e78592d76f88bc9134092f7c24b05 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\clipboard.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/clipboard/clipboard_vc8.vcproj b/samples/clipboard/clipboard_vc8.vcproj
index 9090c8050baf5928676a11eab350f2e916d1c983..846cdef0cc2fa40bd4b900526e13dcb585dc0b1b 100644 (file)
--- a/samples/clipboard/clipboard_vc8.vcproj
+++ b/samples/clipboard/clipboard_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\clipboard.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/clipboard/clipboard_vc9.vcproj b/samples/clipboard/clipboard_vc9.vcproj
index a3dd209b0a4fa948cf22c10b7b22b3d3f9e7bc9a..8c994553310ed0001e75f71ba37b2dbdec162869 100644 (file)
--- a/samples/clipboard/clipboard_vc9.vcproj
+++ b/samples/clipboard/clipboard_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\clipboard.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc
index 7c0bb26f1db1f63f1e3013bcbbb22cfd5d1ed2ed..136f07bffa859cf810456ccdd705d57891e39f30 100644 (file)
--- a/samples/clipboard/makefile.bcc
+++ b/samples/clipboard/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\clipboard.ilf del $(OBJS)\clipboard.ilf\r
        -if exist $(OBJS)\clipboard.ils del $(OBJS)\clipboard.ils\r
 \r
        -if exist $(OBJS)\clipboard.ilf del $(OBJS)\clipboard.ilf\r
        -if exist $(OBJS)\clipboard.ils del $(OBJS)\clipboard.ils\r
 \r

-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS)  $(OBJS)\clipboard_clipboard.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp\r
 \r
 $(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp\r
        $(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp\r
 \r

-$(OBJS)\clipboard_clipboard.res: .\clipboard.rc\r
-       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\r
-\r

diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc
index f6ee961492b30bc3cd7f1555b9852202234cbdc2..35abd9ff5ede337a2380361efce5b2685e5be9e5 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CLIPBOARD_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CLIPBOARD_OBJECTS =  \\r

-       $(OBJS)\clipboard_clipboard.o \\r
-       $(OBJS)\clipboard_clipboard_rc.o\r
+       $(OBJS)\clipboard_sample_rc.o \
+       $(OBJS)\clipboard_clipboard.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
 \r

-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\clipboard_clipboard.o: ./clipboard.cpp\r
        $(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\clipboard_clipboard_rc.o: ./clipboard.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc
index 84306804f71ced5333c57156f837a57838517234..95260a055b44498906e3acde6a6df8923988e5d2 100644 (file)
--- 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 =  \\r
        $(OBJS)\clipboard_clipboard.obj\r
 CLIPBOARD_RESOURCES =  \\r
 CLIPBOARD_OBJECTS =  \\r
        $(OBJS)\clipboard_clipboard.obj\r
 CLIPBOARD_RESOURCES =  \\r

-       $(OBJS)\clipboard_clipboard.res\r
+       $(OBJS)\clipboard_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk\r
        -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb\r
 \r
        -if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk\r
        -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb\r
 \r

-$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp\r
 \r
 $(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp\r
 \r

-$(OBJS)\clipboard_clipboard.res: .\clipboard.rc\r
-       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\r
-\r

diff --git a/samples/clipboard/makefile.wat b/samples/clipboard/makefile.wat
index d7ad411167b6da666957df31c7ddf6e36c4b2585..0b4cb18644092df4c5303b86f1087377bf38e480 100644 (file)
--- a/samples/clipboard/makefile.wat
+++ b/samples/clipboard/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe\r
 \r

-$(OBJS)\clipboard.exe :  $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res\r
+$(OBJS)\clipboard.exe :  $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res

        @%create $(OBJS)\clipboard.lbc\r
        @%append $(OBJS)\clipboard.lbc option quiet\r
        @%append $(OBJS)\clipboard.lbc name $^@\r
        @%create $(OBJS)\clipboard.lbc\r
        @%append $(OBJS)\clipboard.lbc option quiet\r
        @%append $(OBJS)\clipboard.lbc name $^@\r


@@ -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)\r
        @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i\r
        @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\r
        @%append $(OBJS)\clipboard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i\r
        @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\r

-       @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_clipboard.res\r
+       @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_sample.res

        @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i\r
        wlink @$(OBJS)\clipboard.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i\r
        wlink @$(OBJS)\clipboard.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $<\r
 \r
 $(OBJS)\clipboard_clipboard.obj :  .AUTODEPEND .\clipboard.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $<\r
 \r

-$(OBJS)\clipboard_clipboard.res :  .AUTODEPEND .\clipboard.rc\r
-       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 $<\r
-\r

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 7a59f843affdfb1eb5d647d9e6f222af920133db..45e31fdb8a783fe6a0934af8b5509ce4de4db9ff 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 CONFTEST_OBJECTS =  \

+       $(__conftest___win32rc) \

        $(__conftest_os2_lib_res) \
        $(__conftest_os2_lib_res) \

-       conftest_conftest.o \
-       $(__conftest___win32rc)
+       conftest_conftest.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/config/config.bkl b/samples/config/config.bkl
index 6bf5b6c75558d9b34fb601c58dc3a46de8712a2a..c8b26bf753023e03224d305e28f5b1b12993a655 100644 (file)
--- a/samples/config/config.bkl
+++ b/samples/config/config.bkl
@@ -7,7 +7,6 @@
         <sources>conftest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>conftest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>conftest.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/config/config.dsp b/samples/config/config.dsp
index 139662ed5540e3dd4da2dfc83adc8892ab95f1f3..a05beba752172fe3da601c2f6f7999889be64c03 100644 (file)
--- a/samples/config/config.dsp
+++ b/samples/config/config.dsp
@@ -256,7 +256,7 @@ SOURCE=.\conftest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\conftest.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj
index 225f3b5e2c3e98617145ddea79a23f799c3a1fd6..f339a8ce19f80a4614d792a04315749ddcaaa7ca 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\conftest.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/config/config_vc8.vcproj b/samples/config/config_vc8.vcproj
index ee899db13089a897075098029ea92bcf7630f995..1d9ebd149da99b635af704d5958130c8914251c5 100644 (file)
--- a/samples/config/config_vc8.vcproj
+++ b/samples/config/config_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\conftest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/config/config_vc9.vcproj b/samples/config/config_vc9.vcproj
index 14c6a303b7db9f050297cffd3baabce51c475335..4f884a56380897246b86baf9056155ed770c78a0 100644 (file)
--- a/samples/config/config_vc9.vcproj
+++ b/samples/config/config_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\conftest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/config/conftest.rc b/samples/config/conftest.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 32edaf852eabcab1cb80fb7a91dc68c68ec30547..12d168faf1d20fa5245e90a48e91d557fed4e815 100644 (file)
--- a/samples/config/makefile.bcc
+++ b/samples/config/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\conftest.ilf del $(OBJS)\conftest.ilf\r
        -if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils\r
 \r
        -if exist $(OBJS)\conftest.ilf del $(OBJS)\conftest.ilf\r
        -if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils\r
 \r

-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS)  $(OBJS)\conftest_conftest.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp\r
 \r
 $(OBJS)\conftest_conftest.obj: .\conftest.cpp\r
        $(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp\r
 \r

-$(OBJS)\conftest_conftest.res: .\conftest.rc\r
-       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\r
-\r

diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc
index 0968758419f8b4ae2ea979f4bd0987c4c4f79600..4c34b8e882d4eebabde39d85593095435fa7c0cb 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CONFTEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CONFTEST_OBJECTS =  \\r

-       $(OBJS)\conftest_conftest.o \\r
-       $(OBJS)\conftest_conftest_rc.o\r
+       $(OBJS)\conftest_sample_rc.o \
+       $(OBJS)\conftest_conftest.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
 \r

-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\conftest_conftest.o: ./conftest.cpp\r
        $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\conftest_conftest_rc.o: ./conftest.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc
index 0e08ea73adc20c88334de4cf8cb4009418b2967f..d564db96d2619a29fdac515fef0b6fd3df9e20ce 100644 (file)
--- 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 =  \\r
        $(OBJS)\conftest_conftest.obj\r
 CONFTEST_RESOURCES =  \\r
 CONFTEST_OBJECTS =  \\r
        $(OBJS)\conftest_conftest.obj\r
 CONFTEST_RESOURCES =  \\r

-       $(OBJS)\conftest_conftest.res\r
+       $(OBJS)\conftest_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk\r
        -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb\r
 \r
        -if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk\r
        -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb\r
 \r

-$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp\r
 \r
 $(OBJS)\conftest_conftest.obj: .\conftest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp\r
 \r

-$(OBJS)\conftest_conftest.res: .\conftest.rc\r
-       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\r
-\r

diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index 870c9cd07f19100130a6a4b7db0d3c962b115b66..28e8c85bd2496cd991855ee3f6cd80b37a9c7793 100644 (file)
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
 \r

-$(OBJS)\conftest.exe :  $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res\r
+$(OBJS)\conftest.exe :  $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res

        @%create $(OBJS)\conftest.lbc\r
        @%append $(OBJS)\conftest.lbc option quiet\r
        @%append $(OBJS)\conftest.lbc name $^@\r
        @%create $(OBJS)\conftest.lbc\r
        @%append $(OBJS)\conftest.lbc option quiet\r
        @%append $(OBJS)\conftest.lbc name $^@\r


@@ -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)\r
        @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i\r
        @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\r
        @%append $(OBJS)\conftest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i\r
        @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\r

-       @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res\r
+       @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_sample.res

        @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i\r
        wlink @$(OBJS)\conftest.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i\r
        wlink @$(OBJS)\conftest.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\conftest_conftest.obj :  .AUTODEPEND .\conftest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $<\r
 \r

-$(OBJS)\conftest_conftest.res :  .AUTODEPEND .\conftest.rc\r
-       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 $<\r
-\r

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index da9256e9b783521b2115fa3e55f646e8dd7d5de6..ef951a18bb80662b47b7968d4d3b9082b34fc0ea 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -33,12 +33,7 @@
 #endif // __WXMSW__
 #endif // wxUSE_TOOLTIPS
 
 #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"
     #include "icons/choice.xpm"
     #include "icons/combo.xpm"
     #include "icons/list.xpm"


@@ -62,6 +57,10 @@
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 

+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+

 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------


@@ -662,7 +661,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
         wxT("examples.")
     };
 
         wxT("examples.")
     };
 

-#ifdef USE_XPM
+#ifndef __WXMSW__

     // image ids
     enum
     {
     // 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);
     imagelist-> Add( wxBitmap( gauge_xpm ));
 #endif // wxUSE_GAUGE
     m_book->SetImageList(imagelist);

-#elif defined(__WXMSW__)
+#else

     // load images from resources
     enum
     {
     // 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);
     }
 
     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);
 #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
 
     // 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;
 
 
     wxMenu *file_menu = new wxMenu;
 

diff --git a/samples/controls/controls.rc b/samples/controls/controls.rc
index 746abb461847da127f3b4b431dcd4f52aa85b270..51ff722dfeaa8a3099da5366cc5fca7ed1f4b1d2 100644 (file)
--- 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"
 
 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"
 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 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/controls/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index d1e518cf8759b91f6e53bae291744e89c07f8f1e..d4ce98c4928e4c17987541b39ae7061239998e58 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \

+       $(__dialogs___win32rc) \

        $(__dialogs_os2_lib_res) \
        dialogs_dialogs.o \
        $(__dialogs_os2_lib_res) \
        dialogs_dialogs.o \

-       $(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS) \
-       $(__dialogs___win32rc)
+       $(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS)

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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
 
 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
 
 @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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index b04b88e4f0623fb9f18b6c1afb228867fb705088..3b68225eb3757632f563bc5fec9a15eba417689d 100644 (file)
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -36,7 +36,6 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>dialogs.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index d151f571ef9d355bf156c86615808dbfd3e9f3a2..941ce02b028c9137d588fff4588ccc2b70f522d6 100644 (file)
--- 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)
 {
 MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title)
 {

-    SetIcon(sample_xpm);
+    SetIcon(wxICON(sample));

 
 #if USE_MODAL_PRESENTATION
     m_dialog = (MyModelessDialog *)NULL;
 
 #if USE_MODAL_PRESENTATION
     m_dialog = (MyModelessDialog *)NULL;

diff --git a/samples/dialogs/dialogs.dsp b/samples/dialogs/dialogs.dsp
index 5017e5de0f29556094483e8f77bab5fd700565b7..7fe362c9f1181bf24ae1302e54244fd867b6cea6 100644 (file)
--- a/samples/dialogs/dialogs.dsp
+++ b/samples/dialogs/dialogs.dsp
@@ -293,10 +293,6 @@ SOURCE=.\dialogs.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\dialogs.rc\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=.\..\..\src\generic\dirdlgg.cpp\r
 \r
 !IF  "$(CFG)" == "dialogs - Win32 DLL Universal Release"\r
 SOURCE=.\..\..\src\generic\dirdlgg.cpp\r
 \r
 !IF  "$(CFG)" == "dialogs - Win32 DLL Universal Release"\r


@@ -406,6 +402,10 @@ SOURCE=.\..\..\src\generic\fontdlgg.cpp
 !ENDIF\r
 \r
 # End Source File\r
 !ENDIF\r
 \r
 # End Source File\r

+# Begin Source File
+
+SOURCE=.\..\..\samples\sample.rc
+# End Source File

 # End Group\r
 # Begin Group "Header Files"\r
 \r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/samples/dialogs/dialogs.ico b/samples/dialogs/dialogs.ico
deleted file mode 100644 (file)
index 6e8c9aa..0000000
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 (file)
index 3a98924..0000000
--- 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 (file)
index 87a8a25..0000000
--- 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 580bb1ddea6fc998674c7c46f365a1744d9343b5..476e421bf1e016f8f3615bb0b67218afcf0589d7 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\dialogs.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj
index 7dbba138d5a4f81467aa508f41bc3f2f09fd3954..6b55c9dfe73fe5b5c21a20a5d2b8033611d83d05 100644 (file)
--- a/samples/dialogs/dialogs_vc8.vcproj
+++ b/samples/dialogs/dialogs_vc8.vcproj
@@ -936,7 +936,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\dialogs.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj
index 6c056fdde940395637765e92cd0bb4b079b0095e..2072a4f03fc75f5e6c54e4ded0883fc7e2a700c8 100644 (file)
--- a/samples/dialogs/dialogs_vc9.vcproj
+++ b/samples/dialogs/dialogs_vc9.vcproj
@@ -908,7 +908,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\dialogs.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 64bdf6899e0d4b47a7842be1bf8bfdb64c787e27..7ef15dbbedc1c874bb2cb38c2d69d586e39126dc 100644 (file)
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -241,15 +241,18 @@ clean:
        -if exist $(OBJS)\dialogs.ilf del $(OBJS)\dialogs.ilf\r
        -if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils\r
 \r
        -if exist $(OBJS)\dialogs.ilf del $(OBJS)\dialogs.ilf\r
        -if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils\r
 \r

-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS)  $(OBJS)\dialogs_dialogs.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp\r
 \r
 $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp\r
        $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp\r
 \r


@@ -265,6 +268,3 @@ $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
 $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp\r
        $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp\r
 \r
 $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp\r
        $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp\r
 \r

-$(OBJS)\dialogs_dialogs.res: .\dialogs.rc\r
-       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\r
-\r

diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index 8a8a78525ecb3092505180de50c9139fe1b04d18..dd329c13a395e7eba5850198764c5eee76727e46 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 DIALOGS_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 DIALOGS_OBJECTS =  \\r

+       $(OBJS)\dialogs_sample_rc.o \

        $(OBJS)\dialogs_dialogs.o \\r
        $(OBJS)\dialogs_dialogs.o \\r

-       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \\r
-       $(OBJS)\dialogs_dialogs_rc.o\r
+       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -232,13 +232,16 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
 \r

-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\dialogs_dialogs.o: ./dialogs.cpp\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r


@@ -254,9 +257,6 @@ $(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp
 $(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index 3ae52d49ba9372f419c91f0496a402dce4bd5713..d05b0358615ebd0ea0124976cda43ef4dd010794 100644 (file)
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -33,7 +33,7 @@ DIALOGS_OBJECTS =  \
        $(OBJS)\dialogs_dialogs.obj \\r
        $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)\r
 DIALOGS_RESOURCES =  \\r
        $(OBJS)\dialogs_dialogs.obj \\r
        $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)\r
 DIALOGS_RESOURCES =  \\r

-       $(OBJS)\dialogs_dialogs.res\r
+       $(OBJS)\dialogs_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -351,7 +351,7 @@ clean:
        -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk\r
        -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb\r
 \r
        -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk\r
        -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb\r
 \r

-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -360,6 +360,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp\r
 \r
 $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp\r
 \r


@@ -375,6 +378,3 @@ $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
 $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp\r
 \r
 $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp\r
 \r

-$(OBJS)\dialogs_dialogs.res: .\dialogs.rc\r
-       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\r
-\r

diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index 1f08ae851c79bac72936bafe7de25949e326603a..d4306bdc078580ec2469b559f349269712a8b222 100644 (file)
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -264,7 +264,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
 \r

-$(OBJS)\dialogs.exe :  $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res\r
+$(OBJS)\dialogs.exe :  $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res

        @%create $(OBJS)\dialogs.lbc\r
        @%append $(OBJS)\dialogs.lbc option quiet\r
        @%append $(OBJS)\dialogs.lbc name $^@\r
        @%create $(OBJS)\dialogs.lbc\r
        @%append $(OBJS)\dialogs.lbc option quiet\r
        @%append $(OBJS)\dialogs.lbc name $^@\r


@@ -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)\r
        @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i\r
        @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\r
        @%append $(OBJS)\dialogs.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i\r
        @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\r

-       @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res\r
+       @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_sample.res

        @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i\r
        wlink @$(OBJS)\dialogs.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i\r
        wlink @$(OBJS)\dialogs.lbc\r
 \r


@@ -280,6 +280,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
 \r
 $(OBJS)\dialogs_dialogs.obj :  .AUTODEPEND .\dialogs.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
 \r


@@ -295,6 +298,3 @@ $(OBJS)\dialogs_filedlgg.obj :  .AUTODEPEND .\..\..\src\generic\filedlgg.cpp
 $(OBJS)\dialogs_fontdlgg.obj :  .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
 \r
 $(OBJS)\dialogs_fontdlgg.obj :  .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<\r
 \r

-$(OBJS)\dialogs_dialogs.res :  .AUTODEPEND .\dialogs.rc\r
-       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 $<\r
-\r

diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index ea88ff0007199e9124b72555de5252735698228c..482120e1fc7ca607ef2696451819215594c2b2ca 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 NETTEST_OBJECTS =  \

+       $(__nettest___win32rc) \

        $(__nettest_os2_lib_res) \
        $(__nettest_os2_lib_res) \

-       nettest_nettest.o \
-       $(__nettest___win32rc)
+       nettest_nettest.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/dialup/dialup.bkl b/samples/dialup/dialup.bkl
index 598f24da819a0c4b137e837b980fe78f9d6ba44b..c68d1d68f59dd8c4f454f6bff9d54b60c6fcbf4b 100644 (file)
--- a/samples/dialup/dialup.bkl
+++ b/samples/dialup/dialup.bkl
@@ -9,7 +9,6 @@
         <sources>nettest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>nettest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>nettest.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/dialup/dialup.dsp b/samples/dialup/dialup.dsp
index ee0707040dddbc01e1dcc0b87b252eeec70ec696..3dd75fea64f6aeddcb900b18183ee91b3b4dbb18 100644 (file)
--- a/samples/dialup/dialup.dsp
+++ b/samples/dialup/dialup.dsp
@@ -256,7 +256,7 @@ SOURCE=.\nettest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\nettest.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj
index a1c8d346c6da36b0222446d5da7170d2dbd76cd8..5535ee5719565d7f9b53e7d1fc110fe4d3bb328e 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\nettest.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/dialup/dialup_vc8.vcproj b/samples/dialup/dialup_vc8.vcproj
index 5198d257ec2c5f12775ec56f27c29b630f643c54..3d40ee34068c1864bc76f98b850a73453c66f880 100644 (file)
--- a/samples/dialup/dialup_vc8.vcproj
+++ b/samples/dialup/dialup_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\nettest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/dialup/dialup_vc9.vcproj b/samples/dialup/dialup_vc9.vcproj
index e82e6fe3db2f839ea0f420096fbe7641bacf3bfa..d4dee25473c69ba9263b20877de97f5281d4727c 100644 (file)
--- a/samples/dialup/dialup_vc9.vcproj
+++ b/samples/dialup/dialup_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\nettest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc
index 046643e99d14941d6f2b15028ed617fcd3d438f4..1b7dabcfc3dfb574e861e2c8b47ff13e5f32d56e 100644 (file)
--- a/samples/dialup/makefile.bcc
+++ b/samples/dialup/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\nettest.ilf del $(OBJS)\nettest.ilf\r
        -if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils\r
 \r
        -if exist $(OBJS)\nettest.ilf del $(OBJS)\nettest.ilf\r
        -if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils\r
 \r

-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS)  $(OBJS)\nettest_nettest.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(NETTEST_CXXFLAGS) .\nettest.cpp\r
 \r
 $(OBJS)\nettest_nettest.obj: .\nettest.cpp\r
        $(CXX) -q -c -P -o$@ $(NETTEST_CXXFLAGS) .\nettest.cpp\r
 \r

-$(OBJS)\nettest_nettest.res: .\nettest.rc\r
-       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\r
-\r

diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc
index fd8c045c59881ed7ac5cb514e1d5b9e4428de048..fa639f5acaa14a0bbe1c0a587067ed8997aed326 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 NETTEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 NETTEST_OBJECTS =  \\r

-       $(OBJS)\nettest_nettest.o \\r
-       $(OBJS)\nettest_nettest_rc.o\r
+       $(OBJS)\nettest_sample_rc.o \
+       $(OBJS)\nettest_nettest.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
 \r

-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\nettest_nettest.o: ./nettest.cpp\r
        $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\nettest_nettest_rc.o: ./nettest.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc
index e982a692a323bde0b7ac5e7f8eadd16daab129ab..ef905531c4ef6f5576de1efe4e70550b6d419a65 100644 (file)
--- 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 =  \\r
        $(OBJS)\nettest_nettest.obj\r
 NETTEST_RESOURCES =  \\r
 NETTEST_OBJECTS =  \\r
        $(OBJS)\nettest_nettest.obj\r
 NETTEST_RESOURCES =  \\r

-       $(OBJS)\nettest_nettest.res\r
+       $(OBJS)\nettest_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk\r
        -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb\r
 \r
        -if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk\r
        -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb\r
 \r

-$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp\r
 \r
 $(OBJS)\nettest_nettest.obj: .\nettest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp\r
 \r

-$(OBJS)\nettest_nettest.res: .\nettest.rc\r
-       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\r
-\r

diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat
index 516778ed807cf574092df463cf609f82d4e1e6e5..55439b1b66cf4fbbf95782b2fb41ba0869d7461d 100644 (file)
--- a/samples/dialup/makefile.wat
+++ b/samples/dialup/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe\r
 \r

-$(OBJS)\nettest.exe :  $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res\r
+$(OBJS)\nettest.exe :  $(NETTEST_OBJECTS) $(OBJS)\nettest_sample.res

        @%create $(OBJS)\nettest.lbc\r
        @%append $(OBJS)\nettest.lbc option quiet\r
        @%append $(OBJS)\nettest.lbc name $^@\r
        @%create $(OBJS)\nettest.lbc\r
        @%append $(OBJS)\nettest.lbc option quiet\r
        @%append $(OBJS)\nettest.lbc name $^@\r


@@ -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)\r
        @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i\r
        @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\r
        @%append $(OBJS)\nettest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i\r
        @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\r

-       @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res\r
+       @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_sample.res

        @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i\r
        wlink @$(OBJS)\nettest.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i\r
        wlink @$(OBJS)\nettest.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\nettest_nettest.obj :  .AUTODEPEND .\nettest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $<\r
 \r

-$(OBJS)\nettest_nettest.res :  .AUTODEPEND .\nettest.rc\r
-       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 $<\r
-\r

diff --git a/samples/dialup/nettest.rc b/samples/dialup/nettest.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 335d7ba3c0e2f62c49efcc8c399ad60c8515dded..3c46f4f160de2c55b03d65d02f2211a42310a603 100644 (file)
--- 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"
 
 doc                 ICON    "doc.ico"
 chrt                ICON    "chart.ico"

diff --git a/samples/docview/mondrian.ico b/samples/docview/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (executable)
index 33ec670..0000000
--- 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 (file)
index cc52c7d..0000000
--- a/samples/docview/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index fc0755b6ff05e8290ba4437aaed8caf3137ecd82..0bd71e6f1b2d612e453c7ff1faadd5ae24406666 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -36,9 +36,9 @@
 
 #include "dragimag.h"
 
 
 #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
 #endif
 
 // main program


@@ -327,7 +327,7 @@ MyFrame::MyFrame()
     wxMenuBar *menu_bar = new wxMenuBar();
     menu_bar->Append(file_menu, wxT("&File"));
 
     wxMenuBar *menu_bar = new wxMenuBar();
     menu_bar->Append(file_menu, wxT("&File"));
 

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

     SetMenuBar( menu_bar );
 
 #if wxUSE_STATUSBAR
     SetMenuBar( menu_bar );
 
 #if wxUSE_STATUSBAR

diff --git a/samples/dragimag/dragimag.rc b/samples/dragimag/dragimag.rc
index 754a07223500535879e8cfea132514488beeab6b..650de583392b6f2ba00b8e75f8fcc6f8e5337dde 100644 (file)
--- a/samples/dragimag/dragimag.rc
+++ b/samples/dragimag/dragimag.rc
@@ -1,5 +1,4 @@
-mondrian ICON "mondrian.ico"
-dragicon ICON "dragicon.ico"
+#include "../sample.rc"

 
 

-#include "wx/msw/wx.rc"
+dragicon ICON "dragicon.ico"

 
 

diff --git a/samples/dragimag/mondrian.ico b/samples/dragimag/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/dragimag/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 54c728b079c3282fc3edf2b121a40686ca155fb1..c064d4335e0ddb88be844e8bde566c01d299cb83 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 DRAWING_OBJECTS =  \

+       $(__drawing___win32rc) \

        $(__drawing_os2_lib_res) \
        $(__drawing_os2_lib_res) \

-       drawing_drawing.o \
-       $(__drawing___win32rc)
+       drawing_drawing.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/drawing/drawing.bkl b/samples/drawing/drawing.bkl
index e2e383dafe3ee10c5351732d0c6f6496a803cea3..0ac1e066ec38dbbea79f62b339f95823bdaa8fbe 100644 (file)
--- a/samples/drawing/drawing.bkl
+++ b/samples/drawing/drawing.bkl
@@ -7,7 +7,6 @@
         <sources>drawing.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>drawing.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>drawing.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index afebb3086948b776b5d228ea6c99ca0f214404b8..c3b3f4be5222385443f11752707967cee9fb42fc 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -45,8 +45,8 @@
 // ----------------------------------------------------------------------------
 
 // the application icon
 // ----------------------------------------------------------------------------
 
 // 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
 
 // ----------------------------------------------------------------------------
 #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
                  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"));
 
     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 43a7ae287cd78b9e3c1816fff8ae74c1dc5cf1f1..0ac675e90597df03eeabf1ea60e38f37c8832ec7 100644 (file)
--- a/samples/drawing/drawing.dsp
+++ b/samples/drawing/drawing.dsp
@@ -256,7 +256,7 @@ SOURCE=.\drawing.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\drawing.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/drawing/drawing.rc b/samples/drawing/drawing.rc
deleted file mode 100644 (file)
index 2b94a2b..0000000
--- 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 b8ecf8a7b364c338d6ac38c3ecbff69ace11c9d1..e9a16aef7d1a5dfa61ea2e76b7a937aa1735c299 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\drawing.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/drawing/drawing_vc8.vcproj b/samples/drawing/drawing_vc8.vcproj
index 6873e41899140ba6d8f39e522f4e84c38d407e39..44e5820442b1c5932f52e481940657c3b1b0c2f3 100644 (file)
--- a/samples/drawing/drawing_vc8.vcproj
+++ b/samples/drawing/drawing_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\drawing.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/drawing/drawing_vc9.vcproj b/samples/drawing/drawing_vc9.vcproj
index c1902b4f743f266daea3430c4bc69c58f47ade94..9b3e92eb70683457cd98d67ea2f5c6274d97aa6a 100644 (file)
--- a/samples/drawing/drawing_vc9.vcproj
+++ b/samples/drawing/drawing_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\drawing.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc
index f59fb25956dc159f0666abbbe37134c005b192f3..8b0e7f1693554f80523e0a8f1d5f3ebfa64ffc2c 100644 (file)
--- a/samples/drawing/makefile.bcc
+++ b/samples/drawing/makefile.bcc
@@ -229,18 +229,18 @@ clean:
        -if exist $(OBJS)\drawing.ilf del $(OBJS)\drawing.ilf\r
        -if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils\r
 \r
        -if exist $(OBJS)\drawing.ilf del $(OBJS)\drawing.ilf\r
        -if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils\r
 \r

-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS)  $(OBJS)\drawing_drawing.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(DRAWING_CXXFLAGS) .\drawing.cpp\r
 \r
 $(OBJS)\drawing_drawing.obj: .\drawing.cpp\r
        $(CXX) -q -c -P -o$@ $(DRAWING_CXXFLAGS) .\drawing.cpp\r
 \r

-$(OBJS)\drawing_drawing.res: .\drawing.rc\r
-       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\r
-\r

diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc
index 09b7850b9f4ae70be3849d79d9b0fbab7cd2f406..ddd59c4c0dbddd7295a92797c6283d315e20680a 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 DRAWING_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 DRAWING_OBJECTS =  \\r

-       $(OBJS)\drawing_drawing.o \\r
-       $(OBJS)\drawing_drawing_rc.o\r
+       $(OBJS)\drawing_sample_rc.o \
+       $(OBJS)\drawing_drawing.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,19 +218,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
 \r

-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\drawing_drawing.o: ./drawing.cpp\r
        $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\drawing_drawing_rc.o: ./drawing.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc
index cca19ae5cc0c6ed853fd79bdb056be5c69e07804..f54e0d4dcc61aabbf04203ebc381ff30e1a9b91c 100644 (file)
--- 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 =  \\r
        $(OBJS)\drawing_drawing.obj\r
 DRAWING_RESOURCES =  \\r
 DRAWING_OBJECTS =  \\r
        $(OBJS)\drawing_drawing.obj\r
 DRAWING_RESOURCES =  \\r

-       $(OBJS)\drawing_drawing.res\r
+       $(OBJS)\drawing_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,7 +339,7 @@ clean:
        -if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk\r
        -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb\r
 \r
        -if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk\r
        -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb\r
 \r

-$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -348,9 +348,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp\r
 \r
 $(OBJS)\drawing_drawing.obj: .\drawing.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp\r
 \r

-$(OBJS)\drawing_drawing.res: .\drawing.rc\r
-       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\r
-\r

diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat
index f0ee1bb83f65ff46e4f316d398737af69a2296f7..ffa658d7203219c2a5fe573920da194390a9c937 100644 (file)
--- a/samples/drawing/makefile.wat
+++ b/samples/drawing/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe\r
 \r

-$(OBJS)\drawing.exe :  $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res\r
+$(OBJS)\drawing.exe :  $(DRAWING_OBJECTS) $(OBJS)\drawing_sample.res

        @%create $(OBJS)\drawing.lbc\r
        @%append $(OBJS)\drawing.lbc option quiet\r
        @%append $(OBJS)\drawing.lbc name $^@\r
        @%create $(OBJS)\drawing.lbc\r
        @%append $(OBJS)\drawing.lbc option quiet\r
        @%append $(OBJS)\drawing.lbc name $^@\r


@@ -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)\r
        @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i\r
        @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\r
        @%append $(OBJS)\drawing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i\r
        @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\r

-       @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res\r
+       @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_sample.res

        @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i\r
        wlink @$(OBJS)\drawing.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i\r
        wlink @$(OBJS)\drawing.lbc\r
 \r


@@ -264,9 +264,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $<\r
 \r
 $(OBJS)\drawing_drawing.obj :  .AUTODEPEND .\drawing.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $<\r
 \r

-$(OBJS)\drawing_drawing.res :  .AUTODEPEND .\drawing.rc\r
-       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 $<\r
-\r

diff --git a/samples/drawing/mondrian.ico b/samples/drawing/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/drawing/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 02aab740db00d014f780c1e71479b99e1b269765..37a879fb681206e5491ddf2fd6dea59f135460b9 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 ERASE_OBJECTS =  \

+       $(__erase___win32rc) \

        $(__erase_os2_lib_res) \
        $(__erase_os2_lib_res) \

-       erase_erase.o \
-       $(__erase___win32rc)
+       erase_erase.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/erase/erase.bkl b/samples/erase/erase.bkl
index 6239ede75748e9c113d423799581e39e5528f1f7..0c0dca9f7c36f9bf1227de493a1c188cc1ff783c 100644 (file)
--- a/samples/erase/erase.bkl
+++ b/samples/erase/erase.bkl
@@ -7,7 +7,6 @@
         <sources>erase.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>erase.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>erase.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index d00ccf0de3f597e7254d5c9418d25ee95dc941e6..d603a93cefca80e56db8a84ff4d2a4756e36a5f3 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -35,9 +35,10 @@
 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------

+

 // the application icon
 // 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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -169,7 +170,7 @@ MyFrame::MyFrame()
        : wxFrame(NULL, wxID_ANY, "Erase sample",
                  wxPoint(50, 50), wxSize(450, 340))
 {
        : 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");
 
     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 );
 
 
     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) );
 
 
     new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );
 

diff --git a/samples/erase/erase.dsp b/samples/erase/erase.dsp
index b6b1a37b9d4caa9740d8a19d72f0f95c2c8efd28..1d17f1196f86fbcf46bc338d6e18e7b6de9613aa 100644 (file)
--- a/samples/erase/erase.dsp
+++ b/samples/erase/erase.dsp
@@ -256,7 +256,7 @@ SOURCE=.\erase.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\erase.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/erase/erase.rc b/samples/erase/erase.rc
deleted file mode 100644 (file)
index 3bf71d6..0000000
--- 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 (file)
index 42078be..0000000
--- 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 (file)
index 695f7b0..0000000
--- 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 9be66866a6b4b58685aad79a8a30f9b08a52af55..89acfced3f45192ba315ade5a8345fee90d2756b 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\erase.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/erase/erase_vc8.vcproj b/samples/erase/erase_vc8.vcproj
index 729cd96e2542e1fa351b4c886c2ee29c611a5c12..877001decd1cd902c54610449827bc0132780607 100644 (file)
--- a/samples/erase/erase_vc8.vcproj
+++ b/samples/erase/erase_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\erase.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/erase/erase_vc9.vcproj b/samples/erase/erase_vc9.vcproj
index d65cf35314dcad4079fa9648c7dfbe2c993f30c7..48ee73ecd897150a65dc20875d51ef17eef4aead 100644 (file)
--- a/samples/erase/erase_vc9.vcproj
+++ b/samples/erase/erase_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\erase.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc
index a2739e5dd43a24ee5227fc84b43749a0ab9ba335..945a153d47d738f61c9dce43cba3c3634afb9708 100644 (file)
--- a/samples/erase/makefile.bcc
+++ b/samples/erase/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\erase.ilf del $(OBJS)\erase.ilf\r
        -if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils\r
 \r
        -if exist $(OBJS)\erase.ilf del $(OBJS)\erase.ilf\r
        -if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils\r
 \r

-$(OBJS)\erase.exe: $(ERASE_OBJECTS)  $(OBJS)\erase_erase.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) .\erase.cpp\r
 \r
 $(OBJS)\erase_erase.obj: .\erase.cpp\r
        $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) .\erase.cpp\r
 \r

-$(OBJS)\erase_erase.res: .\erase.rc\r
-       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\r
-\r

diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc
index e641d9a0681aa2b4d7f20e2834660863632adec5..37bfed6b38d93e2bb9d21d27201c701ff8b64347 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ERASE_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ERASE_OBJECTS =  \\r

-       $(OBJS)\erase_erase.o \\r
-       $(OBJS)\erase_erase_rc.o\r
+       $(OBJS)\erase_sample_rc.o \
+       $(OBJS)\erase_erase.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
 \r

-$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\erase_erase.o: ./erase.cpp\r
        $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\erase_erase_rc.o: ./erase.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index 72b815f22d1537aa73a65d0104dfdd82db8dcc18..116d7f1fbc9faeae24dd228eb3d0a54410538647 100644 (file)
--- 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 =  \\r
        $(OBJS)\erase_erase.obj\r
 ERASE_RESOURCES =  \\r
 ERASE_OBJECTS =  \\r
        $(OBJS)\erase_erase.obj\r
 ERASE_RESOURCES =  \\r

-       $(OBJS)\erase_erase.res\r
+       $(OBJS)\erase_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk\r
        -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb\r
 \r
        -if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk\r
        -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb\r
 \r

-$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp\r
 \r
 $(OBJS)\erase_erase.obj: .\erase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp\r
 \r

-$(OBJS)\erase_erase.res: .\erase.rc\r
-       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\r
-\r

diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat
index a7eb8220e1e98c7e7d08385966bd43f41e304da5..74baca1f232a72991d2bc0b1b0a785fc023479b6 100644 (file)
--- a/samples/erase/makefile.wat
+++ b/samples/erase/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe\r
 \r

-$(OBJS)\erase.exe :  $(ERASE_OBJECTS) $(OBJS)\erase_erase.res\r
+$(OBJS)\erase.exe :  $(ERASE_OBJECTS) $(OBJS)\erase_sample.res

        @%create $(OBJS)\erase.lbc\r
        @%append $(OBJS)\erase.lbc option quiet\r
        @%append $(OBJS)\erase.lbc name $^@\r
        @%create $(OBJS)\erase.lbc\r
        @%append $(OBJS)\erase.lbc option quiet\r
        @%append $(OBJS)\erase.lbc name $^@\r


@@ -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)\r
        @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i\r
        @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\r
        @%append $(OBJS)\erase.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i\r
        @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\r

-       @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res\r
+       @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_sample.res

        @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i\r
        wlink @$(OBJS)\erase.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i\r
        wlink @$(OBJS)\erase.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $<\r
 \r
 $(OBJS)\erase_erase.obj :  .AUTODEPEND .\erase.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $<\r
 \r

-$(OBJS)\erase_erase.res :  .AUTODEPEND .\erase.rc\r
-       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 $<\r
-\r

diff --git a/samples/erase/mondrian.ico b/samples/erase/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index 18d5e76..0000000
--- a/samples/erase/mondrian.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 7 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-"a c None",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ +aaaaaaaaaaaaaaaa+ .... ",\r
-" ++++++ +aaaaaaaaaaaaaaaa+ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ +aaaaaaaaaaaaaaaa+      ",\r
-" ++++++ +aaaaaaaaaaaaaaaa+ ++++ ",\r
-" ++++++ +aaaaaaaaaaaaaaaa+ ++++ ",\r
-" ++++++ +aaaaaaaaaaaaaaaa+ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/erase/mondros2.ico b/samples/erase/mondros2.ico
deleted file mode 100644 (file)
index 8b0e58c..0000000
Binary files a/samples/erase/mondros2.ico and /dev/null differ

diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 98e02727522acfcb0d356f4d4ed071f533019ee8..d3604236a94cbb842e39514e57643be5ab67beb8 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 EVENT_OBJECTS =  \

+       $(__event___win32rc) \

        $(__event_os2_lib_res) \
        $(__event_os2_lib_res) \

-       event_event.o \
-       $(__event___win32rc)
+       event_event.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/event/event.bkl b/samples/event/event.bkl
index 78b9436d640cb0fc939b2d3089df868f7e151fe8..e5b558fac3d8ec7d5bca3499520c06dd27d54346 100644 (file)
--- a/samples/event/event.bkl
+++ b/samples/event/event.bkl
@@ -7,7 +7,6 @@
         <sources>event.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>event.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>event.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/event/event.dsp b/samples/event/event.dsp
index 9a7eb7196db001d7dd9b9c18919ba4a1a046d5fc..06bc7fc0cfac96668de909245aef57fd714dcf35 100644 (file)
--- a/samples/event/event.dsp
+++ b/samples/event/event.dsp
@@ -256,7 +256,7 @@ SOURCE=.\event.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\event.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/event/event.rc b/samples/event/event.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 88912c20159bdac16f93965a5d539dc16e29f9a5..1e7d45d87df9e08ae288623ccdab5856fb43c6bf 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\event.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/event/event_vc8.vcproj b/samples/event/event_vc8.vcproj
index c894bb60dcb80178348b26e16ec63d45156b9009..fff4f4ee1f2f95d694e3ed0a300b5b0d930ad960 100644 (file)
--- a/samples/event/event_vc8.vcproj
+++ b/samples/event/event_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\event.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/event/event_vc9.vcproj b/samples/event/event_vc9.vcproj
index 61d383dfabea3c72f702801d15bc14588a249732..505652e5a82c87476e4bfa99f71604ba4a97090f 100644 (file)
--- a/samples/event/event_vc9.vcproj
+++ b/samples/event/event_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\event.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc
index 9b01b5502406c2dcf4ac6aa9db6bff52f6a12321..5a2b1d18ec1173f2c9055aec3e71c8c588493aca 100644 (file)
--- a/samples/event/makefile.bcc
+++ b/samples/event/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\event.ilf del $(OBJS)\event.ilf\r
        -if exist $(OBJS)\event.ils del $(OBJS)\event.ils\r
 \r
        -if exist $(OBJS)\event.ilf del $(OBJS)\event.ilf\r
        -if exist $(OBJS)\event.ils del $(OBJS)\event.ils\r
 \r

-$(OBJS)\event.exe: $(EVENT_OBJECTS)  $(OBJS)\event_event.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\event.cpp\r
 \r
 $(OBJS)\event_event.obj: .\event.cpp\r
        $(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\event.cpp\r
 \r

-$(OBJS)\event_event.res: .\event.rc\r
-       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\r
-\r

diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc
index 350fb95cbff45dabe8f492bf06a20e367f095720..1129cb54f3d54e21dd8fbb5e06298175b5853a61 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 EVENT_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 EVENT_OBJECTS =  \\r

-       $(OBJS)\event_event.o \\r
-       $(OBJS)\event_event_rc.o\r
+       $(OBJS)\event_sample_rc.o \
+       $(OBJS)\event_event.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
 \r

-$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\event_event.o: ./event.cpp\r
        $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\event_event_rc.o: ./event.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc
index a33912989c0c5435e1d199b554ffa4da5f24c379..2eb79f0e4bba35e4351c41b7d57851a41e69aaf2 100644 (file)
--- 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 =  \\r
        $(OBJS)\event_event.obj\r
 EVENT_RESOURCES =  \\r
 EVENT_OBJECTS =  \\r
        $(OBJS)\event_event.obj\r
 EVENT_RESOURCES =  \\r

-       $(OBJS)\event_event.res\r
+       $(OBJS)\event_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk\r
        -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb\r
 \r
        -if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk\r
        -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb\r
 \r

-$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp\r
 \r
 $(OBJS)\event_event.obj: .\event.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp\r
 \r

-$(OBJS)\event_event.res: .\event.rc\r
-       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\r
-\r

diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat
index aca2c4bd4905d3ebcbf5f38b4a43a7b94644d1c8..8c5280eeecfd71e549378db0d3f74540f10cef48 100644 (file)
--- a/samples/event/makefile.wat
+++ b/samples/event/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
 \r

-$(OBJS)\event.exe :  $(EVENT_OBJECTS) $(OBJS)\event_event.res\r
+$(OBJS)\event.exe :  $(EVENT_OBJECTS) $(OBJS)\event_sample.res

        @%create $(OBJS)\event.lbc\r
        @%append $(OBJS)\event.lbc option quiet\r
        @%append $(OBJS)\event.lbc name $^@\r
        @%create $(OBJS)\event.lbc\r
        @%append $(OBJS)\event.lbc option quiet\r
        @%append $(OBJS)\event.lbc name $^@\r


@@ -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)\r
        @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i\r
        @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\r
        @%append $(OBJS)\event.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i\r
        @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\r

-       @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res\r
+       @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_sample.res

        @for %i in () do @%append $(OBJS)\event.lbc option stack=%i\r
        wlink @$(OBJS)\event.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\event.lbc option stack=%i\r
        wlink @$(OBJS)\event.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $<\r
 \r
 $(OBJS)\event_event.obj :  .AUTODEPEND .\event.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $<\r
 \r

-$(OBJS)\event_event.res :  .AUTODEPEND .\event.rc\r
-       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 $<\r
-\r

diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 08e01bfab097a309b2f6f3f947c01a9cbab5f222..09f50fd878a923e6ce4075a2e996305d068b1ea7 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 FONT_OBJECTS =  \

+       $(__font___win32rc) \

        $(__font_os2_lib_res) \
        $(__font_os2_lib_res) \

-       font_font.o \
-       $(__font___win32rc)
+       font_font.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/font/font.bkl b/samples/font/font.bkl
index 16ec889b76205f7a266a5d02cc268c4714ee31b1..cb88a72e12b4bab661175490681fce8f2443314e 100644 (file)
--- a/samples/font/font.bkl
+++ b/samples/font/font.bkl
@@ -7,7 +7,6 @@
         <sources>font.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>font.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>font.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index e2d4200e57ad5080e9e4958ee2526c4f3dddaaf3..cb036de8b7c21e0bf91f0ed128fce1e49e127961 100644 (file)
--- 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();
 
 {
     m_fontSize = wxNORMAL_FONT->GetPointSize();
 

-    SetIcon(wxIcon(sample_xpm));
+    SetIcon(wxICON(sample));

 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

diff --git a/samples/font/font.dsp b/samples/font/font.dsp
index 7c14346df46e04bc64383804410670bccdc2c1df..3f9830634ed4bc8fdb1866dcc2988ee447c56cdb 100644 (file)
--- a/samples/font/font.dsp
+++ b/samples/font/font.dsp
@@ -256,7 +256,7 @@ SOURCE=.\font.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\font.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/font/font.rc b/samples/font/font.rc
deleted file mode 100644 (file)
index 55808f0..0000000
--- 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 cef6fe271b0667fea9df533cb8a1b45243b06453..fb5eb5079e667dc9b8c1203ee888488bbb663bfb 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\font.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/font/font_vc8.vcproj b/samples/font/font_vc8.vcproj
index 4d6091ce51981d728df70cc962fd5660fc67fccc..84c88c6b0bdc79475ee6f27fc308cbececb4c3c7 100644 (file)
--- a/samples/font/font_vc8.vcproj
+++ b/samples/font/font_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\font.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/font/font_vc9.vcproj b/samples/font/font_vc9.vcproj
index 4acf8568c0e8ad667c9681d97df71f69c5fcadca..a47e293f507bb1deb5d374565dfb91eda0e2bafc 100644 (file)
--- a/samples/font/font_vc9.vcproj
+++ b/samples/font/font_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\font.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc
index af145bacfb4fb49afd23d9afc508592a070da16f..b5c7e313aae03c3eb4865574f582aa845b658421 100644 (file)
--- a/samples/font/makefile.bcc
+++ b/samples/font/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\font.ilf del $(OBJS)\font.ilf\r
        -if exist $(OBJS)\font.ils del $(OBJS)\font.ils\r
 \r
        -if exist $(OBJS)\font.ilf del $(OBJS)\font.ilf\r
        -if exist $(OBJS)\font.ils del $(OBJS)\font.ils\r
 \r

-$(OBJS)\font.exe: $(FONT_OBJECTS)  $(OBJS)\font_font.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(FONT_CXXFLAGS) .\font.cpp\r
 \r
 $(OBJS)\font_font.obj: .\font.cpp\r
        $(CXX) -q -c -P -o$@ $(FONT_CXXFLAGS) .\font.cpp\r
 \r

-$(OBJS)\font_font.res: .\font.rc\r
-       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\r
-\r

diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index 5b4ce7e7e3c68c17859a3536ddfc3a6555ed2de9..b652a4e96d7908417ab787df5ad34a2ec7f74bed 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 FONT_OBJECTS =  \\r
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 FONT_OBJECTS =  \\r

-       $(OBJS)\font_font.o \\r
-       $(OBJS)\font_font_rc.o\r
+       $(OBJS)\font_sample_rc.o \
+       $(OBJS)\font_font.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -217,15 +217,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
 \r

-$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\font_font.o: ./font.cpp\r
        $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\font_font_rc.o: ./font.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc
index 4106543cee00ceb7474935841d477cb194e1ed5d..ca10ef6340587f30339f54738f90a456715ad87a 100644 (file)
--- 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 =  \\r
        $(OBJS)\font_font.obj\r
 FONT_RESOURCES =  \\r
 FONT_OBJECTS =  \\r
        $(OBJS)\font_font.obj\r
 FONT_RESOURCES =  \\r

-       $(OBJS)\font_font.res\r
+       $(OBJS)\font_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk\r
        -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb\r
 \r
        -if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk\r
        -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb\r
 \r

-$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp\r
 \r
 $(OBJS)\font_font.obj: .\font.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp\r
 \r

-$(OBJS)\font_font.res: .\font.rc\r
-       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\r
-\r

diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat
index ff59cf49c695a1c6dd364825c0e9771e16a4f49e..3cefec7c3fcee2f891e5b83cdb847fe2aa513d05 100644 (file)
--- a/samples/font/makefile.wat
+++ b/samples/font/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\font.exe del $(OBJS)\font.exe\r
 \r

-$(OBJS)\font.exe :  $(FONT_OBJECTS) $(OBJS)\font_font.res\r
+$(OBJS)\font.exe :  $(FONT_OBJECTS) $(OBJS)\font_sample.res

        @%create $(OBJS)\font.lbc\r
        @%append $(OBJS)\font.lbc option quiet\r
        @%append $(OBJS)\font.lbc name $^@\r
        @%create $(OBJS)\font.lbc\r
        @%append $(OBJS)\font.lbc option quiet\r
        @%append $(OBJS)\font.lbc name $^@\r


@@ -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)\r
        @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i\r
        @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\r
        @%append $(OBJS)\font.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i\r
        @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\r

-       @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res\r
+       @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_sample.res

        @for %i in () do @%append $(OBJS)\font.lbc option stack=%i\r
        wlink @$(OBJS)\font.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\font.lbc option stack=%i\r
        wlink @$(OBJS)\font.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $<\r
 \r
 $(OBJS)\font_font.obj :  .AUTODEPEND .\font.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $<\r
 \r

-$(OBJS)\font_font.res :  .AUTODEPEND .\font.rc\r
-       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 $<\r
-\r

diff --git a/samples/font/mondrian.ico b/samples/font/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index 82bdf07..0000000
--- 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 176c6781c82d3ff10128ab24d55b7533256abfc6..dd958b89a95a5b1e54cbb5a328fa8b877ce69134 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 HELP_OBJECTS =  \

+       $(__help___win32rc) \

        $(__help_os2_lib_res) \
        $(__help_os2_lib_res) \

-       help_demo.o \
-       $(__help___win32rc)
+       help_demo.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 5935d59b1ffe74b6d51a4b52dfaa464ecb0b2c0d..505574ad6ade52bd8f837b0e820b00c61c362a87 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -79,8 +79,8 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // 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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -396,7 +396,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #endif
 {
     // set the frame icon
 #endif
 {
     // set the frame icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

diff --git a/samples/help/demo.rc b/samples/help/demo.rc
deleted file mode 100644 (file)
index 74b8e3f..0000000
--- 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 5a50aad189466c887fc2508acd746793d94dfbd6..50af7881c2a2a6ad70cf30d953554ede40041bd4 100644 (file)
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -10,7 +10,6 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>demo.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/help/help.dsp b/samples/help/help.dsp
index 7a61119cfa22ff176f4ea35971597d488c829315..1010aa4315839e8c183a018affa52fc9bc64f997 100644 (file)
--- a/samples/help/help.dsp
+++ b/samples/help/help.dsp
@@ -256,7 +256,7 @@ SOURCE=.\demo.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\demo.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj
index 30c239ba50a0966fac349010375eeaf30c13dfac..50418f2da781f6f4abe40fa45019d16b29feb701 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\demo.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj
index 5889047887dbe613480cfbc4d55fc603be0dbaee..c4d03ff988e24a79e534fbe20d42ac78cf6e5146 100644 (file)
--- a/samples/help/help_vc8.vcproj
+++ b/samples/help/help_vc8.vcproj
@@ -824,7 +824,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\demo.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/help/help_vc9.vcproj b/samples/help/help_vc9.vcproj
index aa4225b191a24b7cb8a3a61d865869c040dfec69..761b4feabab31c6698c7d0508f540c5ce2f0a790 100644 (file)
--- a/samples/help/help_vc9.vcproj
+++ b/samples/help/help_vc9.vcproj
@@ -796,7 +796,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\demo.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index d4041f4e9677abf95abfb188dc19ffc75514473a..19fb55ee5565a15dece261cb571083ab321dd912 100644 (file)
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -237,9 +237,9 @@ clean:
        -if exist $(OBJS)\help.ilf del $(OBJS)\help.ilf\r
        -if exist $(OBJS)\help.ils del $(OBJS)\help.ils\r
 \r
        -if exist $(OBJS)\help.ilf del $(OBJS)\help.ilf\r
        -if exist $(OBJS)\help.ils del $(OBJS)\help.ils\r
 \r

-$(OBJS)\help.exe: $(HELP_OBJECTS)  $(OBJS)\help_demo.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
 |\r
 \r
 data: \r


@@ -250,9 +250,9 @@ data_doc:
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) .\demo.cpp\r
 \r
 $(OBJS)\help_demo.obj: .\demo.cpp\r
        $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) .\demo.cpp\r
 \r

-$(OBJS)\help_demo.res: .\demo.rc\r
-       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\r
-\r

diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index c10ecdabee2235ce3c6e930897dd4873f9b41bfe..862ca6f9511821a13be43e959e66ac14a658c290 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HELP_OBJECTS =  \\r
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HELP_OBJECTS =  \\r

-       $(OBJS)\help_demo.o \\r
-       $(OBJS)\help_demo_rc.o\r
+       $(OBJS)\help_sample_rc.o \
+       $(OBJS)\help_demo.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -225,7 +225,7 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
 \r

-$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o\r
+$(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\r
 \r
 data: \r
        $(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\r
 \r
 data: \r


@@ -236,12 +236,12 @@ data_doc:
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(HELP_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\help_demo.o: ./demo.cpp\r
        $(CXX) -c -o $@ $(HELP_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\help_demo_rc.o: ./demo.rc\r
-       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\r
-\r

 .PHONY: all clean data data_doc\r
 \r
 \r
 .PHONY: all clean data data_doc\r
 \r
 \r

diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index 278ef96eff115472260b363c7cfe08f9f033ab96..e811f1fa51d2ef0ce092efab3b7f69896d925940 100644 (file)
--- 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 =  \\r
        $(OBJS)\help_demo.obj\r
 HELP_RESOURCES =  \\r
 HELP_OBJECTS =  \\r
        $(OBJS)\help_demo.obj\r
 HELP_RESOURCES =  \\r

-       $(OBJS)\help_demo.res\r
+       $(OBJS)\help_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -347,7 +347,7 @@ clean:
        -if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk\r
        -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb\r
 \r
        -if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk\r
        -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb\r
 \r

-$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -360,9 +360,9 @@ data_doc:
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp\r
 \r
 $(OBJS)\help_demo.obj: .\demo.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp\r
 \r

-$(OBJS)\help_demo.res: .\demo.rc\r
-       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\r
-\r

diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat
index 45667996993fac43b0cbad9381a612ec8f8db0df..08180aca8f12e687c6f6fba6fb27cf72ba891e72 100644 (file)
--- a/samples/help/makefile.wat
+++ b/samples/help/makefile.wat
@@ -258,7 +258,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\help.exe del $(OBJS)\help.exe\r
 \r

-$(OBJS)\help.exe :  $(HELP_OBJECTS) $(OBJS)\help_demo.res\r
+$(OBJS)\help.exe :  $(HELP_OBJECTS) $(OBJS)\help_sample.res

        @%create $(OBJS)\help.lbc\r
        @%append $(OBJS)\help.lbc option quiet\r
        @%append $(OBJS)\help.lbc name $^@\r
        @%create $(OBJS)\help.lbc\r
        @%append $(OBJS)\help.lbc option quiet\r
        @%append $(OBJS)\help.lbc name $^@\r


@@ -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)\r
        @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i\r
        @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\r
        @%append $(OBJS)\help.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i\r
        @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\r

-       @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res\r
+       @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_sample.res

        @for %i in () do @%append $(OBJS)\help.lbc option stack=%i\r
        wlink @$(OBJS)\help.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\help.lbc option stack=%i\r
        wlink @$(OBJS)\help.lbc\r
 \r


@@ -278,9 +278,9 @@ data_doc : .SYMBOLIC
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r
        if not exist $(OBJS)\doc mkdir $(OBJS)\doc\r
        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\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $<\r
 \r
 $(OBJS)\help_demo.obj :  .AUTODEPEND .\demo.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $<\r
 \r

-$(OBJS)\help_demo.res :  .AUTODEPEND .\demo.rc\r
-       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 $<\r
-\r

diff --git a/samples/help/mondrian.ico b/samples/help/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/help/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index db1eaba74d38bf36ac686d56be77fbe31dc5eee2..c2dd8e76975d0611b14cce4d1b649f1ba534342a 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 HTLBOX_OBJECTS =  \

+       $(__htlbox___win32rc) \

        $(__htlbox_os2_lib_res) \
        $(__htlbox_os2_lib_res) \

-       htlbox_htlbox.o \
-       $(__htlbox___win32rc)
+       htlbox_htlbox.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/htlbox/htlbox.bkl b/samples/htlbox/htlbox.bkl
index 3105bc4d6b318c4c4ab8606e2498cd98300ca002..6374eecbdc685effc8991e1c2cb318777976645e 100644 (file)
--- a/samples/htlbox/htlbox.bkl
+++ b/samples/htlbox/htlbox.bkl
@@ -8,7 +8,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>htlbox.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index af34173fa0d985911bc9f06af926f5ccb5874125..091a1d77aa5f2f3d1c5b035e26eaf3bf137d299f 100644 (file)
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -241,7 +241,7 @@ MyFrame::MyFrame()
                  wxDefaultPosition, wxSize(500, 500))
 {
     // set the frame icon
                  wxDefaultPosition, wxSize(500, 500))
 {
     // set the frame icon

-    SetIcon(wxIcon(sample_xpm));
+    SetIcon(wxICON(sample));

 
 #if wxUSE_MENUS
     // create a menu bar
 
 #if wxUSE_MENUS
     // create a menu bar

diff --git a/samples/htlbox/htlbox.dsp b/samples/htlbox/htlbox.dsp
index 9fd1c3b37e5d2fc1c2a0aa939d7797059785a456..2d32fd46e2c0a289bda04e0fc0bcc6a47d8d35b5 100644 (file)
--- a/samples/htlbox/htlbox.dsp
+++ b/samples/htlbox/htlbox.dsp
@@ -256,7 +256,7 @@ SOURCE=.\htlbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\htlbox.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/htlbox/htlbox.rc b/samples/htlbox/htlbox.rc
deleted file mode 100644 (file)
index 74b8e3f..0000000
--- 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 4cd4b7ba2ca823a83a3096f1725f5536ebf75c59..2922968fa9549bfa73036fd5571b8b07ea2ecb17 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\htlbox.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/htlbox/htlbox_vc8.vcproj b/samples/htlbox/htlbox_vc8.vcproj
index cb83bcfb6ec00fb34a45f7d20e2b0cf9dabaa07b..4ece7a197ebf80db44c33eed08194d0a016b25ee 100644 (file)
--- a/samples/htlbox/htlbox_vc8.vcproj
+++ b/samples/htlbox/htlbox_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\htlbox.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/htlbox/htlbox_vc9.vcproj b/samples/htlbox/htlbox_vc9.vcproj
index 83815578340c7a213b7d57fe6a5a5c87e900ce93..6f6e1e2da7d149ffa76e669918eb31632caaa12f 100644 (file)
--- a/samples/htlbox/htlbox_vc9.vcproj
+++ b/samples/htlbox/htlbox_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\htlbox.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc
index 5b3c815e650098fe935d290f98026fbf8e31e3f5..55a89e9cde6e39d98c84034c5492070ad7707e2d 100644 (file)
--- a/samples/htlbox/makefile.bcc
+++ b/samples/htlbox/makefile.bcc
@@ -233,14 +233,14 @@ clean:
        -if exist $(OBJS)\htlbox.ilf del $(OBJS)\htlbox.ilf\r
        -if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils\r
 \r
        -if exist $(OBJS)\htlbox.ilf del $(OBJS)\htlbox.ilf\r
        -if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils\r
 \r

-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS)  $(OBJS)\htlbox_htlbox.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp\r
 \r
 $(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp\r
        $(CXX) -q -c -P -o$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp\r
 \r

-$(OBJS)\htlbox_htlbox.res: .\htlbox.rc\r
-       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\r
-\r

diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc
index 346341964dc4d9e9b5fcb83e113701019925211b..92ac3978b5dbd80b6a50ff12f433e7ab50dd070c 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HTLBOX_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HTLBOX_OBJECTS =  \\r

-       $(OBJS)\htlbox_htlbox.o \\r
-       $(OBJS)\htlbox_htlbox_rc.o\r
+       $(OBJS)\htlbox_sample_rc.o \
+       $(OBJS)\htlbox_htlbox.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,15 +222,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
 \r

-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\htlbox_htlbox.o: ./htlbox.cpp\r
        $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\htlbox_htlbox_rc.o: ./htlbox.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index 3a375352cca1c7186509d645562f92c30497b144..bc63ae4ed814fb3d397e3bedcdcbc2eee5a922a8 100644 (file)
--- 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 =  \\r
        $(OBJS)\htlbox_htlbox.obj\r
 HTLBOX_RESOURCES =  \\r
 HTLBOX_OBJECTS =  \\r
        $(OBJS)\htlbox_htlbox.obj\r
 HTLBOX_RESOURCES =  \\r

-       $(OBJS)\htlbox_htlbox.res\r
+       $(OBJS)\htlbox_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,14 +343,14 @@ clean:
        -if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk\r
        -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb\r
 \r
        -if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk\r
        -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb\r
 \r

-$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp\r
 \r
 $(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp\r
 \r

-$(OBJS)\htlbox_htlbox.res: .\htlbox.rc\r
-       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\r
-\r

diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat
index f4a16b2e4551bbb95494143e54a561c001212079..0d0790e570507a9012b44c633aa5ea9411466b85 100644 (file)
--- a/samples/htlbox/makefile.wat
+++ b/samples/htlbox/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe\r
 \r

-$(OBJS)\htlbox.exe :  $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res\r
+$(OBJS)\htlbox.exe :  $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample.res

        @%create $(OBJS)\htlbox.lbc\r
        @%append $(OBJS)\htlbox.lbc option quiet\r
        @%append $(OBJS)\htlbox.lbc name $^@\r
        @%create $(OBJS)\htlbox.lbc\r
        @%append $(OBJS)\htlbox.lbc option quiet\r
        @%append $(OBJS)\htlbox.lbc name $^@\r


@@ -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)\r
        @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i\r
        @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\r
        @%append $(OBJS)\htlbox.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i\r
        @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\r

-       @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res\r
+       @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_sample.res

        @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i\r
        wlink @$(OBJS)\htlbox.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i\r
        wlink @$(OBJS)\htlbox.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $<\r
 \r
 $(OBJS)\htlbox_htlbox.obj :  .AUTODEPEND .\htlbox.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $<\r
 \r

-$(OBJS)\htlbox_htlbox.res :  .AUTODEPEND .\htlbox.rc\r
-       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 $<\r
-\r

diff --git a/samples/htlbox/mondrian.ico b/samples/htlbox/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/htlbox/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 519eff4f5bc0e2c0984a70c05773c87c949ea308..4c4f680a3cdc16f3d7b4abbed3815165e6fef962 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 ABOUT_OBJECTS =  \

+       $(__about___win32rc) \

        $(__about_os2_lib_res) \
        $(__about_os2_lib_res) \

-       about_about.o \
-       $(__about___win32rc)
+       about_about.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 473530efeead0132e46def1b84ee0287c0fe683d..bcb634caa857d33cdf92fb7ec8d8d2ea5af67436 100644 (file)
--- a/samples/html/about/about.bkl
+++ b/samples/html/about/about.bkl
@@ -10,7 +10,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>about.rc</win32-res>

     </exe>
 
     <wx-data id="data_files">
     </exe>
 
     <wx-data id="data_files">

diff --git a/samples/html/about/about.dsp b/samples/html/about/about.dsp
index 8758d1cebfc571706b60d21e89bd324e0887c2d3..3a33cc0b4cc6eb8acbcea7b62aebddc8c33bd603 100644 (file)
--- a/samples/html/about/about.dsp
+++ b/samples/html/about/about.dsp
@@ -256,7 +256,7 @@ SOURCE=.\about.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\about.rc\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/about/about.rc b/samples/html/about/about.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 5832fdc9423db7864eef9f516370b409a43e4667..759a133554e045d6eabf9f88617a5b199446012f 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\about.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/about/about_vc8.vcproj b/samples/html/about/about_vc8.vcproj
index 2167a7c85794f36633b4e5f1be9c2a812d17ea55..96e86bd2748d41c2c36302328ca92a5897f20856 100644 (file)
--- a/samples/html/about/about_vc8.vcproj
+++ b/samples/html/about/about_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\about.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/about/about_vc9.vcproj b/samples/html/about/about_vc9.vcproj
index c82f1638c845a9761a7f5e20db8ae2f73d0c508a..070ef2727381aa50fa580a0f5d78c289bec2a4c4 100644 (file)
--- a/samples/html/about/about_vc9.vcproj
+++ b/samples/html/about/about_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\about.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc
index b881589482ddafe49508dd54fad437c40c7ceaf3..89deacc0209e5a4e7bcce8b2601eb39939f244e7 100644 (file)
--- 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\r
        -if exist $(OBJS)\about.ils del $(OBJS)\about.ils\r
 \r
        -if exist $(OBJS)\about.ilf del $(OBJS)\about.ilf\r
        -if exist $(OBJS)\about.ils del $(OBJS)\about.ils\r
 \r

-$(OBJS)\about.exe: $(ABOUT_OBJECTS)  $(OBJS)\about_about.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data_files: \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
 \r
 |\r
 \r
 data_files: \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(ABOUT_CXXFLAGS) .\about.cpp\r
 \r
 $(OBJS)\about_about.obj: .\about.cpp\r
        $(CXX) -q -c -P -o$@ $(ABOUT_CXXFLAGS) .\about.cpp\r
 \r

-$(OBJS)\about_about.res: .\about.rc\r
-       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\r
-\r

diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index 0f9da36d908eade626ca7b0d70ca0b4a85863e85..b5bc6bc24fce6bc51dbd4a06270771fe85f7f042 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ABOUT_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ABOUT_OBJECTS =  \\r

-       $(OBJS)\about_about.o \\r
-       $(OBJS)\about_about_rc.o\r
+       $(OBJS)\about_sample_rc.o \
+       $(OBJS)\about_about.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
 \r

-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o\r
+$(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\r
 \r
 data_files: \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data\r
 \r
        $(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\r
 \r
 data_files: \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\about_about.o: ./about.cpp\r
        $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\about_about_rc.o: ./about.rc\r
-       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\r
-\r

 .PHONY: all clean data_files\r
 \r
 \r
 .PHONY: all clean data_files\r
 \r
 \r

diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc
index cf468eb2504253b56ef95890d6e47e11c505f54b..016f1e01484ad64f630215b111c88a88d9d18e69 100644 (file)
--- 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 =  \\r
        $(OBJS)\about_about.obj\r
 ABOUT_RESOURCES =  \\r
 ABOUT_OBJECTS =  \\r
        $(OBJS)\about_about.obj\r
 ABOUT_RESOURCES =  \\r

-       $(OBJS)\about_about.res\r
+       $(OBJS)\about_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,7 +343,7 @@ clean:
        -if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk\r
        -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb\r
 \r
        -if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk\r
        -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb\r
 \r

-$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -352,9 +352,9 @@ data_files:
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
 \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp\r
 \r
 $(OBJS)\about_about.obj: .\about.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp\r
 \r

-$(OBJS)\about_about.res: .\about.rc\r
-       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\r
-\r

diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
index a09ac1c118a04c24b07659695b046f001d8fdd5d..59e5ac82930a75d2149e691eb01427cd388c1f11 100644 (file)
--- 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\r
        -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\about.exe del $(OBJS)\about.exe\r
 \r

-$(OBJS)\about.exe :  $(ABOUT_OBJECTS) $(OBJS)\about_about.res\r
+$(OBJS)\about.exe :  $(ABOUT_OBJECTS) $(OBJS)\about_sample.res

        @%create $(OBJS)\about.lbc\r
        @%append $(OBJS)\about.lbc option quiet\r
        @%append $(OBJS)\about.lbc name $^@\r
        @%create $(OBJS)\about.lbc\r
        @%append $(OBJS)\about.lbc option quiet\r
        @%append $(OBJS)\about.lbc name $^@\r


@@ -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)\r
        @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i\r
        @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\r
        @%append $(OBJS)\about.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i\r
        @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\r

-       @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res\r
+       @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_sample.res

        @for %i in () do @%append $(OBJS)\about.lbc option stack=%i\r
        wlink @$(OBJS)\about.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\about.lbc option stack=%i\r
        wlink @$(OBJS)\about.lbc\r
 \r


@@ -269,9 +269,9 @@ data_files : .SYMBOLIC
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
 \r
        if not exist $(OBJS)\data mkdir $(OBJS)\data\r
        for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $<\r
 \r
 $(OBJS)\about_about.obj :  .AUTODEPEND .\about.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $<\r
 \r

-$(OBJS)\about_about.res :  .AUTODEPEND .\about.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index e036696bb6e0bf98f987019586a103680ca3e295..ea35b9801af23c89cdbd4c200cb16a15dabb5c58 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
        -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 HTMLHELP_OBJECTS =  \

+       $(__htmlhelp___win32rc) \

        $(__htmlhelp_os2_lib_res) \
        $(__htmlhelp_os2_lib_res) \

-       htmlhelp_help.o \
-       $(__htmlhelp___win32rc)
+       htmlhelp_help.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 f6b883e124d2d92687502eecd4dce96853fd604e..58d6bab16932478a23a3538dcd72b6a424931802 100644 (file)
--- a/samples/html/help/help.bkl
+++ b/samples/html/help/help.bkl
@@ -10,7 +10,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>help.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp
index ae10a2f892ddeb3779622cdf1902d09ff10b59fa..0325b87dcc08313c691901ee179aea0aa4e04971 100644 (file)
--- a/samples/html/help/help.dsp
+++ b/samples/html/help/help.dsp
@@ -256,7 +256,7 @@ SOURCE=.\help.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\help.rc\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/help/help.rc b/samples/html/help/help.rc
deleted file mode 100644 (file)
index b86c4e2..0000000
--- 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 560e8257ad44db7c4a8b66e96f4a86142a528c92..7182f54d4c45e70ccdbee3d02693edb67ff1a978 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\help.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/help/help_vc8.vcproj b/samples/html/help/help_vc8.vcproj
index e8e9d43020fbb46d8a6915cb44cb4fab2269dea4..bd5bdecc8ebc834676014a620adbabea6074fb0a 100644 (file)
--- a/samples/html/help/help_vc8.vcproj
+++ b/samples/html/help/help_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\help.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/help/help_vc9.vcproj b/samples/html/help/help_vc9.vcproj
index d62b57a62d3d7dc3e0af357d908b4debb450b837..d36410199793a5ed2d3d067b3f2b653fd2ab1c88 100644 (file)
--- a/samples/html/help/help_vc9.vcproj
+++ b/samples/html/help/help_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\help.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc
index fa29ed6fced5cc040d87dcf1e9d204a2c6a60a03..5f48fc9036b541e5929da9e579757bebab51476d 100644 (file)
--- 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\r
        -if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils\r
 \r
        -if exist $(OBJS)\htmlhelp.ilf del $(OBJS)\htmlhelp.ilf\r
        -if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils\r
 \r

-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS)  $(OBJS)\htmlhelp_help.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(HTMLHELP_CXXFLAGS) .\help.cpp\r
 \r
 $(OBJS)\htmlhelp_help.obj: .\help.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLHELP_CXXFLAGS) .\help.cpp\r
 \r

-$(OBJS)\htmlhelp_help.res: .\help.rc\r
-       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\r
-\r

diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc
index 426cf49755079d585ea503309aa117095fbbc80c..d7b9f6dd96ba91c93dd0bda9b54704fb9444dea5 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HTMLHELP_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HTMLHELP_OBJECTS =  \\r

-       $(OBJS)\htmlhelp_help.o \\r
-       $(OBJS)\htmlhelp_help_rc.o\r
+       $(OBJS)\htmlhelp_sample_rc.o \
+       $(OBJS)\htmlhelp_help.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
 \r

-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(HTMLHELP_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\htmlhelp_help.o: ./help.cpp\r
        $(CXX) -c -o $@ $(HTMLHELP_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\htmlhelp_help_rc.o: ./help.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc
index a6f4f5818199f4d9b5d6d5e168579c2e2e2b3d0f..af26d05a356eb82ddb64a00f1acfa35d85d925a2 100644 (file)
--- 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 =  \\r
        $(OBJS)\htmlhelp_help.obj\r
 HTMLHELP_RESOURCES =  \\r
 HTMLHELP_OBJECTS =  \\r
        $(OBJS)\htmlhelp_help.obj\r
 HTMLHELP_RESOURCES =  \\r

-       $(OBJS)\htmlhelp_help.res\r
+       $(OBJS)\htmlhelp_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,7 +343,7 @@ clean:
        -if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk\r
        -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb\r
 \r
        -if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk\r
        -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb\r
 \r

-$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -352,9 +352,9 @@ data:
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp\r
 \r
 $(OBJS)\htmlhelp_help.obj: .\help.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp\r
 \r

-$(OBJS)\htmlhelp_help.res: .\help.rc\r
-       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\r
-\r

diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat
index 6f75a1ae7d179dabb65f11713e44bd57f111c4fb..b65c2ed3985e0483b0b8c9f5c8ce7f20a8887116 100644 (file)
--- 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\r
        -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe\r
 \r

-$(OBJS)\htmlhelp.exe :  $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res\r
+$(OBJS)\htmlhelp.exe :  $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample.res

        @%create $(OBJS)\htmlhelp.lbc\r
        @%append $(OBJS)\htmlhelp.lbc option quiet\r
        @%append $(OBJS)\htmlhelp.lbc name $^@\r
        @%create $(OBJS)\htmlhelp.lbc\r
        @%append $(OBJS)\htmlhelp.lbc option quiet\r
        @%append $(OBJS)\htmlhelp.lbc name $^@\r


@@ -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)\r
        @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i\r
        @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\r
        @%append $(OBJS)\htmlhelp.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i\r
        @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\r

-       @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res\r
+       @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_sample.res

        @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i\r
        wlink @$(OBJS)\htmlhelp.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i\r
        wlink @$(OBJS)\htmlhelp.lbc\r
 \r


@@ -269,9 +269,9 @@ data : .SYMBOLIC
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles\r
        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\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $<\r
 \r
 $(OBJS)\htmlhelp_help.obj :  .AUTODEPEND .\help.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $<\r
 \r

-$(OBJS)\htmlhelp_help.res :  .AUTODEPEND .\help.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 5b85c947a90a0f6560fff632cddd5a4453da726d..cccfc89ce4c13715d95ec646bd9449b80c0ef8f9 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
        -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 HELPVIEW_OBJECTS =  \

+       $(__helpview___win32rc) \

        $(__helpview_os2_lib_res) \
        $(__helpview_os2_lib_res) \

-       helpview_helpview.o \
-       $(__helpview___win32rc)
+       helpview_helpview.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 a04699656e95758a4487d20258b9054ba2c99414..88030818491cf716f32238eba6514cd69a46463b 100644 (file)
--- a/samples/html/helpview/helpview.bkl
+++ b/samples/html/helpview/helpview.bkl
@@ -10,7 +10,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>helpview.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/html/helpview/helpview.dsp b/samples/html/helpview/helpview.dsp
index c9d0401359c0f6ca6c0a43f98e2b970bc53af2d5..abc50e11f7d62c5f6cd3cd08d61583e512f5ec72 100644 (file)
--- a/samples/html/helpview/helpview.dsp
+++ b/samples/html/helpview/helpview.dsp
@@ -256,7 +256,7 @@ SOURCE=.\helpview.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\helpview.rc\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/helpview/helpview.ico b/samples/html/helpview/helpview.ico
deleted file mode 100644 (file)
index cbf2223..0000000
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 (file)
index d43931e..0000000
--- 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 5906e06514c9d84c7bb5d5dd46f5f48be9c1ea07..82fe528857f4bf36a1ea182a3d92feaf867a3818 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\helpview.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/helpview/helpview_vc8.vcproj b/samples/html/helpview/helpview_vc8.vcproj
index 6020078bef98710b4af2c0d3ade412edbb0e8d18..23c9122c0927175626bd1f3aa0a3cf26a9a5ee5e 100644 (file)
--- a/samples/html/helpview/helpview_vc8.vcproj
+++ b/samples/html/helpview/helpview_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\helpview.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/helpview/helpview_vc9.vcproj b/samples/html/helpview/helpview_vc9.vcproj
index 632cb7a94eda4dcb3b879e786e33c7133b549bc3..ba66e08c80dabdd8d8b8b8a671c618390130c8b3 100644 (file)
--- a/samples/html/helpview/helpview_vc9.vcproj
+++ b/samples/html/helpview/helpview_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\helpview.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc
index 77d62e8ec2b51d84078bc24666bd596aba854e6f..181850c3f8b04a3974d4f3bdc8dc789cdaaee31f 100644 (file)
--- 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\r
        -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils\r
 \r
        -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf\r
        -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils\r
 \r

-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
 \r
 $(OBJS)\helpview_helpview.obj: .\helpview.cpp\r
        $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
 \r

-$(OBJS)\helpview_helpview.res: .\helpview.rc\r
-       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\r
-\r

diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index 58aa8395cf8e3a89dc306b29d12a450dd1216a02..9207ed4345cdf03c514fc662dc7c7278b9f78cf2 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HELPVIEW_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HELPVIEW_OBJECTS =  \\r

-       $(OBJS)\helpview_helpview.o \\r
-       $(OBJS)\helpview_helpview_rc.o\r
+       $(OBJS)\helpview_sample_rc.o \
+       $(OBJS)\helpview_helpview.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
 \r

-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\helpview_helpview.o: ./helpview.cpp\r
        $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\helpview_helpview_rc.o: ./helpview.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index 80c08510a6e89996df69535ffad513593ce575c9..e8aa323360312e6782978dff312f5c75e30761da 100644 (file)
--- 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 =  \\r
        $(OBJS)\helpview_helpview.obj\r
 HELPVIEW_RESOURCES =  \\r
 HELPVIEW_OBJECTS =  \\r
        $(OBJS)\helpview_helpview.obj\r
 HELPVIEW_RESOURCES =  \\r

-       $(OBJS)\helpview_helpview.res\r
+       $(OBJS)\helpview_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,7 +343,7 @@ clean:
        -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk\r
        -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb\r
 \r
        -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk\r
        -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb\r
 \r

-$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -352,9 +352,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
 \r
 $(OBJS)\helpview_helpview.obj: .\helpview.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp\r
 \r

-$(OBJS)\helpview_helpview.res: .\helpview.rc\r
-       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\r
-\r

diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
index bce8d72a0204f184d82309491a49c579f37e2358..6acac408df6ba208ec63810ec58a078e6d65d6b5 100644 (file)
--- 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\r
        -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe\r
 \r

-$(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res\r
+$(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res

        @%create $(OBJS)\helpview.lbc\r
        @%append $(OBJS)\helpview.lbc option quiet\r
        @%append $(OBJS)\helpview.lbc name $^@\r
        @%create $(OBJS)\helpview.lbc\r
        @%append $(OBJS)\helpview.lbc option quiet\r
        @%append $(OBJS)\helpview.lbc name $^@\r


@@ -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)\r
        @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i\r
        @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\r
        @%append $(OBJS)\helpview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i\r
        @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\r

-       @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res\r
+       @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_sample.res

        @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i\r
        wlink @$(OBJS)\helpview.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i\r
        wlink @$(OBJS)\helpview.lbc\r
 \r


@@ -269,9 +269,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<\r
 \r
 $(OBJS)\helpview_helpview.obj :  .AUTODEPEND .\helpview.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<\r
 \r

-$(OBJS)\helpview_helpview.res :  .AUTODEPEND .\helpview.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/helpview/mondrian.ico b/samples/html/helpview/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 200d419fc21719259ffccede966b99de3cd0fac3..118c30525fd48aa347b82957a7a71c8aa578e755 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
        -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 HTMLPRINTING_OBJECTS =  \

+       $(__htmlprinting___win32rc) \

        $(__htmlprinting_os2_lib_res) \
        $(__htmlprinting_os2_lib_res) \

-       htmlprinting_printing.o \
-       $(__htmlprinting___win32rc)
+       htmlprinting_printing.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 95ae48b9ab325bd606f1ae4c398cc685f0d22bf6..fae2dc47fe64049c2de52b6147e308155309bdb9 100644 (file)
--- 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\r
        -if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils\r
 \r
        -if exist $(OBJS)\htmlprinting.ilf del $(OBJS)\htmlprinting.ilf\r
        -if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils\r
 \r

-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS)  $(OBJS)\htmlprinting_printing.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp\r
 \r
 $(OBJS)\htmlprinting_printing.obj: .\printing.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp\r
 \r

-$(OBJS)\htmlprinting_printing.res: .\printing.rc\r
-       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\r
-\r

diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc
index 4c8cd67f4a65554bb452793adec7e154c69365ff..6e3eec196b3221770d247d3fecb0c3e0a9ecfe4a 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HTMLPRINTING_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 HTMLPRINTING_OBJECTS =  \\r

-       $(OBJS)\htmlprinting_printing.o \\r
-       $(OBJS)\htmlprinting_printing_rc.o\r
+       $(OBJS)\htmlprinting_sample_rc.o \
+       $(OBJS)\htmlprinting_printing.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
 \r

-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\htmlprinting_printing.o: ./printing.cpp\r
        $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\htmlprinting_printing_rc.o: ./printing.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc
index e1805e759e61f7514fead3da35115d244636a008..852d6679c68c16e71e31562ccf67d9455b25f2ca 100644 (file)
--- 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 =  \\r
        $(OBJS)\htmlprinting_printing.obj\r
 HTMLPRINTING_RESOURCES =  \\r
 HTMLPRINTING_OBJECTS =  \\r
        $(OBJS)\htmlprinting_printing.obj\r
 HTMLPRINTING_RESOURCES =  \\r

-       $(OBJS)\htmlprinting_printing.res\r
+       $(OBJS)\htmlprinting_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,7 +343,7 @@ clean:
        -if exist $(OBJS)\htmlprinting.ilk del $(OBJS)\htmlprinting.ilk\r
        -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb\r
 \r
        -if exist $(OBJS)\htmlprinting.ilk del $(OBJS)\htmlprinting.ilk\r
        -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb\r
 \r

-$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -352,9 +352,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp\r
 \r
 $(OBJS)\htmlprinting_printing.obj: .\printing.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp\r
 \r

-$(OBJS)\htmlprinting_printing.res: .\printing.rc\r
-       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\r
-\r

diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat
index fbfbbd9875a9774fe80a87c7f52c6c1195657f64..eb2acb3904f13a6993de9856267b9a16b5630676 100644 (file)
--- 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\r
        -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe\r
 \r

-$(OBJS)\htmlprinting.exe :  $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res\r
+$(OBJS)\htmlprinting.exe :  $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_sample.res

        @%create $(OBJS)\htmlprinting.lbc\r
        @%append $(OBJS)\htmlprinting.lbc option quiet\r
        @%append $(OBJS)\htmlprinting.lbc name $^@\r
        @%create $(OBJS)\htmlprinting.lbc\r
        @%append $(OBJS)\htmlprinting.lbc option quiet\r
        @%append $(OBJS)\htmlprinting.lbc name $^@\r


@@ -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)\r
        @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i\r
        @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\r
        @%append $(OBJS)\htmlprinting.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i\r
        @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\r

-       @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res\r
+       @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_sample.res

        @for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i\r
        wlink @$(OBJS)\htmlprinting.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i\r
        wlink @$(OBJS)\htmlprinting.lbc\r
 \r


@@ -269,9 +269,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $<\r
 \r
 $(OBJS)\htmlprinting_printing.obj :  .AUTODEPEND .\printing.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $<\r
 \r

-$(OBJS)\htmlprinting_printing.res :  .AUTODEPEND .\printing.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/printing/mondrian.ico b/samples/html/printing/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 4da52afcc82c4a2b5fa282ebf2e5bb9d16d648bc..b9233ff4ef506728a47eb2cad5512b765cc8d3ed 100644 (file)
--- a/samples/html/printing/printing.bkl
+++ b/samples/html/printing/printing.bkl
@@ -10,7 +10,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>printing.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/html/printing/printing.dsp b/samples/html/printing/printing.dsp
index ac1337c951d115ee618eed02d17a683ee1b35110..8089a9b7661af0e3e02c33b02d5e541f38b98896 100644 (file)
--- a/samples/html/printing/printing.dsp
+++ b/samples/html/printing/printing.dsp
@@ -256,7 +256,7 @@ SOURCE=.\printing.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\printing.rc\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/printing/printing.rc b/samples/html/printing/printing.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 77620359ab4d92b13c9a8d530608c5030e1e1045..a185b8ec42353196bcf09e1034a7487f10bff0e1 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\printing.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/printing/printing_vc8.vcproj b/samples/html/printing/printing_vc8.vcproj
index 3240c0de1f64ad95dc96436a73fac8ef3f9bba80..d02b675317e39bd371fb90855c914638dfa3560d 100644 (file)
--- a/samples/html/printing/printing_vc8.vcproj
+++ b/samples/html/printing/printing_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\printing.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/printing/printing_vc9.vcproj b/samples/html/printing/printing_vc9.vcproj
index 7d9005e41b98fd560937e601e8cd6bd8d6235b77..832b88d477ac3de0b13f5138285f1a56db3d2a96 100644 (file)
--- a/samples/html/printing/printing_vc9.vcproj
+++ b/samples/html/printing/printing_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\printing.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 69f9b1e16fca83b91bd34b192d176f7170e2903c..8ea0a5938760a387f5dae9bf92b5fb8d24e164ed 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \

+       $(__test___win32rc) \

        $(__test_os2_lib_res) \
        $(__test_os2_lib_res) \

-       test_test.o \
-       $(__test___win32rc)
+       test_test.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 ec111dd02f379771cf01c833aa97224c005f79d3..c5bd9f08f38d03888f1b7762da9c9d7491352c27 100644 (file)
--- 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\r
        -if exist $(OBJS)\test.ils del $(OBJS)\test.ils\r
 \r
        -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf\r
        -if exist $(OBJS)\test.ils del $(OBJS)\test.ils\r
 \r

-$(OBJS)\test.exe: $(TEST_OBJECTS)  $(OBJS)\test_test.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp\r
 \r
 $(OBJS)\test_test.obj: .\test.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp\r
 \r

-$(OBJS)\test_test.res: .\test.rc\r
-       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\r
-\r

diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc
index ae1aafe880ddaded1de601aab85bdee48185f278..62a4c85f00711a9086c5ce4d4167fefd89843ef2 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 TEST_OBJECTS =  \\r
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 TEST_OBJECTS =  \\r

-       $(OBJS)\test_test.o \\r
-       $(OBJS)\test_test_rc.o\r
+       $(OBJS)\test_sample_rc.o \
+       $(OBJS)\test_test.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -225,19 +225,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
 \r

-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\test_test.o: ./test.cpp\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\test_test_rc.o: ./test.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc
index 824cbc765b50996849a6dadd216261cfb0bc5f86..8d289e5a578ffac1287160d94ba397ce34aa0d84 100644 (file)
--- 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 =  \\r
        $(OBJS)\test_test.obj\r
 TEST_RESOURCES =  \\r
 TEST_OBJECTS =  \\r
        $(OBJS)\test_test.obj\r
 TEST_RESOURCES =  \\r

-       $(OBJS)\test_test.res\r
+       $(OBJS)\test_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -347,7 +347,7 @@ clean:
        -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk\r
        -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb\r
 \r
        -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk\r
        -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb\r
 \r

-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -356,9 +356,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp\r
 \r
 $(OBJS)\test_test.obj: .\test.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp\r
 \r

-$(OBJS)\test_test.res: .\test.rc\r
-       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\r
-\r

diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat
index 6f8ac24bd59056cabfb6e75e2733f292739eda77..9c5bbb8ac8b7b8b319d8e6df373a4c1ab6e2cf36 100644 (file)
--- 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\r
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe\r
 \r

-$(OBJS)\test.exe :  $(TEST_OBJECTS) $(OBJS)\test_test.res\r
+$(OBJS)\test.exe :  $(TEST_OBJECTS) $(OBJS)\test_sample.res

        @%create $(OBJS)\test.lbc\r
        @%append $(OBJS)\test.lbc option quiet\r
        @%append $(OBJS)\test.lbc name $^@\r
        @%create $(OBJS)\test.lbc\r
        @%append $(OBJS)\test.lbc option quiet\r
        @%append $(OBJS)\test.lbc name $^@\r


@@ -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)\r
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i\r
        @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\r
        @%append $(OBJS)\test.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i\r
        @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\r

-       @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res\r
+       @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res

        @for %i in () do @%append $(OBJS)\test.lbc option stack=%i\r
        wlink @$(OBJS)\test.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\test.lbc option stack=%i\r
        wlink @$(OBJS)\test.lbc\r
 \r


@@ -274,9 +274,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r

-$(OBJS)\test_test.res :  .AUTODEPEND .\test.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/test/test.bkl b/samples/html/test/test.bkl
index c3fc72713b88aac4d0bd7e5b28fa0d100a1270c4..66807e97978e4995fb75f958eb274b7aa7d36e01 100644 (file)
--- a/samples/html/test/test.bkl
+++ b/samples/html/test/test.bkl
@@ -11,7 +11,6 @@
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>test.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/html/test/test.dsp b/samples/html/test/test.dsp
index e291f1d14a28d8f0ac82dbc12f6f0fed2f7577f0..e293cdc62b6dcb82e340ae3d8b25b91ec33e2a3d 100644 (file)
--- a/samples/html/test/test.dsp
+++ b/samples/html/test/test.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\test.cpp\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\test.rc\r
+SOURCE=.\test.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/test/test.rc b/samples/html/test/test.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 89a80e121b0e2d3e08eeb6285cca83db70797199..5c0ca912fca238a09d83b5369056235f5ac537ce 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\test.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/test/test_vc8.vcproj b/samples/html/test/test_vc8.vcproj
index a780b5b7e618a7facea046564a24f55afa6fec50..0430a3faa5f50efb5603be1a8395a121ce5ce74d 100644 (file)
--- a/samples/html/test/test_vc8.vcproj
+++ b/samples/html/test/test_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\test.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/test/test_vc9.vcproj b/samples/html/test/test_vc9.vcproj
index 7b0073565aa2997bf774c61ee7294731e9833c85..f0ee711268d75da781bc3f9018a3c8be87a8c4f5 100644 (file)
--- a/samples/html/test/test_vc9.vcproj
+++ b/samples/html/test/test_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\test.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 34b2ca0f3aec3cd1801a3d2a38fc6a1184b1e452..86d6df926e7a027ed50f43740d2b301836ae833c 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 VIRTUAL_OBJECTS =  \

+       $(__virtual___win32rc) \

        $(__virtual_os2_lib_res) \
        $(__virtual_os2_lib_res) \

-       virtual_virtual.o \
-       $(__virtual___win32rc)
+       virtual_virtual.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 c612334eea1456fd0e3a69af063fbfd4aacc815b..67597b29115241ca9812f60c6e447d2eded6edba 100644 (file)
--- 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\r
        -if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils\r
 \r
        -if exist $(OBJS)\virtual.ilf del $(OBJS)\virtual.ilf\r
        -if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils\r
 \r

-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS)  $(OBJS)\virtual_virtual.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp\r
 \r
 $(OBJS)\virtual_virtual.obj: .\virtual.cpp\r
        $(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp\r
 \r

-$(OBJS)\virtual_virtual.res: .\virtual.rc\r
-       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\r
-\r

diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc
index 874f4b585045da5cf5c5e11c354ab04c6deb5a76..5f23ea8d0c59b5eee06152862d4d41fd401845a2 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 VIRTUAL_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 VIRTUAL_OBJECTS =  \\r

-       $(OBJS)\virtual_virtual.o \\r
-       $(OBJS)\virtual_virtual_rc.o\r
+       $(OBJS)\virtual_sample_rc.o \
+       $(OBJS)\virtual_virtual.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
 \r

-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\virtual_virtual.o: ./virtual.cpp\r
        $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\virtual_virtual_rc.o: ./virtual.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc
index e6b1eab61c0b210e8d208a0c54369f522838ba0b..07b3f6c3fb0c216e2b1bd089839507381546d323 100644 (file)
--- 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 =  \\r
        $(OBJS)\virtual_virtual.obj\r
 VIRTUAL_RESOURCES =  \\r
 VIRTUAL_OBJECTS =  \\r
        $(OBJS)\virtual_virtual.obj\r
 VIRTUAL_RESOURCES =  \\r

-       $(OBJS)\virtual_virtual.res\r
+       $(OBJS)\virtual_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,7 +343,7 @@ clean:
        -if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk\r
        -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb\r
 \r
        -if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk\r
        -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb\r
 \r

-$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -352,9 +352,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp\r
 \r
 $(OBJS)\virtual_virtual.obj: .\virtual.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp\r
 \r

-$(OBJS)\virtual_virtual.res: .\virtual.rc\r
-       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\r
-\r

diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat
index 2666fec756fdbbcc39e96253360cbb087579ba74..56ba609202c48df0831a85a529718001981103c8 100644 (file)
--- 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\r
        -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe\r
 \r

-$(OBJS)\virtual.exe :  $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res\r
+$(OBJS)\virtual.exe :  $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample.res

        @%create $(OBJS)\virtual.lbc\r
        @%append $(OBJS)\virtual.lbc option quiet\r
        @%append $(OBJS)\virtual.lbc name $^@\r
        @%create $(OBJS)\virtual.lbc\r
        @%append $(OBJS)\virtual.lbc option quiet\r
        @%append $(OBJS)\virtual.lbc name $^@\r


@@ -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)\r
        @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i\r
        @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\r
        @%append $(OBJS)\virtual.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i\r
        @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\r

-       @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res\r
+       @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_sample.res

        @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i\r
        wlink @$(OBJS)\virtual.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i\r
        wlink @$(OBJS)\virtual.lbc\r
 \r


@@ -269,9 +269,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $<\r
 \r
 $(OBJS)\virtual_virtual.obj :  .AUTODEPEND .\virtual.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $<\r
 \r

-$(OBJS)\virtual_virtual.res :  .AUTODEPEND .\virtual.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/virtual/virtual.bkl b/samples/html/virtual/virtual.bkl
index 10c045e6a605c1534524b0b2bad7f98158fd9742..c4ea69452abfaf0030cef3fb4237902ee680ff81 100644 (file)
--- a/samples/html/virtual/virtual.bkl
+++ b/samples/html/virtual/virtual.bkl
@@ -10,7 +10,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>virtual.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/html/virtual/virtual.dsp b/samples/html/virtual/virtual.dsp
index b15b61eff5f6e3f6fd127cd5ad16929cf66efbfa..d40518babcf77b8a1552a0335c76fb27ee394776 100644 (file)
--- a/samples/html/virtual/virtual.dsp
+++ b/samples/html/virtual/virtual.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\virtual.cpp\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\virtual.rc\r
+SOURCE=.\virtual.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/virtual/virtual.rc b/samples/html/virtual/virtual.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 85b21b9f967f48aa7145596dc8fdbea83a93c513..534819d8bd26e315eed3f43cc52ac3509f6de3be 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\virtual.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/virtual/virtual_vc8.vcproj b/samples/html/virtual/virtual_vc8.vcproj
index dcb547723b07ae45af573a853b8f4c6ce16118fb..3e30647dd0d42aeefbeb082623f8013dd37bf952 100644 (file)
--- a/samples/html/virtual/virtual_vc8.vcproj
+++ b/samples/html/virtual/virtual_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\virtual.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/virtual/virtual_vc9.vcproj b/samples/html/virtual/virtual_vc9.vcproj
index 88a2a42933434eb879e482a9599a2365f266ccde..8a766bae7992af12a671c9eddd3ecfdc6e1adfc4 100644 (file)
--- a/samples/html/virtual/virtual_vc9.vcproj
+++ b/samples/html/virtual/virtual_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\virtual.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 8677c5983ecbf5b18584f3555b9f7c1781e6bd43..3b351797c0644f272152c3edb52d66c5e59a771e 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 WIDGET_OBJECTS =  \

+       $(__widget___win32rc) \

        $(__widget_os2_lib_res) \
        $(__widget_os2_lib_res) \

-       widget_widget.o \
-       $(__widget___win32rc)
+       widget_widget.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 c23716f3e56c2a9edbe5adf65e625d3003c87f66..a2ff8751435aeb1e12be268f2543898805d715c0 100644 (file)
--- 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\r
        -if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils\r
 \r
        -if exist $(OBJS)\widget.ilf del $(OBJS)\widget.ilf\r
        -if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils\r
 \r

-$(OBJS)\widget.exe: $(WIDGET_OBJECTS)  $(OBJS)\widget_widget.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(WIDGET_CXXFLAGS) .\widget.cpp\r
 \r
 $(OBJS)\widget_widget.obj: .\widget.cpp\r
        $(CXX) -q -c -P -o$@ $(WIDGET_CXXFLAGS) .\widget.cpp\r
 \r

-$(OBJS)\widget_widget.res: .\widget.rc\r
-       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\r
-\r

diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc
index 26dfed954d1c97a9788ba7be35bac32d920a0e90..abac600b5a15addec46235dcd901049c74058227 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 WIDGET_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 WIDGET_OBJECTS =  \\r

-       $(OBJS)\widget_widget.o \\r
-       $(OBJS)\widget_widget_rc.o\r
+       $(OBJS)\widget_sample_rc.o \
+       $(OBJS)\widget_widget.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,19 +222,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
 \r

-$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\widget_widget.o: ./widget.cpp\r
        $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\widget_widget_rc.o: ./widget.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc
index 20511cd18ca8a31d3048beacd097be3d4b6cec79..9fa57087bf40f41f794c8e3bb085747eced217b5 100644 (file)
--- 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 =  \\r
        $(OBJS)\widget_widget.obj\r
 WIDGET_RESOURCES =  \\r
 WIDGET_OBJECTS =  \\r
        $(OBJS)\widget_widget.obj\r
 WIDGET_RESOURCES =  \\r

-       $(OBJS)\widget_widget.res\r
+       $(OBJS)\widget_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,7 +343,7 @@ clean:
        -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk\r
        -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb\r
 \r
        -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk\r
        -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb\r
 \r

-$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -352,9 +352,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp\r
 \r
 $(OBJS)\widget_widget.obj: .\widget.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp\r
 \r

-$(OBJS)\widget_widget.res: .\widget.rc\r
-       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\r
-\r

diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat
index 143142993b7b59363cbdada18b3332db7226f7ef..33ecfd349448b7c7f6ed9b54acb9c3d5c575591c 100644 (file)
--- 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\r
        -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe\r
 \r

-$(OBJS)\widget.exe :  $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res\r
+$(OBJS)\widget.exe :  $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res

        @%create $(OBJS)\widget.lbc\r
        @%append $(OBJS)\widget.lbc option quiet\r
        @%append $(OBJS)\widget.lbc name $^@\r
        @%create $(OBJS)\widget.lbc\r
        @%append $(OBJS)\widget.lbc option quiet\r
        @%append $(OBJS)\widget.lbc name $^@\r


@@ -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)\r
        @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i\r
        @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\r
        @%append $(OBJS)\widget.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i\r
        @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\r

-       @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res\r
+       @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_sample.res

        @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i\r
        wlink @$(OBJS)\widget.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i\r
        wlink @$(OBJS)\widget.lbc\r
 \r


@@ -269,9 +269,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $<\r
 \r
 $(OBJS)\widget_widget.obj :  .AUTODEPEND .\widget.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $<\r
 \r

-$(OBJS)\widget_widget.res :  .AUTODEPEND .\widget.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/widget/widget.bkl b/samples/html/widget/widget.bkl
index 82e8e709caeffe7e02cc1e3dfbe223ab47bb5e87..0abefd62df8556afc8d608b3ce47781b54a871e7 100644 (file)
--- a/samples/html/widget/widget.bkl
+++ b/samples/html/widget/widget.bkl
@@ -10,7 +10,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>widget.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/html/widget/widget.dsp b/samples/html/widget/widget.dsp
index 44eb98ca1366361939768a0ace9fdb8918949d17..050767a39040029b5868f74d34c03f2ff8e9dd3e 100644 (file)
--- a/samples/html/widget/widget.dsp
+++ b/samples/html/widget/widget.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\widget.cpp\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\widget.rc\r
+SOURCE=.\widget.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/widget/widget.rc b/samples/html/widget/widget.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 e2af16f7e95a849db8df6e80d2350d2d2928ccac..2ddf0be4d4560e3212339b8d071747382e573f2b 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\widget.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/widget/widget_vc8.vcproj b/samples/html/widget/widget_vc8.vcproj
index 2e1b4e8d4f0a51eaff1d845a1bac7590bf071bf1..0184ca70f59747a2dd1c9371e191d2cd457d0caa 100644 (file)
--- a/samples/html/widget/widget_vc8.vcproj
+++ b/samples/html/widget/widget_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\widget.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/widget/widget_vc9.vcproj b/samples/html/widget/widget_vc9.vcproj
index 8128a50b78db81915be073750063f39cf265d241..4f745ae7e6d1423c3fd6134f392880eb0ba6b64a 100644 (file)
--- a/samples/html/widget/widget_vc9.vcproj
+++ b/samples/html/widget/widget_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\widget.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 296e281aff2bdcafd0e404f5c381622f9724a141..f18a1fb52a2857f5cb0dff53361046e211fb66b5 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 ZIP_OBJECTS =  \

+       $(__zip___win32rc) \

        $(__zip_os2_lib_res) \
        $(__zip_os2_lib_res) \

-       zip_zip.o \
-       $(__zip___win32rc)
+       zip_zip.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # 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 f47ab00a65b0d854bfe87e041f43f150e5abad9a..4f29b4dae1d8526eae92252804e1476d58f7e2f5 100644 (file)
--- 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\r
        -if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils\r
 \r
        -if exist $(OBJS)\zip.ilf del $(OBJS)\zip.ilf\r
        -if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils\r
 \r

-$(OBJS)\zip.exe: $(ZIP_OBJECTS)  $(OBJS)\zip_zip.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) .\zip.cpp\r
 \r
 $(OBJS)\zip_zip.obj: .\zip.cpp\r
        $(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) .\zip.cpp\r
 \r

-$(OBJS)\zip_zip.res: .\zip.rc\r
-       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\r
-\r

diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc
index 99a8adb88897046c42f1d7e4c5841195d4e0af6f..35c0468a175a2b574a8d22821b77d545161fe81e 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ZIP_OBJECTS =  \\r
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ZIP_OBJECTS =  \\r

-       $(OBJS)\zip_zip.o \\r
-       $(OBJS)\zip_zip_rc.o\r
+       $(OBJS)\zip_sample_rc.o \
+       $(OBJS)\zip_zip.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -221,19 +221,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
 \r

-$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (pages.zip start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (pages.zip start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\zip_zip.o: ./zip.cpp\r
        $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\zip_zip_rc.o: ./zip.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc
index 7f8e9efe8351fd8bc67ccf39a8a681d5e98766f1..2cdc74f8e5e9966734c9fcc693076d6e0e4dbdbc 100644 (file)
--- 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 =  \\r
        $(OBJS)\zip_zip.obj\r
 ZIP_RESOURCES =  \\r
 ZIP_OBJECTS =  \\r
        $(OBJS)\zip_zip.obj\r
 ZIP_RESOURCES =  \\r

-       $(OBJS)\zip_zip.res\r
+       $(OBJS)\zip_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,7 +343,7 @@ clean:
        -if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk\r
        -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb\r
 \r
        -if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk\r
        -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb\r
 \r

-$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -352,9 +352,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp\r
 \r
 $(OBJS)\zip_zip.obj: .\zip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp\r
 \r

-$(OBJS)\zip_zip.res: .\zip.rc\r
-       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\r
-\r

diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat
index 60af87d3d3179b9f77d698eaf9b3f7f7a89c0659..9883257bae9586c06efaa9cc5f4ab5c6d62a31c6 100644 (file)
--- 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\r
        -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe\r
 \r

-$(OBJS)\zip.exe :  $(ZIP_OBJECTS) $(OBJS)\zip_zip.res\r
+$(OBJS)\zip.exe :  $(ZIP_OBJECTS) $(OBJS)\zip_sample.res

        @%create $(OBJS)\zip.lbc\r
        @%append $(OBJS)\zip.lbc option quiet\r
        @%append $(OBJS)\zip.lbc name $^@\r
        @%create $(OBJS)\zip.lbc\r
        @%append $(OBJS)\zip.lbc option quiet\r
        @%append $(OBJS)\zip.lbc name $^@\r


@@ -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)\r
        @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i\r
        @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\r
        @%append $(OBJS)\zip.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i\r
        @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\r

-       @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res\r
+       @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_sample.res

        @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i\r
        wlink @$(OBJS)\zip.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i\r
        wlink @$(OBJS)\zip.lbc\r
 \r


@@ -269,9 +269,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $<\r
 \r
 $(OBJS)\zip_zip.obj :  .AUTODEPEND .\zip.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $<\r
 \r

-$(OBJS)\zip_zip.res :  .AUTODEPEND .\zip.rc\r
-       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 $<\r
-\r

diff --git a/samples/html/zip/zip.bkl b/samples/html/zip/zip.bkl
index dbf4125afd5a38d794dd3afcb5ea07742de77603..1383c4ca1394aba0b174059b903e68348695af54 100644 (file)
--- a/samples/html/zip/zip.bkl
+++ b/samples/html/zip/zip.bkl
@@ -10,7 +10,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>zip.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/html/zip/zip.dsp b/samples/html/zip/zip.dsp
index 6b1b782dd3d24cd8b2e4ebcaa8d131f180be95cf..010074d7900fc6c02619bd425683064dc4b8054f 100644 (file)
--- a/samples/html/zip/zip.dsp
+++ b/samples/html/zip/zip.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\zip.cpp\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\zip.rc\r
+SOURCE=.\zip.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/html/zip/zip.rc b/samples/html/zip/zip.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 037f696a83611a85b2e755a62a8d4b17e8cfe252..9cc3d74a9aa80101cfa62c0358db194f4e01571c 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\zip.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/html/zip/zip_vc8.vcproj b/samples/html/zip/zip_vc8.vcproj
index 5b697ddb26de55e59d7367dc10b259892482f795..4ce5f4247d7e7a5d77789555eed2ec5aac383d00 100644 (file)
--- a/samples/html/zip/zip_vc8.vcproj
+++ b/samples/html/zip/zip_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\zip.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/html/zip/zip_vc9.vcproj b/samples/html/zip/zip_vc9.vcproj
index 0f94c0027b884eed29068e1d6a7f511fcd5ccf1e..3eab2e300742887db6d3b2933a6e022f47b13bd7 100644 (file)
--- a/samples/html/zip/zip_vc9.vcproj
+++ b/samples/html/zip/zip_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\zip.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 0cf34cf63c0c7d4cbc8e2bca554dedd1b65e0f7d..e11a0489b1ede6d0309815c6941396bb51928bee 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \

+       $(__image___win32rc) \

        $(__image_os2_lib_res) \
        image_image.o \
        $(__image_os2_lib_res) \
        image_image.o \

-       image_canvas.o \
-       $(__image___win32rc)
+       image_canvas.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/image/image.bkl b/samples/image/image.bkl
index b2218036e7f613a9a1ae87a2c8d24db0907493f1..3762421268e4b359a130d4afc779b80dceab9662 100644 (file)
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -10,7 +10,6 @@
         <headers>canvas.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <headers>canvas.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>image.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/image/image.dsp b/samples/image/image.dsp
index cd8e7b20176b3893510c647ec47149d6e6263406..ec02e8cda6de39157b175ba8cce73c8da5d0a5f0 100644 (file)
--- a/samples/image/image.dsp
+++ b/samples/image/image.dsp
@@ -260,7 +260,7 @@ SOURCE=.\image.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\image.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/image/image.rc b/samples/image/image.rc
deleted file mode 100644 (file)
index 626b82f..0000000
--- 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 (file)
index be4e15f..0000000
--- 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 8e0014b607b7ffd8cdd59674dffbb9613e5face9..0133336c7f66476e723175b874c42309d12cc8b0 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\image.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj
index 9ae1ab08492419d0411559e989027e78cb12d91c..67155308b072b3d2d30691682f170d1f72cdefed 100644 (file)
--- a/samples/image/image_vc8.vcproj
+++ b/samples/image/image_vc8.vcproj
@@ -828,7 +828,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\image.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/image/image_vc9.vcproj b/samples/image/image_vc9.vcproj
index 918674ff527f18006c1b7eaeb2061b0e585466f3..63cd0c7e4dd1c26a58ff7993a65710f499883f17 100644 (file)
--- a/samples/image/image_vc9.vcproj
+++ b/samples/image/image_vc9.vcproj
@@ -800,7 +800,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\image.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index b165f8f48d3e63fecce8cad2eaffd6290bf2cd54..a4297123c42aac02c65b9ce655d9069e5538bb58 100644 (file)
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -230,21 +230,21 @@ clean:
        -if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf\r
        -if exist $(OBJS)\image.ils del $(OBJS)\image.ils\r
 \r
        -if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf\r
        -if exist $(OBJS)\image.ils del $(OBJS)\image.ils\r
 \r

-$(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_image.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
 \r
 $(OBJS)\image_canvas.obj: .\canvas.cpp\r
        $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
 \r
 $(OBJS)\image_image.obj: .\image.cpp\r
        $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
 \r
 $(OBJS)\image_canvas.obj: .\canvas.cpp\r
        $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
 \r

-$(OBJS)\image_image.res: .\image.rc\r
-       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\r
-\r

diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc
index aa10455e557335b7e00988e5695b9542bfe754e2..4c201f184d1f3756c27086e073e0810e557e0edc 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 IMAGE_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 IMAGE_OBJECTS =  \\r

+       $(OBJS)\image_sample_rc.o \

        $(OBJS)\image_image.o \\r
        $(OBJS)\image_image.o \\r

-       $(OBJS)\image_canvas.o \\r
-       $(OBJS)\image_image_rc.o\r
+       $(OBJS)\image_canvas.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -219,22 +219,22 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
 \r

-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\image_canvas.o: ./canvas.cpp\r
        $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\image_image.o: ./image.cpp\r
        $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\image_canvas.o: ./canvas.cpp\r
        $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\image_image_rc.o: ./image.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index 63a16ad11520303aab1051de979f258fc6f3e507..e30ef131cb692303badf4fc7f3d525864867b347 100644 (file)
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -33,7 +33,7 @@ IMAGE_OBJECTS =  \
        $(OBJS)\image_image.obj \\r
        $(OBJS)\image_canvas.obj\r
 IMAGE_RESOURCES =  \\r
        $(OBJS)\image_image.obj \\r
        $(OBJS)\image_canvas.obj\r
 IMAGE_RESOURCES =  \\r

-       $(OBJS)\image_image.res\r
+       $(OBJS)\image_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -340,7 +340,7 @@ clean:
        -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk\r
        -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb\r
 \r
        -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk\r
        -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb\r
 \r

-$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -349,12 +349,12 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
 \r
 $(OBJS)\image_canvas.obj: .\canvas.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
 \r
 $(OBJS)\image_image.obj: .\image.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
 \r
 $(OBJS)\image_canvas.obj: .\canvas.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
 \r

-$(OBJS)\image_image.res: .\image.rc\r
-       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\r
-\r

diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat
index 195cbe900ff6d8e6da884103b7dfb5a054699f65..d7c4f0fa12596b7f879f389a6bbb20ddd6390381 100644 (file)
--- a/samples/image/makefile.wat
+++ b/samples/image/makefile.wat
@@ -249,7 +249,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
 \r

-$(OBJS)\image.exe :  $(IMAGE_OBJECTS) $(OBJS)\image_image.res\r
+$(OBJS)\image.exe :  $(IMAGE_OBJECTS) $(OBJS)\image_sample.res

        @%create $(OBJS)\image.lbc\r
        @%append $(OBJS)\image.lbc option quiet\r
        @%append $(OBJS)\image.lbc name $^@\r
        @%create $(OBJS)\image.lbc\r
        @%append $(OBJS)\image.lbc option quiet\r
        @%append $(OBJS)\image.lbc name $^@\r


@@ -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)\r
        @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i\r
        @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\r
        @%append $(OBJS)\image.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i\r
        @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\r

-       @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res\r
+       @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_sample.res

        @for %i in () do @%append $(OBJS)\image.lbc option stack=%i\r
        wlink @$(OBJS)\image.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\image.lbc option stack=%i\r
        wlink @$(OBJS)\image.lbc\r
 \r


@@ -265,12 +265,12 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        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)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<\r
 \r
 $(OBJS)\image_canvas.obj :  .AUTODEPEND .\canvas.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<\r
 \r
 $(OBJS)\image_image.obj :  .AUTODEPEND .\image.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<\r
 \r
 $(OBJS)\image_canvas.obj :  .AUTODEPEND .\canvas.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<\r
 \r

-$(OBJS)\image_image.res :  .AUTODEPEND .\image.rc\r
-       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 $<\r
-\r

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 40c98b0e7b893c0b8c29792417c093424ff07af9..5c603795cfbe6d828a4c4398213ae4fdcdbc9e5a 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 INTERNAT_OBJECTS =  \

+       $(__internat___win32rc) \

        $(__internat_os2_lib_res) \
        $(__internat_os2_lib_res) \

-       internat_internat.o \
-       $(__internat___win32rc)
+       internat_internat.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/internat/internat.bkl b/samples/internat/internat.bkl
index bb29f446d0f6b403d7de51f0a741ad498101e8cd..33e0c06f58af27949ae638e09b8779c7258170fa 100644 (file)
--- a/samples/internat/internat.bkl
+++ b/samples/internat/internat.bkl
@@ -7,7 +7,6 @@
         <sources>internat.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>internat.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>internat.rc</win32-res>

     </exe>
 
     <template id="catalog">
     </exe>
 
     <template id="catalog">

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index c2fa8fcb3605d024a7aac1a45f303a3f43143e89..223cb01fb4398941c55b1134c440c04b273876ea 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -37,8 +37,8 @@
 #include "wx/log.h"
 #include "wx/cmdline.h"
 
 #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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -287,7 +287,7 @@ MyFrame::MyFrame(wxLocale& locale)
                  _("International wxWidgets App")),
          m_locale(locale)
 {
                  _("International wxWidgets App")),
          m_locale(locale)
 {

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;

diff --git a/samples/internat/internat.dsp b/samples/internat/internat.dsp
index ff0e5045fb6ba7c307b8f5300f7b573483f3ac30..ed77c62e2535f4e00141521e5052f1d9c19d664e 100644 (file)
--- a/samples/internat/internat.dsp
+++ b/samples/internat/internat.dsp
@@ -256,7 +256,7 @@ SOURCE=.\internat.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\internat.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/internat/internat.rc b/samples/internat/internat.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 ef8cb8b3c061417bfcc2e75d7c633874653bae59..cbe639fad5a860ca3e330dae699ddd152d998670 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\internat.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/internat/internat_vc8.vcproj b/samples/internat/internat_vc8.vcproj
index 6241e460393e392b736e4df741951a7981dca7db..a830b15fa3041de850e883fc3e6cf43f470d3007 100644 (file)
--- a/samples/internat/internat_vc8.vcproj
+++ b/samples/internat/internat_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\internat.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/internat/internat_vc9.vcproj b/samples/internat/internat_vc9.vcproj
index 7096174a2ba9c24f7082466cc78bfec6b34bf5c1..100cedfb1fe25ef8856fe82139376d416ba4adf5 100644 (file)
--- a/samples/internat/internat_vc9.vcproj
+++ b/samples/internat/internat_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\internat.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc
index b3c24c662860c92c1460dd5dbb9a4fb3648f46e2..a6e65ef881ac7b20a955a21d1fb4c449d73bef18 100644 (file)
--- a/samples/internat/makefile.bcc
+++ b/samples/internat/makefile.bcc
@@ -229,9 +229,9 @@ clean:
        -if exist $(OBJS)\internat.ilf del $(OBJS)\internat.ilf\r
        -if exist $(OBJS)\internat.ils del $(OBJS)\internat.ils\r
 \r
        -if exist $(OBJS)\internat.ilf del $(OBJS)\internat.ilf\r
        -if exist $(OBJS)\internat.ils del $(OBJS)\internat.ils\r
 \r

-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS)  $(OBJS)\internat_internat.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 ar: \r
 |\r
 \r
 ar: \r


@@ -282,9 +282,9 @@ ja_JP.EUC-JP:
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(INTERNAT_CXXFLAGS) .\internat.cpp\r
 \r
 $(OBJS)\internat_internat.obj: .\internat.cpp\r
        $(CXX) -q -c -P -o$@ $(INTERNAT_CXXFLAGS) .\internat.cpp\r
 \r

-$(OBJS)\internat_internat.res: .\internat.rc\r
-       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\r
-\r

diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc
index c00c96a59fdaa8a254a5c7c7893a197e6cb12d7f..fd2f4f498231fd2746252dae50b68e17299f311f 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 INTERNAT_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 INTERNAT_OBJECTS =  \\r

-       $(OBJS)\internat_internat.o \\r
-       $(OBJS)\internat_internat_rc.o\r
+       $(OBJS)\internat_sample_rc.o \
+       $(OBJS)\internat_internat.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,7 +218,7 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
 \r

-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat_rc.o\r
+$(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\r
 \r
 ar: \r
        $(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\r
 \r
 ar: \r


@@ -269,12 +269,12 @@ ja_JP.EUC-JP:
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\internat_internat.o: ./internat.cpp\r
        $(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\internat_internat_rc.o: ./internat.rc\r
-       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\r
-\r

 .PHONY: all clean ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP\r
 \r
 \r
 .PHONY: all clean ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP\r
 \r
 \r

diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc
index 624b2b6fcfdce88a8528c4bf9142315f3decd311..7677451c54d4912b1a785a69b30c7d0707c99ad1 100644 (file)
--- 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 =  \\r
        $(OBJS)\internat_internat.obj\r
 INTERNAT_RESOURCES =  \\r
 INTERNAT_OBJECTS =  \\r
        $(OBJS)\internat_internat.obj\r
 INTERNAT_RESOURCES =  \\r

-       $(OBJS)\internat_internat.res\r
+       $(OBJS)\internat_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,7 +339,7 @@ clean:
        -if exist $(OBJS)\internat.ilk del $(OBJS)\internat.ilk\r
        -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb\r
 \r
        -if exist $(OBJS)\internat.ilk del $(OBJS)\internat.ilk\r
        -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb\r
 \r

-$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -392,9 +392,9 @@ ja_JP.EUC-JP:
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) .\internat.cpp\r
 \r
 $(OBJS)\internat_internat.obj: .\internat.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) .\internat.cpp\r
 \r

-$(OBJS)\internat_internat.res: .\internat.rc\r
-       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\r
-\r

diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat
index eaa032795d3a80cfabb443f31be8c29c3eca299b..d1a88a132186f67c0a5218cfb9f9400366c99415 100644 (file)
--- a/samples/internat/makefile.wat
+++ b/samples/internat/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe\r
 \r

-$(OBJS)\internat.exe :  $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res\r
+$(OBJS)\internat.exe :  $(INTERNAT_OBJECTS) $(OBJS)\internat_sample.res

        @%create $(OBJS)\internat.lbc\r
        @%append $(OBJS)\internat.lbc option quiet\r
        @%append $(OBJS)\internat.lbc name $^@\r
        @%create $(OBJS)\internat.lbc\r
        @%append $(OBJS)\internat.lbc option quiet\r
        @%append $(OBJS)\internat.lbc name $^@\r


@@ -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)\r
        @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i\r
        @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\r
        @%append $(OBJS)\internat.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i\r
        @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\r

-       @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res\r
+       @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_sample.res

        @for %i in () do @%append $(OBJS)\internat.lbc option stack=%i\r
        wlink @$(OBJS)\internat.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\internat.lbc option stack=%i\r
        wlink @$(OBJS)\internat.lbc\r
 \r


@@ -308,9 +308,9 @@ ja_JP.EUC-JP : .SYMBOLIC
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r
        if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP\r
        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\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $<\r
 \r
 $(OBJS)\internat_internat.obj :  .AUTODEPEND .\internat.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $<\r
 \r

-$(OBJS)\internat_internat.res :  .AUTODEPEND .\internat.rc\r
-       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 $<\r
-\r

diff --git a/samples/internat/mondrian.ico b/samples/internat/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/internat/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 36c9d4552d0cfe98936dd131b2513e5c01557e50..99f160aaef443251c1c40f8a23d29be34cec3736 100644 (file)
--- 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"
 
 // 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"
 
 #include "wx/datetime.h"
 #include "client.h"
 

+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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
         : 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;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;

diff --git a/samples/ipc/client.rc b/samples/ipc/client.rc
deleted file mode 100644 (file)
index 74b8e3f..0000000
--- 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 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/ipc/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/ipc/server.rc b/samples/ipc/server.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 (file)
index c0777b9..0000000
Binary files a/samples/joytest/chart.ico and /dev/null differ

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 2f77ae74c21b2c523594f2ab10e06cd13bee6524..e5abd60f970fb5b4f4478cff4d0492110712afeb 100644 (file)
--- 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);
 
     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;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;

diff --git a/samples/joytest/joytest.ico b/samples/joytest/joytest.ico
deleted file mode 100644 (file)
index 7d0eceb..0000000
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 (file)
index 8138605..0000000
--- 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 (file)
index 2310c5d..0000000
Binary files a/samples/joytest/mondrian.ico and /dev/null differ

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index a0c177731b19fead58b272cab1f3d84fc09447ad..cd02c960284ee545979e53bad4f8d9cc95d7d78d 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 KEYBOARD_OBJECTS =  \

+       $(__keyboard___win32rc) \

        $(__keyboard_os2_lib_res) \
        $(__keyboard_os2_lib_res) \

-       keyboard_keyboard.o \
-       $(__keyboard___win32rc)
+       keyboard_keyboard.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/keyboard/keyboard.bkl b/samples/keyboard/keyboard.bkl
index d0ef3a694653bda36eb3571861648d0726a1c538..f01d014af39783ce30d27b7ad772373a9aae7681 100644 (file)
--- a/samples/keyboard/keyboard.bkl
+++ b/samples/keyboard/keyboard.bkl
@@ -7,7 +7,6 @@
         <sources>keyboard.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>keyboard.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>keyboard.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/keyboard/keyboard.dsp b/samples/keyboard/keyboard.dsp
index c0fcb6ac97ecd3b8d1912cecb5e341206617285a..2a602713bff84c2bd95399f404136df8ed618cf9 100644 (file)
--- a/samples/keyboard/keyboard.dsp
+++ b/samples/keyboard/keyboard.dsp
@@ -256,7 +256,7 @@ SOURCE=.\keyboard.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\keyboard.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/keyboard/keyboard.rc b/samples/keyboard/keyboard.rc
deleted file mode 100644 (file)
index b86c4e2..0000000
--- 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 871dca6a45646f34373723216705d8f8157da2bc..ddc98f1ebadf1eba5b1a0c725b93d9c1fcbba230 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\keyboard.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/keyboard/keyboard_vc8.vcproj b/samples/keyboard/keyboard_vc8.vcproj
index 5c998399d47ae8d6c152b7314dfcd9beac0b46c9..8bf92fd3aec13ea8ca85512a605d816eff767c8c 100644 (file)
--- a/samples/keyboard/keyboard_vc8.vcproj
+++ b/samples/keyboard/keyboard_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\keyboard.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/keyboard/keyboard_vc9.vcproj b/samples/keyboard/keyboard_vc9.vcproj
index 87da044d7bf9fa1b860f88c1f818036c6a04f167..b9b3df21630ec6a17a69bef26bb1b1864265b645 100644 (file)
--- a/samples/keyboard/keyboard_vc9.vcproj
+++ b/samples/keyboard/keyboard_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\keyboard.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc
index 9efe73b465e20e83b80bfbad0a5f6008d6ee2630..8584f51093254a1049cea95c426627b9b2fae878 100644 (file)
--- a/samples/keyboard/makefile.bcc
+++ b/samples/keyboard/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\keyboard.ilf del $(OBJS)\keyboard.ilf\r
        -if exist $(OBJS)\keyboard.ils del $(OBJS)\keyboard.ils\r
 \r
        -if exist $(OBJS)\keyboard.ilf del $(OBJS)\keyboard.ilf\r
        -if exist $(OBJS)\keyboard.ils del $(OBJS)\keyboard.ils\r
 \r

-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS)  $(OBJS)\keyboard_keyboard.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp\r
 \r
 $(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp\r
        $(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp\r
 \r

-$(OBJS)\keyboard_keyboard.res: .\keyboard.rc\r
-       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\r
-\r

diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index f366dff4e4bc27fd6baa9c6ce64416a63585a40f..7968341b56ea21c8280e2c1e15ee5aef629d69b2 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 KEYBOARD_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 KEYBOARD_OBJECTS =  \\r

-       $(OBJS)\keyboard_keyboard.o \\r
-       $(OBJS)\keyboard_keyboard_rc.o\r
+       $(OBJS)\keyboard_sample_rc.o \
+       $(OBJS)\keyboard_keyboard.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
 \r

-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\keyboard_keyboard.o: ./keyboard.cpp\r
        $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\keyboard_keyboard_rc.o: ./keyboard.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc
index 52627f4644bfd71478cd49366e0646699c068337..e57b3d0a8717dc28e8cf6d974487035a598636fc 100644 (file)
--- 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 =  \\r
        $(OBJS)\keyboard_keyboard.obj\r
 KEYBOARD_RESOURCES =  \\r
 KEYBOARD_OBJECTS =  \\r
        $(OBJS)\keyboard_keyboard.obj\r
 KEYBOARD_RESOURCES =  \\r

-       $(OBJS)\keyboard_keyboard.res\r
+       $(OBJS)\keyboard_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\keyboard.ilk del $(OBJS)\keyboard.ilk\r
        -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb\r
 \r
        -if exist $(OBJS)\keyboard.ilk del $(OBJS)\keyboard.ilk\r
        -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb\r
 \r

-$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp\r
 \r
 $(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp\r
 \r

-$(OBJS)\keyboard_keyboard.res: .\keyboard.rc\r
-       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\r
-\r

diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat
index 42a28d0791a18c24c0254946847abf44b39ae35e..4b587380bcabca457dc97c59880203539fc22530 100644 (file)
--- a/samples/keyboard/makefile.wat
+++ b/samples/keyboard/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
 \r

-$(OBJS)\keyboard.exe :  $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res\r
+$(OBJS)\keyboard.exe :  $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample.res

        @%create $(OBJS)\keyboard.lbc\r
        @%append $(OBJS)\keyboard.lbc option quiet\r
        @%append $(OBJS)\keyboard.lbc name $^@\r
        @%create $(OBJS)\keyboard.lbc\r
        @%append $(OBJS)\keyboard.lbc option quiet\r
        @%append $(OBJS)\keyboard.lbc name $^@\r


@@ -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)\r
        @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i\r
        @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\r
        @%append $(OBJS)\keyboard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i\r
        @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\r

-       @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res\r
+       @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_sample.res

        @for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i\r
        wlink @$(OBJS)\keyboard.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i\r
        wlink @$(OBJS)\keyboard.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $<\r
 \r
 $(OBJS)\keyboard_keyboard.obj :  .AUTODEPEND .\keyboard.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $<\r
 \r

-$(OBJS)\keyboard_keyboard.res :  .AUTODEPEND .\keyboard.rc\r
-       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 $<\r
-\r

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index dcaa3c588686c0324b9efb69ea7f2225a809b739..fc3ad56f37c98f4187f83635a9b50b01dd656fe8 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 LAYOUT_OBJECTS =  \

+       $(__layout___win32rc) \

        $(__layout_os2_lib_res) \
        $(__layout_os2_lib_res) \

-       layout_layout.o \
-       $(__layout___win32rc)
+       layout_layout.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/layout/layout.bkl b/samples/layout/layout.bkl
index 349f58c4c143d4b89219ed75289bf03538a2d263..ab3d16d2cd31bf002ede783aa5bf15aba56c80ea 100644 (file)
--- a/samples/layout/layout.bkl
+++ b/samples/layout/layout.bkl
@@ -8,7 +8,6 @@
         <headers>layout.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <headers>layout.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>layout.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/layout/layout.dsp b/samples/layout/layout.dsp
index 857e860086a70fc042e396f8619d73d91f2f8f51..4241d58b3e4cf60f8a7632328672a1ef5b3f07a7 100644 (file)
--- a/samples/layout/layout.dsp
+++ b/samples/layout/layout.dsp
@@ -256,7 +256,7 @@ SOURCE=.\layout.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\layout.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/layout/layout.rc b/samples/layout/layout.rc
deleted file mode 100644 (file)
index b86c4e2..0000000
--- 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 12ec6a6c7410f1b65a9bbfd91436d0b9834ce129..ce69e247748a7b6caf28f244fadffef9a4eba46f 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\layout.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/layout/layout_vc8.vcproj b/samples/layout/layout_vc8.vcproj
index e33c468d4f7a2c87c2477b6ed361c02598ca1ee1..bb3e8c071a631e39a6feef0622fe7e2cb6f9bbb6 100644 (file)
--- a/samples/layout/layout_vc8.vcproj
+++ b/samples/layout/layout_vc8.vcproj
@@ -824,7 +824,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\layout.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/layout/layout_vc9.vcproj b/samples/layout/layout_vc9.vcproj
index 62736678c264e1abea6413155b54752821a6c49c..55ca20da1a0de1bb751a55a68c8db47947bbd2ab 100644 (file)
--- a/samples/layout/layout_vc9.vcproj
+++ b/samples/layout/layout_vc9.vcproj
@@ -796,7 +796,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\layout.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc
index 402cf6ea33b3f5d23cece1e4cd544bdf3858b458..1cfa9f81dec9f13e553d59c4bea16f2c001764dc 100644 (file)
--- a/samples/layout/makefile.bcc
+++ b/samples/layout/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\layout.ilf del $(OBJS)\layout.ilf\r
        -if exist $(OBJS)\layout.ils del $(OBJS)\layout.ils\r
 \r
        -if exist $(OBJS)\layout.ilf del $(OBJS)\layout.ilf\r
        -if exist $(OBJS)\layout.ils del $(OBJS)\layout.ils\r
 \r

-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS)  $(OBJS)\layout_layout.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(LAYOUT_CXXFLAGS) .\layout.cpp\r
 \r
 $(OBJS)\layout_layout.obj: .\layout.cpp\r
        $(CXX) -q -c -P -o$@ $(LAYOUT_CXXFLAGS) .\layout.cpp\r
 \r

-$(OBJS)\layout_layout.res: .\layout.rc\r
-       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\r
-\r

diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index 07c15565b38ef9638ab9e51eda87bf35a0ffd1ba..99eb457e7883348968ff52ec53eb84e01621f718 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 LAYOUT_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 LAYOUT_OBJECTS =  \\r

-       $(OBJS)\layout_layout.o \\r
-       $(OBJS)\layout_layout_rc.o\r
+       $(OBJS)\layout_sample_rc.o \
+       $(OBJS)\layout_layout.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
 \r

-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\layout_layout.o: ./layout.cpp\r
        $(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\layout_layout_rc.o: ./layout.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc
index b828b30ed348cbf812569ff1ba4801b5b3c724a1..03d0e8c67835f8ba5df04b9b67c255294cafde58 100644 (file)
--- 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 =  \\r
        $(OBJS)\layout_layout.obj\r
 LAYOUT_RESOURCES =  \\r
 LAYOUT_OBJECTS =  \\r
        $(OBJS)\layout_layout.obj\r
 LAYOUT_RESOURCES =  \\r

-       $(OBJS)\layout_layout.res\r
+       $(OBJS)\layout_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\layout.ilk del $(OBJS)\layout.ilk\r
        -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb\r
 \r
        -if exist $(OBJS)\layout.ilk del $(OBJS)\layout.ilk\r
        -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb\r
 \r

-$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) .\layout.cpp\r
 \r
 $(OBJS)\layout_layout.obj: .\layout.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) .\layout.cpp\r
 \r

-$(OBJS)\layout_layout.res: .\layout.rc\r
-       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\r
-\r

diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index d793a4fbd7494714d655bdb8900330f5011d50af..76de46896677402c8109dea5f837307ff426b3f2 100644 (file)
--- a/samples/layout/makefile.wat
+++ b/samples/layout/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe\r
 \r

-$(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res\r
+$(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_sample.res

        @%create $(OBJS)\layout.lbc\r
        @%append $(OBJS)\layout.lbc option quiet\r
        @%append $(OBJS)\layout.lbc name $^@\r
        @%create $(OBJS)\layout.lbc\r
        @%append $(OBJS)\layout.lbc option quiet\r
        @%append $(OBJS)\layout.lbc name $^@\r


@@ -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)\r
        @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i\r
        @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\r
        @%append $(OBJS)\layout.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i\r
        @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\r

-       @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res\r
+       @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_sample.res

        @for %i in () do @%append $(OBJS)\layout.lbc option stack=%i\r
        wlink @$(OBJS)\layout.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\layout.lbc option stack=%i\r
        wlink @$(OBJS)\layout.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<\r
 \r
 $(OBJS)\layout_layout.obj :  .AUTODEPEND .\layout.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<\r
 \r

-$(OBJS)\layout_layout.res :  .AUTODEPEND .\layout.rc\r
-       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 $<\r
-\r

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 4cf75b240684842a73c3eed7f3f1ad14342f12ef..aee4619954c7c39cf7e00ec944e3cfa3922e7cde 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)
 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)

-    #include "mondrian.xpm"
+    #include "../sample.xpm"

 #endif
 
 #ifndef __WXMSW__
 #endif
 
 #ifndef __WXMSW__


@@ -173,7 +173,7 @@ MyFrame::MyFrame(const wxChar *title)
     m_numListItems = 10;
 
     // Give it an icon
     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);
 
     // 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 8b6cecfef9b1292139baa5e9cc447fcd20e8ca23..f413e2ff0ed2c6d131c0c8a3ab209311e440f8d2 100644 (file)
--- 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"
 
 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 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/listctrl/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index fc4ba65e2178c35ffd9f9d96c9f6ca03b31f0579..e5ed720455ac486bd404aef4ebb269332f5dbdb2 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 MEMCHECK_OBJECTS =  \

+       $(__memcheck___win32rc) \

        $(__memcheck_os2_lib_res) \
        $(__memcheck_os2_lib_res) \

-       memcheck_memcheck.o \
-       $(__memcheck___win32rc)
+       memcheck_memcheck.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc
index 94f72ac453f508ee7b8bbe9a0d6b64f9ed9b0d7e..a27e060a798e6bab12d6f8bb86bb29c947621add 100644 (file)
--- a/samples/memcheck/makefile.bcc
+++ b/samples/memcheck/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\memcheck.ilf del $(OBJS)\memcheck.ilf\r
        -if exist $(OBJS)\memcheck.ils del $(OBJS)\memcheck.ils\r
 \r
        -if exist $(OBJS)\memcheck.ilf del $(OBJS)\memcheck.ilf\r
        -if exist $(OBJS)\memcheck.ils del $(OBJS)\memcheck.ils\r
 \r

-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS)  $(OBJS)\memcheck_memcheck.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp\r
 \r
 $(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp\r
        $(CXX) -q -c -P -o$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp\r
 \r

-$(OBJS)\memcheck_memcheck.res: .\memcheck.rc\r
-       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\r
-\r

diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc
index 46fb082f228736a2e7822efd622fd0e4600dd9dc..d3e5f788938d10c7fc489b4801f981a02bce69a9 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 MEMCHECK_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 MEMCHECK_OBJECTS =  \\r

-       $(OBJS)\memcheck_memcheck.o \\r
-       $(OBJS)\memcheck_memcheck_rc.o\r
+       $(OBJS)\memcheck_sample_rc.o \
+       $(OBJS)\memcheck_memcheck.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
 \r

-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\memcheck_memcheck.o: ./memcheck.cpp\r
        $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\memcheck_memcheck_rc.o: ./memcheck.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc
index 32cef591515439d130e1064b0f650b7962f2f7c9..ed6ba5c216e44ee40061bbd47d87b1e0e06c8c48 100644 (file)
--- 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 =  \\r
        $(OBJS)\memcheck_memcheck.obj\r
 MEMCHECK_RESOURCES =  \\r
 MEMCHECK_OBJECTS =  \\r
        $(OBJS)\memcheck_memcheck.obj\r
 MEMCHECK_RESOURCES =  \\r

-       $(OBJS)\memcheck_memcheck.res\r
+       $(OBJS)\memcheck_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\memcheck.ilk del $(OBJS)\memcheck.ilk\r
        -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb\r
 \r
        -if exist $(OBJS)\memcheck.ilk del $(OBJS)\memcheck.ilk\r
        -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb\r
 \r

-$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp\r
 \r
 $(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp\r
 \r

-$(OBJS)\memcheck_memcheck.res: .\memcheck.rc\r
-       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\r
-\r

diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat
index 60554039dc28447aad76dbb62eea84a41cba1c29..d12d069a6f399c28c38eb987eb85e410c59d4fb3 100644 (file)
--- a/samples/memcheck/makefile.wat
+++ b/samples/memcheck/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe\r
 \r

-$(OBJS)\memcheck.exe :  $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res\r
+$(OBJS)\memcheck.exe :  $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_sample.res

        @%create $(OBJS)\memcheck.lbc\r
        @%append $(OBJS)\memcheck.lbc option quiet\r
        @%append $(OBJS)\memcheck.lbc name $^@\r
        @%create $(OBJS)\memcheck.lbc\r
        @%append $(OBJS)\memcheck.lbc option quiet\r
        @%append $(OBJS)\memcheck.lbc name $^@\r


@@ -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)\r
        @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i\r
        @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\r
        @%append $(OBJS)\memcheck.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i\r
        @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\r

-       @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res\r
+       @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_sample.res

        @for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i\r
        wlink @$(OBJS)\memcheck.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i\r
        wlink @$(OBJS)\memcheck.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $<\r
 \r
 $(OBJS)\memcheck_memcheck.obj :  .AUTODEPEND .\memcheck.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $<\r
 \r

-$(OBJS)\memcheck_memcheck.res :  .AUTODEPEND .\memcheck.rc\r
-       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 $<\r
-\r

diff --git a/samples/memcheck/memcheck.bkl b/samples/memcheck/memcheck.bkl
index 5029c09bcab89f07f4ead6813f6f728eb1b45ccb..13637455586e3115520899727f139741f816b54d 100644 (file)
--- a/samples/memcheck/memcheck.bkl
+++ b/samples/memcheck/memcheck.bkl
@@ -7,7 +7,6 @@
         <sources>memcheck.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>memcheck.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>memcheck.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index a637d6a0a73b7c4d33870cc8d512b9db6840fe31..6468754414edfbd89ed48268adb3eaa72d504ee8 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -22,8 +22,8 @@
 
 #include "wx/datetime.h"
 
 
 #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__
 #endif
 
 #ifndef __WXDEBUG__


@@ -57,13 +57,13 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit(void)
 {
   if ( !wxApp::OnInit() )
 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
 
   // 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;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;

diff --git a/samples/memcheck/memcheck.dsp b/samples/memcheck/memcheck.dsp
index 5e3799def5c0ee15abfee7607a96bad82d6d2967..dfae39805a6d34c203ad8c69cd6507a926c52e82 100644 (file)
--- a/samples/memcheck/memcheck.dsp
+++ b/samples/memcheck/memcheck.dsp
@@ -256,7 +256,7 @@ SOURCE=.\memcheck.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\memcheck.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/memcheck/memcheck.rc b/samples/memcheck/memcheck.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 95a2633f2f72403245db128960d145553bb41035..e0475dabca95d180bc226da89299beabbb8c7969 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\memcheck.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/memcheck/memcheck_vc8.vcproj b/samples/memcheck/memcheck_vc8.vcproj
index a64c0abac6221d640ec7a7f084aaee43afe6d50f..70e9ba61fc2e5c68f4f5943d6965b5ee98739345 100644 (file)
--- a/samples/memcheck/memcheck_vc8.vcproj
+++ b/samples/memcheck/memcheck_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\memcheck.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/memcheck/memcheck_vc9.vcproj b/samples/memcheck/memcheck_vc9.vcproj
index c0290c3dfb49a4e8ae298c1eb31cbe835e84915c..1c3a2ba7d4f85951b4fb85fbae905fd69fc5f08f 100644 (file)
--- a/samples/memcheck/memcheck_vc9.vcproj
+++ b/samples/memcheck/memcheck_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\memcheck.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/memcheck/mondrian.ico b/samples/memcheck/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/memcheck/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/menu/MENU.RCO b/samples/menu/MENU.RCO
deleted file mode 100644 (file)
index 1554583..0000000
--- 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 9d78b468a0ddb6e8bbea79a111815671d4798cde..35c64aec25127ae6d5632c10a15de97a63b66f5f 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 MENU_OBJECTS =  \

+       $(__menu___win32rc) \

        $(__menu_os2_lib_res) \
        $(__menu_os2_lib_res) \

-       menu_menu.o \
-       $(__menu___win32rc)
+       menu_menu.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc
index fb35883a3a1c4f011d9b5b044884cf2dc3e3483d..60a688930b2aa8ce4f7a0c9a27e6862b32d434ea 100644 (file)
--- a/samples/menu/makefile.bcc
+++ b/samples/menu/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\menu.ilf del $(OBJS)\menu.ilf\r
        -if exist $(OBJS)\menu.ils del $(OBJS)\menu.ils\r
 \r
        -if exist $(OBJS)\menu.ilf del $(OBJS)\menu.ilf\r
        -if exist $(OBJS)\menu.ils del $(OBJS)\menu.ils\r
 \r

-$(OBJS)\menu.exe: $(MENU_OBJECTS)  $(OBJS)\menu_menu.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(MENU_CXXFLAGS) .\menu.cpp\r
 \r
 $(OBJS)\menu_menu.obj: .\menu.cpp\r
        $(CXX) -q -c -P -o$@ $(MENU_CXXFLAGS) .\menu.cpp\r
 \r

-$(OBJS)\menu_menu.res: .\menu.rc\r
-       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\r
-\r

diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc
index 32fb82e64c47512e826b92a28de2a768ce6e57c7..066306d4826c1bc1e3f6e24fea728308fe8210a5 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 MENU_OBJECTS =  \\r
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 MENU_OBJECTS =  \\r

-       $(OBJS)\menu_menu.o \\r
-       $(OBJS)\menu_menu_rc.o\r
+       $(OBJS)\menu_sample_rc.o \
+       $(OBJS)\menu_menu.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -217,15 +217,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
 \r

-$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\menu_menu.o: ./menu.cpp\r
        $(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\menu_menu_rc.o: ./menu.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc
index 7ade6d00c171e22ccdded4746de8cb2c08edced7..56069aa5dddbebb1f808d500d7acfefec598575d 100644 (file)
--- 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 =  \\r
        $(OBJS)\menu_menu.obj\r
 MENU_RESOURCES =  \\r
 MENU_OBJECTS =  \\r
        $(OBJS)\menu_menu.obj\r
 MENU_RESOURCES =  \\r

-       $(OBJS)\menu_menu.res\r
+       $(OBJS)\menu_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\menu.ilk del $(OBJS)\menu.ilk\r
        -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb\r
 \r
        -if exist $(OBJS)\menu.ilk del $(OBJS)\menu.ilk\r
        -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb\r
 \r

-$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) .\menu.cpp\r
 \r
 $(OBJS)\menu_menu.obj: .\menu.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) .\menu.cpp\r
 \r

-$(OBJS)\menu_menu.res: .\menu.rc\r
-       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\r
-\r

diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat
index ccf682bd85e1c576074dc5e0d1874ec96c35ada5..547dd7676c22dfb4b471d6f6902097d7abcf5dc9 100644 (file)
--- a/samples/menu/makefile.wat
+++ b/samples/menu/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe\r
 \r

-$(OBJS)\menu.exe :  $(MENU_OBJECTS) $(OBJS)\menu_menu.res\r
+$(OBJS)\menu.exe :  $(MENU_OBJECTS) $(OBJS)\menu_sample.res

        @%create $(OBJS)\menu.lbc\r
        @%append $(OBJS)\menu.lbc option quiet\r
        @%append $(OBJS)\menu.lbc name $^@\r
        @%create $(OBJS)\menu.lbc\r
        @%append $(OBJS)\menu.lbc option quiet\r
        @%append $(OBJS)\menu.lbc name $^@\r


@@ -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)\r
        @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i\r
        @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\r
        @%append $(OBJS)\menu.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i\r
        @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\r

-       @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res\r
+       @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_sample.res

        @for %i in () do @%append $(OBJS)\menu.lbc option stack=%i\r
        wlink @$(OBJS)\menu.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\menu.lbc option stack=%i\r
        wlink @$(OBJS)\menu.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $<\r
 \r
 $(OBJS)\menu_menu.obj :  .AUTODEPEND .\menu.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $<\r
 \r

-$(OBJS)\menu_menu.res :  .AUTODEPEND .\menu.rc\r
-       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 $<\r
-\r

diff --git a/samples/menu/menu.bkl b/samples/menu/menu.bkl
index 3e519fe983b800620990f70c193ce42522789c1d..030e9f07a5f35051c186b66f2cb83e7b219a2920 100644 (file)
--- a/samples/menu/menu.bkl
+++ b/samples/menu/menu.bkl
@@ -7,7 +7,6 @@
         <sources>menu.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>menu.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>menu.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/menu/menu.dsp b/samples/menu/menu.dsp
index cd81c2638e406dd37096c55e3654e2821f93657b..06ae47fbf46359560c077292521b996ba90572d8 100644 (file)
--- a/samples/menu/menu.dsp
+++ b/samples/menu/menu.dsp
@@ -256,7 +256,7 @@ SOURCE=.\menu.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\menu.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/menu/menu.rc b/samples/menu/menu.rc
deleted file mode 100644 (file)
index b86c4e2..0000000
--- 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 58ce4df18044ad665e2436c7a1490728af112dfc..20ba0160a19f264dae916ba252d51b12ee60dd7b 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\menu.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/menu/menu_vc8.vcproj b/samples/menu/menu_vc8.vcproj
index e97ec8eae583df08987951ae0ee48921c0beb70f..7542c7fed62761ecb40a0a49a82b37c0a4cb1b96 100644 (file)
--- a/samples/menu/menu_vc8.vcproj
+++ b/samples/menu/menu_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\menu.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/menu/menu_vc9.vcproj b/samples/menu/menu_vc9.vcproj
index 2caa7c735028593eb990637b76caa46953402103..019f651f0ea3fb82175b2cff6b92a8e6e25c2ad7 100644 (file)
--- a/samples/menu/menu_vc9.vcproj
+++ b/samples/menu/menu_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\menu.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/menu/mondros2.ico b/samples/menu/mondros2.ico
deleted file mode 100644 (file)
index 8b0e58c..0000000
Binary files a/samples/menu/mondros2.ico and /dev/null differ

diff --git a/samples/minimal/minimal.plc b/samples/minimal/minimal.plc
index 8a742b4540d1ea062b02bce3297c0505a957dc63..e2117132b2611fc0dbf5e794d8ded31fa7463855 100644 (file)
--- 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 "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"
 
         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
     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 (file)
index b862bd2..0000000
--- 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 (file)
index fc50aa7..0000000
--- 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 (file)
index 412a762..0000000
--- 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.icns b/samples/minimal/mondrian.icns
deleted file mode 100644 (file)
index 43fbff2..0000000
Binary files a/samples/minimal/mondrian.icns and /dev/null differ

diff --git a/samples/minimal/mondrian.r b/samples/minimal/mondrian.r
deleted file mode 100755 (executable)
index e7c39a8..0000000
--- 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 (file)
index 8b0e58c..0000000
Binary files a/samples/minimal/mondros2.ico and /dev/null differ

diff --git a/samples/minimal/sample.icns b/samples/minimal/sample.icns
new file mode 100644 (file)
index 0000000..43fbff2
Binary files /dev/null and b/samples/minimal/sample.icns differ

diff --git a/samples/nativdlg/nativdlg.rc b/samples/nativdlg/nativdlg.rc
index db18d163f29712aa219b60fc7fea3b510322f86e..0e6c1a3d1bd5ec548b46a9fac28a5ea507aeb785 100644 (file)
--- 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"
 
 
 #include "dialog1.rc"
 

diff --git a/samples/notebook/mondrian.ico b/samples/notebook/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index 8b0e58c..0000000
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 (file)
index 62b693c..0000000
--- 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 f630c1c079b527671175a0977038fa9f97ed995d..f45d84a76527af427c97bec8d2275f93afb5b7ad 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 OLEAUTO_OBJECTS =  \

+       $(__oleauto___win32rc) \

        $(__oleauto_os2_lib_res) \
        $(__oleauto_os2_lib_res) \

-       oleauto_oleauto.o \
-       $(__oleauto___win32rc)
+       oleauto_oleauto.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc
index 225183a3d15715f877c62046099fd969ba827df0..8efc18f8cb8a54e1f90b008165b894efb5777393 100644 (file)
--- a/samples/oleauto/makefile.bcc
+++ b/samples/oleauto/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\oleauto.ilf del $(OBJS)\oleauto.ilf\r
        -if exist $(OBJS)\oleauto.ils del $(OBJS)\oleauto.ils\r
 \r
        -if exist $(OBJS)\oleauto.ilf del $(OBJS)\oleauto.ilf\r
        -if exist $(OBJS)\oleauto.ils del $(OBJS)\oleauto.ils\r
 \r

-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS)  $(OBJS)\oleauto_oleauto.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp\r
 \r
 $(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp\r
        $(CXX) -q -c -P -o$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp\r
 \r

-$(OBJS)\oleauto_oleauto.res: .\oleauto.rc\r
-       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\r
-\r

diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index c87c88eec6296160d3721f996ba40cf48e659fef..83c919b84ef7d084cf6aba8b2d368d84e1569842 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 OLEAUTO_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 OLEAUTO_OBJECTS =  \\r

-       $(OBJS)\oleauto_oleauto.o \\r
-       $(OBJS)\oleauto_oleauto_rc.o\r
+       $(OBJS)\oleauto_sample_rc.o \
+       $(OBJS)\oleauto_oleauto.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
 \r

-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\oleauto_oleauto.o: ./oleauto.cpp\r
        $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\oleauto_oleauto_rc.o: ./oleauto.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc
index fe0d0f2514be7b9033a49fcc4d14196be4bee09c..33c54f757aad3a3e92861c32f63de1d8494f2c9b 100644 (file)
--- 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 =  \\r
        $(OBJS)\oleauto_oleauto.obj\r
 OLEAUTO_RESOURCES =  \\r
 OLEAUTO_OBJECTS =  \\r
        $(OBJS)\oleauto_oleauto.obj\r
 OLEAUTO_RESOURCES =  \\r

-       $(OBJS)\oleauto_oleauto.res\r
+       $(OBJS)\oleauto_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\oleauto.ilk del $(OBJS)\oleauto.ilk\r
        -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb\r
 \r
        -if exist $(OBJS)\oleauto.ilk del $(OBJS)\oleauto.ilk\r
        -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb\r
 \r

-$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp\r
 \r
 $(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp\r
 \r

-$(OBJS)\oleauto_oleauto.res: .\oleauto.rc\r
-       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\r
-\r

diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat
index 72e76bbbca11e7f1a044ff56bd7839dd7c59f142..85726abb87900ebd2885d1a80919a711baf33ce5 100644 (file)
--- a/samples/oleauto/makefile.wat
+++ b/samples/oleauto/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe\r
 \r

-$(OBJS)\oleauto.exe :  $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res\r
+$(OBJS)\oleauto.exe :  $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_sample.res

        @%create $(OBJS)\oleauto.lbc\r
        @%append $(OBJS)\oleauto.lbc option quiet\r
        @%append $(OBJS)\oleauto.lbc name $^@\r
        @%create $(OBJS)\oleauto.lbc\r
        @%append $(OBJS)\oleauto.lbc option quiet\r
        @%append $(OBJS)\oleauto.lbc name $^@\r


@@ -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)\r
        @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i\r
        @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\r
        @%append $(OBJS)\oleauto.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i\r
        @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\r

-       @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res\r
+       @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_sample.res

        @for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i\r
        wlink @$(OBJS)\oleauto.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i\r
        wlink @$(OBJS)\oleauto.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $<\r
 \r
 $(OBJS)\oleauto_oleauto.obj :  .AUTODEPEND .\oleauto.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $<\r
 \r

-$(OBJS)\oleauto_oleauto.res :  .AUTODEPEND .\oleauto.rc\r
-       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 $<\r
-\r

diff --git a/samples/oleauto/mondrian.ico b/samples/oleauto/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/oleauto/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/oleauto/oleauto.bkl b/samples/oleauto/oleauto.bkl
index 9558e0340a265585a114abd056d623370fa1064b..4f15b31e058a709081233d03d6896f0dc59d2528 100644 (file)
--- a/samples/oleauto/oleauto.bkl
+++ b/samples/oleauto/oleauto.bkl
@@ -7,7 +7,6 @@
         <sources>oleauto.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>oleauto.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>oleauto.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 383ef4d01284af008689cec592970bd8b546954f..18a83c83598b08a6f1420bf0bb7705a360dbf00c 100644 (file)
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -40,8 +40,8 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
-    #include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"

 #endif
 
 // ----------------------------------------------------------------------------
 #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
        : 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;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

diff --git a/samples/oleauto/oleauto.dsp b/samples/oleauto/oleauto.dsp
index 40a58274410e923c2c43ea74b5e68a1d3f8f1311..0e999081127580ce39040ca3bc91a8f2ff41165f 100644 (file)
--- a/samples/oleauto/oleauto.dsp
+++ b/samples/oleauto/oleauto.dsp
@@ -256,7 +256,7 @@ SOURCE=.\oleauto.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\oleauto.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/oleauto/oleauto.rc b/samples/oleauto/oleauto.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 911465d8834104fdc29f657d30a8e525ec5d1b4c..c5533008a780bde281a4cb7b4079d006ef58fa08 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\oleauto.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/oleauto/oleauto_vc8.vcproj b/samples/oleauto/oleauto_vc8.vcproj
index 511e07d29bf121b5a8d0cf18e42e54de84475e3b..b5679cdf17a4869c1cec2e45fa679b3e776e41df 100644 (file)
--- a/samples/oleauto/oleauto_vc8.vcproj
+++ b/samples/oleauto/oleauto_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\oleauto.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/oleauto/oleauto_vc9.vcproj b/samples/oleauto/oleauto_vc9.vcproj
index caa5f45ae95ae0815d21c829420b49ed4c006796..5013b5c091a0844671f7479d061f50acf2a3885e 100644 (file)
--- a/samples/oleauto/oleauto_vc9.vcproj
+++ b/samples/oleauto/oleauto_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\oleauto.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index d0afbfe4c575a5cff3274258a1be0272264e0120..abce6a1e47e3caf9a4f1c1958b4614e4ad3bd969 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 CUBE_OBJECTS =  \

+       $(__cube___win32rc) \

        $(__cube_os2_lib_res) \
        $(__cube_os2_lib_res) \

-       cube_cube.o \
-       $(__cube___win32rc)
+       cube_cube.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # 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 50b4b5c5c453dbe6b612fa2e0ad88c86921bf9bb..0de7e9cbc9662ce9c7cf89b9274ff01f2b476760 100644 (file)
--- a/samples/opengl/cube/cube.bkl
+++ b/samples/opengl/cube/cube.bkl
@@ -15,7 +15,6 @@
         <wx-lib>gl</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>gl</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>cube.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/opengl/cube/cube.dsp b/samples/opengl/cube/cube.dsp
index 155f319ede133cc32c889a994cad50e422ea73fc..78ac8966c39f441fe201d0dfdfac6f5d0e551e9c 100644 (file)
--- a/samples/opengl/cube/cube.dsp
+++ b/samples/opengl/cube/cube.dsp
@@ -256,7 +256,7 @@ SOURCE=.\cube.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\cube.rc\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/opengl/cube/cube.rc b/samples/opengl/cube/cube.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 c9a5cd1eeee4f6a8bc564ce1bd2790e55e3f2cd9..0085da0d342afd7803994e33e677019b2cdc4548 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\cube.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/opengl/cube/cube_vc8.vcproj b/samples/opengl/cube/cube_vc8.vcproj
index 1ab259e2265dfd68b3ec55b8e6333704888a82a3..c16dcb3b1747d02569dc5a2ee8e4a022780bc1dc 100644 (file)
--- a/samples/opengl/cube/cube_vc8.vcproj
+++ b/samples/opengl/cube/cube_vc8.vcproj
@@ -824,7 +824,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\cube.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/opengl/cube/cube_vc9.vcproj b/samples/opengl/cube/cube_vc9.vcproj
index 609d12e9ed9799c1aa52c1e8b9787846a7990b79..a15cab7ff81312d4b43331936a830e798a1b388d 100644 (file)
--- a/samples/opengl/cube/cube_vc9.vcproj
+++ b/samples/opengl/cube/cube_vc9.vcproj
@@ -796,7 +796,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\cube.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc
index 4caa499bcead7c99a4f31b8fe69a3e2165a07adc..8502597ddc2bb2a686f2dc5b6f40ef7292882396 100644 (file)
--- 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\r
 \r
 !if "$(USE_OPENGL)" == "1"\r
        -if exist $(OBJS)\cube.ils del $(OBJS)\cube.ils\r
 \r
 !if "$(USE_OPENGL)" == "1"\r

-$(OBJS)\cube.exe: $(CUBE_OBJECTS)  $(OBJS)\cube_cube.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 !endif\r
 \r
 |\r
 !endif\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(CUBE_CXXFLAGS) .\cube.cpp\r
 \r
 $(OBJS)\cube_cube.obj: .\cube.cpp\r
        $(CXX) -q -c -P -o$@ $(CUBE_CXXFLAGS) .\cube.cpp\r
 \r

-$(OBJS)\cube_cube.res: .\cube.rc\r
-       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\r
-\r

diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc
index 81d124b9eb3e1bc1f9ec9169083c2c6132c5fbb4..b06af8983d7ab33ad7321ed6f8b68d64308ac64a 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CUBE_OBJECTS =  \\r
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CUBE_OBJECTS =  \\r

-       $(OBJS)\cube_cube.o \\r
-       $(OBJS)\cube_cube_rc.o\r
+       $(OBJS)\cube_sample_rc.o \
+       $(OBJS)\cube_cube.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -221,16 +221,16 @@ clean:
        -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe\r
 \r
 ifeq ($(USE_OPENGL),1)\r
        -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe\r
 \r
 ifeq ($(USE_OPENGL),1)\r

-$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o\r
+$(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\r
 endif\r
 \r
        $(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\r
 endif\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\cube_cube.o: ./cube.cpp\r
        $(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\cube_cube_rc.o: ./cube.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc
index bebcf9390c00f85b9c50f7cd76a45ffbfe5fd21d..4d820d0775b3e5d4503fc7ea49de49feb3051672 100644 (file)
--- 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 =  \\r
        $(OBJS)\cube_cube.obj\r
 CUBE_RESOURCES =  \\r
 CUBE_OBJECTS =  \\r
        $(OBJS)\cube_cube.obj\r
 CUBE_RESOURCES =  \\r

-       $(OBJS)\cube_cube.res\r
+       $(OBJS)\cube_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,15 +343,15 @@ clean:
        -if exist $(OBJS)\cube.pdb del $(OBJS)\cube.pdb\r
 \r
 !if "$(USE_OPENGL)" == "1"\r
        -if exist $(OBJS)\cube.pdb del $(OBJS)\cube.pdb\r
 \r
 !if "$(USE_OPENGL)" == "1"\r

-$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 !endif\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 !endif\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) .\cube.cpp\r
 \r
 $(OBJS)\cube_cube.obj: .\cube.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) .\cube.cpp\r
 \r

-$(OBJS)\cube_cube.res: .\cube.rc\r
-       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\r
-\r

diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat
index 78c44ed48601b8d34cf65f458389ccbea3411c4f..81cdc52b9028487f036ea7508c34abe4666dd8af 100644 (file)
--- 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\r
 \r
 !ifeq USE_OPENGL 1\r
        -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe\r
 \r
 !ifeq USE_OPENGL 1\r

-$(OBJS)\cube.exe :  $(CUBE_OBJECTS) $(OBJS)\cube_cube.res\r
+$(OBJS)\cube.exe :  $(CUBE_OBJECTS) $(OBJS)\cube_sample.res

        @%create $(OBJS)\cube.lbc\r
        @%append $(OBJS)\cube.lbc option quiet\r
        @%append $(OBJS)\cube.lbc name $^@\r
        @%create $(OBJS)\cube.lbc\r
        @%append $(OBJS)\cube.lbc option quiet\r
        @%append $(OBJS)\cube.lbc name $^@\r


@@ -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)\r
        @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i\r
        @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\r
        @%append $(OBJS)\cube.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i\r
        @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\r

-       @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res\r
+       @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_sample.res

        @for %i in () do @%append $(OBJS)\cube.lbc option stack=%i\r
        wlink @$(OBJS)\cube.lbc\r
 !endif\r
 \r
        @for %i in () do @%append $(OBJS)\cube.lbc option stack=%i\r
        wlink @$(OBJS)\cube.lbc\r
 !endif\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $<\r
 \r
 $(OBJS)\cube_cube.obj :  .AUTODEPEND .\cube.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $<\r
 \r

-$(OBJS)\cube_cube.res :  .AUTODEPEND .\cube.rc\r
-       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 $<\r
-\r

diff --git a/samples/opengl/cube/mondrian.ico b/samples/opengl/cube/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index 2310c5d..0000000
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 deafc30eec86e61b200d210107c3967f42c3b3dc..d9406008791017500fdf804a3902e29c68d041b7 100644 (file)
--- 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 =  \
        -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_os2_lib_res) \
        penguin_penguin.o \
        penguin_dxfrenderer.o \

-       penguin_trackball.o \
-       $(__penguin___win32rc)
+       penguin_trackball.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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
 
 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_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
 
 # 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 c5e56f95ff7574db8b81dd951e14b757386ec1cb..b9d557c27fa798c161f483206197dbf4407c2e4b 100644 (file)
--- 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\r
 \r
 !if "$(USE_OPENGL)" == "1"\r
        -if exist $(OBJS)\penguin.ils del $(OBJS)\penguin.ils\r
 \r
 !if "$(USE_OPENGL)" == "1"\r

-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS)  $(OBJS)\penguin_penguin.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 !endif\r
 \r
 |\r
 !endif\r
 \r


@@ -252,6 +252,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp\r
 \r
 $(OBJS)\penguin_penguin.obj: .\penguin.cpp\r
        $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp\r
 \r


@@ -261,6 +264,3 @@ $(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp
 $(OBJS)\penguin_trackball.obj: .\trackball.c\r
        $(CC) -q -c -P- -o$@ $(PENGUIN_CFLAGS) .\trackball.c\r
 \r
 $(OBJS)\penguin_trackball.obj: .\trackball.c\r
        $(CC) -q -c -P- -o$@ $(PENGUIN_CFLAGS) .\trackball.c\r
 \r

-$(OBJS)\penguin_penguin.res: .\penguin.rc\r
-       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\r
-\r

diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc
index 093c2137e296f6045f630b620ddad2215dad7f46..397b3c6599d53a20b8396e0ef1d658ece7050e7b 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 PENGUIN_OBJECTS =  \\r
        -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 PENGUIN_OBJECTS =  \\r

+       $(OBJS)\penguin_sample_rc.o \

        $(OBJS)\penguin_penguin.o \\r
        $(OBJS)\penguin_dxfrenderer.o \\r
        $(OBJS)\penguin_penguin.o \\r
        $(OBJS)\penguin_dxfrenderer.o \\r

-       $(OBJS)\penguin_trackball.o \\r
-       $(OBJS)\penguin_penguin_rc.o\r
+       $(OBJS)\penguin_trackball.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -231,7 +231,7 @@ clean:
        -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe\r
 \r
 ifeq ($(USE_OPENGL),1)\r
        -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe\r
 \r
 ifeq ($(USE_OPENGL),1)\r

-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o\r
+$(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\r
 endif\r
 \r
        $(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\r
 endif\r
 \r


@@ -239,6 +239,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (penguin.dxf.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (penguin.dxf.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\penguin_penguin.o: ./penguin.cpp\r
        $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<\r
 \r


@@ -248,9 +251,6 @@ $(OBJS)\penguin_dxfrenderer.o: ./dxfrenderer.cpp
 $(OBJS)\penguin_trackball.o: ./trackball.c\r
        $(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\penguin_trackball.o: ./trackball.c\r
        $(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\penguin_penguin_rc.o: ./penguin.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc
index 36d06e1960d4d28f439ae7c94be5324a952f1df5..d1810924d8d0e5fd8dbe6b602a1c453d4a166840 100644 (file)
--- a/samples/opengl/penguin/makefile.vc
+++ b/samples/opengl/penguin/makefile.vc
@@ -42,7 +42,7 @@ PENGUIN_OBJECTS =  \
        $(OBJS)\penguin_dxfrenderer.obj \\r
        $(OBJS)\penguin_trackball.obj\r
 PENGUIN_RESOURCES =  \\r
        $(OBJS)\penguin_dxfrenderer.obj \\r
        $(OBJS)\penguin_trackball.obj\r
 PENGUIN_RESOURCES =  \\r

-       $(OBJS)\penguin_penguin.res\r
+       $(OBJS)\penguin_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -353,7 +353,7 @@ clean:
        -if exist $(OBJS)\penguin.pdb del $(OBJS)\penguin.pdb\r
 \r
 !if "$(USE_OPENGL)" == "1"\r
        -if exist $(OBJS)\penguin.pdb del $(OBJS)\penguin.pdb\r
 \r
 !if "$(USE_OPENGL)" == "1"\r

-$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -363,6 +363,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp\r
 \r
 $(OBJS)\penguin_penguin.obj: .\penguin.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp\r
 \r


@@ -372,6 +375,3 @@ $(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp
 $(OBJS)\penguin_trackball.obj: .\trackball.c\r
        $(CC) /c /nologo /TC /Fo$@ $(PENGUIN_CFLAGS) .\trackball.c\r
 \r
 $(OBJS)\penguin_trackball.obj: .\trackball.c\r
        $(CC) /c /nologo /TC /Fo$@ $(PENGUIN_CFLAGS) .\trackball.c\r
 \r

-$(OBJS)\penguin_penguin.res: .\penguin.rc\r
-       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\r
-\r

diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat
index 9dd84ef6edaa14093509373b26a5b46844a7ee0b..0e8366fbc24e44be3b9f38239a0d05ba9194b56c 100644 (file)
--- 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\r
 \r
 !ifeq USE_OPENGL 1\r
        -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe\r
 \r
 !ifeq USE_OPENGL 1\r

-$(OBJS)\penguin.exe :  $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res\r
+$(OBJS)\penguin.exe :  $(PENGUIN_OBJECTS) $(OBJS)\penguin_sample.res

        @%create $(OBJS)\penguin.lbc\r
        @%append $(OBJS)\penguin.lbc option quiet\r
        @%append $(OBJS)\penguin.lbc name $^@\r
        @%create $(OBJS)\penguin.lbc\r
        @%append $(OBJS)\penguin.lbc option quiet\r
        @%append $(OBJS)\penguin.lbc name $^@\r


@@ -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)\r
        @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i\r
        @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\r
        @%append $(OBJS)\penguin.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i\r
        @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\r

-       @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res\r
+       @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_sample.res

        @for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i\r
        wlink @$(OBJS)\penguin.lbc\r
 !endif\r
        @for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i\r
        wlink @$(OBJS)\penguin.lbc\r
 !endif\r


@@ -279,6 +279,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<\r
 \r
 $(OBJS)\penguin_penguin.obj :  .AUTODEPEND .\penguin.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<\r
 \r


@@ -288,6 +291,3 @@ $(OBJS)\penguin_dxfrenderer.obj :  .AUTODEPEND .\dxfrenderer.cpp
 $(OBJS)\penguin_trackball.obj :  .AUTODEPEND .\trackball.c\r
        $(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $<\r
 \r
 $(OBJS)\penguin_trackball.obj :  .AUTODEPEND .\trackball.c\r
        $(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $<\r
 \r

-$(OBJS)\penguin_penguin.res :  .AUTODEPEND .\penguin.rc\r
-       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 $<\r
-\r

diff --git a/samples/opengl/penguin/penguin.bkl b/samples/opengl/penguin/penguin.bkl
index 53a93afe2190af3e343c07a0dc299656cb642535..97bef7dc8c100705fe99b95ed9acfae9ea2b477a 100644 (file)
--- a/samples/opengl/penguin/penguin.bkl
+++ b/samples/opengl/penguin/penguin.bkl
@@ -23,7 +23,6 @@
         <wx-lib>gl</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>gl</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>penguin.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index e18cb95adc1c5cdea3c349c7e131c43e7e94bdee..aa01dc0ccbb95481e667e05a35a1894bb7f99e14 100644 (file)
--- 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)
 {
     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;
 
     // Make the "File" menu
     wxMenu *fileMenu = new wxMenu;

diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp
index 67838a956ee99fe1c0a2070822b34b39c3c6cb79..0bcfa769802bbb4ebffeeca8d665811ef17ef7f4 100644 (file)
--- a/samples/opengl/penguin/penguin.dsp
+++ b/samples/opengl/penguin/penguin.dsp
@@ -260,7 +260,7 @@ SOURCE=.\penguin.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\penguin.rc\r
+SOURCE=.\..\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/samples/opengl/penguin/penguin.rc b/samples/opengl/penguin/penguin.rc
deleted file mode 100644 (file)
index f3accc6..0000000
--- 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 8806cf0abdd482d7c90bef2ab01b8f638f082d3a..e095eab9896e6fca842c74971b201c399b54aba0 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\penguin.rc">\r
+                               RelativePath="..\..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/opengl/penguin/penguin_vc8.vcproj b/samples/opengl/penguin/penguin_vc8.vcproj
index 5e6ae8043e69a6d018c4f4fdcbb6f8eae493aef3..377044bab6ccdcd353b891e9f57b7a9ea4e8cb28 100644 (file)
--- a/samples/opengl/penguin/penguin_vc8.vcproj
+++ b/samples/opengl/penguin/penguin_vc8.vcproj
@@ -840,7 +840,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\penguin.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/opengl/penguin/penguin_vc9.vcproj b/samples/opengl/penguin/penguin_vc9.vcproj
index 7c99895895b27c5e91de7314261d68ffdea63e89..8860894ccedab63d4882bed8786ed692d699650e 100644 (file)
--- a/samples/opengl/penguin/penguin_vc9.vcproj
+++ b/samples/opengl/penguin/penguin_vc9.vcproj
@@ -812,7 +812,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\penguin.rc"\r
+                               RelativePath="..\..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/ownerdrw/mondrian.ico b/samples/ownerdrw/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
Binary files a/samples/ownerdrw/mondrian.ico and /dev/null differ

diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index b42ed4761e8506110395d4b1f30819b38a85de81..dd01cedc1bd4cc01df7d0a56f2cbaf4a8d4d256a 100644 (file)
--- 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
          : 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();
 
     // create the menu
     InitMenu();

diff --git a/samples/ownerdrw/ownerdrw.rc b/samples/ownerdrw/ownerdrw.rc
index 86df22581e3010e798b22df863383207816ac27c..0adec0b9a30e34e86dc7246b1bbbfcabb0f8e149 100644 (file)
--- 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"
 
 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 94b5c3ca24d1daea66b1eb217304962f82745123..118e3814024fc5919357c64008a7d35b0b96df48 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 PRINTING_OBJECTS =  \

+       $(__printing___win32rc) \

        $(__printing_os2_lib_res) \
        $(__printing_os2_lib_res) \

-       printing_printing.o \
-       $(__printing___win32rc)
+       printing_printing.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc
index dafb59b2a0cb2de08ae853a4aa76133cb874deb2..84174a24d35ee13ccdf7aef6d27bfc6ca1a630b5 100644 (file)
--- a/samples/printing/makefile.bcc
+++ b/samples/printing/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\printing.ilf del $(OBJS)\printing.ilf\r
        -if exist $(OBJS)\printing.ils del $(OBJS)\printing.ils\r
 \r
        -if exist $(OBJS)\printing.ilf del $(OBJS)\printing.ilf\r
        -if exist $(OBJS)\printing.ils del $(OBJS)\printing.ils\r
 \r

-$(OBJS)\printing.exe: $(PRINTING_OBJECTS)  $(OBJS)\printing_printing.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(PRINTING_CXXFLAGS) .\printing.cpp\r
 \r
 $(OBJS)\printing_printing.obj: .\printing.cpp\r
        $(CXX) -q -c -P -o$@ $(PRINTING_CXXFLAGS) .\printing.cpp\r
 \r

-$(OBJS)\printing_printing.res: .\printing.rc\r
-       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\r
-\r

diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc
index f37a9dc8037384ae8360adb835a702e7877c1141..e62c47fd68fafa6ab220ecadeb1c78ae1135e36e 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 PRINTING_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 PRINTING_OBJECTS =  \\r

-       $(OBJS)\printing_printing.o \\r
-       $(OBJS)\printing_printing_rc.o\r
+       $(OBJS)\printing_sample_rc.o \
+       $(OBJS)\printing_printing.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
 \r

-$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\printing_printing.o: ./printing.cpp\r
        $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\printing_printing_rc.o: ./printing.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index 492dc3fbf083b6bafcf3ffda44b648d0707bc05e..5534993dcacf8b80acc3ae0b3dec02352906279c 100644 (file)
--- 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 =  \\r
        $(OBJS)\printing_printing.obj\r
 PRINTING_RESOURCES =  \\r
 PRINTING_OBJECTS =  \\r
        $(OBJS)\printing_printing.obj\r
 PRINTING_RESOURCES =  \\r

-       $(OBJS)\printing_printing.res\r
+       $(OBJS)\printing_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\printing.ilk del $(OBJS)\printing.ilk\r
        -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb\r
 \r
        -if exist $(OBJS)\printing.ilk del $(OBJS)\printing.ilk\r
        -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb\r
 \r

-$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) .\printing.cpp\r
 \r
 $(OBJS)\printing_printing.obj: .\printing.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) .\printing.cpp\r
 \r

-$(OBJS)\printing_printing.res: .\printing.rc\r
-       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\r
-\r

diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat
index 16cf399f725363b84a7483eb00fafc2e56094ab1..d90c7b71c60d03df7214df81700830fbebb6c82f 100644 (file)
--- a/samples/printing/makefile.wat
+++ b/samples/printing/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe\r
 \r

-$(OBJS)\printing.exe :  $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res\r
+$(OBJS)\printing.exe :  $(PRINTING_OBJECTS) $(OBJS)\printing_sample.res

        @%create $(OBJS)\printing.lbc\r
        @%append $(OBJS)\printing.lbc option quiet\r
        @%append $(OBJS)\printing.lbc name $^@\r
        @%create $(OBJS)\printing.lbc\r
        @%append $(OBJS)\printing.lbc option quiet\r
        @%append $(OBJS)\printing.lbc name $^@\r


@@ -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)\r
        @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i\r
        @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\r
        @%append $(OBJS)\printing.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i\r
        @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\r

-       @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res\r
+       @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_sample.res

        @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i\r
        wlink @$(OBJS)\printing.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i\r
        wlink @$(OBJS)\printing.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $<\r
 \r
 $(OBJS)\printing_printing.obj :  .AUTODEPEND .\printing.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $<\r
 \r

-$(OBJS)\printing_printing.res :  .AUTODEPEND .\printing.rc\r
-       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 $<\r
-\r

diff --git a/samples/printing/mondrian.ico b/samples/printing/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/printing/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/printing/printing.bkl b/samples/printing/printing.bkl
index 0829d7b60de39f657bf4bd612359bd54c2462079..5bb3d56c81bae3a93f8e1aa5c176ce30f75589c5 100644 (file)
--- a/samples/printing/printing.bkl
+++ b/samples/printing/printing.bkl
@@ -8,7 +8,6 @@
         <headers>printing.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <headers>printing.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>printing.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 61fcb8d06a51291c10d17a11d98c3c7e09445323..205caee63724687992ecf5452b9326c080bbefa6 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -51,8 +51,8 @@
 
 #include "printing.h"
 
 
 #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
 #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 );
 
     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);
 
 
     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
 #endif // wxUSE_STATUSBAR
 
     // Load icon and bitmap

-    SetIcon( wxICON( mondrian) );
+    SetIcon( wxICON( sample) );

 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;

diff --git a/samples/printing/printing.dsp b/samples/printing/printing.dsp
index 8bbb712ed924533064b6a3bbd058efe3f25ac44a..dbe2d48c6f31a3e6b7a85939a21089a0c73b8164 100644 (file)
--- a/samples/printing/printing.dsp
+++ b/samples/printing/printing.dsp
@@ -256,7 +256,7 @@ SOURCE=.\printing.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\printing.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/printing/printing.rc b/samples/printing/printing.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 42f7b9cb8c100c588503b18ee3b6655c3440f5ef..4afe5d3352ab695b96f357ab1d2fc4c0c338285c 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\printing.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/printing/printing_vc8.vcproj b/samples/printing/printing_vc8.vcproj
index ea2e71aa8fb8b0ed9cdcbc37fda8d668af5cbf8f..6c6ab26f2075d8830a4a15e1096e81558089d070 100644 (file)
--- a/samples/printing/printing_vc8.vcproj
+++ b/samples/printing/printing_vc8.vcproj
@@ -824,7 +824,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\printing.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/printing/printing_vc9.vcproj b/samples/printing/printing_vc9.vcproj
index a03e70bac2cad2ac223539fe484bf5c5f023f221..389309c8d76d5b4336a8ba2d14d32a7e0356beb2 100644 (file)
--- a/samples/printing/printing_vc9.vcproj
+++ b/samples/printing/printing_vc9.vcproj
@@ -796,7 +796,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\printing.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/regtest/regtest.rc b/samples/regtest/regtest.rc
index 8d688bba6f6ec4662dd41a4c1fa7111317870ffe..e8d98320661eefa82aea5b881d5971958ab4fa5d 100644 (file)
--- 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"
 
 app_icon       ICON "registry.ico"
 icon_key1      ICON "key1.ico"

diff --git a/samples/sample.rc4 b/samples/sample.rc4
new file mode 100644 (file)
index 0000000..2f8fff4
--- /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 (file)
index 0000000..2f8fff4
--- /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/sample_os2.ico b/samples/sample_os2.ico
new file mode 100644 (file)
index 0000000..8b0e58c
Binary files /dev/null and b/samples/sample_os2.ico differ

diff --git a/samples/sashtest/sashtest.rc b/samples/sashtest/sashtest.rc
index 3719f5af816fd54cdd9e6f8920f9019ddfe0e13d..ea837631a9fe7cc060dec8e4f797caa2a37de746 100644 (file)
--- 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"
 
 
 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 10af270e51d31f64610559aa519919c6abaf909c..5a4e37427fdcdb426c2c00fc3e15d6fbdcb633f7 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 SCROLL_OBJECTS =  \

+       $(__scroll___win32rc) \

        $(__scroll_os2_lib_res) \
        $(__scroll_os2_lib_res) \

-       scroll_scroll.o \
-       $(__scroll___win32rc)
+       scroll_scroll.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc
index ff28afb609001bedef10d01dc94df0feffcd4711..b22f2d826fabfcf8c4dd8cf4722703a4916a3508 100644 (file)
--- a/samples/scroll/makefile.bcc
+++ b/samples/scroll/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\scroll.ilf del $(OBJS)\scroll.ilf\r
        -if exist $(OBJS)\scroll.ils del $(OBJS)\scroll.ils\r
 \r
        -if exist $(OBJS)\scroll.ilf del $(OBJS)\scroll.ilf\r
        -if exist $(OBJS)\scroll.ils del $(OBJS)\scroll.ils\r
 \r

-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS)  $(OBJS)\scroll_scroll.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(SCROLL_CXXFLAGS) .\scroll.cpp\r
 \r
 $(OBJS)\scroll_scroll.obj: .\scroll.cpp\r
        $(CXX) -q -c -P -o$@ $(SCROLL_CXXFLAGS) .\scroll.cpp\r
 \r

-$(OBJS)\scroll_scroll.res: .\scroll.rc\r
-       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\r
-\r

diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc
index 38cc4062074acc3e2100350bed94cc298a2aae28..224fda3e6ae0ff604c9450d061dc38498b29431e 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SCROLL_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SCROLL_OBJECTS =  \\r

-       $(OBJS)\scroll_scroll.o \\r
-       $(OBJS)\scroll_scroll_rc.o\r
+       $(OBJS)\scroll_sample_rc.o \
+       $(OBJS)\scroll_scroll.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
 \r

-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\scroll_scroll.o: ./scroll.cpp\r
        $(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\scroll_scroll_rc.o: ./scroll.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc
index ee803ada25e424620b5d57160326876cb0c768d9..9098682c8da4eb599ebc40c5a26e6d3dbb3e37f2 100644 (file)
--- 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 =  \\r
        $(OBJS)\scroll_scroll.obj\r
 SCROLL_RESOURCES =  \\r
 SCROLL_OBJECTS =  \\r
        $(OBJS)\scroll_scroll.obj\r
 SCROLL_RESOURCES =  \\r

-       $(OBJS)\scroll_scroll.res\r
+       $(OBJS)\scroll_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\scroll.ilk del $(OBJS)\scroll.ilk\r
        -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb\r
 \r
        -if exist $(OBJS)\scroll.ilk del $(OBJS)\scroll.ilk\r
        -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb\r
 \r

-$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) .\scroll.cpp\r
 \r
 $(OBJS)\scroll_scroll.obj: .\scroll.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) .\scroll.cpp\r
 \r

-$(OBJS)\scroll_scroll.res: .\scroll.rc\r
-       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\r
-\r

diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat
index 4fc5a3d1df76d94c1499c3374d1bf5d3f7377c02..8afee141f4944bc1c75b3be2d7d3c18e3142ad1e 100644 (file)
--- a/samples/scroll/makefile.wat
+++ b/samples/scroll/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe\r
 \r

-$(OBJS)\scroll.exe :  $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res\r
+$(OBJS)\scroll.exe :  $(SCROLL_OBJECTS) $(OBJS)\scroll_sample.res

        @%create $(OBJS)\scroll.lbc\r
        @%append $(OBJS)\scroll.lbc option quiet\r
        @%append $(OBJS)\scroll.lbc name $^@\r
        @%create $(OBJS)\scroll.lbc\r
        @%append $(OBJS)\scroll.lbc option quiet\r
        @%append $(OBJS)\scroll.lbc name $^@\r


@@ -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)\r
        @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i\r
        @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\r
        @%append $(OBJS)\scroll.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i\r
        @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\r

-       @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res\r
+       @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_sample.res

        @for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i\r
        wlink @$(OBJS)\scroll.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i\r
        wlink @$(OBJS)\scroll.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\scroll_scroll.obj :  .AUTODEPEND .\scroll.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $<\r
 \r

-$(OBJS)\scroll_scroll.res :  .AUTODEPEND .\scroll.rc\r
-       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 $<\r
-\r

diff --git a/samples/scroll/mondros2.ico b/samples/scroll/mondros2.ico
deleted file mode 100644 (file)
index 8b0e58c..0000000
Binary files a/samples/scroll/mondros2.ico and /dev/null differ

diff --git a/samples/scroll/scroll.bkl b/samples/scroll/scroll.bkl
index 58658b5c740ef4202dcb45d9b88bc1e8c34f81b2..35f30cc60dd739947ce1e50c66367e1c33115dce 100644 (file)
--- a/samples/scroll/scroll.bkl
+++ b/samples/scroll/scroll.bkl
@@ -7,7 +7,6 @@
         <sources>scroll.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>scroll.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>scroll.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/scroll/scroll.dsp b/samples/scroll/scroll.dsp
index ece9c56819c2257e6bb17bf9ea6a0adad64b7f7f..e130c8f38d5e152d31fce830f2c385ad7b6f8dc0 100644 (file)
--- a/samples/scroll/scroll.dsp
+++ b/samples/scroll/scroll.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\scroll.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\scroll.rc\r
+SOURCE=.\scroll.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/scroll/scroll.rc b/samples/scroll/scroll.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 ed47f1d89ef70f46c28278f8aee89ff3689db854..724e5f93ae2564a9afe4656cfbfad30ac0f7be94 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\scroll.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/scroll/scroll_vc8.vcproj b/samples/scroll/scroll_vc8.vcproj
index 1f4ba96dd25310f83a580658c2f3d983914900d5..6baf7306dd50132f22e62c73c5b195ad80c6a693 100644 (file)
--- a/samples/scroll/scroll_vc8.vcproj
+++ b/samples/scroll/scroll_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\scroll.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/scroll/scroll_vc9.vcproj b/samples/scroll/scroll_vc9.vcproj
index b2f281b21ccf091c1645f64c5d2445c3171cf3ca..e4b7e383a2612343d468c374312e1f1543c42f99 100644 (file)
--- a/samples/scroll/scroll_vc9.vcproj
+++ b/samples/scroll/scroll_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\scroll.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 98f7d65fa7a1532da3eb2c995afad86ad185c63a..82ad8d4b0f4ab5e50a24b61e80ef517973246b1c 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 SHAPED_OBJECTS =  \

+       $(__shaped___win32rc) \

        $(__shaped_os2_lib_res) \
        $(__shaped_os2_lib_res) \

-       shaped_shaped.o \
-       $(__shaped___win32rc)
+       shaped_shaped.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc
index ea98585d6faed7a49f663fcd10dad89352a7f350..f3aff6d619edd99054dfd3d747a219f6e8a9a7a0 100644 (file)
--- a/samples/shaped/makefile.bcc
+++ b/samples/shaped/makefile.bcc
@@ -229,18 +229,18 @@ clean:
        -if exist $(OBJS)\shaped.ilf del $(OBJS)\shaped.ilf\r
        -if exist $(OBJS)\shaped.ils del $(OBJS)\shaped.ils\r
 \r
        -if exist $(OBJS)\shaped.ilf del $(OBJS)\shaped.ilf\r
        -if exist $(OBJS)\shaped.ils del $(OBJS)\shaped.ils\r
 \r

-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS)  $(OBJS)\shaped_shaped.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(SHAPED_CXXFLAGS) .\shaped.cpp\r
 \r
 $(OBJS)\shaped_shaped.obj: .\shaped.cpp\r
        $(CXX) -q -c -P -o$@ $(SHAPED_CXXFLAGS) .\shaped.cpp\r
 \r

-$(OBJS)\shaped_shaped.res: .\shaped.rc\r
-       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\r
-\r

diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index 323933995fff26e18dbe8a8605f8a01e5388bcae..32929d712c2bfa969f161daad394017620b7f3e4 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SHAPED_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SHAPED_OBJECTS =  \\r

-       $(OBJS)\shaped_shaped.o \\r
-       $(OBJS)\shaped_shaped_rc.o\r
+       $(OBJS)\shaped_sample_rc.o \
+       $(OBJS)\shaped_shaped.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,19 +218,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
 \r

-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (star.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (star.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\shaped_shaped.o: ./shaped.cpp\r
        $(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\shaped_shaped_rc.o: ./shaped.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc
index 27598d97dd77def24e4e9a27cf92fbd5ffbb6fb1..5961123da5573bc7492bdf634797b9fd218bf92f 100644 (file)
--- 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 =  \\r
        $(OBJS)\shaped_shaped.obj\r
 SHAPED_RESOURCES =  \\r
 SHAPED_OBJECTS =  \\r
        $(OBJS)\shaped_shaped.obj\r
 SHAPED_RESOURCES =  \\r

-       $(OBJS)\shaped_shaped.res\r
+       $(OBJS)\shaped_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,7 +339,7 @@ clean:
        -if exist $(OBJS)\shaped.ilk del $(OBJS)\shaped.ilk\r
        -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb\r
 \r
        -if exist $(OBJS)\shaped.ilk del $(OBJS)\shaped.ilk\r
        -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb\r
 \r

-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -348,9 +348,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) .\shaped.cpp\r
 \r
 $(OBJS)\shaped_shaped.obj: .\shaped.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) .\shaped.cpp\r
 \r

-$(OBJS)\shaped_shaped.res: .\shaped.rc\r
-       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\r
-\r

diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat
index 58a7bacd338ae7ecf989651ede12d77a0996badd..68f31069185abcc6b67972d64f8ed78e2a79cd0a 100644 (file)
--- a/samples/shaped/makefile.wat
+++ b/samples/shaped/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
 \r

-$(OBJS)\shaped.exe :  $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res\r
+$(OBJS)\shaped.exe :  $(SHAPED_OBJECTS) $(OBJS)\shaped_sample.res

        @%create $(OBJS)\shaped.lbc\r
        @%append $(OBJS)\shaped.lbc option quiet\r
        @%append $(OBJS)\shaped.lbc name $^@\r
        @%create $(OBJS)\shaped.lbc\r
        @%append $(OBJS)\shaped.lbc option quiet\r
        @%append $(OBJS)\shaped.lbc name $^@\r


@@ -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)\r
        @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i\r
        @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\r
        @%append $(OBJS)\shaped.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i\r
        @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\r

-       @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res\r
+       @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_sample.res

        @for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i\r
        wlink @$(OBJS)\shaped.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i\r
        wlink @$(OBJS)\shaped.lbc\r
 \r


@@ -264,9 +264,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $<\r
 \r
 $(OBJS)\shaped_shaped.obj :  .AUTODEPEND .\shaped.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $<\r
 \r

-$(OBJS)\shaped_shaped.res :  .AUTODEPEND .\shaped.rc\r
-       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 $<\r
-\r

diff --git a/samples/shaped/shaped.bkl b/samples/shaped/shaped.bkl
index 49f1189814f928780ec09bd3afa0e9f6732365d4..477705c15f4edc3255296f5b07ada41468a10714 100644 (file)
--- a/samples/shaped/shaped.bkl
+++ b/samples/shaped/shaped.bkl
@@ -7,9 +7,8 @@
         <sources>shaped.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>shaped.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>shaped.rc</win32-res>

     </exe>
     </exe>

-    
+

     <wx-data id="data">
         <files>star.png</files>
     </wx-data>
     <wx-data id="data">
         <files>star.png</files>
     </wx-data>

diff --git a/samples/shaped/shaped.dsp b/samples/shaped/shaped.dsp
index 329571cd3b2953db73c4ff91ca4f76695a7790a2..b84fb7f30012b06659b911271a12bebd9b8ee3a3 100644 (file)
--- a/samples/shaped/shaped.dsp
+++ b/samples/shaped/shaped.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\shaped.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\shaped.rc\r
+SOURCE=.\shaped.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/shaped/shaped.rc b/samples/shaped/shaped.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 0c24827b244b8d2081530f86af0201990d570acf..0608d8268b37bb44efc40fbab8717263de03e047 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\shaped.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/shaped/shaped_vc8.vcproj b/samples/shaped/shaped_vc8.vcproj
index 5e076534ab1872dc669550df1e95a3e81217d02c..e536b24ea81de12445a46a749690252271b03cc2 100644 (file)
--- a/samples/shaped/shaped_vc8.vcproj
+++ b/samples/shaped/shaped_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\shaped.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/shaped/shaped_vc9.vcproj b/samples/shaped/shaped_vc9.vcproj
index 32ccd08b6ffe829c9fc63d35a8d62219da0ec7ed..81210e8ecea160dfc705eee7115709f2b948f3ea 100644 (file)
--- a/samples/shaped/shaped_vc9.vcproj
+++ b/samples/shaped/shaped_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\shaped.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 0ea35e48e1ca330ce218a9b7ac5fd8b798ade2d2..9b33b775c0439e86e235d069f194c4d9df4596e4 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 CLIENT_OBJECTS =  \

+       $(__client___win32rc) \

        $(os2_lib_res) \
        $(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_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) \
        $(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) \
 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_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
 @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_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 = \
 @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_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
 @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_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)
 @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)
 
        
        $(__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.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
 
        $(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
 
 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 c435c1e9ccdc88e34f10b6aea7a41bf747769000..b45ccb3f0962549db777ef00ea73553e77566c11 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -39,7 +39,9 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif

 
 // --------------------------------------------------------------------------
 // classes
 
 // --------------------------------------------------------------------------
 // classes


@@ -206,7 +208,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
                              wxDefaultPosition, wxSize(300, 200))
 {
   // Give the frame an icon
                              wxDefaultPosition, wxSize(300, 200))
 {
   // Give the frame an icon

-  SetIcon(wxICON(mondrian));
+  SetIcon(wxICON(sample));

 
   // Make menus
   m_menuFile = new wxMenu();
 
   // Make menus
   m_menuFile = new wxMenu();

diff --git a/samples/sockets/client.rc b/samples/sockets/client.rc
deleted file mode 100644 (file)
index f1579f6..0000000
--- 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 (file)
index 7844dfd..0000000
Binary files a/samples/sockets/connect.ico and /dev/null differ

diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc
index 293090a23fe0e5d20e47dc1d26704206f670f483..7e617d66886f0695a56d0a6cb477ec8ddfda4224 100644 (file)
--- a/samples/sockets/makefile.bcc
+++ b/samples/sockets/makefile.bcc
@@ -285,16 +285,16 @@ clean:
        -if exist $(OBJS)\baseserver.ils del $(OBJS)\baseserver.ils\r
 \r
 !if "$(USE_GUI)" == "1"\r
        -if exist $(OBJS)\baseserver.ils del $(OBJS)\baseserver.ils\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\client.exe: $(CLIENT_OBJECTS)  $(OBJS)\client_client.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 |\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\server.exe: $(SERVER_OBJECTS)  $(OBJS)\server_server.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 !endif\r
 \r
 |\r
 !endif\r
 \r


@@ -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,,\r
 |\r
 \r
        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,,\r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(CLIENT_CXXFLAGS) .\client.cpp\r
 \r
 $(OBJS)\client_client.obj: .\client.cpp\r
        $(CXX) -q -c -P -o$@ $(CLIENT_CXXFLAGS) .\client.cpp\r
 \r

-$(OBJS)\client_client.res: .\client.rc\r
-       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\r
+$(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

 \r
 $(OBJS)\server_server.obj: .\server.cpp\r
        $(CXX) -q -c -P -o$@ $(SERVER_CXXFLAGS) .\server.cpp\r
 \r
 \r
 $(OBJS)\server_server.obj: .\server.cpp\r
        $(CXX) -q -c -P -o$@ $(SERVER_CXXFLAGS) .\server.cpp\r
 \r

-$(OBJS)\server_server.res: .\server.rc\r
-       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\r
-\r

 $(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp\r
        $(CXX) -q -c -P -o$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp\r
 \r
 $(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp\r
        $(CXX) -q -c -P -o$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp\r
 \r

diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index de3a0495ef0cb2cef604042c4feecb05a990afbf..6d6c1d9c4cc614bde9650f21bf1bb1acf04ee0ba 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CLIENT_OBJECTS =  \\r
        -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \\r
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CLIENT_OBJECTS =  \\r

-       $(OBJS)\client_client.o \\r
-       $(OBJS)\client_client_rc.o\r
+       $(OBJS)\client_sample_rc.o \
+       $(OBJS)\client_client.o

 SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
 SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r


@@ -38,8 +38,8 @@ SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS)
        -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \\r
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SERVER_OBJECTS =  \\r
        -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \\r
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SERVER_OBJECTS =  \\r

-       $(OBJS)\server_server.o \\r
-       $(OBJS)\server_server_rc.o\r
+       $(OBJS)\server_sample_rc.o \
+       $(OBJS)\server_server.o

 BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
 BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r


@@ -261,12 +261,12 @@ clean:
        -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
 \r
 ifeq ($(USE_GUI),1)\r
        -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
 \r
 ifeq ($(USE_GUI),1)\r

-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o\r
+$(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\r
 endif\r
 \r
 ifeq ($(USE_GUI),1)\r
        $(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\r
 endif\r
 \r
 ifeq ($(USE_GUI),1)\r

-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o\r
+$(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\r
 endif\r
 \r
        $(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\r
 endif\r
 \r


@@ -276,18 +276,18 @@ $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
 $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)\r
        $(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\r
 \r
 $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)\r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\client_client.o: ./client.cpp\r
        $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\client_client_rc.o: ./client.rc\r
+$(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\r
 \r
 $(OBJS)\server_server.o: ./server.cpp\r
        $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $(CPPDEPS) $<\r
 \r
        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\r
 \r
 $(OBJS)\server_server.o: ./server.cpp\r
        $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\server_server_rc.o: ./server.rc\r
-       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\r
-\r

 $(OBJS)\baseclient_baseclient.o: ./baseclient.cpp\r
        $(CXX) -c -o $@ $(BASECLIENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\baseclient_baseclient.o: ./baseclient.cpp\r
        $(CXX) -c -o $@ $(BASECLIENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index a8915ad0e4b023a1ed89ea9e2c81e9e969b44780..50d9fdf6b41c8cc53dff3501d14e0f096207406b 100644 (file)
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -31,7 +31,7 @@ CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
 CLIENT_OBJECTS =  \\r
        $(OBJS)\client_client.obj\r
 CLIENT_RESOURCES =  \\r
 CLIENT_OBJECTS =  \\r
        $(OBJS)\client_client.obj\r
 CLIENT_RESOURCES =  \\r

-       $(OBJS)\client_client.res\r
+       $(OBJS)\client_sample.res

 SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \\r
        $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
 SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \\r
        $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r


@@ -43,7 +43,7 @@ SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \
 SERVER_OBJECTS =  \\r
        $(OBJS)\server_server.obj\r
 SERVER_RESOURCES =  \\r
 SERVER_OBJECTS =  \\r
        $(OBJS)\server_server.obj\r
 SERVER_RESOURCES =  \\r

-       $(OBJS)\server_server.res\r
+       $(OBJS)\server_sample.res

 BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(____DEBUGRUNTIME) \\r
        $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
 BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(____DEBUGRUNTIME) \\r
        $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r


@@ -444,14 +444,14 @@ clean:
        -if exist $(OBJS)\baseserver.pdb del $(OBJS)\baseserver.pdb\r
 \r
 !if "$(USE_GUI)" == "1"\r
        -if exist $(OBJS)\baseserver.pdb del $(OBJS)\baseserver.pdb\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r

-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res\r
+$(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) @<<\r
        $(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\r
 <<\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(__DEBUGINFO_18)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
        $(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\r
 <<\r


@@ -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\r
 <<\r
 \r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) .\client.cpp\r
 \r
 $(OBJS)\client_client.obj: .\client.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) .\client.cpp\r
 \r

-$(OBJS)\client_client.res: .\client.rc\r
-       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\r
+$(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

 \r
 $(OBJS)\server_server.obj: .\server.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) .\server.cpp\r
 \r
 \r
 $(OBJS)\server_server.obj: .\server.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) .\server.cpp\r
 \r

-$(OBJS)\server_server.res: .\server.rc\r
-       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\r
-\r

 $(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp\r
 \r
 $(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp\r
 \r

diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat
index c51cfdfca26854cdf28ea1bfe658190b09f889a3..fd8ce84653f21015a3c2fe5a263b402f5dd6ed99 100644 (file)
--- 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\r
 \r
 !ifeq USE_GUI 1\r
        -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
 \r
 !ifeq USE_GUI 1\r

-$(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_client.res\r
+$(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_sample.res

        @%create $(OBJS)\client.lbc\r
        @%append $(OBJS)\client.lbc option quiet\r
        @%append $(OBJS)\client.lbc name $^@\r
        @%create $(OBJS)\client.lbc\r
        @%append $(OBJS)\client.lbc option quiet\r
        @%append $(OBJS)\client.lbc name $^@\r


@@ -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)\r
        @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i\r
        @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\r
        @%append $(OBJS)\client.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i\r
        @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\r

-       @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res\r
+       @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_sample.res

        @for %i in () do @%append $(OBJS)\client.lbc option stack=%i\r
        wlink @$(OBJS)\client.lbc\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
        @for %i in () do @%append $(OBJS)\client.lbc option stack=%i\r
        wlink @$(OBJS)\client.lbc\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r

-$(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_server.res\r
+$(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_sample.res

        @%create $(OBJS)\server.lbc\r
        @%append $(OBJS)\server.lbc option quiet\r
        @%append $(OBJS)\server.lbc name $^@\r
        @%create $(OBJS)\server.lbc\r
        @%append $(OBJS)\server.lbc option quiet\r
        @%append $(OBJS)\server.lbc name $^@\r


@@ -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)\r
        @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i\r
        @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\r
        @%append $(OBJS)\server.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i\r
        @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\r

-       @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res\r
+       @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_sample.res

        @for %i in () do @%append $(OBJS)\server.lbc option stack=%i\r
        wlink @$(OBJS)\server.lbc\r
 !endif\r
        @for %i in () do @%append $(OBJS)\server.lbc option stack=%i\r
        wlink @$(OBJS)\server.lbc\r
 !endif\r


@@ -343,18 +343,18 @@ $(OBJS)\baseserver.exe :  $(BASESERVER_OBJECTS)
        @for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i\r
        wlink @$(OBJS)\baseserver.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i\r
        wlink @$(OBJS)\baseserver.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<\r
 \r
 $(OBJS)\client_client.obj :  .AUTODEPEND .\client.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<\r
 \r

-$(OBJS)\client_client.res :  .AUTODEPEND .\client.rc\r
+$(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 $<\r
 \r
 $(OBJS)\server_server.obj :  .AUTODEPEND .\server.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $<\r
 \r
        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 $<\r
 \r
 $(OBJS)\server_server.obj :  .AUTODEPEND .\server.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $<\r
 \r

-$(OBJS)\server_server.res :  .AUTODEPEND .\server.rc\r
-       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 $<\r
-\r

 $(OBJS)\baseclient_baseclient.obj :  .AUTODEPEND .\baseclient.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $<\r
 \r
 $(OBJS)\baseclient_baseclient.obj :  .AUTODEPEND .\baseclient.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $<\r
 \r

diff --git a/samples/sockets/mondrian.ico b/samples/sockets/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/sockets/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 6dcc04eb2343398a35132edc7727d40617579fa6..4187191ceeca460067d005619ec8e3d5cd2e5cd9 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -45,7 +45,9 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif

 
 // --------------------------------------------------------------------------
 // classes
 
 // --------------------------------------------------------------------------
 // classes


@@ -179,7 +181,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
                              wxDefaultPosition, wxSize(300, 200))
 {
   // Give the frame an icon
                              wxDefaultPosition, wxSize(300, 200))
 {
   // Give the frame an icon

-  SetIcon(wxICON(mondrian));
+  SetIcon(wxICON(sample));

 
   // Make menus
   m_menuFile = new wxMenu();
 
   // Make menus
   m_menuFile = new wxMenu();

diff --git a/samples/sockets/server.rc b/samples/sockets/server.rc
deleted file mode 100644 (file)
index b289ec6..0000000
--- 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 0e9b60e45e98abf820b1bfee2d2cc92c2bc63bff..76c543168d48ed449d713d0932d9fa959d54b89d 100644 (file)
--- a/samples/sockets/sockets.bkl
+++ b/samples/sockets/sockets.bkl
@@ -16,7 +16,6 @@
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>client.rc</win32-res>

     </exe>
 
     <exe id="server" template="wx_sample" template_append="wx_append" cond="$(cond_build_gui)">
     </exe>
 
     <exe id="server" template="wx_sample" template_append="wx_append" cond="$(cond_build_gui)">


@@ -24,7 +23,6 @@
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>server.rc</win32-res>

     </exe>
 
     <exe id="baseclient" template="wx_sample_console"
     </exe>
 
     <exe id="baseclient" template="wx_sample_console"

diff --git a/samples/sockets/sockets_client.dsp b/samples/sockets/sockets_client.dsp
index 8ed360d2db26696259255deaed02f9fc4a9703be..f20eb5a114f4924fcfa84fa04dee0b546b548867 100644 (file)
--- a/samples/sockets/sockets_client.dsp
+++ b/samples/sockets/sockets_client.dsp
@@ -256,7 +256,7 @@ SOURCE=.\client.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\client.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/sockets/sockets_server.dsp b/samples/sockets/sockets_server.dsp
index 91398d153dacff49f321cd1d58d01fc077e05560..b50efe213503911bffaf40654880dc1865607343 100644 (file)
--- a/samples/sockets/sockets_server.dsp
+++ b/samples/sockets/sockets_server.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\server.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\server.rc\r
+SOURCE=.\server.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/sockets/sockets_vc7_client.vcproj b/samples/sockets/sockets_vc7_client.vcproj
index 50e2596e940b8342cb4c633753bc7885607b6e6b..3e2f2a659ef48c5e6918517075ac0420361473db 100644 (file)
--- a/samples/sockets/sockets_vc7_client.vcproj
+++ b/samples/sockets/sockets_vc7_client.vcproj
@@ -550,7 +550,7 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\client.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/sockets/sockets_vc7_server.vcproj b/samples/sockets/sockets_vc7_server.vcproj
index efa7b9daf4e208c5ac1d1a641f60684b147d7782..0d7a20fdde88d34cef746b8d317788b61b4ace59 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\server.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/sockets/sockets_vc8_client.vcproj b/samples/sockets/sockets_vc8_client.vcproj
index caa2e3ec76eaec5ce6e47750f970a87ef8be9a07..366579c1685cd71eda93ba5efe81b45899cfc08b 100644 (file)
--- a/samples/sockets/sockets_vc8_client.vcproj
+++ b/samples/sockets/sockets_vc8_client.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\client.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/sockets/sockets_vc8_server.vcproj b/samples/sockets/sockets_vc8_server.vcproj
index 55d35d3bb0f433b78fc6c4dfa4a6d7c619e92667..b8670d7a481620be7a75f2a04ad34169a7e6d925 100644 (file)
--- a/samples/sockets/sockets_vc8_server.vcproj
+++ b/samples/sockets/sockets_vc8_server.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\server.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/sockets/sockets_vc9_client.vcproj b/samples/sockets/sockets_vc9_client.vcproj
index aaf74dd928b144b524c2d77eea1a82198fccfd72..cb9667204f781fd848cf012b988ee99e26be8180 100644 (file)
--- a/samples/sockets/sockets_vc9_client.vcproj
+++ b/samples/sockets/sockets_vc9_client.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\client.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/sockets/sockets_vc9_server.vcproj b/samples/sockets/sockets_vc9_server.vcproj
index 1ce0ba4361caaf4aac45d3e6e77e2cd4a1613804..a64e3a5edaaedde1cb4fbe8ab0859ffd3ad06b19 100644 (file)
--- a/samples/sockets/sockets_vc9_server.vcproj
+++ b/samples/sockets/sockets_vc9_server.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\server.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index ec4c9d50e1f3d10b9822b1769cb6027ee5049ba1..9b9f7b3e7e70310289aea63727e8a1aea0e74294 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 SPLITTER_OBJECTS =  \

+       $(__splitter___win32rc) \

        $(__splitter_os2_lib_res) \
        $(__splitter_os2_lib_res) \

-       splitter_splitter.o \
-       $(__splitter___win32rc)
+       splitter_splitter.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc
index b1074a0806fcba471cd5a5fc2eaf999de56e16c7..a4804fe18c0289a6562752e3fc8e3d8dfa61bcbe 100644 (file)
--- a/samples/splitter/makefile.bcc
+++ b/samples/splitter/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\splitter.ilf del $(OBJS)\splitter.ilf\r
        -if exist $(OBJS)\splitter.ils del $(OBJS)\splitter.ils\r
 \r
        -if exist $(OBJS)\splitter.ilf del $(OBJS)\splitter.ilf\r
        -if exist $(OBJS)\splitter.ils del $(OBJS)\splitter.ils\r
 \r

-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS)  $(OBJS)\splitter_splitter.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp\r
 \r
 $(OBJS)\splitter_splitter.obj: .\splitter.cpp\r
        $(CXX) -q -c -P -o$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp\r
 \r

-$(OBJS)\splitter_splitter.res: .\splitter.rc\r
-       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\r
-\r

diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc
index 3cb38311106708dcd9ffd88a65af9e27f5a58311..72013e97034361afc41b1d19f61217d3ac9bea88 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SPLITTER_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SPLITTER_OBJECTS =  \\r

-       $(OBJS)\splitter_splitter.o \\r
-       $(OBJS)\splitter_splitter_rc.o\r
+       $(OBJS)\splitter_sample_rc.o \
+       $(OBJS)\splitter_splitter.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
 \r

-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\splitter_splitter.o: ./splitter.cpp\r
        $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\splitter_splitter_rc.o: ./splitter.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc
index c82f445887e251169df9c52899370428e7e02fa9..3f9d9ed656134dcb02a16650bcf37968d61aee68 100644 (file)
--- 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 =  \\r
        $(OBJS)\splitter_splitter.obj\r
 SPLITTER_RESOURCES =  \\r
 SPLITTER_OBJECTS =  \\r
        $(OBJS)\splitter_splitter.obj\r
 SPLITTER_RESOURCES =  \\r

-       $(OBJS)\splitter_splitter.res\r
+       $(OBJS)\splitter_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\splitter.ilk del $(OBJS)\splitter.ilk\r
        -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb\r
 \r
        -if exist $(OBJS)\splitter.ilk del $(OBJS)\splitter.ilk\r
        -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb\r
 \r

-$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp\r
 \r
 $(OBJS)\splitter_splitter.obj: .\splitter.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp\r
 \r

-$(OBJS)\splitter_splitter.res: .\splitter.rc\r
-       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\r
-\r

diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat
index ea70852f98d4b9dbc439d6294c9e34a726283be9..b2fc26c9d7e30c76f21bd1f567d0547872214c53 100644 (file)
--- a/samples/splitter/makefile.wat
+++ b/samples/splitter/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe\r
 \r

-$(OBJS)\splitter.exe :  $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res\r
+$(OBJS)\splitter.exe :  $(SPLITTER_OBJECTS) $(OBJS)\splitter_sample.res

        @%create $(OBJS)\splitter.lbc\r
        @%append $(OBJS)\splitter.lbc option quiet\r
        @%append $(OBJS)\splitter.lbc name $^@\r
        @%create $(OBJS)\splitter.lbc\r
        @%append $(OBJS)\splitter.lbc option quiet\r
        @%append $(OBJS)\splitter.lbc name $^@\r


@@ -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)\r
        @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i\r
        @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\r
        @%append $(OBJS)\splitter.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i\r
        @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\r

-       @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res\r
+       @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_sample.res

        @for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i\r
        wlink @$(OBJS)\splitter.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i\r
        wlink @$(OBJS)\splitter.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $<\r
 \r
 $(OBJS)\splitter_splitter.obj :  .AUTODEPEND .\splitter.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $<\r
 \r

-$(OBJS)\splitter_splitter.res :  .AUTODEPEND .\splitter.rc\r
-       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 $<\r
-\r

diff --git a/samples/splitter/mondrian.ico b/samples/splitter/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
Binary files a/samples/splitter/mondrian.ico and /dev/null differ

diff --git a/samples/splitter/splitter.bkl b/samples/splitter/splitter.bkl
index 0b62172f5c54820d9d961b6e94f5499ed2d9915a..2dce3f0cbaa39a0cc9dd0d80fab467885a82d565 100644 (file)
--- a/samples/splitter/splitter.bkl
+++ b/samples/splitter/splitter.bkl
@@ -7,7 +7,6 @@
         <sources>splitter.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>splitter.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>splitter.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/splitter/splitter.dsp b/samples/splitter/splitter.dsp
index d544c1406e75803a66acf9dc79cbac3a2da9c8b1..11aca2c864fc213dc2f24e7e58b12b8e369498d1 100644 (file)
--- a/samples/splitter/splitter.dsp
+++ b/samples/splitter/splitter.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\splitter.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\splitter.rc\r
+SOURCE=.\splitter.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/splitter/splitter.rc b/samples/splitter/splitter.rc
deleted file mode 100644 (file)
index d5ffa41..0000000
--- 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 a3c48946ad7e31139d84fdb6cc6594beb451f643..6ce5873f65155bc14dfbc51e79491fa694d34d9c 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\splitter.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/splitter/splitter_vc8.vcproj b/samples/splitter/splitter_vc8.vcproj
index 0ab6da45adda9f48a55dcce04dae7294f5ae2574..b0ba26ebd81e88c0e56cba9a030113e8299dad4e 100644 (file)
--- a/samples/splitter/splitter_vc8.vcproj
+++ b/samples/splitter/splitter_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\splitter.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/splitter/splitter_vc9.vcproj b/samples/splitter/splitter_vc9.vcproj
index 0f91849199a97eb1a5777a8f4fe79c81ed9df6c0..8ba38efb00058d26e903e33c9dda50d3fda1e986 100644 (file)
--- a/samples/splitter/splitter_vc9.vcproj
+++ b/samples/splitter/splitter_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\splitter.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 9a276e57a8c9113dcd4e9ed3b70295a5baef6453..8a0e25945d09b214455efcb4c82c7237310f957a 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 STATBAR_OBJECTS =  \

+       $(__statbar___win32rc) \

        $(__statbar_os2_lib_res) \
        $(__statbar_os2_lib_res) \

-       statbar_statbar.o \
-       $(__statbar___win32rc)
+       statbar_statbar.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc
index 35271a461864159b5c31cd1f4ea68a36061d06c0..ceb6f5e4c989e5047dd781520be72d55cb63c6e2 100644 (file)
--- a/samples/statbar/makefile.bcc
+++ b/samples/statbar/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\statbar.ilf del $(OBJS)\statbar.ilf\r
        -if exist $(OBJS)\statbar.ils del $(OBJS)\statbar.ils\r
 \r
        -if exist $(OBJS)\statbar.ilf del $(OBJS)\statbar.ilf\r
        -if exist $(OBJS)\statbar.ils del $(OBJS)\statbar.ils\r
 \r

-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS)  $(OBJS)\statbar_statbar.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(STATBAR_CXXFLAGS) .\statbar.cpp\r
 \r
 $(OBJS)\statbar_statbar.obj: .\statbar.cpp\r
        $(CXX) -q -c -P -o$@ $(STATBAR_CXXFLAGS) .\statbar.cpp\r
 \r

-$(OBJS)\statbar_statbar.res: .\statbar.rc\r
-       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\r
-\r

diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc
index dfebcec016b869069a22d98edec02bfbef33fed5..008f8ba4221a3d1a50a19c52130ccd1c1e57a0d7 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 STATBAR_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 STATBAR_OBJECTS =  \\r

-       $(OBJS)\statbar_statbar.o \\r
-       $(OBJS)\statbar_statbar_rc.o\r
+       $(OBJS)\statbar_sample_rc.o \
+       $(OBJS)\statbar_statbar.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
 \r

-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\statbar_statbar.o: ./statbar.cpp\r
        $(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\statbar_statbar_rc.o: ./statbar.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc
index c8e6f9ffe20b772046764f0ec46842b9b8a9c726..90c76717e340897c9207d04e0a9b82595071d645 100644 (file)
--- 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 =  \\r
        $(OBJS)\statbar_statbar.obj\r
 STATBAR_RESOURCES =  \\r
 STATBAR_OBJECTS =  \\r
        $(OBJS)\statbar_statbar.obj\r
 STATBAR_RESOURCES =  \\r

-       $(OBJS)\statbar_statbar.res\r
+       $(OBJS)\statbar_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\statbar.ilk del $(OBJS)\statbar.ilk\r
        -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb\r
 \r
        -if exist $(OBJS)\statbar.ilk del $(OBJS)\statbar.ilk\r
        -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb\r
 \r

-$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) .\statbar.cpp\r
 \r
 $(OBJS)\statbar_statbar.obj: .\statbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) .\statbar.cpp\r
 \r

-$(OBJS)\statbar_statbar.res: .\statbar.rc\r
-       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\r
-\r

diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat
index aa4ee604720cf7ca400ed4099ab4c227a2690b55..2aaf5f97ec426fb6688fe1eb72527063976b0655 100644 (file)
--- a/samples/statbar/makefile.wat
+++ b/samples/statbar/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe\r
 \r

-$(OBJS)\statbar.exe :  $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res\r
+$(OBJS)\statbar.exe :  $(STATBAR_OBJECTS) $(OBJS)\statbar_sample.res

        @%create $(OBJS)\statbar.lbc\r
        @%append $(OBJS)\statbar.lbc option quiet\r
        @%append $(OBJS)\statbar.lbc name $^@\r
        @%create $(OBJS)\statbar.lbc\r
        @%append $(OBJS)\statbar.lbc option quiet\r
        @%append $(OBJS)\statbar.lbc name $^@\r


@@ -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)\r
        @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i\r
        @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\r
        @%append $(OBJS)\statbar.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i\r
        @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\r

-       @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res\r
+       @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_sample.res

        @for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i\r
        wlink @$(OBJS)\statbar.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i\r
        wlink @$(OBJS)\statbar.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $<\r
 \r
 $(OBJS)\statbar_statbar.obj :  .AUTODEPEND .\statbar.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $<\r
 \r

-$(OBJS)\statbar_statbar.res :  .AUTODEPEND .\statbar.rc\r
-       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 $<\r
-\r

diff --git a/samples/statbar/statbar.bkl b/samples/statbar/statbar.bkl
index 82d7904b6b6865c23f2127cd8521b0f1d2213f5b..a8fe53a826e5b3912676240d42620543044a08b0 100644 (file)
--- a/samples/statbar/statbar.bkl
+++ b/samples/statbar/statbar.bkl
@@ -7,7 +7,6 @@
         <sources>statbar.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>statbar.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>statbar.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/statbar/statbar.dsp b/samples/statbar/statbar.dsp
index 55de1489a4607500b7885ce927cf848a04613183..27a690051bd5b4c4c5d2f64fdced97be99ef3697 100644 (file)
--- a/samples/statbar/statbar.dsp
+++ b/samples/statbar/statbar.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\statbar.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\statbar.rc\r
+SOURCE=.\statbar.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/statbar/statbar.rc b/samples/statbar/statbar.rc
deleted file mode 100644 (file)
index b86c4e2..0000000
--- 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 32d309fbc3e5630cfd48269320db6e7a7f03398a..5e008238b0a213ae77be1a6cbd00969f93f1062b 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\statbar.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/statbar/statbar_vc8.vcproj b/samples/statbar/statbar_vc8.vcproj
index 6f2dc5c9c9381135ab7b7b59e686c60af4bf847a..4e0bab5c0059ceb67ce82e9874dcbf3863244030 100644 (file)
--- a/samples/statbar/statbar_vc8.vcproj
+++ b/samples/statbar/statbar_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\statbar.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/statbar/statbar_vc9.vcproj b/samples/statbar/statbar_vc9.vcproj
index e318e731427270c60d1b355a6c9dbc226e9ee48c..85dd2f503663cf76308d98a52499de242d7d3c95 100644 (file)
--- a/samples/statbar/statbar_vc9.vcproj
+++ b/samples/statbar/statbar_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\statbar.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index ea629a017ff4e56dcefbebfa0a5458f67301e727..708b0bddd61ec782d1b5aff14e6946535fec9082 100644 (file)
--- 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 =  \
        -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_os2_lib_res) \
        stctest_stctest.o \
        stctest_edit.o \

-       stctest_prefs.o \
-       $(__stctest___win32rc)
+       stctest_prefs.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
        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
 
 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_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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc
index baf4eabdc5da01f6ea7847239c64b4463fb8b752..b214aa46f9aff8d782144a4c0ebe39a503ea1bc2 100644 (file)
--- a/samples/stc/makefile.bcc
+++ b/samples/stc/makefile.bcc
@@ -244,6 +244,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\stctest.cpp\r
 \r
 $(OBJS)\stctest_stctest.obj: .\stctest.cpp\r
        $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\stctest.cpp\r
 \r


@@ -253,6 +256,3 @@ $(OBJS)\stctest_edit.obj: .\edit.cpp
 $(OBJS)\stctest_prefs.obj: .\prefs.cpp\r
        $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\prefs.cpp\r
 \r
 $(OBJS)\stctest_prefs.obj: .\prefs.cpp\r
        $(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) .\prefs.cpp\r
 \r

-$(OBJS)\stctest_sample.res: .\..\sample.rc\r
-       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\r
-\r

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 1ddcd8c3cf7f564694e9765bb636cf5fc080d89c..244a6f3f4124827941f96f4752b9d2b1508de3ef 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 STCTEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 STCTEST_OBJECTS =  \\r

+       $(OBJS)\stctest_sample_rc.o \

        $(OBJS)\stctest_stctest.o \\r
        $(OBJS)\stctest_edit.o \\r
        $(OBJS)\stctest_stctest.o \\r
        $(OBJS)\stctest_edit.o \\r

-       $(OBJS)\stctest_prefs.o \\r
-       $(OBJS)\stctest_sample_rc.o\r
+       $(OBJS)\stctest_prefs.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -231,6 +231,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\stctest_stctest.o: ./stctest.cpp\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r


@@ -240,9 +243,6 @@ $(OBJS)\stctest_edit.o: ./edit.cpp
 $(OBJS)\stctest_prefs.o: ./prefs.cpp\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\stctest_prefs.o: ./prefs.cpp\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\stctest_sample_rc.o: ./../sample.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index 3c03f0a73def8fd45e41b642bf783b8b78d6c88f..69ca0c3bed2bd93fcbdfd6e5f043290202f0fc42 100644 (file)
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -354,6 +354,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\stctest.cpp\r
 \r
 $(OBJS)\stctest_stctest.obj: .\stctest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\stctest.cpp\r
 \r


@@ -363,6 +366,3 @@ $(OBJS)\stctest_edit.obj: .\edit.cpp
 $(OBJS)\stctest_prefs.obj: .\prefs.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\prefs.cpp\r
 \r
 $(OBJS)\stctest_prefs.obj: .\prefs.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\prefs.cpp\r
 \r

-$(OBJS)\stctest_sample.res: .\..\sample.rc\r
-       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\r
-\r

diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index 5639e9bb5720a336e2bb779a778ada4f8741c012..0607840dd350bf3c6ccb89127625733fa01270af 100644 (file)
--- a/samples/stc/makefile.wat
+++ b/samples/stc/makefile.wat
@@ -271,6 +271,9 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<\r
 \r


@@ -280,6 +283,3 @@ $(OBJS)\stctest_edit.obj :  .AUTODEPEND .\edit.cpp
 $(OBJS)\stctest_prefs.obj :  .AUTODEPEND .\prefs.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\stctest_prefs.obj :  .AUTODEPEND .\prefs.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<\r
 \r

-$(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\sample.rc\r
-       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 $<\r
-\r

diff --git a/samples/stc/mondrian.ico b/samples/stc/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/stc/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/stc/stctest.bkl b/samples/stc/stctest.bkl
index 03cdd5498b69e4e69c27e58f35778be3aac4da36..6bb0a0b47dcaa662bb0f93038ae79c5f8525ae2c 100644 (file)
--- a/samples/stc/stctest.bkl
+++ b/samples/stc/stctest.bkl
@@ -21,8 +21,6 @@
         <if cond="OUT_OF_TREE_MAKEFILES=='0'">
             <sys-lib>$(LIB_SCINTILLA)</sys-lib>
         </if>
         <if cond="OUT_OF_TREE_MAKEFILES=='0'">
             <sys-lib>$(LIB_SCINTILLA)</sys-lib>
         </if>

-
-        <win32-res>../sample.rc</win32-res>

     </exe>
 
     <wx-data id="data">
     </exe>
 
     <wx-data id="data">

diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index a8961ae5c8dca6c5e51209a6b730fdf77902317f..4b5a4658a29792a0c7595a16a21f170b68a0e2ea 100644 (file)
--- 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)
 //----------------------------------------------------------------------------
 
 // 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
 
 //============================================================================
 #endif
 
 //============================================================================


@@ -316,12 +316,11 @@ AppFrame::AppFrame (const wxString &title)
 {
     SetIcon(wxICON(sample));
 
 {
     SetIcon(wxICON(sample));
 

-    // intitialize important variables
+    // initialize important variables

     m_edit = NULL;
 
     // set icon and background
     SetTitle (*g_appname);
     m_edit = NULL;
 
     // set icon and background
     SetTitle (*g_appname);

-    SetIcon (wxICON (mondrian));

     SetBackgroundColour (wxT("WHITE"));
 
     // about box shown for 1 seconds
     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);
 
     // 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);
     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 9d778317f5f16e9574dc5cf769a76a56138eef58..6741b06e5742ce73db2202c8390a18f811f0e5c2 100644 (file)
--- a/samples/stc/stctest.dsp
+++ b/samples/stc/stctest.dsp
@@ -260,7 +260,7 @@ SOURCE=.\prefs.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\..\sample.rc\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/samples/stc/stctest.rc b/samples/stc/stctest.rc
deleted file mode 100644 (file)
index 55808f0..0000000
--- 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 1a6d1da3a2b6f53d193ec5bc29ec1a02092fa26b..ad59c96c8065dfc4359701a3f9c583b465651ed7 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath="..\sample.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/stc/stctest_vc8.vcproj b/samples/stc/stctest_vc8.vcproj
index b6b8f98f59de29e821f1a3c7d926ba0caef3cca4..a5752cc13dffd83af7dbb193b2acb1fa46e335f6 100644 (file)
--- a/samples/stc/stctest_vc8.vcproj
+++ b/samples/stc/stctest_vc8.vcproj
@@ -840,7 +840,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath="..\sample.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/stc/stctest_vc9.vcproj b/samples/stc/stctest_vc9.vcproj
index bd6129339b9705932281bff013504c2d24fac556..e3b89ce343276789f0718186016d99102f06c50b 100644 (file)
--- a/samples/stc/stctest_vc9.vcproj
+++ b/samples/stc/stctest_vc9.vcproj
@@ -812,7 +812,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath="..\sample.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/svg/mondrian.ico b/samples/svg/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/svg/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 0cf0c134ca319f47224fc581d54d0f4b9c5bf94a..26f712730f37eb3c3219d795e6af6659c8362bdb 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -31,13 +31,15 @@
 #include "wx/dcsvg.h"
 #include "wx/vector.h"
 
 #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"
 
 #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;
 
 class MyChild;
 class MyCanvas;
 


@@ -175,7 +177,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
 {
     m_nWinCreated = 0;
 
 {
     m_nWinCreated = 0;
 

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // 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);
 
     // 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;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;


@@ -486,7 +488,7 @@ void MyCanvas::OnDraw(wxDC& dc)
             break;
 
         case 6:
             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 ");
             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 6df320751a7e8a9f88e06c473eb43a94ae5ba543..bbd7b799393ef2167b22678a254e1db085e900ab 100644 (file)
--- 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"
 
 svgbitmap               BITMAP  "SVGlogo24.bmp"

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index ec493cee606a85d4df650d96e566537b512b4f74..33c0e3c0533707d8cfa4c9f60325e2c8dd43d63f 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 TEXT_OBJECTS =  \

+       $(__text___win32rc) \

        $(__text_os2_lib_res) \
        $(__text_os2_lib_res) \

-       text_text.o \
-       $(__text___win32rc)
+       text_text.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc
index 7cc905b1f52c42e02b29cb6d74722987576b1a04..52eae796c161b38651943b805e005ffb31f26ab9 100644 (file)
--- a/samples/text/makefile.bcc
+++ b/samples/text/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\text.ilf del $(OBJS)\text.ilf\r
        -if exist $(OBJS)\text.ils del $(OBJS)\text.ils\r
 \r
        -if exist $(OBJS)\text.ilf del $(OBJS)\text.ilf\r
        -if exist $(OBJS)\text.ils del $(OBJS)\text.ils\r
 \r

-$(OBJS)\text.exe: $(TEXT_OBJECTS)  $(OBJS)\text_text.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(TEXT_CXXFLAGS) .\text.cpp\r
 \r
 $(OBJS)\text_text.obj: .\text.cpp\r
        $(CXX) -q -c -P -o$@ $(TEXT_CXXFLAGS) .\text.cpp\r
 \r

-$(OBJS)\text_text.res: .\text.rc\r
-       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\r
-\r

diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc
index 4b57b71e27394226271ceed04ff44f5fd51f48fe..eb91532a5c96e070abff1d617d5a04d1580f17db 100644 (file)
--- 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) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 TEXT_OBJECTS =  \\r
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 TEXT_OBJECTS =  \\r

-       $(OBJS)\text_text.o \\r
-       $(OBJS)\text_text_rc.o\r
+       $(OBJS)\text_sample_rc.o \
+       $(OBJS)\text_text.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -217,15 +217,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
 \r

-$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\text_text.o: ./text.cpp\r
        $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\text_text_rc.o: ./text.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc
index 6c88d589b8e8929cf88186951de84ebb2dda0574..68ca91e5a52d17931580f6e649c426cf0368c60c 100644 (file)
--- 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 =  \\r
        $(OBJS)\text_text.obj\r
 TEXT_RESOURCES =  \\r
 TEXT_OBJECTS =  \\r
        $(OBJS)\text_text.obj\r
 TEXT_RESOURCES =  \\r

-       $(OBJS)\text_text.res\r
+       $(OBJS)\text_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\text.ilk del $(OBJS)\text.ilk\r
        -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb\r
 \r
        -if exist $(OBJS)\text.ilk del $(OBJS)\text.ilk\r
        -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb\r
 \r

-$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) .\text.cpp\r
 \r
 $(OBJS)\text_text.obj: .\text.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) .\text.cpp\r
 \r

-$(OBJS)\text_text.res: .\text.rc\r
-       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\r
-\r

diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat
index 4a61e59ab0d3852c6869c184f7b5096ab30802f1..3bd35c3b4e572c6ee0664c1e6f8581008426c6e3 100644 (file)
--- a/samples/text/makefile.wat
+++ b/samples/text/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\text.exe del $(OBJS)\text.exe\r
 \r

-$(OBJS)\text.exe :  $(TEXT_OBJECTS) $(OBJS)\text_text.res\r
+$(OBJS)\text.exe :  $(TEXT_OBJECTS) $(OBJS)\text_sample.res

        @%create $(OBJS)\text.lbc\r
        @%append $(OBJS)\text.lbc option quiet\r
        @%append $(OBJS)\text.lbc name $^@\r
        @%create $(OBJS)\text.lbc\r
        @%append $(OBJS)\text.lbc option quiet\r
        @%append $(OBJS)\text.lbc name $^@\r


@@ -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)\r
        @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i\r
        @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\r
        @%append $(OBJS)\text.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i\r
        @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\r

-       @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res\r
+       @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_sample.res

        @for %i in () do @%append $(OBJS)\text.lbc option stack=%i\r
        wlink @$(OBJS)\text.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\text.lbc option stack=%i\r
        wlink @$(OBJS)\text.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $<\r
 \r
 $(OBJS)\text_text.obj :  .AUTODEPEND .\text.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $<\r
 \r

-$(OBJS)\text_text.res :  .AUTODEPEND .\text.rc\r
-       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 $<\r
-\r

diff --git a/samples/text/mondrian.ico b/samples/text/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/text/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/text/text.bkl b/samples/text/text.bkl
index a9b023c48af01d9febb258de6223312887d1ba3e..ae4aba1deb8f9709ebce5f68475d6367d559c8ff 100644 (file)
--- a/samples/text/text.bkl
+++ b/samples/text/text.bkl
@@ -7,7 +7,6 @@
         <sources>text.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>text.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>text.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/text/text.dsp b/samples/text/text.dsp
index 9ce2d9b6bfeff40ecb87f046bdbcfe3d1aa5a35e..a59ed54d1082278362308f4309365d0f0a966574 100644 (file)
--- a/samples/text/text.dsp
+++ b/samples/text/text.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\text.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\text.rc\r
+SOURCE=.\text.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/text/text.rc b/samples/text/text.rc
deleted file mode 100644 (file)
index 94d2402..0000000
--- 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 997b08a73844cc601f4765a2cfe382a6bad2bb8f..59a33b91d9ff9eb39f9f5c9935c8aeea97b70205 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\text.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/text/text_vc8.vcproj b/samples/text/text_vc8.vcproj
index b7ee4fb923e83deafcd2f48a624774ab3296ec7f..f8f7d0c5eeb5acf8c17649b6d22a6f4b5014ce2a 100644 (file)
--- a/samples/text/text_vc8.vcproj
+++ b/samples/text/text_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\text.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/text/text_vc9.vcproj b/samples/text/text_vc9.vcproj
index e21d01068592f02898aad34393d093d1e70e7924..403d33f1db025ac393f109142fc872489e172441 100644 (file)
--- a/samples/text/text_vc9.vcproj
+++ b/samples/text/text_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\text.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 3d0d4c227c2c970b8c71ab1da296052751cf52f9..1b4b224e284a74ff50fb7ecdadd0d58e9f914cb7 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 THREAD_OBJECTS =  \

+       $(__thread___win32rc) \

        $(__thread_os2_lib_res) \
        $(__thread_os2_lib_res) \

-       thread_thread.o \
-       $(__thread___win32rc)
+       thread_thread.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc
index 88a680e7eb9ec0671bfba5b3f4b15bf0891e6d32..a04300fbe1f36ce36a764ff9fd65e447af4c0f63 100644 (file)
--- a/samples/thread/makefile.bcc
+++ b/samples/thread/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\thread.ilf del $(OBJS)\thread.ilf\r
        -if exist $(OBJS)\thread.ils del $(OBJS)\thread.ils\r
 \r
        -if exist $(OBJS)\thread.ilf del $(OBJS)\thread.ilf\r
        -if exist $(OBJS)\thread.ils del $(OBJS)\thread.ils\r
 \r

-$(OBJS)\thread.exe: $(THREAD_OBJECTS)  $(OBJS)\thread_thread.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(THREAD_CXXFLAGS) .\thread.cpp\r
 \r
 $(OBJS)\thread_thread.obj: .\thread.cpp\r
        $(CXX) -q -c -P -o$@ $(THREAD_CXXFLAGS) .\thread.cpp\r
 \r

-$(OBJS)\thread_thread.res: .\thread.rc\r
-       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\r
-\r

diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc
index 755ebcffa289695628957fa811e5479c9fe55837..f1310dbbfd89185935d3f27f27653a139ea2401a 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 THREAD_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 THREAD_OBJECTS =  \\r

-       $(OBJS)\thread_thread.o \\r
-       $(OBJS)\thread_thread_rc.o\r
+       $(OBJS)\thread_sample_rc.o \
+       $(OBJS)\thread_thread.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
 \r

-$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(THREAD_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\thread_thread.o: ./thread.cpp\r
        $(CXX) -c -o $@ $(THREAD_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\thread_thread_rc.o: ./thread.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc
index db718d5db4b585c56ea3c4752f8f22492a86a93a..56f24a2ed8d5f68c52399790da1afa57285491cd 100644 (file)
--- 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 =  \\r
        $(OBJS)\thread_thread.obj\r
 THREAD_RESOURCES =  \\r
 THREAD_OBJECTS =  \\r
        $(OBJS)\thread_thread.obj\r
 THREAD_RESOURCES =  \\r

-       $(OBJS)\thread_thread.res\r
+       $(OBJS)\thread_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\thread.ilk del $(OBJS)\thread.ilk\r
        -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb\r
 \r
        -if exist $(OBJS)\thread.ilk del $(OBJS)\thread.ilk\r
        -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb\r
 \r

-$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) .\thread.cpp\r
 \r
 $(OBJS)\thread_thread.obj: .\thread.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) .\thread.cpp\r
 \r

-$(OBJS)\thread_thread.res: .\thread.rc\r
-       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\r
-\r

diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat
index e87ac4c1d75e1477c41b58909f20f5ccb16ba652..a8b8ed19593e341a33b06bd4c89a2488926550b2 100644 (file)
--- a/samples/thread/makefile.wat
+++ b/samples/thread/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe\r
 \r

-$(OBJS)\thread.exe :  $(THREAD_OBJECTS) $(OBJS)\thread_thread.res\r
+$(OBJS)\thread.exe :  $(THREAD_OBJECTS) $(OBJS)\thread_sample.res

        @%create $(OBJS)\thread.lbc\r
        @%append $(OBJS)\thread.lbc option quiet\r
        @%append $(OBJS)\thread.lbc name $^@\r
        @%create $(OBJS)\thread.lbc\r
        @%append $(OBJS)\thread.lbc option quiet\r
        @%append $(OBJS)\thread.lbc name $^@\r


@@ -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)\r
        @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i\r
        @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\r
        @%append $(OBJS)\thread.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i\r
        @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\r

-       @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res\r
+       @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_sample.res

        @for %i in () do @%append $(OBJS)\thread.lbc option stack=%i\r
        wlink @$(OBJS)\thread.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\thread.lbc option stack=%i\r
        wlink @$(OBJS)\thread.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $<\r
 \r
 $(OBJS)\thread_thread.obj :  .AUTODEPEND .\thread.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $<\r
 \r

-$(OBJS)\thread_thread.res :  .AUTODEPEND .\thread.rc\r
-       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 $<\r
-\r

diff --git a/samples/thread/thread.bkl b/samples/thread/thread.bkl
index a864b6ccbd8a2b298bd6804bc998741dfd1bfc5a..c2102a8b20ead5e318c60568f3fa572ab6651c3c 100644 (file)
--- a/samples/thread/thread.bkl
+++ b/samples/thread/thread.bkl
@@ -7,7 +7,6 @@
         <sources>thread.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <sources>thread.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>thread.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index da8acbdc542570f84d0621975b6fac0e31912c26..132795efa120d8bd62b8aacf21490a9011355bce 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -351,7 +351,7 @@ MyFrame::MyFrame(const wxString& title)
 {
     m_oldLogger = wxLog::GetActiveTarget();
 
 {
     m_oldLogger = wxLog::GetActiveTarget();
 

-    SetIcon(wxIcon(sample_xpm));
+    SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenuBar *menuBar = new wxMenuBar;
 
     // Make a menubar
     wxMenuBar *menuBar = new wxMenuBar;

diff --git a/samples/thread/thread.dsp b/samples/thread/thread.dsp
index 04aaffba8c664e68ddebec18276744cbed90002e..499eb369802eab84afcdca99179394247bd07775 100644 (file)
--- a/samples/thread/thread.dsp
+++ b/samples/thread/thread.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\thread.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\thread.rc\r
+SOURCE=.\thread.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/thread/thread.rc b/samples/thread/thread.rc
deleted file mode 100644 (file)
index 82bdf07..0000000
--- 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 928553b738a4746189c7ea4b34361d4da9cbbd78..ac16dd91c632c1d187749fb0e7fcae200a631fac 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\thread.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/thread/thread_vc8.vcproj b/samples/thread/thread_vc8.vcproj
index fceb181eeaa1ea036a312ca5f391910a1a3c3e25..810b4b2b31ff039ff8ef8b4545d8785dacb48aae 100644 (file)
--- a/samples/thread/thread_vc8.vcproj
+++ b/samples/thread/thread_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\thread.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/thread/thread_vc9.vcproj b/samples/thread/thread_vc9.vcproj
index ff0e45cd76a900678d57e90e1ebfc9730c95d3cc..4708ef4b6366f3287d4595c5f0951fd56d60353b 100644 (file)
--- a/samples/thread/thread_vc9.vcproj
+++ b/samples/thread/thread_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\thread.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/toolbar/mondrian.ico b/samples/toolbar/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/toolbar/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/toolbar/mondros2.ico b/samples/toolbar/mondros2.ico
deleted file mode 100644 (file)
index 8b0e58c..0000000
Binary files a/samples/toolbar/mondros2.ico and /dev/null differ

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 7d0a678acd845e2a67ca10bca73809a0cc0e87af..7e5558a1b35d144f0cc58423b1e048f84e00bd6d 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -61,7 +61,7 @@
 // ----------------------------------------------------------------------------
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)
 // ----------------------------------------------------------------------------
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)

-    #include "mondrian.xpm"
+    #include "../sample.xpm"

 #endif
 
 #if USE_XPM_BITMAPS
 #endif
 
 #if USE_XPM_BITMAPS


@@ -543,7 +543,7 @@ MyFrame::MyFrame(wxFrame* parent,
 #endif
 
     // Give it an icon
 #endif
 
     // Give it an icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;
 
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;

diff --git a/samples/toolbar/toolbar.rc b/samples/toolbar/toolbar.rc
index 42bb7cb984177c11922c569ac6534516ded5af18..3a4920cf6cf3269d1a021fe1f3fdfb9d6c50a46c 100644 (file)
--- 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"
 
 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 (file)
index 21e4973..0000000
--- 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 b02c69ddbb9ae5f3605533b113f18728baa93913..864dc05a65a012469aaeb315abdeff725a929620 100644 (file)
--- 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 =  \
        $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 TYPETEST_OBJECTS =  \

+       $(__typetest___win32rc) \

        $(__typetest_os2_lib_res) \
        $(__typetest_os2_lib_res) \

-       typetest_typetest.o \
-       $(__typetest___win32rc)
+       typetest_typetest.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc
index 94d78d93b2e569246d1a3d753643f0a373c0172b..c3928590a5769b3682823584630a3a94a946373d 100644 (file)
--- a/samples/typetest/makefile.bcc
+++ b/samples/typetest/makefile.bcc
@@ -229,14 +229,14 @@ clean:
        -if exist $(OBJS)\typetest.ilf del $(OBJS)\typetest.ilf\r
        -if exist $(OBJS)\typetest.ils del $(OBJS)\typetest.ils\r
 \r
        -if exist $(OBJS)\typetest.ilf del $(OBJS)\typetest.ilf\r
        -if exist $(OBJS)\typetest.ils del $(OBJS)\typetest.ils\r
 \r

-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS)  $(OBJS)\typetest_typetest.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp\r
 \r
 $(OBJS)\typetest_typetest.obj: .\typetest.cpp\r
        $(CXX) -q -c -P -o$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp\r
 \r

-$(OBJS)\typetest_typetest.res: .\typetest.rc\r
-       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\r
-\r

diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc
index 17fdb8c8c1be5ee39fe52fa84f7fb955cc780b46..89e629574d5a69f4fcc9489e974863aa2ded0015 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 TYPETEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 TYPETEST_OBJECTS =  \\r

-       $(OBJS)\typetest_typetest.o \\r
-       $(OBJS)\typetest_typetest_rc.o\r
+       $(OBJS)\typetest_sample_rc.o \
+       $(OBJS)\typetest_typetest.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -218,15 +218,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
 \r

-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\typetest_typetest.o: ./typetest.cpp\r
        $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\typetest_typetest_rc.o: ./typetest.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc
index 63097d365569539b3e64543459087dce69f0159b..d32982bed59a84d1647b3cf837ddcd4620b2f69f 100644 (file)
--- 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 =  \\r
        $(OBJS)\typetest_typetest.obj\r
 TYPETEST_RESOURCES =  \\r
 TYPETEST_OBJECTS =  \\r
        $(OBJS)\typetest_typetest.obj\r
 TYPETEST_RESOURCES =  \\r

-       $(OBJS)\typetest_typetest.res\r
+       $(OBJS)\typetest_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -339,14 +339,14 @@ clean:
        -if exist $(OBJS)\typetest.ilk del $(OBJS)\typetest.ilk\r
        -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb\r
 \r
        -if exist $(OBJS)\typetest.ilk del $(OBJS)\typetest.ilk\r
        -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb\r
 \r

-$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp\r
 \r
 $(OBJS)\typetest_typetest.obj: .\typetest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp\r
 \r

-$(OBJS)\typetest_typetest.res: .\typetest.rc\r
-       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\r
-\r

diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat
index e34401735199304bf33d8b1f24da72bddc59f25f..bcb63ef97bb249dad078cf33267317d1f40323cc 100644 (file)
--- a/samples/typetest/makefile.wat
+++ b/samples/typetest/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe\r
 \r

-$(OBJS)\typetest.exe :  $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res\r
+$(OBJS)\typetest.exe :  $(TYPETEST_OBJECTS) $(OBJS)\typetest_sample.res

        @%create $(OBJS)\typetest.lbc\r
        @%append $(OBJS)\typetest.lbc option quiet\r
        @%append $(OBJS)\typetest.lbc name $^@\r
        @%create $(OBJS)\typetest.lbc\r
        @%append $(OBJS)\typetest.lbc option quiet\r
        @%append $(OBJS)\typetest.lbc name $^@\r


@@ -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)\r
        @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i\r
        @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\r
        @%append $(OBJS)\typetest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i\r
        @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\r

-       @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res\r
+       @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_sample.res

        @for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i\r
        wlink @$(OBJS)\typetest.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i\r
        wlink @$(OBJS)\typetest.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\typetest_typetest.obj :  .AUTODEPEND .\typetest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $<\r
 \r

-$(OBJS)\typetest_typetest.res :  .AUTODEPEND .\typetest.rc\r
-       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 $<\r
-\r

diff --git a/samples/typetest/mondrian.ico b/samples/typetest/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
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 (file)
index cc52c7d..0000000
--- a/samples/typetest/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */\r
-static const char *const mondrian_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"32 32 6 1",\r
-"  c Black",\r
-". c Blue",\r
-"X c #00bf00",\r
-"o c Red",\r
-"O c Yellow",\r
-"+ c Gray100",\r
-/* pixels */\r
-"                                ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-" oooooo +++++++++++++++++++++++ ",\r
-"                                ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++ .... ",\r
-" ++++++ ++++++++++++++++++      ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++ ++++++++++++++++++ ++++ ",\r
-" ++++++                    ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",\r
-"                                "\r
-};\r

diff --git a/samples/typetest/typetest.bkl b/samples/typetest/typetest.bkl
index ae9e27cba60efcc1329dd2e7a2a30f2ee3918aaf..f146e9685d25ca7a776b37cb89bd317878ff9037 100644 (file)
--- a/samples/typetest/typetest.bkl
+++ b/samples/typetest/typetest.bkl
@@ -8,7 +8,6 @@
         <headers>typetest.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <headers>typetest.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>typetest.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index b71edda8e5ac56785da70d3f0bb3737996e3dd65..e3a20a94f3b13365abaec823b33db6229c0b8a9d 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -25,8 +25,8 @@
 
 #include "typetest.h"
 
 
 #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
 #endif
 
 #ifdef new


@@ -80,7 +80,7 @@ bool MyApp::OnInit()
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Give it an icon
                                  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;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;

diff --git a/samples/typetest/typetest.dsp b/samples/typetest/typetest.dsp
index ad4a7a42e771feac4d714f5fd1e51fb55b284a13..76d6e368271d20b6c3ab6681c80ce3c9782359ee 100644 (file)
--- a/samples/typetest/typetest.dsp
+++ b/samples/typetest/typetest.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\typetest.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\typetest.rc\r
+SOURCE=.\typetest.cpp

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/typetest/typetest.rc b/samples/typetest/typetest.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- 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 3c3925a8e6f0407cfeff2e56dcac21182a5153a7..01b1f578a5a129b180d7b1d869a8d9523610989f 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\typetest.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/typetest/typetest_vc8.vcproj b/samples/typetest/typetest_vc8.vcproj
index e30852c370a57f5927aa439d5a81142baa29649d..aa6e53b95ae4c90b66dd36e825c937b569257fb4 100644 (file)
--- a/samples/typetest/typetest_vc8.vcproj
+++ b/samples/typetest/typetest_vc8.vcproj
@@ -824,7 +824,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\typetest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/typetest/typetest_vc9.vcproj b/samples/typetest/typetest_vc9.vcproj
index b3e5c68efdc7c5b259b94d19a36a75c00c4facb3..b6adb061a75412316ec1b87a44ceb5fb726cd982 100644 (file)
--- a/samples/typetest/typetest_vc9.vcproj
+++ b/samples/typetest/typetest_vc9.vcproj
@@ -796,7 +796,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\typetest.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 2cc6ffce7c8affc5c186e3bfb3b9333e5b74001b..bc73fdea2e972c0f81b0dac7f5a29ffa489924be 100644 (file)
--- 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 =  \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 WIZARD_OBJECTS =  \

+       $(__wizard___win32rc) \

        $(__wizard_os2_lib_res) \
        $(__wizard_os2_lib_res) \

-       wizard_wizard.o \
-       $(__wizard___win32rc)
+       wizard_wizard.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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)
 
 
 @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.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc
index 55a81dda042d7da34e47bda2bd28656ebfc7ff63..54c712310c33a43dfdb0557c3c2063e99f7ca06e 100644 (file)
--- a/samples/wizard/makefile.bcc
+++ b/samples/wizard/makefile.bcc
@@ -233,14 +233,14 @@ clean:
        -if exist $(OBJS)\wizard.ilf del $(OBJS)\wizard.ilf\r
        -if exist $(OBJS)\wizard.ils del $(OBJS)\wizard.ils\r
 \r
        -if exist $(OBJS)\wizard.ilf del $(OBJS)\wizard.ilf\r
        -if exist $(OBJS)\wizard.ils del $(OBJS)\wizard.ils\r
 \r

-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS)  $(OBJS)\wizard_wizard.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 |\r
 \r

+$(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\r
        $(CXX) -q -c -P -o$@ $(WIZARD_CXXFLAGS) .\wizard.cpp\r
 \r
 $(OBJS)\wizard_wizard.obj: .\wizard.cpp\r
        $(CXX) -q -c -P -o$@ $(WIZARD_CXXFLAGS) .\wizard.cpp\r
 \r

-$(OBJS)\wizard_wizard.res: .\wizard.rc\r
-       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\r
-\r

diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc
index ac23d0b7b800a6b6f5c9695fdfa4f0a8fdeaae72..c82eecaebae4be985346376891b7423fd836afca 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 WIZARD_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 WIZARD_OBJECTS =  \\r

-       $(OBJS)\wizard_wizard.o \\r
-       $(OBJS)\wizard_wizard_rc.o\r
+       $(OBJS)\wizard_sample_rc.o \
+       $(OBJS)\wizard_wizard.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -222,15 +222,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
 \r

-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard_rc.o\r
+$(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\r
 \r
        $(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\r
 \r

+$(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\r
        $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\wizard_wizard.o: ./wizard.cpp\r
        $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\wizard_wizard_rc.o: ./wizard.rc\r
-       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\r
-\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc
index 8b344128e1ea56e2f3aad7c27acdfec13175985b..ff59126ef395bc6872ab9eb6c930175706ac432c 100644 (file)
--- 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 =  \\r
        $(OBJS)\wizard_wizard.obj\r
 WIZARD_RESOURCES =  \\r
 WIZARD_OBJECTS =  \\r
        $(OBJS)\wizard_wizard.obj\r
 WIZARD_RESOURCES =  \\r

-       $(OBJS)\wizard_wizard.res\r
+       $(OBJS)\wizard_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -343,14 +343,14 @@ clean:
        -if exist $(OBJS)\wizard.ilk del $(OBJS)\wizard.ilk\r
        -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb\r
 \r
        -if exist $(OBJS)\wizard.ilk del $(OBJS)\wizard.ilk\r
        -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb\r
 \r

-$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r

+$(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\r
        $(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) .\wizard.cpp\r
 \r
 $(OBJS)\wizard_wizard.obj: .\wizard.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) .\wizard.cpp\r
 \r

-$(OBJS)\wizard_wizard.res: .\wizard.rc\r
-       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\r
-\r

diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat
index ee5a323342aabcd07934b8eb018b9b7f5044eb89..9f17ba8645e05a8a86920a25225029f2a9c5221e 100644 (file)
--- a/samples/wizard/makefile.wat
+++ b/samples/wizard/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe\r
 \r

-$(OBJS)\wizard.exe :  $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res\r
+$(OBJS)\wizard.exe :  $(WIZARD_OBJECTS) $(OBJS)\wizard_sample.res

        @%create $(OBJS)\wizard.lbc\r
        @%append $(OBJS)\wizard.lbc option quiet\r
        @%append $(OBJS)\wizard.lbc name $^@\r
        @%create $(OBJS)\wizard.lbc\r
        @%append $(OBJS)\wizard.lbc option quiet\r
        @%append $(OBJS)\wizard.lbc name $^@\r


@@ -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)\r
        @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i\r
        @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\r
        @%append $(OBJS)\wizard.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i\r
        @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\r

-       @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res\r
+       @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_sample.res

        @for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i\r
        wlink @$(OBJS)\wizard.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i\r
        wlink @$(OBJS)\wizard.lbc\r
 \r

+$(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\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $<\r
 \r
 $(OBJS)\wizard_wizard.obj :  .AUTODEPEND .\wizard.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $<\r
 \r

-$(OBJS)\wizard_wizard.res :  .AUTODEPEND .\wizard.rc\r
-       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 $<\r
-\r

diff --git a/samples/wizard/wizard.bkl b/samples/wizard/wizard.bkl
index 05c16bdfab76bbc30f774b45dc16c0f456bf5935..9603bc23ad2af9c641afd0b01619ca3b1777c4d3 100644 (file)
--- a/samples/wizard/wizard.bkl
+++ b/samples/wizard/wizard.bkl
@@ -8,7 +8,6 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>wizard.rc</win32-res>

     </exe>
 
 </makefile>
     </exe>
 
 </makefile>

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 1d9427753d9c76fcae640c9285ae02e44ff84b1c..94c95c08201052f7f30b4ec8bd1e45ff70a6a63d 100644 (file)
--- 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);
     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))
 
     // 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 f2864c41180aa3a13147ae5ec8c64ee32eb177d2..7c75720518ad3ddbf31628e927a806e9808757e0 100644 (file)
--- a/samples/wizard/wizard.dsp
+++ b/samples/wizard/wizard.dsp
@@ -252,11 +252,11 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=.\wizard.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\wizard.rc\r
+SOURCE=.\wizard.cpp

 # End Source File\r
 # End Group\r
 # End Target\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/samples/wizard/wizard.rc b/samples/wizard/wizard.rc
deleted file mode 100644 (file)
index 4bd72d7..0000000
--- 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 4c29a296fd8e8c9b758b05d0a3f5365d3b79c19e..a5a9b77c33849cad2ce3073828a4982187c1282f 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\wizard.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/wizard/wizard_vc8.vcproj b/samples/wizard/wizard_vc8.vcproj
index 68623650b19e947ba3edcb24fd9d884b3c974334..0c6809ee5529ee37bfa86ff337fe6e93a609a801 100644 (file)
--- a/samples/wizard/wizard_vc8.vcproj
+++ b/samples/wizard/wizard_vc8.vcproj
@@ -814,7 +814,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\wizard.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/wizard/wizard_vc9.vcproj b/samples/wizard/wizard_vc9.vcproj
index be0037f5e387e8a848f6d2e3bf4db7a9bf85df6e..35f23776ce45d5dc1f5bff5518342dde2aa3a51b 100644 (file)
--- a/samples/wizard/wizard_vc9.vcproj
+++ b/samples/wizard/wizard_vc9.vcproj
@@ -786,7 +786,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\wizard.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 7ea3abec3a95fe1136384a75af1a70c5dadbcadd..4347831552a175e16201138aa82ba133c18ee878 100644 (file)
--- 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 =  \
        -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_os2_lib_res) \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \
        xrcdemo_derivdlg.o \

-       xrcdemo_custclas.o \
-       $(__xrcdemo___win32rc)
+       xrcdemo_custclas.o

 
 ### Conditionally set variables: ###
 
 
 ### 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_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 \
 @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_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)
 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
 
 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` ; \
        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
 
        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
 
 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_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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index 73e9da221ffd1f5aff9479dfd7e0e824adcb3e7d..6139b7a092551ea2f71fe14f3120174b668cc403 100644 (file)
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -248,14 +248,17 @@ clean:
        -if exist $(OBJS)\xrcdemo.ilf del $(OBJS)\xrcdemo.ilf\r
        -if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils\r
 \r
        -if exist $(OBJS)\xrcdemo.ilf del $(OBJS)\xrcdemo.ilf\r
        -if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils\r
 \r

-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res\r
+$(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) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       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\r
+       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

 |\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
 |\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r

-       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\r
+       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

 \r
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r
 \r
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r


@@ -269,6 +272,3 @@ $(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp
 $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
 \r
 $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
 \r

-$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc\r
-       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\r
-\r

diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index de000191279b7e926ecd5e984b3b1ba42ab1e647..d3a21e3299866bc5a21553ad06ddbf2a179374df 100644 (file)
--- 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) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 XRCDEMO_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 XRCDEMO_OBJECTS =  \\r

+       $(OBJS)\xrcdemo_sample_rc.o \

        $(OBJS)\xrcdemo_xrcdemo.o \\r
        $(OBJS)\xrcdemo_myframe.o \\r
        $(OBJS)\xrcdemo_derivdlg.o \\r
        $(OBJS)\xrcdemo_xrcdemo.o \\r
        $(OBJS)\xrcdemo_myframe.o \\r
        $(OBJS)\xrcdemo_derivdlg.o \\r

-       $(OBJS)\xrcdemo_custclas.o \\r
-       $(OBJS)\xrcdemo_xrcdemo_rc.o\r
+       $(OBJS)\xrcdemo_custclas.o

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -237,12 +237,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
 \r

-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o\r
+$(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\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
        $(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\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r

-       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\r
+       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

 \r
 $(OBJS)\xrcdemo_xrcdemo.o: ./xrcdemo.cpp\r
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\xrcdemo_xrcdemo.o: ./xrcdemo.cpp\r
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r


@@ -256,9 +259,6 @@ $(OBJS)\xrcdemo_derivdlg.o: ./derivdlg.cpp
 $(OBJS)\xrcdemo_custclas.o: ./custclas.cpp\r
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\xrcdemo_custclas.o: ./custclas.cpp\r
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\xrcdemo_xrcdemo_rc.o: ./xrcdemo.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r

diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index 44ad80e67d5c367391cfed0dadabfa1de9b32497..5aefe6bb9c106d010062a18213bc7fd7fbc333fe 100644 (file)
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -35,7 +35,7 @@ XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_derivdlg.obj \\r
        $(OBJS)\xrcdemo_custclas.obj\r
 XRCDEMO_RESOURCES =  \\r
        $(OBJS)\xrcdemo_derivdlg.obj \\r
        $(OBJS)\xrcdemo_custclas.obj\r
 XRCDEMO_RESOURCES =  \\r

-       $(OBJS)\xrcdemo_xrcdemo.res\r
+       $(OBJS)\xrcdemo_sample.res

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -358,14 +358,17 @@ clean:
        -if exist $(OBJS)\xrcdemo.ilk del $(OBJS)\xrcdemo.ilk\r
        -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb\r
 \r
        -if exist $(OBJS)\xrcdemo.ilk del $(OBJS)\xrcdemo.ilk\r
        -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb\r
 \r

-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res\r
+$(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) @<<\r
        $(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\r
 <<\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(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\r
 <<\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r

-       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\r
+       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

 \r
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r
 \r
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r


@@ -379,6 +382,3 @@ $(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp
 $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
 \r
 $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
 \r

-$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc\r
-       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\r
-\r

diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat
index aed6fffb1a4a28f31970b7400a26955c7fe908e1..9b3f37fe4906054a9766f51dcbaf5395787122cf 100644 (file)
--- a/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@ -271,7 +271,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe\r
 \r

-$(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res\r
+$(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res

        @%create $(OBJS)\xrcdemo.lbc\r
        @%append $(OBJS)\xrcdemo.lbc option quiet\r
        @%append $(OBJS)\xrcdemo.lbc name $^@\r
        @%create $(OBJS)\xrcdemo.lbc\r
        @%append $(OBJS)\xrcdemo.lbc option quiet\r
        @%append $(OBJS)\xrcdemo.lbc name $^@\r


@@ -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)\r
        @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i\r
        @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\r
        @%append $(OBJS)\xrcdemo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i\r
        @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\r

-       @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res\r
+       @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_sample.res

        @for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i\r
        wlink @$(OBJS)\xrcdemo.lbc\r
 \r
 data : .SYMBOLIC \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
        @for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i\r
        wlink @$(OBJS)\xrcdemo.lbc\r
 \r
 data : .SYMBOLIC \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r

-       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\r
+       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 $<

 \r
 $(OBJS)\xrcdemo_xrcdemo.obj :  .AUTODEPEND .\xrcdemo.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r
 \r
 $(OBJS)\xrcdemo_xrcdemo.obj :  .AUTODEPEND .\xrcdemo.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r


@@ -299,6 +302,3 @@ $(OBJS)\xrcdemo_derivdlg.obj :  .AUTODEPEND .\derivdlg.cpp
 $(OBJS)\xrcdemo_custclas.obj :  .AUTODEPEND .\custclas.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r
 \r
 $(OBJS)\xrcdemo_custclas.obj :  .AUTODEPEND .\custclas.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<\r
 \r

-$(OBJS)\xrcdemo_xrcdemo.res :  .AUTODEPEND .\xrcdemo.rc\r
-       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 $<\r
-\r

diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 0e8e1f604923fc49c846fc8326b6d035d999b6a4..fe36c8acfab43b4167050b1ff41a5eb2a12bda3d 100644 (file)
--- 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.
     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")));
 
     // 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 (file)
index f3ef791..0000000
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 (file)
index bafbf53..0000000
--- a/samples/xrc/rc/appicon.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */\r
-static const char *const appicon_xpm[] = {\r
-"32 32 17 1",\r
-"      c None",\r
-".     c #000000",\r
-"+     c #800000",\r
-"@     c #008000",\r
-"#     c #808000",\r
-"$     c #000080",\r
-"%     c #800080",\r
-"&     c #008080",\r
-"*     c #C0C0C0",\r
-"=     c #808080",\r
-"-     c #FF0000",\r
-";     c #00FF00",\r
-">     c #FFFF00",\r
-",     c #0000FF",\r
-"'     c #FF00FF",\r
-")     c #00FFFF",\r
-"!     c #FFFFFF",\r
-"                                ",\r
-"===============================.",\r
-"=*****************************=.",\r
-"=*$$$$$$$$$$$$$$$$$$$$$$$$$$$$=.",\r
-"=*$$$$$$$$$$$$$$$$$$$**.**.**.=.",\r
-"=*$$$$$$$$$$$$$$$$$$$**.**.**.=.",\r
-"=*$$$$$$$$$$$$$$$$$$$.........=.",\r
-"=*****************************=.",\r
-"=*=============================.",\r
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",\r
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",\r
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",\r
-"=*=!!!!!!!,!!!!!!!!!!!,!!!!!!*=.",\r
-"=*=!!!!!!,,!!!!!!!!!!!,,!!!!!*=.",\r
-"=*=!!!!!,,!!!!!!!!!!!!!,,!!!!*=.",\r
-"=*=!!!!,,!!...........!!,,!!!*=.",\r
-"=*=!!!,,!!!.$$$$$$!!!.!!!,,!!*=.",\r
-"=*=!!,,!!!!.$$$$$$!!!.!!!!,,!*=.",\r
-"=*=!!,,!!!!.$$$$$$!!!.!!!!,,!*=.",\r
-"=*=!!!,,!!!.$$$$$$!!!.!!!,,!!*=.",\r
-"=*=!!!!,,!!...........!!,,!!!*=.",\r
-"=*=!!!!!,,!!!!!!!!!!!!!,,!!!!*=.",\r
-"=*=!!!!!!,,!!!!!!!!!!!,,!!!!!*=.",\r
-"=*=!!!!!!!,!!!!!!!!!!!,!!!!!!*=.",\r
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",\r
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",\r
-"=*=!!!!!!!!!!!!!!!!!!!!!!!!!!*=.",\r
-"=*****************************=.",\r
-"===============================.",\r
-"................................",\r
-"                                ",\r
-"                                "};\r

diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index 9c646c571832a334794550d525783895230f28c1..c4d734d65e7618ab2f92440b79432ace5921b753 100644 (file)
--- a/samples/xrc/xrcdemo.bkl
+++ b/samples/xrc/xrcdemo.bkl
@@ -22,14 +22,13 @@
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>xrcdemo.rc</win32-res>

     </exe>
 
     <wx-data id="data">
         <dstdir>$(BUILDDIR)/rc</dstdir>
         <srcdir>$(SRCDIR)/rc</srcdir>
         <files>
     </exe>
 
     <wx-data id="data">
         <dstdir>$(BUILDDIR)/rc</dstdir>
         <srcdir>$(SRCDIR)/rc</srcdir>
         <files>

-            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
             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 ba63c093d833a78d9cad3d3c7138a87f38f8118b..f0bdd10e94b6fb88af9d1caa75d49809a85bd827 100644 (file)
--- a/samples/xrc/xrcdemo.dsp
+++ b/samples/xrc/xrcdemo.dsp
@@ -264,11 +264,11 @@ SOURCE=.\myframe.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\xrcdemo.cpp\r
+SOURCE=.\..\..\samples\sample.rc

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=.\xrcdemo.rc\r
+SOURCE=.\xrcdemo.cpp

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/xrc/xrcdemo.rc b/samples/xrc/xrcdemo.rc
deleted file mode 100644 (file)
index a5b2ce3..0000000
--- 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 d1d2ca9832bb1c551eab8dcebfc5abb42435981e..530a7de6527eb7c0bdb2957d04f32300a24264c8 100644 (file)
--- 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"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r

-                               RelativePath=".\xrcdemo.rc">\r
+                               RelativePath="..\..\samples\sample.rc">

                        </File>\r
                </Filter>\r
        </Files>\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/xrc/xrcdemo_vc8.vcproj b/samples/xrc/xrcdemo_vc8.vcproj
index 0cd46cdfcfb2cc60e914914f737681cd93e5bd91..3019d06193771a519db1aca6933a80ccda0942fb 100644 (file)
--- a/samples/xrc/xrcdemo_vc8.vcproj
+++ b/samples/xrc/xrcdemo_vc8.vcproj
@@ -848,7 +848,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\xrcdemo.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/xrc/xrcdemo_vc9.vcproj b/samples/xrc/xrcdemo_vc9.vcproj
index 2b1fbb18ace6862e6a1ea84dba23bee8f5f9bec3..418d5915efcdf7ce3ecdcf67d04ab8e7177d7ff2 100644 (file)
--- a/samples/xrc/xrcdemo_vc9.vcproj
+++ b/samples/xrc/xrcdemo_vc9.vcproj
@@ -820,7 +820,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r

-                               RelativePath=".\xrcdemo.rc"\r
+                               RelativePath="..\..\samples\sample.rc"

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r