From 3cb332c1553bb977cb8db16c19c733684ef72805 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Jun 2010 17:42:33 +0000 Subject: [PATCH] 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 --- docs/doxygen/overviews/bitmap.h | 8 +- docs/gtk/install.txt | 8 +- docs/mgl/install.txt | 6 +- docs/motif/install.txt | 5 +- docs/wine/install.txt | 8 +- docs/x11/install.txt | 2 +- include/wx/gdicmn.h | 6 +- interface/wx/icon.h | 6 +- samples/access/Makefile.in | 12 +- samples/access/access.bkl | 1 - samples/access/access.dsp | 2 +- samples/access/access_vc7.vcproj | 2 +- samples/access/access_vc8.vcproj | 2 +- samples/access/access_vc9.vcproj | 2 +- samples/access/accesstest.cpp | 6 +- samples/access/accesstest.rc | 3 - samples/access/makefile.bcc | 10 +- samples/access/makefile.gcc | 12 +- samples/access/makefile.vc | 10 +- samples/access/makefile.wat | 10 +- samples/access/mondrian.ico | Bin 766 -> 0 bytes samples/access/mondrian.xpm | 44 - samples/animate/anitest.cpp | 2 +- samples/artprov/Makefile.in | 12 +- samples/artprov/artprov.bkl | 1 - samples/artprov/artprov.dsp | 2 +- samples/artprov/artprov_vc7.vcproj | 2 +- samples/artprov/artprov_vc8.vcproj | 2 +- samples/artprov/artprov_vc9.vcproj | 2 +- samples/artprov/arttest.cpp | 4 +- samples/artprov/arttest.rc | 3 - samples/artprov/makefile.bcc | 10 +- samples/artprov/makefile.gcc | 12 +- samples/artprov/makefile.vc | 10 +- samples/artprov/makefile.wat | 10 +- samples/artprov/mondrian.ico | Bin 766 -> 0 bytes samples/artprov/mondrian.xpm | 44 - samples/calendar/Makefile.in | 12 +- samples/calendar/calendar.bkl | 1 - samples/calendar/calendar.cpp | 2 +- samples/calendar/calendar.dsp | 2 +- samples/calendar/calendar_vc7.vcproj | 2 +- samples/calendar/calendar_vc8.vcproj | 2 +- samples/calendar/calendar_vc9.vcproj | 2 +- samples/calendar/makefile.bcc | 10 +- samples/calendar/makefile.gcc | 12 +- samples/calendar/makefile.vc | 10 +- samples/calendar/makefile.wat | 10 +- samples/caret/Makefile.in | 12 +- samples/caret/caret.bkl | 1 - samples/caret/caret.cpp | 9 +- samples/caret/caret.dsp | 2 +- samples/caret/caret.rc | 2 - samples/caret/caret_vc7.vcproj | 2 +- samples/caret/caret_vc8.vcproj | 2 +- samples/caret/caret_vc9.vcproj | 2 +- samples/caret/makefile.bcc | 10 +- samples/caret/makefile.gcc | 12 +- samples/caret/makefile.vc | 10 +- samples/caret/makefile.wat | 10 +- samples/caret/mondrian.xpm | 44 - samples/clipboard/Makefile.in | 12 +- samples/clipboard/clipboard.bkl | 1 - samples/clipboard/clipboard.dsp | 2 +- samples/clipboard/clipboard.rc | 2 - samples/clipboard/clipboard_vc7.vcproj | 2 +- samples/clipboard/clipboard_vc8.vcproj | 2 +- samples/clipboard/clipboard_vc9.vcproj | 2 +- samples/clipboard/makefile.bcc | 10 +- samples/clipboard/makefile.gcc | 12 +- samples/clipboard/makefile.vc | 10 +- samples/clipboard/makefile.wat | 10 +- samples/config/Makefile.in | 12 +- samples/config/config.bkl | 1 - samples/config/config.dsp | 2 +- samples/config/config_vc7.vcproj | 2 +- samples/config/config_vc8.vcproj | 2 +- samples/config/config_vc9.vcproj | 2 +- samples/config/conftest.rc | 2 - samples/config/makefile.bcc | 10 +- samples/config/makefile.gcc | 12 +- samples/config/makefile.vc | 10 +- samples/config/makefile.wat | 10 +- samples/controls/controls.cpp | 32 +- samples/controls/controls.rc | 4 +- samples/controls/mondrian.ico | Bin 766 -> 0 bytes samples/controls/mondrian.xpm | 44 - samples/dialogs/Makefile.in | 12 +- samples/dialogs/dialogs.bkl | 1 - samples/dialogs/dialogs.cpp | 2 +- samples/dialogs/dialogs.dsp | 8 +- samples/dialogs/dialogs.ico | Bin 1078 -> 0 bytes samples/dialogs/dialogs.rc | 4 - samples/dialogs/dialogs.rcO | 4 - samples/dialogs/dialogs_vc7.vcproj | 2 +- samples/dialogs/dialogs_vc8.vcproj | 2 +- samples/dialogs/dialogs_vc9.vcproj | 2 +- samples/dialogs/makefile.bcc | 10 +- samples/dialogs/makefile.gcc | 12 +- samples/dialogs/makefile.vc | 10 +- samples/dialogs/makefile.wat | 10 +- samples/dialup/Makefile.in | 12 +- samples/dialup/dialup.bkl | 1 - samples/dialup/dialup.dsp | 2 +- samples/dialup/dialup_vc7.vcproj | 2 +- samples/dialup/dialup_vc8.vcproj | 2 +- samples/dialup/dialup_vc9.vcproj | 2 +- samples/dialup/makefile.bcc | 10 +- samples/dialup/makefile.gcc | 12 +- samples/dialup/makefile.vc | 10 +- samples/dialup/makefile.wat | 10 +- samples/dialup/nettest.rc | 2 - samples/docview/docview.rc | 2 +- samples/docview/mondrian.ico | Bin 766 -> 0 bytes samples/docview/mondrian.r | 2667 ---------------- samples/docview/mondrian.xpm | 44 - samples/dragimag/dragimag.cpp | 8 +- samples/dragimag/dragimag.rc | 5 +- samples/dragimag/mondrian.ico | Bin 766 -> 0 bytes samples/dragimag/mondrian.xpm | 44 - samples/drawing/Makefile.in | 12 +- samples/drawing/drawing.bkl | 1 - samples/drawing/drawing.cpp | 6 +- samples/drawing/drawing.dsp | 2 +- samples/drawing/drawing.rc | 3 - samples/drawing/drawing_vc7.vcproj | 2 +- samples/drawing/drawing_vc8.vcproj | 2 +- samples/drawing/drawing_vc9.vcproj | 2 +- samples/drawing/makefile.bcc | 10 +- samples/drawing/makefile.gcc | 12 +- samples/drawing/makefile.vc | 10 +- samples/drawing/makefile.wat | 10 +- samples/drawing/mondrian.ico | Bin 766 -> 0 bytes samples/drawing/mondrian.xpm | 44 - samples/erase/Makefile.in | 12 +- samples/erase/erase.bkl | 1 - samples/erase/erase.cpp | 9 +- samples/erase/erase.dsp | 2 +- samples/erase/erase.rc | 6 - samples/erase/erase.rc0 | 6 - samples/erase/erase.rc4 | 6 - samples/erase/erase_vc7.vcproj | 2 +- samples/erase/erase_vc8.vcproj | 2 +- samples/erase/erase_vc9.vcproj | 2 +- samples/erase/makefile.bcc | 10 +- samples/erase/makefile.gcc | 12 +- samples/erase/makefile.vc | 10 +- samples/erase/makefile.wat | 10 +- samples/erase/mondrian.ico | Bin 766 -> 0 bytes samples/erase/mondrian.xpm | 45 - samples/event/Makefile.in | 12 +- samples/event/event.bkl | 1 - samples/event/event.dsp | 2 +- samples/event/event.rc | 2 - samples/event/event_vc7.vcproj | 2 +- samples/event/event_vc8.vcproj | 2 +- samples/event/event_vc9.vcproj | 2 +- samples/event/makefile.bcc | 10 +- samples/event/makefile.gcc | 12 +- samples/event/makefile.vc | 10 +- samples/event/makefile.wat | 10 +- samples/font/Makefile.in | 12 +- samples/font/font.bkl | 1 - samples/font/font.cpp | 2 +- samples/font/font.dsp | 2 +- samples/font/font.rc | 4 - samples/font/font_vc7.vcproj | 2 +- samples/font/font_vc8.vcproj | 2 +- samples/font/font_vc9.vcproj | 2 +- samples/font/makefile.bcc | 10 +- samples/font/makefile.gcc | 12 +- samples/font/makefile.vc | 10 +- samples/font/makefile.wat | 10 +- samples/font/mondrian.ico | Bin 766 -> 0 bytes samples/grid/griddemo.rc | 2 - samples/help/Makefile.in | 12 +- samples/help/demo.cpp | 6 +- samples/help/demo.rc | 2 - samples/help/help.bkl | 1 - samples/help/help.dsp | 2 +- samples/help/help_vc7.vcproj | 2 +- samples/help/help_vc8.vcproj | 2 +- samples/help/help_vc9.vcproj | 2 +- samples/help/makefile.bcc | 10 +- samples/help/makefile.gcc | 12 +- samples/help/makefile.vc | 10 +- samples/help/makefile.wat | 10 +- samples/help/mondrian.ico | Bin 766 -> 0 bytes samples/help/mondrian.xpm | 44 - samples/htlbox/Makefile.in | 12 +- samples/htlbox/htlbox.bkl | 1 - samples/htlbox/htlbox.cpp | 2 +- samples/htlbox/htlbox.dsp | 2 +- samples/htlbox/htlbox.rc | 2 - samples/htlbox/htlbox_vc7.vcproj | 2 +- samples/htlbox/htlbox_vc8.vcproj | 2 +- samples/htlbox/htlbox_vc9.vcproj | 2 +- samples/htlbox/makefile.bcc | 10 +- samples/htlbox/makefile.gcc | 12 +- samples/htlbox/makefile.vc | 10 +- samples/htlbox/makefile.wat | 10 +- samples/htlbox/mondrian.ico | Bin 766 -> 0 bytes samples/htlbox/mondrian.xpm | 44 - samples/html/about/Makefile.in | 12 +- samples/html/about/about.bkl | 1 - samples/html/about/about.dsp | 2 +- samples/html/about/about.rc | 2 - samples/html/about/about_vc7.vcproj | 2 +- samples/html/about/about_vc8.vcproj | 2 +- samples/html/about/about_vc9.vcproj | 2 +- samples/html/about/makefile.bcc | 10 +- samples/html/about/makefile.gcc | 12 +- samples/html/about/makefile.vc | 10 +- samples/html/about/makefile.wat | 10 +- samples/html/help/Makefile.in | 12 +- samples/html/help/help.bkl | 1 - samples/html/help/help.dsp | 2 +- samples/html/help/help.rc | 1 - samples/html/help/help_vc7.vcproj | 2 +- samples/html/help/help_vc8.vcproj | 2 +- samples/html/help/help_vc9.vcproj | 2 +- samples/html/help/makefile.bcc | 10 +- samples/html/help/makefile.gcc | 12 +- samples/html/help/makefile.vc | 10 +- samples/html/help/makefile.wat | 10 +- samples/html/helpview/Makefile.in | 12 +- samples/html/helpview/helpview.bkl | 1 - samples/html/helpview/helpview.dsp | 2 +- samples/html/helpview/helpview.ico | Bin 1078 -> 0 bytes samples/html/helpview/helpview.rc | 5 - samples/html/helpview/helpview_vc7.vcproj | 2 +- samples/html/helpview/helpview_vc8.vcproj | 2 +- samples/html/helpview/helpview_vc9.vcproj | 2 +- samples/html/helpview/makefile.bcc | 10 +- samples/html/helpview/makefile.gcc | 12 +- samples/html/helpview/makefile.vc | 10 +- samples/html/helpview/makefile.wat | 10 +- samples/html/helpview/mondrian.ico | Bin 766 -> 0 bytes samples/html/printing/Makefile.in | 13 +- samples/html/printing/makefile.bcc | 10 +- samples/html/printing/makefile.gcc | 12 +- samples/html/printing/makefile.vc | 10 +- samples/html/printing/makefile.wat | 10 +- samples/html/printing/mondrian.ico | Bin 766 -> 0 bytes samples/html/printing/printing.bkl | 1 - samples/html/printing/printing.dsp | 2 +- samples/html/printing/printing.rc | 3 - samples/html/printing/printing_vc7.vcproj | 2 +- samples/html/printing/printing_vc8.vcproj | 2 +- samples/html/printing/printing_vc9.vcproj | 2 +- samples/html/test/Makefile.in | 12 +- samples/html/test/makefile.bcc | 10 +- samples/html/test/makefile.gcc | 12 +- samples/html/test/makefile.vc | 10 +- samples/html/test/makefile.wat | 10 +- samples/html/test/test.bkl | 1 - samples/html/test/test.dsp | 4 +- samples/html/test/test.rc | 2 - samples/html/test/test_vc7.vcproj | 2 +- samples/html/test/test_vc8.vcproj | 2 +- samples/html/test/test_vc9.vcproj | 2 +- samples/html/virtual/Makefile.in | 12 +- samples/html/virtual/makefile.bcc | 10 +- samples/html/virtual/makefile.gcc | 12 +- samples/html/virtual/makefile.vc | 10 +- samples/html/virtual/makefile.wat | 10 +- samples/html/virtual/virtual.bkl | 1 - samples/html/virtual/virtual.dsp | 4 +- samples/html/virtual/virtual.rc | 2 - samples/html/virtual/virtual_vc7.vcproj | 2 +- samples/html/virtual/virtual_vc8.vcproj | 2 +- samples/html/virtual/virtual_vc9.vcproj | 2 +- samples/html/widget/Makefile.in | 12 +- samples/html/widget/makefile.bcc | 10 +- samples/html/widget/makefile.gcc | 12 +- samples/html/widget/makefile.vc | 10 +- samples/html/widget/makefile.wat | 10 +- samples/html/widget/widget.bkl | 1 - samples/html/widget/widget.dsp | 4 +- samples/html/widget/widget.rc | 2 - samples/html/widget/widget_vc7.vcproj | 2 +- samples/html/widget/widget_vc8.vcproj | 2 +- samples/html/widget/widget_vc9.vcproj | 2 +- samples/html/zip/Makefile.in | 12 +- samples/html/zip/makefile.bcc | 10 +- samples/html/zip/makefile.gcc | 12 +- samples/html/zip/makefile.vc | 10 +- samples/html/zip/makefile.wat | 10 +- samples/html/zip/zip.bkl | 1 - samples/html/zip/zip.dsp | 4 +- samples/html/zip/zip.rc | 2 - samples/html/zip/zip_vc7.vcproj | 2 +- samples/html/zip/zip_vc8.vcproj | 2 +- samples/html/zip/zip_vc9.vcproj | 2 +- samples/image/Makefile.in | 12 +- samples/image/image.bkl | 1 - samples/image/image.dsp | 2 +- samples/image/image.rc | 3 - samples/image/image.rco | 2 - samples/image/image_vc7.vcproj | 2 +- samples/image/image_vc8.vcproj | 2 +- samples/image/image_vc9.vcproj | 2 +- samples/image/makefile.bcc | 10 +- samples/image/makefile.gcc | 12 +- samples/image/makefile.vc | 10 +- samples/image/makefile.wat | 10 +- samples/internat/Makefile.in | 12 +- samples/internat/internat.bkl | 1 - samples/internat/internat.cpp | 6 +- samples/internat/internat.dsp | 2 +- samples/internat/internat.rc | 3 - samples/internat/internat_vc7.vcproj | 2 +- samples/internat/internat_vc8.vcproj | 2 +- samples/internat/internat_vc9.vcproj | 2 +- samples/internat/makefile.bcc | 10 +- samples/internat/makefile.gcc | 12 +- samples/internat/makefile.vc | 10 +- samples/internat/makefile.wat | 10 +- samples/internat/mondrian.ico | Bin 766 -> 0 bytes samples/internat/mondrian.xpm | 44 - samples/ipc/client.cpp | 10 +- samples/ipc/client.rc | 2 - samples/ipc/mondrian.ico | Bin 766 -> 0 bytes samples/ipc/mondrian.xpm | 44 - samples/ipc/server.rc | 3 - samples/joytest/chart.ico | Bin 766 -> 0 bytes samples/joytest/joytest.cpp | 8 +- samples/joytest/joytest.ico | Bin 766 -> 0 bytes samples/joytest/joytest.rc | 5 - samples/joytest/mondrian.ico | Bin 766 -> 0 bytes samples/keyboard/Makefile.in | 12 +- samples/keyboard/keyboard.bkl | 1 - samples/keyboard/keyboard.dsp | 2 +- samples/keyboard/keyboard.rc | 1 - samples/keyboard/keyboard_vc7.vcproj | 2 +- samples/keyboard/keyboard_vc8.vcproj | 2 +- samples/keyboard/keyboard_vc9.vcproj | 2 +- samples/keyboard/makefile.bcc | 10 +- samples/keyboard/makefile.gcc | 12 +- samples/keyboard/makefile.vc | 10 +- samples/keyboard/makefile.wat | 10 +- samples/layout/Makefile.in | 12 +- samples/layout/layout.bkl | 1 - samples/layout/layout.dsp | 2 +- samples/layout/layout.rc | 1 - samples/layout/layout_vc7.vcproj | 2 +- samples/layout/layout_vc8.vcproj | 2 +- samples/layout/layout_vc9.vcproj | 2 +- samples/layout/makefile.bcc | 10 +- samples/layout/makefile.gcc | 12 +- samples/layout/makefile.vc | 10 +- samples/layout/makefile.wat | 10 +- samples/listctrl/listtest.cpp | 4 +- samples/listctrl/listtest.rc | 4 +- samples/listctrl/mondrian.ico | Bin 766 -> 0 bytes samples/listctrl/mondrian.xpm | 44 - samples/memcheck/Makefile.in | 12 +- samples/memcheck/makefile.bcc | 10 +- samples/memcheck/makefile.gcc | 12 +- samples/memcheck/makefile.vc | 10 +- samples/memcheck/makefile.wat | 10 +- samples/memcheck/memcheck.bkl | 1 - samples/memcheck/memcheck.cpp | 8 +- samples/memcheck/memcheck.dsp | 2 +- samples/memcheck/memcheck.rc | 3 - samples/memcheck/memcheck_vc7.vcproj | 2 +- samples/memcheck/memcheck_vc8.vcproj | 2 +- samples/memcheck/memcheck_vc9.vcproj | 2 +- samples/memcheck/mondrian.ico | Bin 766 -> 0 bytes samples/memcheck/mondrian.xpm | 44 - samples/menu/MENU.RCO | 3 - samples/menu/Makefile.in | 12 +- samples/menu/makefile.bcc | 10 +- samples/menu/makefile.gcc | 12 +- samples/menu/makefile.vc | 10 +- samples/menu/makefile.wat | 10 +- samples/menu/menu.bkl | 1 - samples/menu/menu.dsp | 2 +- samples/menu/menu.rc | 1 - samples/menu/menu_vc7.vcproj | 2 +- samples/menu/menu_vc8.vcproj | 2 +- samples/menu/menu_vc9.vcproj | 2 +- samples/menu/mondros2.ico | Bin 996 -> 0 bytes samples/minimal/minimal.plc | 4 +- samples/minimal/minimal.rc | 3 - samples/minimal/minimal.rc4 | 6 - samples/minimal/minimal.rcO | 6 - samples/minimal/mondrian.r | 2675 ----------------- samples/minimal/mondros2.ico | Bin 996 -> 0 bytes .../minimal/{mondrian.icns => sample.icns} | Bin samples/nativdlg/nativdlg.rc | 2 +- samples/notebook/mondrian.ico | Bin 766 -> 0 bytes samples/notebook/mondros2.ico | Bin 996 -> 0 bytes samples/notebook/notebook.rcO | 4 - samples/oleauto/Makefile.in | 12 +- samples/oleauto/makefile.bcc | 10 +- samples/oleauto/makefile.gcc | 12 +- samples/oleauto/makefile.vc | 10 +- samples/oleauto/makefile.wat | 10 +- samples/oleauto/mondrian.ico | Bin 766 -> 0 bytes samples/oleauto/mondrian.xpm | 44 - samples/oleauto/oleauto.bkl | 1 - samples/oleauto/oleauto.cpp | 6 +- samples/oleauto/oleauto.dsp | 2 +- samples/oleauto/oleauto.rc | 3 - samples/oleauto/oleauto_vc7.vcproj | 2 +- samples/oleauto/oleauto_vc8.vcproj | 2 +- samples/oleauto/oleauto_vc9.vcproj | 2 +- samples/opengl/cube/Makefile.in | 12 +- samples/opengl/cube/cube.bkl | 1 - samples/opengl/cube/cube.dsp | 2 +- samples/opengl/cube/cube.rc | 3 - samples/opengl/cube/cube_vc7.vcproj | 2 +- samples/opengl/cube/cube_vc8.vcproj | 2 +- samples/opengl/cube/cube_vc9.vcproj | 2 +- samples/opengl/cube/makefile.bcc | 10 +- samples/opengl/cube/makefile.gcc | 12 +- samples/opengl/cube/makefile.vc | 10 +- samples/opengl/cube/makefile.wat | 10 +- samples/opengl/cube/mondrian.ico | Bin 766 -> 0 bytes samples/opengl/isosurf/mondrian.ico | Bin 766 -> 0 bytes samples/opengl/penguin/Makefile.in | 12 +- samples/opengl/penguin/makefile.bcc | 10 +- samples/opengl/penguin/makefile.gcc | 12 +- samples/opengl/penguin/makefile.vc | 10 +- samples/opengl/penguin/makefile.wat | 10 +- samples/opengl/penguin/penguin.bkl | 1 - samples/opengl/penguin/penguin.cpp | 2 +- samples/opengl/penguin/penguin.dsp | 2 +- samples/opengl/penguin/penguin.rc | 3 - samples/opengl/penguin/penguin_vc7.vcproj | 2 +- samples/opengl/penguin/penguin_vc8.vcproj | 2 +- samples/opengl/penguin/penguin_vc9.vcproj | 2 +- samples/ownerdrw/mondrian.ico | Bin 766 -> 0 bytes samples/ownerdrw/ownerdrw.cpp | 2 +- samples/ownerdrw/ownerdrw.rc | 5 +- samples/printing/Makefile.in | 12 +- samples/printing/makefile.bcc | 10 +- samples/printing/makefile.gcc | 12 +- samples/printing/makefile.vc | 10 +- samples/printing/makefile.wat | 10 +- samples/printing/mondrian.ico | Bin 766 -> 0 bytes samples/printing/mondrian.xpm | 44 - samples/printing/printing.bkl | 1 - samples/printing/printing.cpp | 8 +- samples/printing/printing.dsp | 2 +- samples/printing/printing.rc | 3 - samples/printing/printing_vc7.vcproj | 2 +- samples/printing/printing_vc8.vcproj | 2 +- samples/printing/printing_vc9.vcproj | 2 +- samples/regtest/regtest.rc | 2 +- samples/sample.rc4 | 2 + samples/sample.rcO | 2 + .../{erase/mondros2.ico => sample_os2.ico} | Bin samples/sashtest/sashtest.rc | 4 +- samples/scroll/Makefile.in | 12 +- samples/scroll/makefile.bcc | 10 +- samples/scroll/makefile.gcc | 12 +- samples/scroll/makefile.vc | 10 +- samples/scroll/makefile.wat | 10 +- samples/scroll/mondros2.ico | Bin 996 -> 0 bytes samples/scroll/scroll.bkl | 1 - samples/scroll/scroll.dsp | 4 +- samples/scroll/scroll.rc | 2 - samples/scroll/scroll_vc7.vcproj | 2 +- samples/scroll/scroll_vc8.vcproj | 2 +- samples/scroll/scroll_vc9.vcproj | 2 +- samples/shaped/Makefile.in | 12 +- samples/shaped/makefile.bcc | 10 +- samples/shaped/makefile.gcc | 12 +- samples/shaped/makefile.vc | 10 +- samples/shaped/makefile.wat | 10 +- samples/shaped/shaped.bkl | 3 +- samples/shaped/shaped.dsp | 4 +- samples/shaped/shaped.rc | 2 - samples/shaped/shaped_vc7.vcproj | 2 +- samples/shaped/shaped_vc8.vcproj | 2 +- samples/shaped/shaped_vc9.vcproj | 2 +- samples/sockets/Makefile.in | 20 +- samples/sockets/client.cpp | 6 +- samples/sockets/client.rc | 3 - samples/sockets/connect.ico | Bin 766 -> 0 bytes samples/sockets/makefile.bcc | 18 +- samples/sockets/makefile.gcc | 20 +- samples/sockets/makefile.vc | 18 +- samples/sockets/makefile.wat | 16 +- samples/sockets/mondrian.ico | Bin 766 -> 0 bytes samples/sockets/mondrian.xpm | 44 - samples/sockets/server.cpp | 6 +- samples/sockets/server.rc | 4 - samples/sockets/sockets.bkl | 2 - samples/sockets/sockets_client.dsp | 2 +- samples/sockets/sockets_server.dsp | 4 +- samples/sockets/sockets_vc7_client.vcproj | 2 +- samples/sockets/sockets_vc7_server.vcproj | 2 +- samples/sockets/sockets_vc8_client.vcproj | 2 +- samples/sockets/sockets_vc8_server.vcproj | 2 +- samples/sockets/sockets_vc9_client.vcproj | 2 +- samples/sockets/sockets_vc9_server.vcproj | 2 +- samples/splitter/Makefile.in | 12 +- samples/splitter/makefile.bcc | 10 +- samples/splitter/makefile.gcc | 12 +- samples/splitter/makefile.vc | 10 +- samples/splitter/makefile.wat | 10 +- samples/splitter/mondrian.ico | Bin 766 -> 0 bytes samples/splitter/splitter.bkl | 1 - samples/splitter/splitter.dsp | 4 +- samples/splitter/splitter.rc | 6 - samples/splitter/splitter_vc7.vcproj | 2 +- samples/splitter/splitter_vc8.vcproj | 2 +- samples/splitter/splitter_vc9.vcproj | 2 +- samples/statbar/Makefile.in | 12 +- samples/statbar/makefile.bcc | 10 +- samples/statbar/makefile.gcc | 12 +- samples/statbar/makefile.vc | 10 +- samples/statbar/makefile.wat | 10 +- samples/statbar/statbar.bkl | 1 - samples/statbar/statbar.dsp | 4 +- samples/statbar/statbar.rc | 1 - samples/statbar/statbar_vc7.vcproj | 2 +- samples/statbar/statbar_vc8.vcproj | 2 +- samples/statbar/statbar_vc9.vcproj | 2 +- samples/stc/Makefile.in | 12 +- samples/stc/makefile.bcc | 6 +- samples/stc/makefile.gcc | 10 +- samples/stc/makefile.vc | 6 +- samples/stc/makefile.wat | 6 +- samples/stc/mondrian.ico | Bin 766 -> 0 bytes samples/stc/mondrian.xpm | 44 - samples/stc/stctest.bkl | 2 - samples/stc/stctest.cpp | 9 +- samples/stc/stctest.dsp | 2 +- samples/stc/stctest.rc | 4 - samples/stc/stctest_vc7.vcproj | 2 +- samples/stc/stctest_vc8.vcproj | 2 +- samples/stc/stctest_vc9.vcproj | 2 +- samples/svg/mondrian.ico | Bin 766 -> 0 bytes samples/svg/mondrian.xpm | 44 - samples/svg/svgtest.cpp | 12 +- samples/svg/svgtest.rc | 10 +- samples/text/Makefile.in | 12 +- samples/text/makefile.bcc | 10 +- samples/text/makefile.gcc | 12 +- samples/text/makefile.vc | 10 +- samples/text/makefile.wat | 10 +- samples/text/mondrian.ico | Bin 766 -> 0 bytes samples/text/mondrian.xpm | 44 - samples/text/text.bkl | 1 - samples/text/text.dsp | 4 +- samples/text/text.rc | 3 - samples/text/text_vc7.vcproj | 2 +- samples/text/text_vc8.vcproj | 2 +- samples/text/text_vc9.vcproj | 2 +- samples/thread/Makefile.in | 12 +- samples/thread/makefile.bcc | 10 +- samples/thread/makefile.gcc | 12 +- samples/thread/makefile.vc | 10 +- samples/thread/makefile.wat | 10 +- samples/thread/thread.bkl | 1 - samples/thread/thread.cpp | 2 +- samples/thread/thread.dsp | 4 +- samples/thread/thread.rc | 2 - samples/thread/thread_vc7.vcproj | 2 +- samples/thread/thread_vc8.vcproj | 2 +- samples/thread/thread_vc9.vcproj | 2 +- samples/toolbar/mondrian.ico | Bin 766 -> 0 bytes samples/toolbar/mondrian.xpm | 44 - samples/toolbar/mondros2.ico | Bin 996 -> 0 bytes samples/toolbar/toolbar.cpp | 4 +- samples/toolbar/toolbar.rc | 3 +- samples/toolbar/toolbar.rco | 13 - samples/typetest/Makefile.in | 12 +- samples/typetest/makefile.bcc | 10 +- samples/typetest/makefile.gcc | 12 +- samples/typetest/makefile.vc | 10 +- samples/typetest/makefile.wat | 10 +- samples/typetest/mondrian.ico | Bin 766 -> 0 bytes samples/typetest/mondrian.xpm | 44 - samples/typetest/typetest.bkl | 1 - samples/typetest/typetest.cpp | 6 +- samples/typetest/typetest.dsp | 4 +- samples/typetest/typetest.rc | 3 - samples/typetest/typetest_vc7.vcproj | 2 +- samples/typetest/typetest_vc8.vcproj | 2 +- samples/typetest/typetest_vc9.vcproj | 2 +- samples/wizard/Makefile.in | 12 +- samples/wizard/makefile.bcc | 10 +- samples/wizard/makefile.gcc | 12 +- samples/wizard/makefile.vc | 10 +- samples/wizard/makefile.wat | 10 +- samples/wizard/wizard.bkl | 1 - samples/wizard/wizard.cpp | 2 +- samples/wizard/wizard.dsp | 4 +- samples/wizard/wizard.rc | 3 - samples/wizard/wizard_vc7.vcproj | 2 +- samples/wizard/wizard_vc8.vcproj | 2 +- samples/wizard/wizard_vc9.vcproj | 2 +- samples/xrc/Makefile.in | 14 +- samples/xrc/makefile.bcc | 12 +- samples/xrc/makefile.gcc | 14 +- samples/xrc/makefile.vc | 12 +- samples/xrc/makefile.wat | 12 +- samples/xrc/myframe.cpp | 2 +- samples/xrc/rc/appicon.ico | Bin 1078 -> 0 bytes samples/xrc/rc/appicon.xpm | 52 - samples/xrc/xrcdemo.bkl | 3 +- samples/xrc/xrcdemo.dsp | 4 +- samples/xrc/xrcdemo.rc | 2 - samples/xrc/xrcdemo_vc7.vcproj | 2 +- samples/xrc/xrcdemo_vc8.vcproj | 2 +- samples/xrc/xrcdemo_vc9.vcproj | 2 +- 611 files changed, 1503 insertions(+), 8123 deletions(-) delete mode 100644 samples/access/accesstest.rc delete mode 100644 samples/access/mondrian.ico delete mode 100644 samples/access/mondrian.xpm delete mode 100644 samples/artprov/arttest.rc delete mode 100644 samples/artprov/mondrian.ico delete mode 100644 samples/artprov/mondrian.xpm delete mode 100644 samples/caret/caret.rc delete mode 100644 samples/caret/mondrian.xpm delete mode 100644 samples/clipboard/clipboard.rc delete mode 100644 samples/config/conftest.rc delete mode 100644 samples/controls/mondrian.ico delete mode 100644 samples/controls/mondrian.xpm delete mode 100644 samples/dialogs/dialogs.ico delete mode 100644 samples/dialogs/dialogs.rc delete mode 100644 samples/dialogs/dialogs.rcO delete mode 100644 samples/dialup/nettest.rc delete mode 100644 samples/docview/mondrian.ico delete mode 100755 samples/docview/mondrian.r delete mode 100644 samples/docview/mondrian.xpm delete mode 100644 samples/dragimag/mondrian.ico delete mode 100644 samples/dragimag/mondrian.xpm delete mode 100644 samples/drawing/drawing.rc delete mode 100644 samples/drawing/mondrian.ico delete mode 100644 samples/drawing/mondrian.xpm delete mode 100644 samples/erase/erase.rc delete mode 100644 samples/erase/erase.rc0 delete mode 100644 samples/erase/erase.rc4 delete mode 100644 samples/erase/mondrian.ico delete mode 100644 samples/erase/mondrian.xpm delete mode 100644 samples/event/event.rc delete mode 100644 samples/font/font.rc delete mode 100644 samples/font/mondrian.ico delete mode 100644 samples/grid/griddemo.rc delete mode 100644 samples/help/demo.rc delete mode 100644 samples/help/mondrian.ico delete mode 100644 samples/help/mondrian.xpm delete mode 100644 samples/htlbox/htlbox.rc delete mode 100644 samples/htlbox/mondrian.ico delete mode 100644 samples/htlbox/mondrian.xpm delete mode 100644 samples/html/about/about.rc delete mode 100644 samples/html/help/help.rc delete mode 100644 samples/html/helpview/helpview.ico delete mode 100644 samples/html/helpview/helpview.rc delete mode 100644 samples/html/helpview/mondrian.ico delete mode 100644 samples/html/printing/mondrian.ico delete mode 100644 samples/html/printing/printing.rc delete mode 100644 samples/html/test/test.rc delete mode 100644 samples/html/virtual/virtual.rc delete mode 100644 samples/html/widget/widget.rc delete mode 100644 samples/html/zip/zip.rc delete mode 100644 samples/image/image.rc delete mode 100644 samples/image/image.rco delete mode 100644 samples/internat/internat.rc delete mode 100644 samples/internat/mondrian.ico delete mode 100644 samples/internat/mondrian.xpm delete mode 100644 samples/ipc/client.rc delete mode 100644 samples/ipc/mondrian.ico delete mode 100644 samples/ipc/mondrian.xpm delete mode 100644 samples/ipc/server.rc delete mode 100644 samples/joytest/chart.ico delete mode 100644 samples/joytest/joytest.ico delete mode 100644 samples/joytest/joytest.rc delete mode 100644 samples/joytest/mondrian.ico delete mode 100644 samples/keyboard/keyboard.rc delete mode 100644 samples/layout/layout.rc delete mode 100644 samples/listctrl/mondrian.ico delete mode 100644 samples/listctrl/mondrian.xpm delete mode 100644 samples/memcheck/memcheck.rc delete mode 100644 samples/memcheck/mondrian.ico delete mode 100644 samples/memcheck/mondrian.xpm delete mode 100644 samples/menu/MENU.RCO delete mode 100644 samples/menu/menu.rc delete mode 100644 samples/menu/mondros2.ico delete mode 100644 samples/minimal/minimal.rc delete mode 100644 samples/minimal/minimal.rc4 delete mode 100644 samples/minimal/minimal.rcO delete mode 100755 samples/minimal/mondrian.r delete mode 100644 samples/minimal/mondros2.ico rename samples/minimal/{mondrian.icns => sample.icns} (100%) delete mode 100644 samples/notebook/mondrian.ico delete mode 100644 samples/notebook/mondros2.ico delete mode 100644 samples/notebook/notebook.rcO delete mode 100644 samples/oleauto/mondrian.ico delete mode 100644 samples/oleauto/mondrian.xpm delete mode 100644 samples/oleauto/oleauto.rc delete mode 100644 samples/opengl/cube/cube.rc delete mode 100644 samples/opengl/cube/mondrian.ico delete mode 100644 samples/opengl/isosurf/mondrian.ico delete mode 100644 samples/opengl/penguin/penguin.rc delete mode 100644 samples/ownerdrw/mondrian.ico delete mode 100644 samples/printing/mondrian.ico delete mode 100644 samples/printing/mondrian.xpm delete mode 100644 samples/printing/printing.rc create mode 100644 samples/sample.rc4 create mode 100644 samples/sample.rcO rename samples/{erase/mondros2.ico => sample_os2.ico} (100%) delete mode 100644 samples/scroll/mondros2.ico delete mode 100644 samples/scroll/scroll.rc delete mode 100644 samples/shaped/shaped.rc delete mode 100644 samples/sockets/client.rc delete mode 100644 samples/sockets/connect.ico delete mode 100644 samples/sockets/mondrian.ico delete mode 100644 samples/sockets/mondrian.xpm delete mode 100644 samples/sockets/server.rc delete mode 100644 samples/splitter/mondrian.ico delete mode 100644 samples/splitter/splitter.rc delete mode 100644 samples/statbar/statbar.rc delete mode 100644 samples/stc/mondrian.ico delete mode 100644 samples/stc/mondrian.xpm delete mode 100644 samples/stc/stctest.rc delete mode 100644 samples/svg/mondrian.ico delete mode 100644 samples/svg/mondrian.xpm delete mode 100644 samples/text/mondrian.ico delete mode 100644 samples/text/mondrian.xpm delete mode 100644 samples/text/text.rc delete mode 100644 samples/thread/thread.rc delete mode 100644 samples/toolbar/mondrian.ico delete mode 100644 samples/toolbar/mondrian.xpm delete mode 100644 samples/toolbar/mondros2.ico delete mode 100644 samples/toolbar/toolbar.rco delete mode 100644 samples/typetest/mondrian.ico delete mode 100644 samples/typetest/mondrian.xpm delete mode 100644 samples/typetest/typetest.rc delete mode 100644 samples/wizard/wizard.rc delete mode 100644 samples/xrc/rc/appicon.ico delete mode 100644 samples/xrc/rc/appicon.xpm delete mode 100644 samples/xrc/xrcdemo.rc diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h index 0b9f20d5b9..1d755e15c4 100644 --- a/docs/doxygen/overviews/bitmap.h +++ b/docs/doxygen/overviews/bitmap.h @@ -33,7 +33,7 @@ include the XPM inline as below, since it's C code, or you can load it at run-time. @code -#include "mondrian.xpm" +#include "sample.xpm" @endcode Sometimes you wish to use a .ico resource on Windows, and XPMs on other @@ -44,16 +44,16 @@ A macro, wxICON(), is available which creates an icon using an XPM on the appropriate platform, or an icon resource on Windows: @code -wxIcon icon(wxICON(mondrian)); +wxIcon icon(wxICON(sample)); // The above line is equivalent to this: #if defined(__WXGTK__) || defined(__WXMOTIF__) - wxIcon icon(mondrian_xpm); + wxIcon icon(sample_xpm); #endif #if defined(__WXMSW__) - wxIcon icon("mondrian"); + wxIcon icon("sample"); #endif @endcode diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 3679ccbe1b..588e27ce81 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -427,13 +427,13 @@ g++ myfoo.cpp `wx-config --cxxflags --libs` -o myfoo Using this way, a make file for the minimal sample would look like this -CC = gcc +CXX = g++ minimal: minimal.o - $(CC) -o minimal minimal.o `wx-config --libs` + $(CXX) -o minimal minimal.o `wx-config --libs` -minimal.o: minimal.cpp mondrian.xpm - $(CC) `wx-config --cxxflags` -c minimal.cpp -o minimal.o +minimal.o: minimal.cpp + $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o clean: rm -f *.o minimal diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt index adf60c38ac..8afa4e38b6 100644 --- a/docs/mgl/install.txt +++ b/docs/mgl/install.txt @@ -99,10 +99,10 @@ will output necessary C++ compiler flags and wx-config --libs will list all needed libraries. See an example of wxWidgets application makefile: minimal: minimal.o - $(CC) -o minimal minimal.o `wx-config --libs` + $(CXX) -o minimal minimal.o `wx-config --libs` -minimal.o: minimal.cpp mondrian.xpm - $(CC) `wx-config --cxxflags` -c minimal.cpp -o minimal.o +minimal.o: minimal.cpp + $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o * Using configure to build MS-DOS version diff --git a/docs/motif/install.txt b/docs/motif/install.txt index b8fc8d22fd..2625218853 100644 --- a/docs/motif/install.txt +++ b/docs/motif/install.txt @@ -455,15 +455,12 @@ CXX = g++ minimal: minimal.o $(CXX) -o minimal minimal.o `wx-config --libs` -minimal.o: minimal.cpp mondrian.xpm +minimal.o: minimal.cpp $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o clean: rm -f *.o minimal -This is certain to become the standard way unless we decide -to stick to tmake. - If your application uses only some of wxWidgets libraries, you can specify required libraries when running wx-config. For example, `wx-config --libs=html,core` will only output link command to link diff --git a/docs/wine/install.txt b/docs/wine/install.txt index fc5c65575e..9a5cd5da1a 100644 --- a/docs/wine/install.txt +++ b/docs/wine/install.txt @@ -308,13 +308,13 @@ g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo Using this way, a make file for the minimal sample would look like this -CC = g++ +CXX = g++ minimal: minimal.o - $(CC) -o minimal minimal.o `wx-config --libs` + $(CXX) -o minimal minimal.o `wx-config --libs` -minimal.o: minimal.cpp mondrian.xpm - $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o +minimal.o: minimal.cpp + $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o clean: rm -f *.o minimal diff --git a/docs/x11/install.txt b/docs/x11/install.txt index ada821077d..ee1a011bb6 100644 --- a/docs/x11/install.txt +++ b/docs/x11/install.txt @@ -437,7 +437,7 @@ CXX = g++ minimal: minimal.o $(CXX) -o minimal minimal.o `wx-config --libs` -minimal.o: minimal.cpp mondrian.xpm +minimal.o: minimal.cpp $(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o clean: diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index a72fc76e27..154c6652c4 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -160,12 +160,12 @@ enum wxStockCursor /* Useful macro for creating icons portably, for example: - wxIcon *icon = new wxICON(mondrian); + wxIcon *icon = new wxICON(sample); expands into: - wxIcon *icon = new wxIcon("mondrian"); // On wxMSW - wxIcon *icon = new wxIcon(mondrian_xpm); // On wxGTK + wxIcon *icon = new wxIcon("sample"); // On wxMSW + wxIcon *icon = new wxIcon(sample_xpm); // On wxGTK */ #ifdef __WXMSW__ diff --git a/interface/wx/icon.h b/interface/wx/icon.h index 80a40419da..4937fdae5f 100644 --- a/interface/wx/icon.h +++ b/interface/wx/icon.h @@ -118,15 +118,15 @@ public: the appropriate platform, or an icon resource on Windows. @code - wxIcon icon(wxICON(mondrian)); + wxIcon icon(wxICON(sample)); // Equivalent to: #if defined(__WXGTK__) || defined(__WXMOTIF__) - wxIcon icon(mondrian_xpm); + wxIcon icon(sample_xpm); #endif #if defined(__WXMSW__) - wxIcon icon("mondrian"); + wxIcon icon("sample"); #endif @endcode diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index ea44030db0..479e54e7a8 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -47,9 +47,9 @@ ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ + $(__accesstest___win32rc) \ $(__accesstest_os2_lib_res) \ - accesstest_accesstest.o \ - $(__accesstest___win32rc) + accesstest_accesstest.o ### Conditionally set variables: ### @@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \ @COND_PLATFORM_OS2_1@__accesstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_sample_rc.o @COND_PLATFORM_OS2_1@__accesstest_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__accesstest_app_Contents_PkgInfo___depname \ @@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_accesstest_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -174,12 +174,12 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) @COND_PLATFORM_MACOSX_1@accesstest_bundle: $(____accesstest_BUNDLE_TGT_REF_DEP) +accesstest_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + accesstest_accesstest.o: $(srcdir)/accesstest.cpp $(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(srcdir)/accesstest.cpp -accesstest_accesstest_rc.o: $(srcdir)/accesstest.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/access/access.bkl b/samples/access/access.bkl index 8e8cdf4d64..57ee881608 100644 --- a/samples/access/access.bkl +++ b/samples/access/access.bkl @@ -7,7 +7,6 @@ accesstest.cpp core base - accesstest.rc diff --git a/samples/access/access.dsp b/samples/access/access.dsp index ac8b68f86e..96502c00e5 100644 --- a/samples/access/access.dsp +++ b/samples/access/access.dsp @@ -256,7 +256,7 @@ SOURCE=.\accesstest.cpp # End Source File # Begin Source File -SOURCE=.\accesstest.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/access/access_vc7.vcproj b/samples/access/access_vc7.vcproj index 1db883ce31..adb7b031fb 100644 --- a/samples/access/access_vc7.vcproj +++ b/samples/access/access_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/access/access_vc8.vcproj b/samples/access/access_vc8.vcproj index 56054e7bed..7cec0a19a6 100644 --- a/samples/access/access_vc8.vcproj +++ b/samples/access/access_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/access/access_vc9.vcproj b/samples/access/access_vc9.vcproj index 3eaf1ac018..bf03379c25 100644 --- a/samples/access/access_vc9.vcproj +++ b/samples/access/access_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp index 47653bdabd..b8db737d81 100644 --- a/samples/access/accesstest.cpp +++ b/samples/access/accesstest.cpp @@ -59,8 +59,8 @@ // ---------------------------------------------------------------------------- // the application icon (under Windows and OS/2 it is in resources) -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) - #include "mondrian.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -329,7 +329,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, SetAccessible(new FrameAccessible(this)); // set the frame icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); #if wxUSE_MENUS // create a menu bar diff --git a/samples/access/accesstest.rc b/samples/access/accesstest.rc deleted file mode 100644 index 7655c62a4c..0000000000 --- a/samples/access/accesstest.rc +++ /dev/null @@ -1,3 +0,0 @@ -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" - diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc index 9544274b7d..e6a734b524 100644 --- a/samples/access/makefile.bcc +++ b/samples/access/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\accesstest.ilf del $(OBJS)\accesstest.ilf -if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils -$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res +$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_accesstest.res + c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_sample.res | +$(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp $(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp -$(OBJS)\accesstest_accesstest.res: .\accesstest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\accesstest.rc - diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc index dccaaadc2f..3143e4973b 100644 --- a/samples/access/makefile.gcc +++ b/samples/access/makefile.gcc @@ -29,8 +29,8 @@ ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ - $(OBJS)\accesstest_accesstest.o \ - $(OBJS)\accesstest_accesstest_rc.o + $(OBJS)\accesstest_sample_rc.o \ + $(OBJS)\accesstest_accesstest.o ### Conditionally set variables: ### @@ -218,15 +218,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe -$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o +$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample_rc.o $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\accesstest_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\accesstest_accesstest.o: ./accesstest.cpp $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\accesstest_accesstest_rc.o: ./accesstest.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index 8f29013459..3aa7d45170 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -32,7 +32,7 @@ ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ ACCESSTEST_OBJECTS = \ $(OBJS)\accesstest_accesstest.obj ACCESSTEST_RESOURCES = \ - $(OBJS)\accesstest_accesstest.res + $(OBJS)\accesstest_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb -$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res +$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(ACCESSTEST_OBJECTS) $(ACCESSTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp -$(OBJS)\accesstest_accesstest.res: .\accesstest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\accesstest.rc - diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat index 31715d0b68..39720a44e1 100644 --- a/samples/access/makefile.wat +++ b/samples/access/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe -$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res +$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample.res @%create $(OBJS)\accesstest.lbc @%append $(OBJS)\accesstest.lbc option quiet @%append $(OBJS)\accesstest.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.re @%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\accesstest.lbc library %i - @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res + @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_sample.res @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i wlink @$(OBJS)\accesstest.lbc +$(OBJS)\accesstest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $< -$(OBJS)\accesstest_accesstest.res : .AUTODEPEND .\accesstest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/access/mondrian.ico b/samples/access/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zartbrows.h core base - arttest.rc diff --git a/samples/artprov/artprov.dsp b/samples/artprov/artprov.dsp index d7f4f5ebf6..066239e83f 100644 --- a/samples/artprov/artprov.dsp +++ b/samples/artprov/artprov.dsp @@ -260,7 +260,7 @@ SOURCE=.\arttest.cpp # End Source File # Begin Source File -SOURCE=.\arttest.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # Begin Group "Header Files" diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj index e021ebe762..b7c55ee625 100644 --- a/samples/artprov/artprov_vc7.vcproj +++ b/samples/artprov/artprov_vc7.vcproj @@ -561,7 +561,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj index f0a445c0d1..9aac78950f 100644 --- a/samples/artprov/artprov_vc8.vcproj +++ b/samples/artprov/artprov_vc8.vcproj @@ -828,7 +828,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/artprov/artprov_vc9.vcproj b/samples/artprov/artprov_vc9.vcproj index 1848d01362..8af3faae08 100644 --- a/samples/artprov/artprov_vc9.vcproj +++ b/samples/artprov/artprov_vc9.vcproj @@ -800,7 +800,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp index 464bf3a27d..1c40be4ea3 100644 --- a/samples/artprov/arttest.cpp +++ b/samples/artprov/arttest.cpp @@ -21,7 +21,7 @@ #endif #if !defined(__WXMSW__) && !defined(__WXPM__) - #include "mondrian.xpm" + #include "../sample.xpm" #endif #include "wx/artprov.h" @@ -150,7 +150,7 @@ wxBitmap MyArtProvider::CreateBitmap(const wxArtID& id, MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(NULL, wxID_ANY, title, pos, size, style) { - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; diff --git a/samples/artprov/arttest.rc b/samples/artprov/arttest.rc deleted file mode 100644 index 755ae7b65e..0000000000 --- a/samples/artprov/arttest.rc +++ /dev/null @@ -1,3 +0,0 @@ -aaaa ICON "mondrian.ico" -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc index 4a107f3fa0..8eaec228c1 100644 --- a/samples/artprov/makefile.bcc +++ b/samples/artprov/makefile.bcc @@ -230,17 +230,17 @@ clean: -if exist $(OBJS)\arttest.ilf del $(OBJS)\arttest.ilf -if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils -$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res +$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_arttest.res + c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_sample.res | +$(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\arttest_arttest.obj: .\arttest.cpp $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp $(OBJS)\arttest_artbrows.obj: .\artbrows.cpp $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp -$(OBJS)\arttest_arttest.res: .\arttest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\arttest.rc - diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc index f5b444413e..e5a8e37ba1 100644 --- a/samples/artprov/makefile.gcc +++ b/samples/artprov/makefile.gcc @@ -29,9 +29,9 @@ ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ + $(OBJS)\arttest_sample_rc.o \ $(OBJS)\arttest_arttest.o \ - $(OBJS)\arttest_artbrows.o \ - $(OBJS)\arttest_arttest_rc.o + $(OBJS)\arttest_artbrows.o ### Conditionally set variables: ### @@ -219,18 +219,18 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe -$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o +$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample_rc.o $(CXX) -o $@ $(ARTTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\arttest_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\arttest_arttest.o: ./arttest.cpp $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\arttest_artbrows.o: ./artbrows.cpp $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\arttest_arttest_rc.o: ./arttest.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index 2b3e39f411..5a841a392d 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -33,7 +33,7 @@ ARTTEST_OBJECTS = \ $(OBJS)\arttest_arttest.obj \ $(OBJS)\arttest_artbrows.obj ARTTEST_RESOURCES = \ - $(OBJS)\arttest_arttest.res + $(OBJS)\arttest_sample.res ### Conditionally set variables: ### @@ -340,17 +340,17 @@ clean: -if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb -$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res +$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(ARTTEST_OBJECTS) $(ARTTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\arttest_arttest.obj: .\arttest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp $(OBJS)\arttest_artbrows.obj: .\artbrows.cpp $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp -$(OBJS)\arttest_arttest.res: .\arttest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\arttest.rc - diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index fe8633ebc7..c7275b7a6e 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/makefile.wat @@ -249,7 +249,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe -$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res +$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample.res @%create $(OBJS)\arttest.lbc @%append $(OBJS)\arttest.lbc option quiet @%append $(OBJS)\arttest.lbc name $^@ @@ -257,16 +257,16 @@ $(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res @%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\arttest.lbc library %i - @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res + @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_sample.res @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i wlink @$(OBJS)\arttest.lbc +$(OBJS)\arttest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< $(OBJS)\arttest_artbrows.obj : .AUTODEPEND .\artbrows.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< -$(OBJS)\arttest_arttest.res : .AUTODEPEND .\arttest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/artprov/mondrian.ico b/samples/artprov/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zadv core base - calendar.rc diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index a6c6007c51..7496322332 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -347,7 +347,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // set the frame icon - SetIcon(wxIcon(sample_xpm)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; diff --git a/samples/calendar/calendar.dsp b/samples/calendar/calendar.dsp index 98f404e265..29769af8c8 100644 --- a/samples/calendar/calendar.dsp +++ b/samples/calendar/calendar.dsp @@ -256,7 +256,7 @@ SOURCE=.\calendar.cpp # End Source File # Begin Source File -SOURCE=.\calendar.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj index 5fef18f255..d5ef839a3a 100644 --- a/samples/calendar/calendar_vc7.vcproj +++ b/samples/calendar/calendar_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/calendar/calendar_vc8.vcproj b/samples/calendar/calendar_vc8.vcproj index a0291743dc..5f03e7c11c 100644 --- a/samples/calendar/calendar_vc8.vcproj +++ b/samples/calendar/calendar_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/calendar/calendar_vc9.vcproj b/samples/calendar/calendar_vc9.vcproj index e5fe0fe631..ab824c9171 100644 --- a/samples/calendar/calendar_vc9.vcproj +++ b/samples/calendar/calendar_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc index b19b0864c8..ace97b885c 100644 --- a/samples/calendar/makefile.bcc +++ b/samples/calendar/makefile.bcc @@ -233,14 +233,14 @@ clean: -if exist $(OBJS)\calendar.ilf del $(OBJS)\calendar.ilf -if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils -$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res +$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_calendar.res + c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_sample.res | +$(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\calendar_calendar.obj: .\calendar.cpp $(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp -$(OBJS)\calendar_calendar.res: .\calendar.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\calendar.rc - diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc index 42a42f37e4..dbfd81dcf0 100644 --- a/samples/calendar/makefile.gcc +++ b/samples/calendar/makefile.gcc @@ -29,8 +29,8 @@ CALENDAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ - $(OBJS)\calendar_calendar.o \ - $(OBJS)\calendar_calendar_rc.o + $(OBJS)\calendar_sample_rc.o \ + $(OBJS)\calendar_calendar.o ### Conditionally set variables: ### @@ -222,15 +222,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe -$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar_rc.o +$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample_rc.o $(CXX) -o $@ $(CALENDAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\calendar_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\calendar_calendar.o: ./calendar.cpp $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\calendar_calendar_rc.o: ./calendar.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index 2a6351a437..16f421b4f5 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -32,7 +32,7 @@ CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CALENDAR_OBJECTS = \ $(OBJS)\calendar_calendar.obj CALENDAR_RESOURCES = \ - $(OBJS)\calendar_calendar.res + $(OBJS)\calendar_sample.res ### Conditionally set variables: ### @@ -343,14 +343,14 @@ clean: -if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb -$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res +$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(CALENDAR_OBJECTS) $(CALENDAR_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\calendar_calendar.obj: .\calendar.cpp $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp -$(OBJS)\calendar_calendar.res: .\calendar.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\calendar.rc - diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat index 9167125da6..c926834ed5 100644 --- a/samples/calendar/makefile.wat +++ b/samples/calendar/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe -$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res +$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample.res @%create $(OBJS)\calendar.lbc @%append $(OBJS)\calendar.lbc option quiet @%append $(OBJS)\calendar.lbc name $^@ @@ -261,13 +261,13 @@ $(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res @%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\calendar.lbc library %i - @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res + @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_sample.res @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i wlink @$(OBJS)\calendar.lbc +$(OBJS)\calendar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $< -$(OBJS)\calendar_calendar.res : .AUTODEPEND .\calendar.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 0b35b0123a..5daa47027c 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -47,9 +47,9 @@ CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ + $(__caret___win32rc) \ $(__caret_os2_lib_res) \ - caret_caret.o \ - $(__caret___win32rc) + caret_caret.o ### Conditionally set variables: ### @@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q @COND_PLATFORM_OS2_1@__caret___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___caret___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__caret___win32rc = caret_sample_rc.o @COND_PLATFORM_OS2_1@__caret_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \ @@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__caret___win32rc = caret_caret_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -174,12 +174,12 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) @COND_PLATFORM_MACOSX_1@caret_bundle: $(____caret_BUNDLE_TGT_REF_DEP) +caret_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + caret_caret.o: $(srcdir)/caret.cpp $(CXXC) -c -o $@ $(CARET_CXXFLAGS) $(srcdir)/caret.cpp -caret_caret_rc.o: $(srcdir)/caret.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/caret/caret.bkl b/samples/caret/caret.bkl index 6836d07cb1..a12ede3659 100644 --- a/samples/caret/caret.bkl +++ b/samples/caret/caret.bkl @@ -7,7 +7,6 @@ caret.cpp core base - caret.rc diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 596fa4b653..91c7fb83ef 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -27,11 +27,12 @@ #include "wx/numdlg.h" // ---------------------------------------------------------------------------- -// ressources +// resources // ---------------------------------------------------------------------------- + // the application icon -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) - #include "mondrian.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -206,7 +207,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // set the frame icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; diff --git a/samples/caret/caret.dsp b/samples/caret/caret.dsp index f4a7fb1574..c347abe682 100644 --- a/samples/caret/caret.dsp +++ b/samples/caret/caret.dsp @@ -256,7 +256,7 @@ SOURCE=.\caret.cpp # End Source File # Begin Source File -SOURCE=.\caret.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/caret/caret.rc b/samples/caret/caret.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/caret/caret.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/caret/caret_vc7.vcproj b/samples/caret/caret_vc7.vcproj index 49c660b50a..094d0cec72 100644 --- a/samples/caret/caret_vc7.vcproj +++ b/samples/caret/caret_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/caret/caret_vc8.vcproj b/samples/caret/caret_vc8.vcproj index 2c303f2c6f..0cd89621c9 100644 --- a/samples/caret/caret_vc8.vcproj +++ b/samples/caret/caret_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/caret/caret_vc9.vcproj b/samples/caret/caret_vc9.vcproj index 83855ddcc2..ebc8540ef1 100644 --- a/samples/caret/caret_vc9.vcproj +++ b/samples/caret/caret_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc index def3d5d785..95d244d316 100644 --- a/samples/caret/makefile.bcc +++ b/samples/caret/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\caret.ilf del $(OBJS)\caret.ilf -if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils -$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res +$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_caret.res + c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_sample.res | +$(OBJS)\caret_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\caret_caret.obj: .\caret.cpp $(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) .\caret.cpp -$(OBJS)\caret_caret.res: .\caret.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\caret.rc - diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc index a55dd11dcb..bcb5c5a0a5 100644 --- a/samples/caret/makefile.gcc +++ b/samples/caret/makefile.gcc @@ -29,8 +29,8 @@ CARET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ - $(OBJS)\caret_caret.o \ - $(OBJS)\caret_caret_rc.o + $(OBJS)\caret_sample_rc.o \ + $(OBJS)\caret_caret.o ### Conditionally set variables: ### @@ -218,15 +218,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe -$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret_rc.o +$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample_rc.o $(CXX) -o $@ $(CARET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\caret_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\caret_caret.o: ./caret.cpp $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\caret_caret_rc.o: ./caret.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index 1ce2adc857..6eb5902164 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -32,7 +32,7 @@ CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CARET_OBJECTS = \ $(OBJS)\caret_caret.obj CARET_RESOURCES = \ - $(OBJS)\caret_caret.res + $(OBJS)\caret_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb -$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res +$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(CARET_OBJECTS) $(CARET_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\caret_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\caret_caret.obj: .\caret.cpp $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp -$(OBJS)\caret_caret.res: .\caret.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\caret.rc - diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat index e14d2bf1f2..e90b59b502 100644 --- a/samples/caret/makefile.wat +++ b/samples/caret/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe -$(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res +$(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_sample.res @%create $(OBJS)\caret.lbc @%append $(OBJS)\caret.lbc option quiet @%append $(OBJS)\caret.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res @%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i - @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res + @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_sample.res @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i wlink @$(OBJS)\caret.lbc +$(OBJS)\caret_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $< -$(OBJS)\caret_caret.res : .AUTODEPEND .\caret.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/caret/mondrian.xpm b/samples/caret/mondrian.xpm deleted file mode 100644 index cc52c7de61..0000000000 --- a/samples/caret/mondrian.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* XPM */ -static const char *const mondrian_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 6 1", -" c Black", -". c Blue", -"X c #00bf00", -"o c Red", -"O c Yellow", -"+ c Gray100", -/* pixels */ -" ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" oooooo +++++++++++++++++++++++ ", -" ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ .... ", -" ++++++ ++++++++++++++++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++++++++++++++++ ++++ ", -" ++++++ ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" ++++++ OOOOOOOOOOOO XXXXX ++++ ", -" " -}; diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in index d00d3c021b..e8d69862d5 100644 --- a/samples/clipboard/Makefile.in +++ b/samples/clipboard/Makefile.in @@ -47,9 +47,9 @@ CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) CLIPBOARD_OBJECTS = \ + $(__clipboard___win32rc) \ $(__clipboard_os2_lib_res) \ - clipboard_clipboard.o \ - $(__clipboard___win32rc) + clipboard_clipboard.o ### Conditionally set variables: ### @@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd = $(NM) clipboard$(EXEEXT) | \ @COND_PLATFORM_OS2_1@__clipboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__clipboard___win32rc = clipboard_sample_rc.o @COND_PLATFORM_OS2_1@__clipboard_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__clipboard_app_Contents_PkgInfo___depname \ @@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__clipboard___win32rc = clipboard_clipboard_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -174,12 +174,12 @@ clipboard$(EXEEXT): $(CLIPBOARD_OBJECTS) $(__clipboard___win32rc) @COND_PLATFORM_MACOSX_1@clipboard_bundle: $(____clipboard_BUNDLE_TGT_REF_DEP) +clipboard_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + clipboard_clipboard.o: $(srcdir)/clipboard.cpp $(CXXC) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(srcdir)/clipboard.cpp -clipboard_clipboard_rc.o: $(srcdir)/clipboard.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/clipboard/clipboard.bkl b/samples/clipboard/clipboard.bkl index a8b1393306..ad52866696 100644 --- a/samples/clipboard/clipboard.bkl +++ b/samples/clipboard/clipboard.bkl @@ -7,7 +7,6 @@ clipboard.cpp core base - clipboard.rc diff --git a/samples/clipboard/clipboard.dsp b/samples/clipboard/clipboard.dsp index 3edafe2498..66b17da7b8 100644 --- a/samples/clipboard/clipboard.dsp +++ b/samples/clipboard/clipboard.dsp @@ -256,7 +256,7 @@ SOURCE=.\clipboard.cpp # End Source File # Begin Source File -SOURCE=.\clipboard.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/clipboard/clipboard.rc b/samples/clipboard/clipboard.rc deleted file mode 100644 index bb8c713934..0000000000 --- a/samples/clipboard/clipboard.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "../sample.rc" - diff --git a/samples/clipboard/clipboard_vc7.vcproj b/samples/clipboard/clipboard_vc7.vcproj index 64c9652797..6c518c582f 100644 --- a/samples/clipboard/clipboard_vc7.vcproj +++ b/samples/clipboard/clipboard_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/clipboard/clipboard_vc8.vcproj b/samples/clipboard/clipboard_vc8.vcproj index 9090c8050b..846cdef0cc 100644 --- a/samples/clipboard/clipboard_vc8.vcproj +++ b/samples/clipboard/clipboard_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/clipboard/clipboard_vc9.vcproj b/samples/clipboard/clipboard_vc9.vcproj index a3dd209b0a..8c99455331 100644 --- a/samples/clipboard/clipboard_vc9.vcproj +++ b/samples/clipboard/clipboard_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc index 7c0bb26f1d..136f07bffa 100644 --- a/samples/clipboard/makefile.bcc +++ b/samples/clipboard/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\clipboard.ilf del $(OBJS)\clipboard.ilf -if exist $(OBJS)\clipboard.ils del $(OBJS)\clipboard.ils -$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res +$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_clipboard.res + c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_sample.res | +$(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp $(CXX) -q -c -P -o$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp -$(OBJS)\clipboard_clipboard.res: .\clipboard.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\clipboard.rc - diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc index f6ee961492..35abd9ff5e 100644 --- a/samples/clipboard/makefile.gcc +++ b/samples/clipboard/makefile.gcc @@ -29,8 +29,8 @@ CLIPBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) CLIPBOARD_OBJECTS = \ - $(OBJS)\clipboard_clipboard.o \ - $(OBJS)\clipboard_clipboard_rc.o + $(OBJS)\clipboard_sample_rc.o \ + $(OBJS)\clipboard_clipboard.o ### Conditionally set variables: ### @@ -218,15 +218,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe -$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard_rc.o +$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample_rc.o $(CXX) -o $@ $(CLIPBOARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\clipboard_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\clipboard_clipboard.o: ./clipboard.cpp $(CXX) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\clipboard_clipboard_rc.o: ./clipboard.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc index 84306804f7..95260a055b 100644 --- a/samples/clipboard/makefile.vc +++ b/samples/clipboard/makefile.vc @@ -32,7 +32,7 @@ CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CLIPBOARD_OBJECTS = \ $(OBJS)\clipboard_clipboard.obj CLIPBOARD_RESOURCES = \ - $(OBJS)\clipboard_clipboard.res + $(OBJS)\clipboard_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb -$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res +$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(CLIPBOARD_OBJECTS) $(CLIPBOARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp -$(OBJS)\clipboard_clipboard.res: .\clipboard.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\clipboard.rc - diff --git a/samples/clipboard/makefile.wat b/samples/clipboard/makefile.wat index d7ad411167..0b4cb18644 100644 --- a/samples/clipboard/makefile.wat +++ b/samples/clipboard/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe -$(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res +$(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample.res @%create $(OBJS)\clipboard.lbc @%append $(OBJS)\clipboard.lbc option quiet @%append $(OBJS)\clipboard.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res @%append $(OBJS)\clipboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\clipboard.lbc library %i - @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_clipboard.res + @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_sample.res @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i wlink @$(OBJS)\clipboard.lbc +$(OBJS)\clipboard_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\clipboard_clipboard.obj : .AUTODEPEND .\clipboard.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $< -$(OBJS)\clipboard_clipboard.res : .AUTODEPEND .\clipboard.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 7a59f843af..45e31fdb8a 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -47,9 +47,9 @@ CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ + $(__conftest___win32rc) \ $(__conftest_os2_lib_res) \ - conftest_conftest.o \ - $(__conftest___win32rc) + conftest_conftest.o ### Conditionally set variables: ### @@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__conftest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_sample_rc.o @COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \ @@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_conftest_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -174,12 +174,12 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) @COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP) +conftest_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + conftest_conftest.o: $(srcdir)/conftest.cpp $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $(srcdir)/conftest.cpp -conftest_conftest_rc.o: $(srcdir)/conftest.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/config/config.bkl b/samples/config/config.bkl index 6bf5b6c755..c8b26bf753 100644 --- a/samples/config/config.bkl +++ b/samples/config/config.bkl @@ -7,7 +7,6 @@ conftest.cpp core base - conftest.rc diff --git a/samples/config/config.dsp b/samples/config/config.dsp index 139662ed55..a05beba752 100644 --- a/samples/config/config.dsp +++ b/samples/config/config.dsp @@ -256,7 +256,7 @@ SOURCE=.\conftest.cpp # End Source File # Begin Source File -SOURCE=.\conftest.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj index 225f3b5e2c..f339a8ce19 100644 --- a/samples/config/config_vc7.vcproj +++ b/samples/config/config_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/config/config_vc8.vcproj b/samples/config/config_vc8.vcproj index ee899db130..1d9ebd149d 100644 --- a/samples/config/config_vc8.vcproj +++ b/samples/config/config_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/config/config_vc9.vcproj b/samples/config/config_vc9.vcproj index 14c6a303b7..4f884a5638 100644 --- a/samples/config/config_vc9.vcproj +++ b/samples/config/config_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/config/conftest.rc b/samples/config/conftest.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/config/conftest.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc index 32edaf852e..12d168faf1 100644 --- a/samples/config/makefile.bcc +++ b/samples/config/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\conftest.ilf del $(OBJS)\conftest.ilf -if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils -$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res +$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_conftest.res + c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_sample.res | +$(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\conftest_conftest.obj: .\conftest.cpp $(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp -$(OBJS)\conftest_conftest.res: .\conftest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\conftest.rc - diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc index 0968758419..4c34b8e882 100644 --- a/samples/config/makefile.gcc +++ b/samples/config/makefile.gcc @@ -29,8 +29,8 @@ CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ - $(OBJS)\conftest_conftest.o \ - $(OBJS)\conftest_conftest_rc.o + $(OBJS)\conftest_sample_rc.o \ + $(OBJS)\conftest_conftest.o ### Conditionally set variables: ### @@ -218,15 +218,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe -$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest_rc.o +$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample_rc.o $(CXX) -o $@ $(CONFTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\conftest_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\conftest_conftest.o: ./conftest.cpp $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\conftest_conftest_rc.o: ./conftest.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index 0e08ea73ad..d564db96d2 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -32,7 +32,7 @@ CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ CONFTEST_OBJECTS = \ $(OBJS)\conftest_conftest.obj CONFTEST_RESOURCES = \ - $(OBJS)\conftest_conftest.res + $(OBJS)\conftest_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb -$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res +$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(CONFTEST_OBJECTS) $(CONFTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\conftest_conftest.obj: .\conftest.cpp $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp -$(OBJS)\conftest_conftest.res: .\conftest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\conftest.rc - diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat index 870c9cd07f..28e8c85bd2 100644 --- a/samples/config/makefile.wat +++ b/samples/config/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe -$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res +$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res @%create $(OBJS)\conftest.lbc @%append $(OBJS)\conftest.lbc option quiet @%append $(OBJS)\conftest.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res @%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\conftest.lbc library %i - @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res + @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_sample.res @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i wlink @$(OBJS)\conftest.lbc +$(OBJS)\conftest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $< -$(OBJS)\conftest_conftest.res : .AUTODEPEND .\conftest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index da9256e9b7..ef951a18bb 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -33,12 +33,7 @@ #endif // __WXMSW__ #endif // wxUSE_TOOLTIPS -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) - #define USE_XPM -#endif - -#ifdef USE_XPM - #include "mondrian.xpm" +#ifndef __WXMSW__ #include "icons/choice.xpm" #include "icons/combo.xpm" #include "icons/list.xpm" @@ -62,6 +57,10 @@ #define EVT_TOGGLEBUTTON EVT_CHECKBOX #endif +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" +#endif + //---------------------------------------------------------------------- // class definitions //---------------------------------------------------------------------- @@ -662,7 +661,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxT("examples.") }; -#ifdef USE_XPM +#ifndef __WXMSW__ // image ids enum { @@ -691,7 +690,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) imagelist-> Add( wxBitmap( gauge_xpm )); #endif // wxUSE_GAUGE m_book->SetImageList(imagelist); -#elif defined(__WXMSW__) +#else // load images from resources enum { @@ -730,19 +729,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) } m_book->SetImageList(imagelist); -#else - - // No images for now -#define Image_List -1 -#define Image_Choice -1 -#define Image_Combo -1 -#define Image_Text -1 -#define Image_Radio -1 -#if wxUSE_GAUGE -#define Image_Gauge -1 -#endif // wxUSE_GAUGE -#define Image_Max -1 - #endif wxPanel *panel = new wxPanel(m_book); @@ -1800,9 +1786,7 @@ MyFrame::MyFrame(const wxChar *title, int x, int y) // The wxICON() macros loads an icon from a resource under Windows // and uses an #included XPM image under GTK+ and Motif -#ifdef USE_XPM - SetIcon( wxICON(mondrian) ); -#endif + SetIcon( wxICON(sample) ); wxMenu *file_menu = new wxMenu; diff --git a/samples/controls/controls.rc b/samples/controls/controls.rc index 746abb4618..51ff722dfe 100644 --- a/samples/controls/controls.rc +++ b/samples/controls/controls.rc @@ -1,4 +1,4 @@ -mondrian ICON "mondrian.ico" +#include "../sample.rc" choice BITMAP "icons/choice.bmp" combo BITMAP "icons/combo.bmp" @@ -6,5 +6,3 @@ gauge BITMAP "icons/gauge.bmp" list BITMAP "icons/list.bmp" radio BITMAP "icons/radio.bmp" text BITMAP "icons/text.bmp" - -#include "wx/msw/wx.rc" diff --git a/samples/controls/mondrian.ico b/samples/controls/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zadv core base - dialogs.rc diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index d151f571ef..941ce02b02 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -496,7 +496,7 @@ bool MyApp::OnInit() MyFrame::MyFrame(const wxString& title) : wxFrame(NULL, wxID_ANY, title) { - SetIcon(sample_xpm); + SetIcon(wxICON(sample)); #if USE_MODAL_PRESENTATION m_dialog = (MyModelessDialog *)NULL; diff --git a/samples/dialogs/dialogs.dsp b/samples/dialogs/dialogs.dsp index 5017e5de0f..7fe362c9f1 100644 --- a/samples/dialogs/dialogs.dsp +++ b/samples/dialogs/dialogs.dsp @@ -293,10 +293,6 @@ SOURCE=.\dialogs.cpp # End Source File # Begin Source File -SOURCE=.\dialogs.rc -# End Source File -# Begin Source File - SOURCE=.\..\..\src\generic\dirdlgg.cpp !IF "$(CFG)" == "dialogs - Win32 DLL Universal Release" @@ -406,6 +402,10 @@ SOURCE=.\..\..\src\generic\fontdlgg.cpp !ENDIF # End Source File +# Begin Source File + +SOURCE=.\..\..\samples\sample.rc +# End Source File # End Group # Begin Group "Header Files" diff --git a/samples/dialogs/dialogs.ico b/samples/dialogs/dialogs.ico deleted file mode 100644 index 6e8c9aab412ab96a696138888b0af7382073278c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1078 zcmeH`F%Ci@5JZQswQvL~^N-=Jv~xQ>76P2vp!li%S9xrQx0=!0Tj+OR DGhpdM diff --git a/samples/dialogs/dialogs.rc b/samples/dialogs/dialogs.rc deleted file mode 100644 index 3a98924530..0000000000 --- a/samples/dialogs/dialogs.rc +++ /dev/null @@ -1,4 +0,0 @@ -dialogs ICON "dialogs.ico" - -#include "wx/msw/wx.rc" - diff --git a/samples/dialogs/dialogs.rcO b/samples/dialogs/dialogs.rcO deleted file mode 100644 index 87a8a25faa..0000000000 --- a/samples/dialogs/dialogs.rcO +++ /dev/null @@ -1,4 +0,0 @@ -ICON 1 PRELOAD "dialogs.ico" - -RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc - diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj index 580bb1ddea..476e421bf1 100644 --- a/samples/dialogs/dialogs_vc7.vcproj +++ b/samples/dialogs/dialogs_vc7.vcproj @@ -642,7 +642,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj index 7dbba138d5..6b55c9dfe7 100644 --- a/samples/dialogs/dialogs_vc8.vcproj +++ b/samples/dialogs/dialogs_vc8.vcproj @@ -936,7 +936,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj index 6c056fdde9..2072a4f03f 100644 --- a/samples/dialogs/dialogs_vc9.vcproj +++ b/samples/dialogs/dialogs_vc9.vcproj @@ -908,7 +908,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc index 64bdf6899e..7ef15dbbed 100644 --- a/samples/dialogs/makefile.bcc +++ b/samples/dialogs/makefile.bcc @@ -241,15 +241,18 @@ clean: -if exist $(OBJS)\dialogs.ilf del $(OBJS)\dialogs.ilf -if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils -$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res +$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_dialogs.res + c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp @@ -265,6 +268,3 @@ $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp -$(OBJS)\dialogs_dialogs.res: .\dialogs.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dialogs.rc - diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc index 8a8a78525e..dd329c13a3 100644 --- a/samples/dialogs/makefile.gcc +++ b/samples/dialogs/makefile.gcc @@ -29,9 +29,9 @@ DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ + $(OBJS)\dialogs_sample_rc.o \ $(OBJS)\dialogs_dialogs.o \ - $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \ - $(OBJS)\dialogs_dialogs_rc.o + $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) ### Conditionally set variables: ### @@ -232,13 +232,16 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe -$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o +$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample_rc.o $(CXX) -o $@ $(DIALOGS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\dialogs_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\dialogs_dialogs.o: ./dialogs.cpp $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $< @@ -254,9 +257,6 @@ $(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp $(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index 3ae52d49ba..d05b035861 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -33,7 +33,7 @@ DIALOGS_OBJECTS = \ $(OBJS)\dialogs_dialogs.obj \ $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) DIALOGS_RESOURCES = \ - $(OBJS)\dialogs_dialogs.res + $(OBJS)\dialogs_sample.res ### Conditionally set variables: ### @@ -351,7 +351,7 @@ clean: -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb -$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res +$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -360,6 +360,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp @@ -375,6 +378,3 @@ $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp -$(OBJS)\dialogs_dialogs.res: .\dialogs.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dialogs.rc - diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index 1f08ae851c..d4306bdc07 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -264,7 +264,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe -$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res +$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res @%create $(OBJS)\dialogs.lbc @%append $(OBJS)\dialogs.lbc option quiet @%append $(OBJS)\dialogs.lbc name $^@ @@ -272,7 +272,7 @@ $(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res @%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i - @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res + @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_sample.res @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i wlink @$(OBJS)\dialogs.lbc @@ -280,6 +280,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\dialogs_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\dialogs_dialogs.obj : .AUTODEPEND .\dialogs.cpp $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< @@ -295,6 +298,3 @@ $(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp $(OBJS)\dialogs_fontdlgg.obj : .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< -$(OBJS)\dialogs_dialogs.res : .AUTODEPEND .\dialogs.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index ea88ff0007..482120e1fc 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -47,9 +47,9 @@ NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ + $(__nettest___win32rc) \ $(__nettest_os2_lib_res) \ - nettest_nettest.o \ - $(__nettest___win32rc) + nettest_nettest.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__nettest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_sample_rc.o @COND_PLATFORM_OS2_1@__nettest_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_app_Contents_PkgInfo___depname \ @@ -108,7 +109,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_nettest_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -176,12 +176,12 @@ distclean: clean @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP) +nettest_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + nettest_nettest.o: $(srcdir)/nettest.cpp $(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $(srcdir)/nettest.cpp -nettest_nettest_rc.o: $(srcdir)/nettest.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/dialup/dialup.bkl b/samples/dialup/dialup.bkl index 598f24da81..c68d1d68f5 100644 --- a/samples/dialup/dialup.bkl +++ b/samples/dialup/dialup.bkl @@ -9,7 +9,6 @@ nettest.cpp core base - nettest.rc diff --git a/samples/dialup/dialup.dsp b/samples/dialup/dialup.dsp index ee0707040d..3dd75fea64 100644 --- a/samples/dialup/dialup.dsp +++ b/samples/dialup/dialup.dsp @@ -256,7 +256,7 @@ SOURCE=.\nettest.cpp # End Source File # Begin Source File -SOURCE=.\nettest.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj index a1c8d346c6..5535ee5719 100644 --- a/samples/dialup/dialup_vc7.vcproj +++ b/samples/dialup/dialup_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/dialup/dialup_vc8.vcproj b/samples/dialup/dialup_vc8.vcproj index 5198d257ec..3d40ee3406 100644 --- a/samples/dialup/dialup_vc8.vcproj +++ b/samples/dialup/dialup_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/dialup/dialup_vc9.vcproj b/samples/dialup/dialup_vc9.vcproj index e82e6fe3db..d4dee25473 100644 --- a/samples/dialup/dialup_vc9.vcproj +++ b/samples/dialup/dialup_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc index 046643e99d..1b7dabcfc3 100644 --- a/samples/dialup/makefile.bcc +++ b/samples/dialup/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\nettest.ilf del $(OBJS)\nettest.ilf -if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils -$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res +$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(NETTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_nettest.res + c0w32.obj $(NETTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_sample.res | +$(OBJS)\nettest_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\nettest_nettest.obj: .\nettest.cpp $(CXX) -q -c -P -o$@ $(NETTEST_CXXFLAGS) .\nettest.cpp -$(OBJS)\nettest_nettest.res: .\nettest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\nettest.rc - diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc index fd8c045c59..fa639f5aca 100644 --- a/samples/dialup/makefile.gcc +++ b/samples/dialup/makefile.gcc @@ -29,8 +29,8 @@ NETTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ - $(OBJS)\nettest_nettest.o \ - $(OBJS)\nettest_nettest_rc.o + $(OBJS)\nettest_sample_rc.o \ + $(OBJS)\nettest_nettest.o ### Conditionally set variables: ### @@ -218,15 +218,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe -$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o +$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_sample_rc.o $(CXX) -o $@ $(NETTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\nettest_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\nettest_nettest.o: ./nettest.cpp $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\nettest_nettest_rc.o: ./nettest.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index e982a692a3..ef905531c4 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -32,7 +32,7 @@ NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ NETTEST_OBJECTS = \ $(OBJS)\nettest_nettest.obj NETTEST_RESOURCES = \ - $(OBJS)\nettest_nettest.res + $(OBJS)\nettest_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb -$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res +$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(NETTEST_OBJECTS) $(NETTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\nettest_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\nettest_nettest.obj: .\nettest.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp -$(OBJS)\nettest_nettest.res: .\nettest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nettest.rc - diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index 516778ed80..55439b1b66 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe -$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res +$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_sample.res @%create $(OBJS)\nettest.lbc @%append $(OBJS)\nettest.lbc option quiet @%append $(OBJS)\nettest.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res @%append $(OBJS)\nettest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nettest.lbc library %i - @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res + @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_sample.res @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i wlink @$(OBJS)\nettest.lbc +$(OBJS)\nettest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\nettest_nettest.obj : .AUTODEPEND .\nettest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $< -$(OBJS)\nettest_nettest.res : .AUTODEPEND .\nettest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/dialup/nettest.rc b/samples/dialup/nettest.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/dialup/nettest.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/docview/docview.rc b/samples/docview/docview.rc index 335d7ba3c0..3c46f4f160 100644 --- a/samples/docview/docview.rc +++ b/samples/docview/docview.rc @@ -1,4 +1,4 @@ -#include "wx/msw/wx.rc" +#include "../sample.rc" doc ICON "doc.ico" chrt ICON "chart.ico" diff --git a/samples/docview/mondrian.ico b/samples/docview/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0ZAppend(file_menu, wxT("&File")); - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); SetMenuBar( menu_bar ); #if wxUSE_STATUSBAR diff --git a/samples/dragimag/dragimag.rc b/samples/dragimag/dragimag.rc index 754a072235..650de58339 100644 --- a/samples/dragimag/dragimag.rc +++ b/samples/dragimag/dragimag.rc @@ -1,5 +1,4 @@ -mondrian ICON "mondrian.ico" -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 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zdrawing.cpp core base - drawing.rc diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index afebb30869..c3b3f4be52 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -45,8 +45,8 @@ // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) - #include "mondrian.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -1694,7 +1694,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { // set the frame icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); wxMenu *menuFile = new wxMenu; menuFile->Append(File_ShowDefault, wxT("&Default screen\tF1")); diff --git a/samples/drawing/drawing.dsp b/samples/drawing/drawing.dsp index 43a7ae287c..0ac675e905 100644 --- a/samples/drawing/drawing.dsp +++ b/samples/drawing/drawing.dsp @@ -256,7 +256,7 @@ SOURCE=.\drawing.cpp # End Source File # Begin Source File -SOURCE=.\drawing.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/drawing/drawing.rc b/samples/drawing/drawing.rc deleted file mode 100644 index 2b94a2b647..0000000000 --- a/samples/drawing/drawing.rc +++ /dev/null @@ -1,3 +0,0 @@ -#include "wx/msw/wx.rc" - -mondrian ICON "mondrian.ico" diff --git a/samples/drawing/drawing_vc7.vcproj b/samples/drawing/drawing_vc7.vcproj index b8ecf8a7b3..e9a16aef7d 100644 --- a/samples/drawing/drawing_vc7.vcproj +++ b/samples/drawing/drawing_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/drawing/drawing_vc8.vcproj b/samples/drawing/drawing_vc8.vcproj index 6873e41899..44e5820442 100644 --- a/samples/drawing/drawing_vc8.vcproj +++ b/samples/drawing/drawing_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/drawing/drawing_vc9.vcproj b/samples/drawing/drawing_vc9.vcproj index c1902b4f74..9b3e92eb70 100644 --- a/samples/drawing/drawing_vc9.vcproj +++ b/samples/drawing/drawing_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc index f59fb25956..8b0e7f1693 100644 --- a/samples/drawing/makefile.bcc +++ b/samples/drawing/makefile.bcc @@ -229,18 +229,18 @@ clean: -if exist $(OBJS)\drawing.ilf del $(OBJS)\drawing.ilf -if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils -$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res +$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_drawing.res + c0w32.obj $(DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\drawing_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\drawing_drawing.obj: .\drawing.cpp $(CXX) -q -c -P -o$@ $(DRAWING_CXXFLAGS) .\drawing.cpp -$(OBJS)\drawing_drawing.res: .\drawing.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\drawing.rc - diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc index 09b7850b9f..ddd59c4c0d 100644 --- a/samples/drawing/makefile.gcc +++ b/samples/drawing/makefile.gcc @@ -29,8 +29,8 @@ DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ - $(OBJS)\drawing_drawing.o \ - $(OBJS)\drawing_drawing_rc.o + $(OBJS)\drawing_sample_rc.o \ + $(OBJS)\drawing_drawing.o ### Conditionally set variables: ### @@ -218,19 +218,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe -$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing_rc.o +$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_sample_rc.o $(CXX) -o $@ $(DRAWING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\drawing_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\drawing_drawing.o: ./drawing.cpp $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\drawing_drawing_rc.o: ./drawing.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index cca19ae5cc..f54e0d4dcc 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -32,7 +32,7 @@ DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ DRAWING_OBJECTS = \ $(OBJS)\drawing_drawing.obj DRAWING_RESOURCES = \ - $(OBJS)\drawing_drawing.res + $(OBJS)\drawing_sample.res ### Conditionally set variables: ### @@ -339,7 +339,7 @@ clean: -if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb -$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res +$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(DRAWING_OBJECTS) $(DRAWING_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -348,9 +348,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\drawing_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\drawing_drawing.obj: .\drawing.cpp $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp -$(OBJS)\drawing_drawing.res: .\drawing.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\drawing.rc - diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat index f0ee1bb83f..ffa658d720 100644 --- a/samples/drawing/makefile.wat +++ b/samples/drawing/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe -$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res +$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_sample.res @%create $(OBJS)\drawing.lbc @%append $(OBJS)\drawing.lbc option quiet @%append $(OBJS)\drawing.lbc name $^@ @@ -256,7 +256,7 @@ $(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res @%append $(OBJS)\drawing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\drawing.lbc library %i - @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res + @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_sample.res @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i wlink @$(OBJS)\drawing.lbc @@ -264,9 +264,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\drawing_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\drawing_drawing.obj : .AUTODEPEND .\drawing.cpp $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $< -$(OBJS)\drawing_drawing.res : .AUTODEPEND .\drawing.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/drawing/mondrian.ico b/samples/drawing/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zerase.cpp core base - erase.rc diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp index d00ccf0de3..d603a93cef 100644 --- a/samples/erase/erase.cpp +++ b/samples/erase/erase.cpp @@ -35,9 +35,10 @@ // ---------------------------------------------------------------------------- // resources // ---------------------------------------------------------------------------- + // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) - #include "mondrian.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -169,7 +170,7 @@ MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, "Erase sample", wxPoint(50, 50), wxSize(450, 340)) { - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF); menuFile->AppendCheckItem(Erase_Menu_UseBuffer, "&Use memory DC\tCtrl-M"); @@ -252,7 +253,7 @@ MyCanvas::MyCanvas(wxFrame *parent) SetScrollbars( 10, 10, 40, 100, 0, 0 ); - m_bitmap = wxBitmap( wxICON(mondrian) ); + m_bitmap = wxBitmap( wxICON(sample) ); new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) ); diff --git a/samples/erase/erase.dsp b/samples/erase/erase.dsp index b6b1a37b9d..1d17f1196f 100644 --- a/samples/erase/erase.dsp +++ b/samples/erase/erase.dsp @@ -256,7 +256,7 @@ SOURCE=.\erase.cpp # End Source File # Begin Source File -SOURCE=.\erase.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/erase/erase.rc b/samples/erase/erase.rc deleted file mode 100644 index 3bf71d6da0..0000000000 --- a/samples/erase/erase.rc +++ /dev/null @@ -1,6 +0,0 @@ -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" - -#define MINIMAL_QUIT 1 -#define MINIMAL_ABOUT 102 - diff --git a/samples/erase/erase.rc0 b/samples/erase/erase.rc0 deleted file mode 100644 index 42078bed50..0000000000 --- a/samples/erase/erase.rc0 +++ /dev/null @@ -1,6 +0,0 @@ -ICON 1 PRELOAD "mondros2.ico" -#include "..\\..\\include\wx\os2\wx.rc" - -#define MINIMAL_QUIT 1 -#define MINIMAL_ABOUT 102 - diff --git a/samples/erase/erase.rc4 b/samples/erase/erase.rc4 deleted file mode 100644 index 695f7b0f76..0000000000 --- a/samples/erase/erase.rc4 +++ /dev/null @@ -1,6 +0,0 @@ -ICON 1 PRELOAD "..\\samples\\erase\\mondros2.ico" -#include "H:\DEV\WX22\WXWINDOWS\include\wx\os2\wx.rc" - -#define MINIMAL_QUIT 1 -#define MINIMAL_ABOUT 102 - diff --git a/samples/erase/erase_vc7.vcproj b/samples/erase/erase_vc7.vcproj index 9be66866a6..89acfced3f 100644 --- a/samples/erase/erase_vc7.vcproj +++ b/samples/erase/erase_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/erase/erase_vc8.vcproj b/samples/erase/erase_vc8.vcproj index 729cd96e25..877001decd 100644 --- a/samples/erase/erase_vc8.vcproj +++ b/samples/erase/erase_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/erase/erase_vc9.vcproj b/samples/erase/erase_vc9.vcproj index d65cf35314..48ee73ecd8 100644 --- a/samples/erase/erase_vc9.vcproj +++ b/samples/erase/erase_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc index a2739e5dd4..945a153d47 100644 --- a/samples/erase/makefile.bcc +++ b/samples/erase/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\erase.ilf del $(OBJS)\erase.ilf -if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils -$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res +$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(ERASE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_erase.res + c0w32.obj $(ERASE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_sample.res | +$(OBJS)\erase_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\erase_erase.obj: .\erase.cpp $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) .\erase.cpp -$(OBJS)\erase_erase.res: .\erase.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\erase.rc - diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc index e641d9a068..37bfed6b38 100644 --- a/samples/erase/makefile.gcc +++ b/samples/erase/makefile.gcc @@ -29,8 +29,8 @@ ERASE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ - $(OBJS)\erase_erase.o \ - $(OBJS)\erase_erase_rc.o + $(OBJS)\erase_sample_rc.o \ + $(OBJS)\erase_erase.o ### Conditionally set variables: ### @@ -218,15 +218,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe -$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase_rc.o +$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_sample_rc.o $(CXX) -o $@ $(ERASE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\erase_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\erase_erase.o: ./erase.cpp $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\erase_erase_rc.o: ./erase.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index 72b815f22d..116d7f1fbc 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -32,7 +32,7 @@ ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ ERASE_OBJECTS = \ $(OBJS)\erase_erase.obj ERASE_RESOURCES = \ - $(OBJS)\erase_erase.res + $(OBJS)\erase_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb -$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res +$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(ERASE_OBJECTS) $(ERASE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\erase_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\erase_erase.obj: .\erase.cpp $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp -$(OBJS)\erase_erase.res: .\erase.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\erase.rc - diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat index a7eb8220e1..74baca1f23 100644 --- a/samples/erase/makefile.wat +++ b/samples/erase/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe -$(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res +$(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_sample.res @%create $(OBJS)\erase.lbc @%append $(OBJS)\erase.lbc option quiet @%append $(OBJS)\erase.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res @%append $(OBJS)\erase.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\erase.lbc library %i - @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res + @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_sample.res @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i wlink @$(OBJS)\erase.lbc +$(OBJS)\erase_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\erase_erase.obj : .AUTODEPEND .\erase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $< -$(OBJS)\erase_erase.res : .AUTODEPEND .\erase.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/erase/mondrian.ico b/samples/erase/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zevent.cpp core base - event.rc diff --git a/samples/event/event.dsp b/samples/event/event.dsp index 9a7eb7196d..06bc7fc0cf 100644 --- a/samples/event/event.dsp +++ b/samples/event/event.dsp @@ -256,7 +256,7 @@ SOURCE=.\event.cpp # End Source File # Begin Source File -SOURCE=.\event.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/event/event.rc b/samples/event/event.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/event/event.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/event/event_vc7.vcproj b/samples/event/event_vc7.vcproj index 88912c2015..1e7d45d87d 100644 --- a/samples/event/event_vc7.vcproj +++ b/samples/event/event_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/event/event_vc8.vcproj b/samples/event/event_vc8.vcproj index c894bb60dc..fff4f4ee1f 100644 --- a/samples/event/event_vc8.vcproj +++ b/samples/event/event_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/event/event_vc9.vcproj b/samples/event/event_vc9.vcproj index 61d383dfab..505652e5a8 100644 --- a/samples/event/event_vc9.vcproj +++ b/samples/event/event_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc index 9b01b55024..5a2b1d18ec 100644 --- a/samples/event/makefile.bcc +++ b/samples/event/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\event.ilf del $(OBJS)\event.ilf -if exist $(OBJS)\event.ils del $(OBJS)\event.ils -$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res +$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(EVENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_event.res + c0w32.obj $(EVENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_sample.res | +$(OBJS)\event_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\event_event.obj: .\event.cpp $(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) .\event.cpp -$(OBJS)\event_event.res: .\event.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\event.rc - diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc index 350fb95cbf..1129cb54f3 100644 --- a/samples/event/makefile.gcc +++ b/samples/event/makefile.gcc @@ -29,8 +29,8 @@ EVENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ - $(OBJS)\event_event.o \ - $(OBJS)\event_event_rc.o + $(OBJS)\event_sample_rc.o \ + $(OBJS)\event_event.o ### Conditionally set variables: ### @@ -218,15 +218,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\event.exe del $(OBJS)\event.exe -$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event_rc.o +$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_sample_rc.o $(CXX) -o $@ $(EVENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\event_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\event_event.o: ./event.cpp $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\event_event_rc.o: ./event.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index a33912989c..2eb79f0e4b 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -32,7 +32,7 @@ EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ EVENT_OBJECTS = \ $(OBJS)\event_event.obj EVENT_RESOURCES = \ - $(OBJS)\event_event.res + $(OBJS)\event_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb -$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res +$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(EVENT_OBJECTS) $(EVENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\event_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\event_event.obj: .\event.cpp $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp -$(OBJS)\event_event.res: .\event.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\event.rc - diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat index aca2c4bd49..8c5280eeec 100644 --- a/samples/event/makefile.wat +++ b/samples/event/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\event.exe del $(OBJS)\event.exe -$(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res +$(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_sample.res @%create $(OBJS)\event.lbc @%append $(OBJS)\event.lbc option quiet @%append $(OBJS)\event.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res @%append $(OBJS)\event.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\event.lbc library %i - @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res + @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_sample.res @for %i in () do @%append $(OBJS)\event.lbc option stack=%i wlink @$(OBJS)\event.lbc +$(OBJS)\event_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\event_event.obj : .AUTODEPEND .\event.cpp $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $< -$(OBJS)\event_event.res : .AUTODEPEND .\event.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 08e01bfab0..09f50fd878 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -47,9 +47,9 @@ FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ + $(__font___win32rc) \ $(__font_os2_lib_res) \ - font_font.o \ - $(__font___win32rc) + font_font.o ### Conditionally set variables: ### @@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \ @COND_PLATFORM_OS2_1@__font___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___font___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__font___win32rc = font_sample_rc.o @COND_PLATFORM_OS2_1@__font_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__font_app_Contents_PkgInfo___depname \ @@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__font___win32rc = font_font_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -174,12 +174,12 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) @COND_PLATFORM_MACOSX_1@font_bundle: $(____font_BUNDLE_TGT_REF_DEP) +font_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + font_font.o: $(srcdir)/font.cpp $(CXXC) -c -o $@ $(FONT_CXXFLAGS) $(srcdir)/font.cpp -font_font_rc.o: $(srcdir)/font.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/font/font.bkl b/samples/font/font.bkl index 16ec889b76..cb88a72e12 100644 --- a/samples/font/font.bkl +++ b/samples/font/font.bkl @@ -7,7 +7,6 @@ font.cpp core base - font.rc diff --git a/samples/font/font.cpp b/samples/font/font.cpp index e2d4200e57..cb036de8b7 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -302,7 +302,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) { m_fontSize = wxNORMAL_FONT->GetPointSize(); - SetIcon(wxIcon(sample_xpm)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; diff --git a/samples/font/font.dsp b/samples/font/font.dsp index 7c14346df4..3f9830634e 100644 --- a/samples/font/font.dsp +++ b/samples/font/font.dsp @@ -256,7 +256,7 @@ SOURCE=.\font.cpp # End Source File # Begin Source File -SOURCE=.\font.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/font/font.rc b/samples/font/font.rc deleted file mode 100644 index 55808f0e34..0000000000 --- a/samples/font/font.rc +++ /dev/null @@ -1,4 +0,0 @@ -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" - - diff --git a/samples/font/font_vc7.vcproj b/samples/font/font_vc7.vcproj index cef6fe271b..fb5eb5079e 100644 --- a/samples/font/font_vc7.vcproj +++ b/samples/font/font_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/font/font_vc8.vcproj b/samples/font/font_vc8.vcproj index 4d6091ce51..84c88c6b0b 100644 --- a/samples/font/font_vc8.vcproj +++ b/samples/font/font_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/font/font_vc9.vcproj b/samples/font/font_vc9.vcproj index 4acf8568c0..a47e293f50 100644 --- a/samples/font/font_vc9.vcproj +++ b/samples/font/font_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc index af145bacfb..b5c7e313aa 100644 --- a/samples/font/makefile.bcc +++ b/samples/font/makefile.bcc @@ -229,14 +229,14 @@ clean: -if exist $(OBJS)\font.ilf del $(OBJS)\font.ilf -if exist $(OBJS)\font.ils del $(OBJS)\font.ils -$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res +$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(FONT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_font.res + c0w32.obj $(FONT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_sample.res | +$(OBJS)\font_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\font_font.obj: .\font.cpp $(CXX) -q -c -P -o$@ $(FONT_CXXFLAGS) .\font.cpp -$(OBJS)\font_font.res: .\font.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\font.rc - diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc index 5b4ce7e7e3..b652a4e96d 100644 --- a/samples/font/makefile.gcc +++ b/samples/font/makefile.gcc @@ -28,8 +28,8 @@ FONT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ - $(OBJS)\font_font.o \ - $(OBJS)\font_font_rc.o + $(OBJS)\font_sample_rc.o \ + $(OBJS)\font_font.o ### Conditionally set variables: ### @@ -217,15 +217,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\font.exe del $(OBJS)\font.exe -$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o +$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_sample_rc.o $(CXX) -o $@ $(FONT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\font_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\font_font.o: ./font.cpp $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\font_font_rc.o: ./font.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index 4106543cee..ca10ef6340 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -32,7 +32,7 @@ FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ FONT_OBJECTS = \ $(OBJS)\font_font.obj FONT_RESOURCES = \ - $(OBJS)\font_font.res + $(OBJS)\font_sample.res ### Conditionally set variables: ### @@ -339,14 +339,14 @@ clean: -if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb -$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res +$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(FONT_OBJECTS) $(FONT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\font_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\font_font.obj: .\font.cpp $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp -$(OBJS)\font_font.res: .\font.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\font.rc - diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat index ff59cf49c6..3cefec7c3f 100644 --- a/samples/font/makefile.wat +++ b/samples/font/makefile.wat @@ -248,7 +248,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\font.exe del $(OBJS)\font.exe -$(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res +$(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_sample.res @%create $(OBJS)\font.lbc @%append $(OBJS)\font.lbc option quiet @%append $(OBJS)\font.lbc name $^@ @@ -256,13 +256,13 @@ $(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res @%append $(OBJS)\font.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\font.lbc library %i - @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res + @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_sample.res @for %i in () do @%append $(OBJS)\font.lbc option stack=%i wlink @$(OBJS)\font.lbc +$(OBJS)\font_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\font_font.obj : .AUTODEPEND .\font.cpp $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $< -$(OBJS)\font_font.res : .AUTODEPEND .\font.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/font/mondrian.ico b/samples/font/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zadv core base - demo.rc diff --git a/samples/help/help.dsp b/samples/help/help.dsp index 7a61119cfa..1010aa4315 100644 --- a/samples/help/help.dsp +++ b/samples/help/help.dsp @@ -256,7 +256,7 @@ SOURCE=.\demo.cpp # End Source File # Begin Source File -SOURCE=.\demo.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # Begin Group "Header Files" diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj index 30c239ba50..50418f2da7 100644 --- a/samples/help/help_vc7.vcproj +++ b/samples/help/help_vc7.vcproj @@ -558,7 +558,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj index 5889047887..c4d03ff988 100644 --- a/samples/help/help_vc8.vcproj +++ b/samples/help/help_vc8.vcproj @@ -824,7 +824,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/help/help_vc9.vcproj b/samples/help/help_vc9.vcproj index aa4225b191..761b4feaba 100644 --- a/samples/help/help_vc9.vcproj +++ b/samples/help/help_vc9.vcproj @@ -796,7 +796,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc index d4041f4e96..19fb55ee55 100644 --- a/samples/help/makefile.bcc +++ b/samples/help/makefile.bcc @@ -237,9 +237,9 @@ clean: -if exist $(OBJS)\help.ilf del $(OBJS)\help.ilf -if exist $(OBJS)\help.ils del $(OBJS)\help.ils -$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res +$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_demo.res + c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_sample.res | data: @@ -250,9 +250,9 @@ data_doc: if not exist $(OBJS)\doc mkdir $(OBJS)\doc for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc +$(OBJS)\help_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\help_demo.obj: .\demo.cpp $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) .\demo.cpp -$(OBJS)\help_demo.res: .\demo.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\demo.rc - diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index c10ecdabee..862ca6f951 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -28,8 +28,8 @@ HELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ - $(OBJS)\help_demo.o \ - $(OBJS)\help_demo_rc.o + $(OBJS)\help_sample_rc.o \ + $(OBJS)\help_demo.o ### Conditionally set variables: ### @@ -225,7 +225,7 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\help.exe del $(OBJS)\help.exe -$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o +$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_sample_rc.o $(CXX) -o $@ $(HELP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: @@ -236,12 +236,12 @@ data_doc: if not exist $(OBJS)\doc mkdir $(OBJS)\doc for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc +$(OBJS)\help_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\help_demo.o: ./demo.cpp $(CXX) -c -o $@ $(HELP_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\help_demo_rc.o: ./demo.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean data data_doc diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 278ef96eff..e811f1fa51 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -32,7 +32,7 @@ HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ HELP_OBJECTS = \ $(OBJS)\help_demo.obj HELP_RESOURCES = \ - $(OBJS)\help_demo.res + $(OBJS)\help_sample.res ### Conditionally set variables: ### @@ -347,7 +347,7 @@ clean: -if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb -$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res +$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(HELP_OBJECTS) $(HELP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -360,9 +360,9 @@ data_doc: if not exist $(OBJS)\doc mkdir $(OBJS)\doc for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc +$(OBJS)\help_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\help_demo.obj: .\demo.cpp $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp -$(OBJS)\help_demo.res: .\demo.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\demo.rc - diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index 4566799699..08180aca8f 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -258,7 +258,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\help.exe del $(OBJS)\help.exe -$(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res +$(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_sample.res @%create $(OBJS)\help.lbc @%append $(OBJS)\help.lbc option quiet @%append $(OBJS)\help.lbc name $^@ @@ -266,7 +266,7 @@ $(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res @%append $(OBJS)\help.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\help.lbc library %i - @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res + @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_sample.res @for %i in () do @%append $(OBJS)\help.lbc option stack=%i wlink @$(OBJS)\help.lbc @@ -278,9 +278,9 @@ data_doc : .SYMBOLIC if not exist $(OBJS)\doc mkdir $(OBJS)\doc for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc +$(OBJS)\help_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $< -$(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/help/mondrian.ico b/samples/help/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zhtml core base - htlbox.rc diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp index af34173fa0..091a1d77aa 100644 --- a/samples/htlbox/htlbox.cpp +++ b/samples/htlbox/htlbox.cpp @@ -241,7 +241,7 @@ MyFrame::MyFrame() wxDefaultPosition, wxSize(500, 500)) { // set the frame icon - SetIcon(wxIcon(sample_xpm)); + SetIcon(wxICON(sample)); #if wxUSE_MENUS // create a menu bar diff --git a/samples/htlbox/htlbox.dsp b/samples/htlbox/htlbox.dsp index 9fd1c3b37e..2d32fd46e2 100644 --- a/samples/htlbox/htlbox.dsp +++ b/samples/htlbox/htlbox.dsp @@ -256,7 +256,7 @@ SOURCE=.\htlbox.cpp # End Source File # Begin Source File -SOURCE=.\htlbox.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/htlbox/htlbox.rc b/samples/htlbox/htlbox.rc deleted file mode 100644 index 74b8e3f417..0000000000 --- a/samples/htlbox/htlbox.rc +++ /dev/null @@ -1,2 +0,0 @@ -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" diff --git a/samples/htlbox/htlbox_vc7.vcproj b/samples/htlbox/htlbox_vc7.vcproj index 4cd4b7ba2c..2922968fa9 100644 --- a/samples/htlbox/htlbox_vc7.vcproj +++ b/samples/htlbox/htlbox_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/htlbox/htlbox_vc8.vcproj b/samples/htlbox/htlbox_vc8.vcproj index cb83bcfb6e..4ece7a197e 100644 --- a/samples/htlbox/htlbox_vc8.vcproj +++ b/samples/htlbox/htlbox_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/htlbox/htlbox_vc9.vcproj b/samples/htlbox/htlbox_vc9.vcproj index 8381557834..6f6e1e2da7 100644 --- a/samples/htlbox/htlbox_vc9.vcproj +++ b/samples/htlbox/htlbox_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc index 5b3c815e65..55a89e9cde 100644 --- a/samples/htlbox/makefile.bcc +++ b/samples/htlbox/makefile.bcc @@ -233,14 +233,14 @@ clean: -if exist $(OBJS)\htlbox.ilf del $(OBJS)\htlbox.ilf -if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils -$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res +$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_htlbox.res + c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_sample.res | +$(OBJS)\htlbox_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp $(CXX) -q -c -P -o$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp -$(OBJS)\htlbox_htlbox.res: .\htlbox.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\htlbox.rc - diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc index 346341964d..92ac3978b5 100644 --- a/samples/htlbox/makefile.gcc +++ b/samples/htlbox/makefile.gcc @@ -29,8 +29,8 @@ HTLBOX_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ - $(OBJS)\htlbox_htlbox.o \ - $(OBJS)\htlbox_htlbox_rc.o + $(OBJS)\htlbox_sample_rc.o \ + $(OBJS)\htlbox_htlbox.o ### Conditionally set variables: ### @@ -222,15 +222,15 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe -$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox_rc.o +$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample_rc.o $(CXX) -o $@ $(HTLBOX_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\htlbox_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\htlbox_htlbox.o: ./htlbox.cpp $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\htlbox_htlbox_rc.o: ./htlbox.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index 3a375352cc..bc63ae4ed8 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -32,7 +32,7 @@ HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ HTLBOX_OBJECTS = \ $(OBJS)\htlbox_htlbox.obj HTLBOX_RESOURCES = \ - $(OBJS)\htlbox_htlbox.res + $(OBJS)\htlbox_sample.res ### Conditionally set variables: ### @@ -343,14 +343,14 @@ clean: -if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb -$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res +$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(HTLBOX_OBJECTS) $(HTLBOX_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << +$(OBJS)\htlbox_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp -$(OBJS)\htlbox_htlbox.res: .\htlbox.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\htlbox.rc - diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat index f4a16b2e45..0d0790e570 100644 --- a/samples/htlbox/makefile.wat +++ b/samples/htlbox/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe -$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res +$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample.res @%create $(OBJS)\htlbox.lbc @%append $(OBJS)\htlbox.lbc option quiet @%append $(OBJS)\htlbox.lbc name $^@ @@ -261,13 +261,13 @@ $(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res @%append $(OBJS)\htlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htlbox.lbc library %i - @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res + @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_sample.res @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i wlink @$(OBJS)\htlbox.lbc +$(OBJS)\htlbox_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\htlbox_htlbox.obj : .AUTODEPEND .\htlbox.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $< -$(OBJS)\htlbox_htlbox.res : .AUTODEPEND .\htlbox.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/htlbox/mondrian.ico b/samples/htlbox/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zhtml core base - about.rc diff --git a/samples/html/about/about.dsp b/samples/html/about/about.dsp index 8758d1cebf..3a33cc0b4c 100644 --- a/samples/html/about/about.dsp +++ b/samples/html/about/about.dsp @@ -256,7 +256,7 @@ SOURCE=.\about.cpp # End Source File # Begin Source File -SOURCE=.\about.rc +SOURCE=.\..\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/html/about/about.rc b/samples/html/about/about.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/html/about/about.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/html/about/about_vc7.vcproj b/samples/html/about/about_vc7.vcproj index 5832fdc942..759a133554 100644 --- a/samples/html/about/about_vc7.vcproj +++ b/samples/html/about/about_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/about/about_vc8.vcproj b/samples/html/about/about_vc8.vcproj index 2167a7c857..96e86bd274 100644 --- a/samples/html/about/about_vc8.vcproj +++ b/samples/html/about/about_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/about/about_vc9.vcproj b/samples/html/about/about_vc9.vcproj index c82f1638c8..070ef27273 100644 --- a/samples/html/about/about_vc9.vcproj +++ b/samples/html/about/about_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc index b881589482..89deacc020 100644 --- a/samples/html/about/makefile.bcc +++ b/samples/html/about/makefile.bcc @@ -233,18 +233,18 @@ clean: -if exist $(OBJS)\about.ilf del $(OBJS)\about.ilf -if exist $(OBJS)\about.ils del $(OBJS)\about.ils -$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res +$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(ABOUT_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_about.res + c0w32.obj $(ABOUT_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_sample.res | data_files: if not exist $(OBJS)\data mkdir $(OBJS)\data for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data +$(OBJS)\about_sample.res: .\..\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc + $(OBJS)\about_about.obj: .\about.cpp $(CXX) -q -c -P -o$@ $(ABOUT_CXXFLAGS) .\about.cpp -$(OBJS)\about_about.res: .\about.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\about.rc - diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc index 0f9da36d90..b5bc6bc24f 100644 --- a/samples/html/about/makefile.gcc +++ b/samples/html/about/makefile.gcc @@ -29,8 +29,8 @@ ABOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = \ - $(OBJS)\about_about.o \ - $(OBJS)\about_about_rc.o + $(OBJS)\about_sample_rc.o \ + $(OBJS)\about_about.o ### Conditionally set variables: ### @@ -222,19 +222,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\about.exe del $(OBJS)\about.exe -$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o +$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample_rc.o $(CXX) -o $@ $(ABOUT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data_files: if not exist $(OBJS)\data mkdir $(OBJS)\data for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data +$(OBJS)\about_sample_rc.o: ./../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + $(OBJS)\about_about.o: ./about.cpp $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\about_about_rc.o: ./about.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - .PHONY: all clean data_files diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index cf468eb250..016f1e0148 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -32,7 +32,7 @@ ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ ABOUT_OBJECTS = \ $(OBJS)\about_about.obj ABOUT_RESOURCES = \ - $(OBJS)\about_about.res + $(OBJS)\about_sample.res ### Conditionally set variables: ### @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb -$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res +$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(ABOUT_OBJECTS) $(ABOUT_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -352,9 +352,9 @@ data_files: if not exist $(OBJS)\data mkdir $(OBJS)\data for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data +$(OBJS)\about_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\about_about.obj: .\about.cpp $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp -$(OBJS)\about_about.res: .\about.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\about.rc - diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat index a09ac1c118..59e5ac8293 100644 --- a/samples/html/about/makefile.wat +++ b/samples/html/about/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\about.exe del $(OBJS)\about.exe -$(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res +$(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_sample.res @%create $(OBJS)\about.lbc @%append $(OBJS)\about.lbc option quiet @%append $(OBJS)\about.lbc name $^@ @@ -261,7 +261,7 @@ $(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res @%append $(OBJS)\about.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\about.lbc library %i - @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res + @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_sample.res @for %i in () do @%append $(OBJS)\about.lbc option stack=%i wlink @$(OBJS)\about.lbc @@ -269,9 +269,9 @@ data_files : .SYMBOLIC if not exist $(OBJS)\data mkdir $(OBJS)\data for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data +$(OBJS)\about_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\about_about.obj : .AUTODEPEND .\about.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $< -$(OBJS)\about_about.res : .AUTODEPEND .\about.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index e036696bb6..ea35b9801a 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -48,9 +48,9 @@ HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HTMLHELP_OBJECTS = \ + $(__htmlhelp___win32rc) \ $(__htmlhelp_os2_lib_res) \ - htmlhelp_help.o \ - $(__htmlhelp___win32rc) + htmlhelp_help.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__htmlhelp___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__htmlhelp___win32rc = htmlhelp_sample_rc.o @COND_PLATFORM_OS2_1@__htmlhelp_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__htmlhelp_app_Contents_PkgInfo___depname \ @@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__htmlhelp___win32rc = htmlhelp_help_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -190,12 +190,12 @@ data: esac; \ done +htmlhelp_sample_rc.o: $(srcdir)/../../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + htmlhelp_help.o: $(srcdir)/help.cpp $(CXXC) -c -o $@ $(HTMLHELP_CXXFLAGS) $(srcdir)/help.cpp -htmlhelp_help_rc.o: $(srcdir)/help.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/html/help/help.bkl b/samples/html/help/help.bkl index f6b883e124..58d6bab169 100644 --- a/samples/html/help/help.bkl +++ b/samples/html/help/help.bkl @@ -10,7 +10,6 @@ html core base - help.rc diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp index ae10a2f892..0325b87dcc 100644 --- a/samples/html/help/help.dsp +++ b/samples/html/help/help.dsp @@ -256,7 +256,7 @@ SOURCE=.\help.cpp # End Source File # Begin Source File -SOURCE=.\help.rc +SOURCE=.\..\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/html/help/help.rc b/samples/html/help/help.rc deleted file mode 100644 index b86c4e2265..0000000000 --- a/samples/html/help/help.rc +++ /dev/null @@ -1 +0,0 @@ -#include "wx/msw/wx.rc" diff --git a/samples/html/help/help_vc7.vcproj b/samples/html/help/help_vc7.vcproj index 560e8257ad..7182f54d4c 100644 --- a/samples/html/help/help_vc7.vcproj +++ b/samples/html/help/help_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/help/help_vc8.vcproj b/samples/html/help/help_vc8.vcproj index e8e9d43020..bd5bdecc8e 100644 --- a/samples/html/help/help_vc8.vcproj +++ b/samples/html/help/help_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/help/help_vc9.vcproj b/samples/html/help/help_vc9.vcproj index d62b57a62d..d364101997 100644 --- a/samples/html/help/help_vc9.vcproj +++ b/samples/html/help/help_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc index fa29ed6fce..5f48fc9036 100644 --- a/samples/html/help/makefile.bcc +++ b/samples/html/help/makefile.bcc @@ -233,18 +233,18 @@ clean: -if exist $(OBJS)\htmlhelp.ilf del $(OBJS)\htmlhelp.ilf -if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils -$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res +$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_help.res + c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_sample.res | data: if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles +$(OBJS)\htmlhelp_sample.res: .\..\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc + $(OBJS)\htmlhelp_help.obj: .\help.cpp $(CXX) -q -c -P -o$@ $(HTMLHELP_CXXFLAGS) .\help.cpp -$(OBJS)\htmlhelp_help.res: .\help.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\help.rc - diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc index 426cf49755..d7b9f6dd96 100644 --- a/samples/html/help/makefile.gcc +++ b/samples/html/help/makefile.gcc @@ -29,8 +29,8 @@ HTMLHELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) HTMLHELP_OBJECTS = \ - $(OBJS)\htmlhelp_help.o \ - $(OBJS)\htmlhelp_help_rc.o + $(OBJS)\htmlhelp_sample_rc.o \ + $(OBJS)\htmlhelp_help.o ### Conditionally set variables: ### @@ -222,19 +222,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe -$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help_rc.o +$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample_rc.o $(CXX) -o $@ $(HTMLHELP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles for %%f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%%f copy .\helpfiles\%%f $(OBJS)\helpfiles +$(OBJS)\htmlhelp_sample_rc.o: ./../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + $(OBJS)\htmlhelp_help.o: ./help.cpp $(CXX) -c -o $@ $(HTMLHELP_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\htmlhelp_help_rc.o: ./help.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index a6f4f58181..af26d05a35 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -32,7 +32,7 @@ HTMLHELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ HTMLHELP_OBJECTS = \ $(OBJS)\htmlhelp_help.obj HTMLHELP_RESOURCES = \ - $(OBJS)\htmlhelp_help.res + $(OBJS)\htmlhelp_sample.res ### Conditionally set variables: ### @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb -$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res +$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(HTMLHELP_OBJECTS) $(HTMLHELP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -352,9 +352,9 @@ data: if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles +$(OBJS)\htmlhelp_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\htmlhelp_help.obj: .\help.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp -$(OBJS)\htmlhelp_help.res: .\help.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\help.rc - diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat index 6f75a1ae7d..b65c2ed398 100644 --- a/samples/html/help/makefile.wat +++ b/samples/html/help/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe -$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res +$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample.res @%create $(OBJS)\htmlhelp.lbc @%append $(OBJS)\htmlhelp.lbc option quiet @%append $(OBJS)\htmlhelp.lbc name $^@ @@ -261,7 +261,7 @@ $(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res @%append $(OBJS)\htmlhelp.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlhelp.lbc library %i - @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res + @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_sample.res @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i wlink @$(OBJS)\htmlhelp.lbc @@ -269,9 +269,9 @@ data : .SYMBOLIC if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles +$(OBJS)\htmlhelp_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\htmlhelp_help.obj : .AUTODEPEND .\help.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $< -$(OBJS)\htmlhelp_help.res : .AUTODEPEND .\help.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 5b85c947a9..cccfc89ce4 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -48,9 +48,9 @@ HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ + $(__helpview___win32rc) \ $(__helpview_os2_lib_res) \ - helpview_helpview.o \ - $(__helpview___win32rc) + helpview_helpview.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_sample_rc.o @COND_PLATFORM_OS2_1@__helpview_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \ @@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_helpview_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -190,12 +190,12 @@ data: esac; \ done +helpview_sample_rc.o: $(srcdir)/../../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + helpview_helpview.o: $(srcdir)/helpview.cpp $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $(srcdir)/helpview.cpp -helpview_helpview_rc.o: $(srcdir)/helpview.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/html/helpview/helpview.bkl b/samples/html/helpview/helpview.bkl index a04699656e..8803081849 100644 --- a/samples/html/helpview/helpview.bkl +++ b/samples/html/helpview/helpview.bkl @@ -10,7 +10,6 @@ html core base - helpview.rc diff --git a/samples/html/helpview/helpview.dsp b/samples/html/helpview/helpview.dsp index c9d0401359..abc50e11f7 100644 --- a/samples/html/helpview/helpview.dsp +++ b/samples/html/helpview/helpview.dsp @@ -256,7 +256,7 @@ SOURCE=.\helpview.cpp # End Source File # Begin Source File -SOURCE=.\helpview.rc +SOURCE=.\..\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/html/helpview/helpview.ico b/samples/html/helpview/helpview.ico deleted file mode 100644 index cbf22233727e5bffd15eb565c73a90d29bb3e9de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1078 zcmcgrIc~!+5FFbCm@4uQtSay?tb%~u`7162P#swWkUBjfU(r)srgTRYhM8H?3Y5U< zlB_h`UCt~eUcdrNl;xUU;e83b09dbczFh#%D`3mMlBfvLiFs-tn zLd5hUMu`YM(k0D5nD$>kQg`2S)6Et72y>W8^gckD*Uy^Tx#lF2dsQ7mXj@8*IZ&jJ z&beUqiLoJsj`3nc*IFexX%|Q9Yz)+Jbm6sSBg>J>V{DU%xthw!%aCd+cX{<@<$*Ms zMg*z+B0128Fk1PBPboBi-0~NaJa;{H*4ie=x$UOe%{%`f=A<9n8@mf)5#tRzqKH>u zL##%Eb4xgL#qKERH$%pby4?-nLKAY_ey}Zg_KA|1&iTOjv3Y>+FP-yBwv!uLxfGbH zmkm~CkDgm&Ol{EjOnI(AU(*{XNyVqMg3hVb8B?Y4$R<-M&2hSKR|kw6;G%&u@A*K^ V-}&U&2i|><_XRc7jyvGSx(^uT2onGR diff --git a/samples/html/helpview/helpview.rc b/samples/html/helpview/helpview.rc deleted file mode 100644 index d43931e596..0000000000 --- a/samples/html/helpview/helpview.rc +++ /dev/null @@ -1,5 +0,0 @@ -/* We need this to get the right default icon. */ -aaaaaa ICON "helpview.ico" -helpview ICON "helpview.ico" - -#include "wx/msw/wx.rc" diff --git a/samples/html/helpview/helpview_vc7.vcproj b/samples/html/helpview/helpview_vc7.vcproj index 5906e06514..82fe528857 100644 --- a/samples/html/helpview/helpview_vc7.vcproj +++ b/samples/html/helpview/helpview_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/helpview/helpview_vc8.vcproj b/samples/html/helpview/helpview_vc8.vcproj index 6020078bef..23c9122c09 100644 --- a/samples/html/helpview/helpview_vc8.vcproj +++ b/samples/html/helpview/helpview_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/helpview/helpview_vc9.vcproj b/samples/html/helpview/helpview_vc9.vcproj index 632cb7a94e..ba66e08c80 100644 --- a/samples/html/helpview/helpview_vc9.vcproj +++ b/samples/html/helpview/helpview_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc index 77d62e8ec2..181850c3f8 100644 --- a/samples/html/helpview/makefile.bcc +++ b/samples/html/helpview/makefile.bcc @@ -233,18 +233,18 @@ clean: -if exist $(OBJS)\helpview.ilf del $(OBJS)\helpview.ilf -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils -$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res +$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res + c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\helpview_sample.res: .\..\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc + $(OBJS)\helpview_helpview.obj: .\helpview.cpp $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp -$(OBJS)\helpview_helpview.res: .\helpview.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\helpview.rc - diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc index 58aa8395cf..9207ed4345 100644 --- a/samples/html/helpview/makefile.gcc +++ b/samples/html/helpview/makefile.gcc @@ -29,8 +29,8 @@ HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ - $(OBJS)\helpview_helpview.o \ - $(OBJS)\helpview_helpview_rc.o + $(OBJS)\helpview_sample_rc.o \ + $(OBJS)\helpview_helpview.o ### Conditionally set variables: ### @@ -222,19 +222,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe -$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o +$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample_rc.o $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\helpview_sample_rc.o: ./../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + $(OBJS)\helpview_helpview.o: ./helpview.cpp $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\helpview_helpview_rc.o: ./helpview.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index 80c08510a6..e8aa323360 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -32,7 +32,7 @@ HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.obj HELPVIEW_RESOURCES = \ - $(OBJS)\helpview_helpview.res + $(OBJS)\helpview_sample.res ### Conditionally set variables: ### @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb -$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res +$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -352,9 +352,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\helpview_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\helpview_helpview.obj: .\helpview.cpp $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp -$(OBJS)\helpview_helpview.res: .\helpview.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc - diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat index bce8d72a02..6acac408df 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe -$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res +$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample.res @%create $(OBJS)\helpview.lbc @%append $(OBJS)\helpview.lbc option quiet @%append $(OBJS)\helpview.lbc name $^@ @@ -261,7 +261,7 @@ $(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i - @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res + @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_sample.res @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i wlink @$(OBJS)\helpview.lbc @@ -269,9 +269,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\helpview_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< -$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - diff --git a/samples/html/helpview/mondrian.ico b/samples/html/helpview/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zhtml core base - printing.rc diff --git a/samples/html/printing/printing.dsp b/samples/html/printing/printing.dsp index ac1337c951..8089a9b766 100644 --- a/samples/html/printing/printing.dsp +++ b/samples/html/printing/printing.dsp @@ -256,7 +256,7 @@ SOURCE=.\printing.cpp # End Source File # Begin Source File -SOURCE=.\printing.rc +SOURCE=.\..\..\..\samples\sample.rc # End Source File # End Group # End Target diff --git a/samples/html/printing/printing.rc b/samples/html/printing/printing.rc deleted file mode 100644 index 7655c62a4c..0000000000 --- a/samples/html/printing/printing.rc +++ /dev/null @@ -1,3 +0,0 @@ -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" - diff --git a/samples/html/printing/printing_vc7.vcproj b/samples/html/printing/printing_vc7.vcproj index 77620359ab..a185b8ec42 100644 --- a/samples/html/printing/printing_vc7.vcproj +++ b/samples/html/printing/printing_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/printing/printing_vc8.vcproj b/samples/html/printing/printing_vc8.vcproj index 3240c0de1f..d02b675317 100644 --- a/samples/html/printing/printing_vc8.vcproj +++ b/samples/html/printing/printing_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/printing/printing_vc9.vcproj b/samples/html/printing/printing_vc9.vcproj index 7d9005e41b..832b88d477 100644 --- a/samples/html/printing/printing_vc9.vcproj +++ b/samples/html/printing/printing_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 69f9b1e16f..8ea0a59387 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -48,9 +48,9 @@ TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ + $(__test___win32rc) \ $(__test_os2_lib_res) \ - test_test.o \ - $(__test___win32rc) + test_test.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \ @COND_PLATFORM_OS2_1@__test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o @COND_PLATFORM_OS2_1@__test_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \ @@ -113,7 +114,6 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__test___win32rc = test_test_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -193,12 +193,12 @@ data: esac; \ done +test_sample_rc.o: $(srcdir)/../../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + test_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp -test_test_rc.o: $(srcdir)/test.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc index ec111dd02f..c5bd9f08f3 100644 --- a/samples/html/test/makefile.bcc +++ b/samples/html/test/makefile.bcc @@ -237,18 +237,18 @@ clean: -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf -if exist $(OBJS)\test.ils del $(OBJS)\test.ils -$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res +$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_test.res + c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\test_sample.res: .\..\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc + $(OBJS)\test_test.obj: .\test.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp -$(OBJS)\test_test.res: .\test.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\test.rc - diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc index ae1aafe880..62a4c85f00 100644 --- a/samples/html/test/makefile.gcc +++ b/samples/html/test/makefile.gcc @@ -28,8 +28,8 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ - $(OBJS)\test_test.o \ - $(OBJS)\test_test_rc.o + $(OBJS)\test_sample_rc.o \ + $(OBJS)\test_test.o ### Conditionally set variables: ### @@ -225,19 +225,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\test.exe del $(OBJS)\test.exe -$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o +$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample_rc.o $(CXX) -o $@ $(TEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\test_sample_rc.o: ./../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + $(OBJS)\test_test.o: ./test.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\test_test_rc.o: ./test.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index 824cbc765b..8d289e5a57 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -32,7 +32,7 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ TEST_OBJECTS = \ $(OBJS)\test_test.obj TEST_RESOURCES = \ - $(OBJS)\test_test.res + $(OBJS)\test_sample.res ### Conditionally set variables: ### @@ -347,7 +347,7 @@ clean: -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb -$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res +$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(TEST_OBJECTS) $(TEST_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -356,9 +356,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\test_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\test_test.obj: .\test.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp -$(OBJS)\test_test.res: .\test.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\test.rc - diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat index 6f8ac24bd5..9c5bbb8ac8 100644 --- a/samples/html/test/makefile.wat +++ b/samples/html/test/makefile.wat @@ -258,7 +258,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\test.exe del $(OBJS)\test.exe -$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res +$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_sample.res @%create $(OBJS)\test.lbc @%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc name $^@ @@ -266,7 +266,7 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\test.lbc library %i - @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res + @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res @for %i in () do @%append $(OBJS)\test.lbc option stack=%i wlink @$(OBJS)\test.lbc @@ -274,9 +274,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\test_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< -$(OBJS)\test_test.res : .AUTODEPEND .\test.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - diff --git a/samples/html/test/test.bkl b/samples/html/test/test.bkl index c3fc72713b..66807e9797 100644 --- a/samples/html/test/test.bkl +++ b/samples/html/test/test.bkl @@ -11,7 +11,6 @@ core net base - test.rc diff --git a/samples/html/test/test.dsp b/samples/html/test/test.dsp index e291f1d14a..e293cdc62b 100644 --- a/samples/html/test/test.dsp +++ b/samples/html/test/test.dsp @@ -252,11 +252,11 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\test.cpp +SOURCE=.\..\..\..\samples\sample.rc # End Source File # Begin Source File -SOURCE=.\test.rc +SOURCE=.\test.cpp # End Source File # End Group # End Target diff --git a/samples/html/test/test.rc b/samples/html/test/test.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/html/test/test.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/html/test/test_vc7.vcproj b/samples/html/test/test_vc7.vcproj index 89a80e121b..5c0ca912fc 100644 --- a/samples/html/test/test_vc7.vcproj +++ b/samples/html/test/test_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/test/test_vc8.vcproj b/samples/html/test/test_vc8.vcproj index a780b5b7e6..0430a3faa5 100644 --- a/samples/html/test/test_vc8.vcproj +++ b/samples/html/test/test_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/test/test_vc9.vcproj b/samples/html/test/test_vc9.vcproj index 7b0073565a..f0ee711268 100644 --- a/samples/html/test/test_vc9.vcproj +++ b/samples/html/test/test_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 34b2ca0f3a..86d6df926e 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -48,9 +48,9 @@ VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ + $(__virtual___win32rc) \ $(__virtual_os2_lib_res) \ - virtual_virtual.o \ - $(__virtual___win32rc) + virtual_virtual.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__virtual___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_sample_rc.o @COND_PLATFORM_OS2_1@__virtual_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__virtual_app_Contents_PkgInfo___depname \ @@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_virtual_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -190,12 +190,12 @@ data: esac; \ done +virtual_sample_rc.o: $(srcdir)/../../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + virtual_virtual.o: $(srcdir)/virtual.cpp $(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $(srcdir)/virtual.cpp -virtual_virtual_rc.o: $(srcdir)/virtual.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc index c612334eea..67597b2911 100644 --- a/samples/html/virtual/makefile.bcc +++ b/samples/html/virtual/makefile.bcc @@ -233,18 +233,18 @@ clean: -if exist $(OBJS)\virtual.ilf del $(OBJS)\virtual.ilf -if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils -$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res +$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_virtual.res + c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\virtual_sample.res: .\..\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc + $(OBJS)\virtual_virtual.obj: .\virtual.cpp $(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp -$(OBJS)\virtual_virtual.res: .\virtual.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\virtual.rc - diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc index 874f4b5850..5f23ea8d0c 100644 --- a/samples/html/virtual/makefile.gcc +++ b/samples/html/virtual/makefile.gcc @@ -29,8 +29,8 @@ VIRTUAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ - $(OBJS)\virtual_virtual.o \ - $(OBJS)\virtual_virtual_rc.o + $(OBJS)\virtual_sample_rc.o \ + $(OBJS)\virtual_virtual.o ### Conditionally set variables: ### @@ -222,19 +222,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe -$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o +$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample_rc.o $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\virtual_sample_rc.o: ./../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + $(OBJS)\virtual_virtual.o: ./virtual.cpp $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\virtual_virtual_rc.o: ./virtual.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index e6b1eab61c..07b3f6c3fb 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -32,7 +32,7 @@ VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ VIRTUAL_OBJECTS = \ $(OBJS)\virtual_virtual.obj VIRTUAL_RESOURCES = \ - $(OBJS)\virtual_virtual.res + $(OBJS)\virtual_sample.res ### Conditionally set variables: ### @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb -$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res +$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(VIRTUAL_OBJECTS) $(VIRTUAL_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -352,9 +352,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\virtual_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\virtual_virtual.obj: .\virtual.cpp $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp -$(OBJS)\virtual_virtual.res: .\virtual.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\virtual.rc - diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat index 2666fec756..56ba609202 100644 --- a/samples/html/virtual/makefile.wat +++ b/samples/html/virtual/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe -$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res +$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample.res @%create $(OBJS)\virtual.lbc @%append $(OBJS)\virtual.lbc option quiet @%append $(OBJS)\virtual.lbc name $^@ @@ -261,7 +261,7 @@ $(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res @%append $(OBJS)\virtual.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\virtual.lbc library %i - @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res + @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_sample.res @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i wlink @$(OBJS)\virtual.lbc @@ -269,9 +269,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\virtual_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\virtual_virtual.obj : .AUTODEPEND .\virtual.cpp $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $< -$(OBJS)\virtual_virtual.res : .AUTODEPEND .\virtual.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - diff --git a/samples/html/virtual/virtual.bkl b/samples/html/virtual/virtual.bkl index 10c045e6a6..c4ea69452a 100644 --- a/samples/html/virtual/virtual.bkl +++ b/samples/html/virtual/virtual.bkl @@ -10,7 +10,6 @@ html core base - virtual.rc diff --git a/samples/html/virtual/virtual.dsp b/samples/html/virtual/virtual.dsp index b15b61eff5..d40518babc 100644 --- a/samples/html/virtual/virtual.dsp +++ b/samples/html/virtual/virtual.dsp @@ -252,11 +252,11 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\virtual.cpp +SOURCE=.\..\..\..\samples\sample.rc # End Source File # Begin Source File -SOURCE=.\virtual.rc +SOURCE=.\virtual.cpp # End Source File # End Group # End Target diff --git a/samples/html/virtual/virtual.rc b/samples/html/virtual/virtual.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/html/virtual/virtual.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/html/virtual/virtual_vc7.vcproj b/samples/html/virtual/virtual_vc7.vcproj index 85b21b9f96..534819d8bd 100644 --- a/samples/html/virtual/virtual_vc7.vcproj +++ b/samples/html/virtual/virtual_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/virtual/virtual_vc8.vcproj b/samples/html/virtual/virtual_vc8.vcproj index dcb547723b..3e30647dd0 100644 --- a/samples/html/virtual/virtual_vc8.vcproj +++ b/samples/html/virtual/virtual_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/virtual/virtual_vc9.vcproj b/samples/html/virtual/virtual_vc9.vcproj index 88a2a42933..8a766bae79 100644 --- a/samples/html/virtual/virtual_vc9.vcproj +++ b/samples/html/virtual/virtual_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 8677c5983e..3b351797c0 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -48,9 +48,9 @@ WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ + $(__widget___win32rc) \ $(__widget_os2_lib_res) \ - widget_widget.o \ - $(__widget___win32rc) + widget_widget.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep @COND_PLATFORM_OS2_1@__widget___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widget___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__widget___win32rc = widget_sample_rc.o @COND_PLATFORM_OS2_1@__widget_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__widget_app_Contents_PkgInfo___depname \ @@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__widget___win32rc = widget_widget_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -190,12 +190,12 @@ data: esac; \ done +widget_sample_rc.o: $(srcdir)/../../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + widget_widget.o: $(srcdir)/widget.cpp $(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $(srcdir)/widget.cpp -widget_widget_rc.o: $(srcdir)/widget.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc index c23716f3e5..a2ff875143 100644 --- a/samples/html/widget/makefile.bcc +++ b/samples/html/widget/makefile.bcc @@ -233,18 +233,18 @@ clean: -if exist $(OBJS)\widget.ilf del $(OBJS)\widget.ilf -if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils -$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res +$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(WIDGET_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_widget.res + c0w32.obj $(WIDGET_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\widget_sample.res: .\..\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc + $(OBJS)\widget_widget.obj: .\widget.cpp $(CXX) -q -c -P -o$@ $(WIDGET_CXXFLAGS) .\widget.cpp -$(OBJS)\widget_widget.res: .\widget.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\widget.rc - diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc index 26dfed954d..abac600b5a 100644 --- a/samples/html/widget/makefile.gcc +++ b/samples/html/widget/makefile.gcc @@ -29,8 +29,8 @@ WIDGET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ - $(OBJS)\widget_widget.o \ - $(OBJS)\widget_widget_rc.o + $(OBJS)\widget_sample_rc.o \ + $(OBJS)\widget_widget.o ### Conditionally set variables: ### @@ -222,19 +222,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe -$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget_rc.o +$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample_rc.o $(CXX) -o $@ $(WIDGET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\widget_sample_rc.o: ./../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + $(OBJS)\widget_widget.o: ./widget.cpp $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\widget_widget_rc.o: ./widget.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index 20511cd18c..9fa57087bf 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -32,7 +32,7 @@ WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ WIDGET_OBJECTS = \ $(OBJS)\widget_widget.obj WIDGET_RESOURCES = \ - $(OBJS)\widget_widget.res + $(OBJS)\widget_sample.res ### Conditionally set variables: ### @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb -$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res +$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(WIDGET_OBJECTS) $(WIDGET_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -352,9 +352,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\widget_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\widget_widget.obj: .\widget.cpp $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp -$(OBJS)\widget_widget.res: .\widget.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\widget.rc - diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat index 143142993b..33ecfd3494 100644 --- a/samples/html/widget/makefile.wat +++ b/samples/html/widget/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe -$(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res +$(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_sample.res @%create $(OBJS)\widget.lbc @%append $(OBJS)\widget.lbc option quiet @%append $(OBJS)\widget.lbc name $^@ @@ -261,7 +261,7 @@ $(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res @%append $(OBJS)\widget.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widget.lbc library %i - @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res + @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_sample.res @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i wlink @$(OBJS)\widget.lbc @@ -269,9 +269,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\widget_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\widget_widget.obj : .AUTODEPEND .\widget.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $< -$(OBJS)\widget_widget.res : .AUTODEPEND .\widget.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - diff --git a/samples/html/widget/widget.bkl b/samples/html/widget/widget.bkl index 82e8e709ca..0abefd62df 100644 --- a/samples/html/widget/widget.bkl +++ b/samples/html/widget/widget.bkl @@ -10,7 +10,6 @@ html core base - widget.rc diff --git a/samples/html/widget/widget.dsp b/samples/html/widget/widget.dsp index 44eb98ca13..050767a390 100644 --- a/samples/html/widget/widget.dsp +++ b/samples/html/widget/widget.dsp @@ -252,11 +252,11 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\widget.cpp +SOURCE=.\..\..\..\samples\sample.rc # End Source File # Begin Source File -SOURCE=.\widget.rc +SOURCE=.\widget.cpp # End Source File # End Group # End Target diff --git a/samples/html/widget/widget.rc b/samples/html/widget/widget.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/html/widget/widget.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/html/widget/widget_vc7.vcproj b/samples/html/widget/widget_vc7.vcproj index e2af16f7e9..2ddf0be4d4 100644 --- a/samples/html/widget/widget_vc7.vcproj +++ b/samples/html/widget/widget_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/widget/widget_vc8.vcproj b/samples/html/widget/widget_vc8.vcproj index 2e1b4e8d4f..0184ca70f5 100644 --- a/samples/html/widget/widget_vc8.vcproj +++ b/samples/html/widget/widget_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/widget/widget_vc9.vcproj b/samples/html/widget/widget_vc9.vcproj index 8128a50b78..4f745ae7e6 100644 --- a/samples/html/widget/widget_vc9.vcproj +++ b/samples/html/widget/widget_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 296e281aff..f18a1fb52a 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -48,9 +48,9 @@ ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = \ + $(__zip___win32rc) \ $(__zip_os2_lib_res) \ - zip_zip.o \ - $(__zip___win32rc) + zip_zip.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \ @COND_PLATFORM_OS2_1@__zip___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___zip___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__zip___win32rc = zip_sample_rc.o @COND_PLATFORM_OS2_1@__zip_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__zip_app_Contents_PkgInfo___depname \ @@ -110,7 +111,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__zip___win32rc = zip_zip_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -190,12 +190,12 @@ data: esac; \ done +zip_sample_rc.o: $(srcdir)/../../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + zip_zip.o: $(srcdir)/zip.cpp $(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $(srcdir)/zip.cpp -zip_zip_rc.o: $(srcdir)/zip.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc index f47ab00a65..4f29b4dae1 100644 --- a/samples/html/zip/makefile.bcc +++ b/samples/html/zip/makefile.bcc @@ -233,18 +233,18 @@ clean: -if exist $(OBJS)\zip.ilf del $(OBJS)\zip.ilf -if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils -$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res +$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(ZIP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_zip.res + c0w32.obj $(ZIP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\zip_sample.res: .\..\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\..\..\..\samples\sample.rc + $(OBJS)\zip_zip.obj: .\zip.cpp $(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) .\zip.cpp -$(OBJS)\zip_zip.res: .\zip.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\zip.rc - diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc index 99a8adb888..35c0468a17 100644 --- a/samples/html/zip/makefile.gcc +++ b/samples/html/zip/makefile.gcc @@ -28,8 +28,8 @@ ZIP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \ -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = \ - $(OBJS)\zip_zip.o \ - $(OBJS)\zip_zip_rc.o + $(OBJS)\zip_sample_rc.o \ + $(OBJS)\zip_zip.o ### Conditionally set variables: ### @@ -221,19 +221,19 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe -$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip_rc.o +$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_sample_rc.o $(CXX) -o $@ $(ZIP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (pages.zip start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\zip_sample_rc.o: ./../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + $(OBJS)\zip_zip.o: ./zip.cpp $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\zip_zip_rc.o: ./zip.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index 7f8e9efe83..2cdc74f8e5 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -32,7 +32,7 @@ ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ ZIP_OBJECTS = \ $(OBJS)\zip_zip.obj ZIP_RESOURCES = \ - $(OBJS)\zip_zip.res + $(OBJS)\zip_sample.res ### Conditionally set variables: ### @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb -$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res +$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(ZIP_OBJECTS) $(ZIP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -352,9 +352,9 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\zip_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + $(OBJS)\zip_zip.obj: .\zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp -$(OBJS)\zip_zip.res: .\zip.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\zip.rc - diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat index 60af87d3d3..9883257bae 100644 --- a/samples/html/zip/makefile.wat +++ b/samples/html/zip/makefile.wat @@ -253,7 +253,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe -$(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res +$(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_sample.res @%create $(OBJS)\zip.lbc @%append $(OBJS)\zip.lbc option quiet @%append $(OBJS)\zip.lbc name $^@ @@ -261,7 +261,7 @@ $(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res @%append $(OBJS)\zip.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\zip.lbc library %i - @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res + @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_sample.res @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i wlink @$(OBJS)\zip.lbc @@ -269,9 +269,9 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\zip_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + $(OBJS)\zip_zip.obj : .AUTODEPEND .\zip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $< -$(OBJS)\zip_zip.res : .AUTODEPEND .\zip.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - diff --git a/samples/html/zip/zip.bkl b/samples/html/zip/zip.bkl index dbf4125afd..1383c4ca13 100644 --- a/samples/html/zip/zip.bkl +++ b/samples/html/zip/zip.bkl @@ -10,7 +10,6 @@ html core base - zip.rc diff --git a/samples/html/zip/zip.dsp b/samples/html/zip/zip.dsp index 6b1b782dd3..010074d790 100644 --- a/samples/html/zip/zip.dsp +++ b/samples/html/zip/zip.dsp @@ -252,11 +252,11 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\zip.cpp +SOURCE=.\..\..\..\samples\sample.rc # End Source File # Begin Source File -SOURCE=.\zip.rc +SOURCE=.\zip.cpp # End Source File # End Group # End Target diff --git a/samples/html/zip/zip.rc b/samples/html/zip/zip.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/samples/html/zip/zip.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/samples/html/zip/zip_vc7.vcproj b/samples/html/zip/zip_vc7.vcproj index 037f696a83..9cc3d74a9a 100644 --- a/samples/html/zip/zip_vc7.vcproj +++ b/samples/html/zip/zip_vc7.vcproj @@ -550,7 +550,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/html/zip/zip_vc8.vcproj b/samples/html/zip/zip_vc8.vcproj index 5b697ddb26..4ce5f4247d 100644 --- a/samples/html/zip/zip_vc8.vcproj +++ b/samples/html/zip/zip_vc8.vcproj @@ -814,7 +814,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/html/zip/zip_vc9.vcproj b/samples/html/zip/zip_vc9.vcproj index 0f94c0027b..3eab2e3007 100644 --- a/samples/html/zip/zip_vc9.vcproj +++ b/samples/html/zip/zip_vc9.vcproj @@ -786,7 +786,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 0cf34cf63c..e11a0489b1 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -47,10 +47,10 @@ IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ + $(__image___win32rc) \ $(__image_os2_lib_res) \ image_image.o \ - image_canvas.o \ - $(__image___win32rc) + image_canvas.o ### Conditionally set variables: ### @@ -86,6 +86,7 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q @COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__image___win32rc = image_sample_rc.o @COND_PLATFORM_OS2_1@__image_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \ @@ -107,7 +108,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -187,15 +187,15 @@ data: esac; \ done +image_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + image_image.o: $(srcdir)/image.cpp $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/image.cpp image_canvas.o: $(srcdir)/canvas.cpp $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/canvas.cpp -image_image_rc.o: $(srcdir)/image.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/image/image.bkl b/samples/image/image.bkl index b2218036e7..3762421268 100644 --- a/samples/image/image.bkl +++ b/samples/image/image.bkl @@ -10,7 +10,6 @@ canvas.h core base - image.rc diff --git a/samples/image/image.dsp b/samples/image/image.dsp index cd8e7b2017..ec02e8cda6 100644 --- a/samples/image/image.dsp +++ b/samples/image/image.dsp @@ -260,7 +260,7 @@ SOURCE=.\image.cpp # End Source File # Begin Source File -SOURCE=.\image.rc +SOURCE=.\..\..\samples\sample.rc # End Source File # End Group # Begin Group "Header Files" diff --git a/samples/image/image.rc b/samples/image/image.rc deleted file mode 100644 index 626b82f58a..0000000000 --- a/samples/image/image.rc +++ /dev/null @@ -1,3 +0,0 @@ -/* mondrian ICON "mondrian.ico" */ -#include "wx/msw/wx.rc" - diff --git a/samples/image/image.rco b/samples/image/image.rco deleted file mode 100644 index be4e15f5e6..0000000000 --- a/samples/image/image.rco +++ /dev/null @@ -1,2 +0,0 @@ -RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc - diff --git a/samples/image/image_vc7.vcproj b/samples/image/image_vc7.vcproj index 8e0014b607..0133336c7f 100644 --- a/samples/image/image_vc7.vcproj +++ b/samples/image/image_vc7.vcproj @@ -561,7 +561,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj index 9ae1ab0849..67155308b0 100644 --- a/samples/image/image_vc8.vcproj +++ b/samples/image/image_vc8.vcproj @@ -828,7 +828,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/image/image_vc9.vcproj b/samples/image/image_vc9.vcproj index 918674ff52..63cd0c7e4d 100644 --- a/samples/image/image_vc9.vcproj +++ b/samples/image/image_vc9.vcproj @@ -800,7 +800,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc index b165f8f48d..a4297123c4 100644 --- a/samples/image/makefile.bcc +++ b/samples/image/makefile.bcc @@ -230,21 +230,21 @@ clean: -if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf -if exist $(OBJS)\image.ils del $(OBJS)\image.ils -$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res +$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample.res ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res + c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_sample.res | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\image_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc + $(OBJS)\image_image.obj: .\image.cpp $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp $(OBJS)\image_canvas.obj: .\canvas.cpp $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp -$(OBJS)\image_image.res: .\image.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc - diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc index aa10455e55..4c201f184d 100644 --- a/samples/image/makefile.gcc +++ b/samples/image/makefile.gcc @@ -29,9 +29,9 @@ IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ + $(OBJS)\image_sample_rc.o \ $(OBJS)\image_image.o \ - $(OBJS)\image_canvas.o \ - $(OBJS)\image_image_rc.o + $(OBJS)\image_canvas.o ### Conditionally set variables: ### @@ -219,22 +219,22 @@ clean: -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\image.exe del $(OBJS)\image.exe -$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o +$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample_rc.o $(CXX) -o $@ $(IMAGE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +$(OBJS)\image_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + $(OBJS)\image_image.o: ./image.cpp $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\image_canvas.o: ./canvas.cpp $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\image_image_rc.o: ./image.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - .PHONY: all clean data diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 63a16ad115..e30ef131cb 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -33,7 +33,7 @@ IMAGE_OBJECTS = \ $(OBJS)\image_image.obj \ $(OBJS)\image_canvas.obj IMAGE_RESOURCES = \ - $(OBJS)\image_image.res + $(OBJS)\image_sample.res ### Conditionally set variables: ### @@ -340,7 +340,7 @@ clean: -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb -$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res +$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(IMAGE_OBJECTS) $(IMAGE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << @@ -349,12 +349,12 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\image_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + $(OBJS)\image_image.obj: .\image.cpp $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp $(OBJS)\image_canvas.obj: .\canvas.cpp $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp -$(OBJS)\image_image.res: .\image.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc - diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat index 195cbe900f..d7c4f0fa12 100644 --- a/samples/image/makefile.wat +++ b/samples/image/makefile.wat @@ -249,7 +249,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\image.exe del $(OBJS)\image.exe -$(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res +$(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_sample.res @%create $(OBJS)\image.lbc @%append $(OBJS)\image.lbc option quiet @%append $(OBJS)\image.lbc name $^@ @@ -257,7 +257,7 @@ $(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res @%append $(OBJS)\image.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\image.lbc library %i - @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res + @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_sample.res @for %i in () do @%append $(OBJS)\image.lbc option stack=%i wlink @$(OBJS)\image.lbc @@ -265,12 +265,12 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +$(OBJS)\image_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + $(OBJS)\image_image.obj : .AUTODEPEND .\image.cpp $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< $(OBJS)\image_canvas.obj : .AUTODEPEND .\canvas.cpp $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< -$(OBJS)\image_image.res : .AUTODEPEND .\image.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 40c98b0e7b..5c603795cf 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -47,9 +47,9 @@ INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ + $(__internat___win32rc) \ $(__internat_os2_lib_res) \ - internat_internat.o \ - $(__internat___win32rc) + internat_internat.o ### Conditionally set variables: ### @@ -85,6 +85,7 @@ COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__internat___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___internat___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__internat___win32rc = internat_sample_rc.o @COND_PLATFORM_OS2_1@__internat_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__internat_app_Contents_PkgInfo___depname \ @@ -106,7 +107,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__internat___win32rc = internat_internat_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -318,12 +318,12 @@ ja_JP.EUC-JP: esac; \ done +internat_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + internat_internat.o: $(srcdir)/internat.cpp $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $(srcdir)/internat.cpp -internat_internat_rc.o: $(srcdir)/internat.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/internat/internat.bkl b/samples/internat/internat.bkl index bb29f446d0..33e0c06f58 100644 --- a/samples/internat/internat.bkl +++ b/samples/internat/internat.bkl @@ -7,7 +7,6 @@ internat.cpp core base - internat.rc